|
|
@@ -7,7 +7,7 @@
|
|
|
element-loading-spinner="el-icon-loading"
|
|
|
>
|
|
|
<div class="crm_search">
|
|
|
- <el-form ref="formRef" label-position="" :model="search" label-width="">
|
|
|
+ <el-form ref="formRef" :model="search" label-width="">
|
|
|
<el-row>
|
|
|
<el-col :span="24" :md="24" :lg="24">
|
|
|
<el-form-item>
|
|
|
@@ -141,7 +141,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-form-item>
|
|
|
+ <el-form-item style="align-items: baseline">
|
|
|
<el-button
|
|
|
v-if="display['R-GlobalOrder-Export'] && display['R-GlobalOrder-Export'].show"
|
|
|
type="primary"
|
|
|
@@ -150,7 +150,7 @@
|
|
|
>{{ $t('Btn.Export') }}</el-button
|
|
|
>
|
|
|
</el-form-item>
|
|
|
- <el-form-item>
|
|
|
+ <el-form-item style="align-items: baseline">
|
|
|
<div class="search_action_btn">
|
|
|
<span
|
|
|
v-if="display['R-GlobalOrder-Add'] && display['R-GlobalOrder-Add'].show"
|
|
|
@@ -322,7 +322,12 @@
|
|
|
width="1000px"
|
|
|
:close-on-click-modal="false"
|
|
|
>
|
|
|
- <DynamicForm ref="dynamicFormRef" :fields="globalCurrenciesField" :global-form="globalForm">
|
|
|
+ <DynamicForm
|
|
|
+ ref="dynamicFormRef"
|
|
|
+ :fields="globalCurrenciesField"
|
|
|
+ :global-form="globalForm"
|
|
|
+ @update:global-form="changeGlobalForm"
|
|
|
+ >
|
|
|
<el-col v-if="isAdd" :span="8">
|
|
|
<el-form-item prop="cId" :label="$t('global.t1')">
|
|
|
<el-select
|
|
|
@@ -648,6 +653,10 @@
|
|
|
}))
|
|
|
|
|
|
// 方法
|
|
|
+ const changeGlobalForm = (data) => {
|
|
|
+ console.log(data)
|
|
|
+ Object.assign(globalForm, data)
|
|
|
+ }
|
|
|
const getStatusColor = (type, status) => {
|
|
|
let color = 'crm_state_blue'
|
|
|
if (type == 'status') {
|
|
|
@@ -1167,7 +1176,9 @@
|
|
|
}
|
|
|
|
|
|
const saveBusiness = async () => {
|
|
|
- const valid = await dynamicFormRef.value.$refs.globalForm.validate()
|
|
|
+ console.log(dynamicFormRef.value.globalFormRef, 'value1')
|
|
|
+ console.log(dynamicFormRef.value.globalFormRef, 'value')
|
|
|
+ const valid = await dynamicFormRef.value.globalFormRef.validate()
|
|
|
const [cardNumber, deductionAccountType] = globalForm.deductionAccount.split(',')
|
|
|
|
|
|
if (valid) {
|
|
|
@@ -1211,10 +1222,6 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- const accountOpen = (cId) => {
|
|
|
- router.push({ name: 'R-CustomerDetail', params: { cId: cId } })
|
|
|
- }
|
|
|
-
|
|
|
const isBusinessFormValid = () => {
|
|
|
const requiredFields = ['areaCode', 'mobile', 'email', 'lastName', 'firstName', 'address']
|
|
|
return requiredFields.every((field) => !!businessForm[field])
|