11/22

src/views/main/Customer/addForm.vue

@@ -36,90 +36,59 @@
       </a-col>
       <a-col :span="6">
         <a-form-item label="全称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入全称"
-            v-decorator="['fullName', { rules: [{ required: true, message: '请输入全称！' }] }]"
-          />
+          <a-input placeholder="请输入全称" v-decorator="['fullName']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入负责人"
-            v-decorator="['chief', { rules: [{ required: true, message: '请输入负责人！' }] }]"
-          />
+          <a-input placeholder="请输入负责人" v-decorator="['chief']" />
         </a-form-item>
       </a-col>
     </a-row>
     <a-row>
       <a-col :span="6">
         <a-form-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入电话"
-            v-decorator="['tel', { rules: [{ required: true, message: '请输入电话！' }] }]"
-          />
+          <a-input placeholder="请输入电话" v-decorator="['tel']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入邮箱"
-            v-decorator="['email', { rules: [{ required: true, message: '请输入邮箱！' }] }]"
-          />
+          <a-input placeholder="请输入邮箱" v-decorator="['email']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="QQ" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入QQ"
-            v-decorator="['qq', { rules: [{ required: true, message: '请输入QQ！' }] }]"
-          />
+          <a-input placeholder="请输入QQ" v-decorator="['qq']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="网址" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入网址"
-            v-decorator="['webUrl', { rules: [{ required: true, message: '请输入网址！' }] }]"
-          />
+          <a-input placeholder="请输入网址" v-decorator="['webUrl']" />
         </a-form-item>
       </a-col>
     </a-row>
     <a-row>
       <a-col :span="6">
         <a-form-item label="省份" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入省份"
-            v-decorator="['province', { rules: [{ required: true, message: '请输入省份！' }] }]"
-          />
+          <a-input placeholder="请输入省份" v-decorator="['province']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="城市" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入城市"
-            v-decorator="['city', { rules: [{ required: true, message: '请输入城市！' }] }]"
-          />
+          <a-input placeholder="请输入城市" v-decorator="['city']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入地址"
-            v-decorator="['addr', { rules: [{ required: true, message: '请输入地址！' }] }]"
-          />
+          <a-input placeholder="请输入地址" v-decorator="['addr']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="客户属性" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-select
-            mode="multiple"
-            placeholder="请选择客户属性"
-            v-decorator="['WpropString', { rules: [{ required: true, message: '请选择客户属性！' }] }]"
-          >
-            <a-select-option v-for="item in propStringData" :key="item.id" :value="item.code">{{
-              item.name
-            }}</a-select-option>
+          <a-select mode="multiple" placeholder="请选择客户属性" v-decorator="['WpropString']">
+            <a-select-option v-for="item in propStringData" :key="item.id" :value="item.code">
+              {{ item.name }}
+            </a-select-option>
           </a-select>
         </a-form-item>
       </a-col>
@@ -127,18 +96,12 @@
     <a-row>
       <a-col :span="12">
         <a-form-item label="英文全名" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入英文全名"
-            v-decorator="['fullNameEN', { rules: [{ required: true, message: '请输入英文全名！' }] }]"
-          />
+          <a-input placeholder="请输入英文全名" v-decorator="['fullNameEN']" />
         </a-form-item>
       </a-col>
       <a-col :span="12">
         <a-form-item label="英文地址" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入英文地址"
-            v-decorator="['addrEN', { rules: [{ required: true, message: '请输入英文地址！' }] }]"
-          />
+          <a-input placeholder="请输入英文地址" v-decorator="['addrEN']" />
         </a-form-item>
       </a-col>
     </a-row>
@@ -199,62 +162,41 @@
     <a-row>
       <a-col :span="12">
         <a-form-item label="发票抬头" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入发票抬头"
-            v-decorator="['invTitle', { rules: [{ required: true, message: '请输入发票抬头！' }] }]"
-          />
+          <a-input placeholder="请输入发票抬头" v-decorator="['invTitle']" />
         </a-form-item>
       </a-col>
       <a-col :span="12">
         <a-form-item label="纳税人识别号" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入纳税人识别号"
-            v-decorator="['taxNO', { rules: [{ required: true, message: '请输入纳税人识别号！' }] }]"
-          />
+          <a-input placeholder="请输入纳税人识别号" v-decorator="['taxNO']" />
         </a-form-item>
       </a-col>
       <a-col :span="18">
         <a-form-item label="发票地址电话" :labelCol="labelCol3" :wrapperCol="wrapperCol3" has-feedback>
-          <a-input
-            placeholder="请输入发票地址电话"
-            v-decorator="['invAddrTel', { rules: [{ required: true, message: '请输入发票地址电话！' }] }]"
-          />
+          <a-input placeholder="请输入发票地址电话" v-decorator="['invAddrTel']" />
         </a-form-item>
       </a-col>
     </a-row>
     <a-row>
       <a-col :span="12">
         <a-form-item label="人民币开户行" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入人民币开户行"
-            v-decorator="['rmbBank', { rules: [{ required: true, message: '请输入人民币开户行！' }] }]"
-          />
+          <a-input placeholder="请输入人民币开户行" v-decorator="['rmbBank']" />
         </a-form-item>
       </a-col>
       <a-col :span="12">
         <a-form-item label="人民币账号" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入人民币账号"
-            v-decorator="['rmbAccount', { rules: [{ required: true, message: '请输入人民币账号！' }] }]"
-          />
+          <a-input placeholder="请输入人民币账号" v-decorator="['rmbAccount']" />
         </a-form-item>
       </a-col>
     </a-row>
     <a-row>
       <a-col :span="12">
         <a-form-item label="美元开户行" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入美元开户行"
-            v-decorator="['usdBank', { rules: [{ required: true, message: '请输入美元开户行！' }] }]"
-          />
+          <a-input placeholder="请输入美元开户行" v-decorator="['usdBank']" />
         </a-form-item>
       </a-col>
       <a-col :span="12">
         <a-form-item label="美元账号" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入美元账号"
-            v-decorator="['usdAccount', { rules: [{ required: true, message: '请输入美元账号！' }] }]"
-          />
+          <a-input placeholder="请输入美元账号" v-decorator="['usdAccount']" />
         </a-form-item>
       </a-col>
     </a-row>
@@ -355,6 +297,7 @@ export default {
         form: { validateFields }
       } = this
       this.confirmLoading = true
+
       validateFields((errors, values) => {
         if (!errors) {
           for (const key in values) {
@@ -362,15 +305,15 @@ export default {
               values[key] = JSON.stringify(values[key])
             }
           }
-
           let propString = ''
-
-          values.WpropString.split('["')[1]
-            .split('"]')[0]
-            .split('","')
-            .forEach(item2 => {
-              propString == '' ? (propString = `[${item2}]`) : (propString = `${propString}[${item2}]`)
-            })
+          if (values.WpropString) {
+            values.WpropString.split('["')[1]
+              .split('"]')[0]
+              .split('","')
+              .forEach(item2 => {
+                propString == '' ? (propString = `[${item2}]`) : (propString = `${propString}[${item2}]`)
+              })
+          }
 
           DjyCustomerAdd({ ...values, propString: propString, contacts: this.ContactsData })
             .then(res => {

src/views/main/Customer/editForm.vue

@@ -36,87 +36,56 @@
       </a-col>
       <a-col :span="6">
         <a-form-item label="全称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入全称"
-            v-decorator="['fullName', { rules: [{ required: true, message: '请输入全称！' }] }]"
-          />
+          <a-input placeholder="请输入全称" v-decorator="['fullName']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入负责人"
-            v-decorator="['chief', { rules: [{ required: true, message: '请输入负责人！' }] }]"
-          />
+          <a-input placeholder="请输入负责人" v-decorator="['chief']" />
         </a-form-item>
       </a-col>
     </a-row>
     <a-row>
       <a-col :span="6">
         <a-form-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入电话"
-            v-decorator="['tel', { rules: [{ required: true, message: '请输入电话！' }] }]"
-          />
+          <a-input placeholder="请输入电话" v-decorator="['tel']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入邮箱"
-            v-decorator="['email', { rules: [{ required: true, message: '请输入邮箱！' }] }]"
-          />
+          <a-input placeholder="请输入邮箱" v-decorator="['email']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="QQ" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入QQ"
-            v-decorator="['qq', { rules: [{ required: true, message: '请输入QQ！' }] }]"
-          />
+          <a-input placeholder="请输入QQ" v-decorator="['qq']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="网址" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入网址"
-            v-decorator="['webUrl', { rules: [{ required: true, message: '请输入网址！' }] }]"
-          />
+          <a-input placeholder="请输入网址" v-decorator="['webUrl']" />
         </a-form-item>
       </a-col>
     </a-row>
     <a-row>
       <a-col :span="6">
         <a-form-item label="省份" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入省份"
-            v-decorator="['province', { rules: [{ required: true, message: '请输入省份！' }] }]"
-          />
+          <a-input placeholder="请输入省份" v-decorator="['province']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="城市" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入城市"
-            v-decorator="['city', { rules: [{ required: true, message: '请输入城市！' }] }]"
-          />
+          <a-input placeholder="请输入城市" v-decorator="['city']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input
-            placeholder="请输入地址"
-            v-decorator="['addr', { rules: [{ required: true, message: '请输入地址！' }] }]"
-          />
+          <a-input placeholder="请输入地址" v-decorator="['addr']" />
         </a-form-item>
       </a-col>
       <a-col :span="6">
         <a-form-item label="客户属性" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-select
-            mode="multiple"
-            placeholder="请选择客户属性"
-            v-decorator="['WpropString', { rules: [{ required: true, message: '请选择客户属性！' }] }]"
-          >
+          <a-select mode="multiple" placeholder="请选择客户属性" v-decorator="['WpropString']">
             <a-select-option v-for="item in propStringData" :key="item.id" :value="item.code">{{
               item.name
             }}</a-select-option>
@@ -127,18 +96,12 @@
     <a-row>
       <a-col :span="12">
         <a-form-item label="英文全名" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入英文全名"
-            v-decorator="['fullNameEN', { rules: [{ required: true, message: '请输入英文全名！' }] }]"
-          />
+          <a-input placeholder="请输入英文全名" v-decorator="['fullNameEN']" />
         </a-form-item>
       </a-col>
       <a-col :span="12">
         <a-form-item label="英文地址" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入英文地址"
-            v-decorator="['addrEN', { rules: [{ required: true, message: '请输入英文地址！' }] }]"
-          />
+          <a-input placeholder="请输入英文地址" v-decorator="['addrEN']" />
         </a-form-item>
       </a-col>
     </a-row>
@@ -199,62 +162,41 @@
     <a-row>
       <a-col :span="12">
         <a-form-item label="发票抬头" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入发票抬头"
-            v-decorator="['invTitle', { rules: [{ required: true, message: '请输入发票抬头！' }] }]"
-          />
+          <a-input placeholder="请输入发票抬头" v-decorator="['invTitle']" />
         </a-form-item>
       </a-col>
       <a-col :span="12">
         <a-form-item label="纳税人识别号" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入纳税人识别号"
-            v-decorator="['taxNO', { rules: [{ required: true, message: '请输入纳税人识别号！' }] }]"
-          />
+          <a-input placeholder="请输入纳税人识别号" v-decorator="['taxNO']" />
         </a-form-item>
       </a-col>
       <a-col :span="18">
         <a-form-item label="发票地址电话" :labelCol="labelCol3" :wrapperCol="wrapperCol3" has-feedback>
-          <a-input
-            placeholder="请输入发票地址电话"
-            v-decorator="['invAddrTel', { rules: [{ required: true, message: '请输入发票地址电话！' }] }]"
-          />
+          <a-input placeholder="请输入发票地址电话" v-decorator="['invAddrTel']" />
         </a-form-item>
       </a-col>
     </a-row>
     <a-row>
       <a-col :span="12">
         <a-form-item label="人民币开户行" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入人民币开户行"
-            v-decorator="['rmbBank', { rules: [{ required: true, message: '请输入人民币开户行！' }] }]"
-          />
+          <a-input placeholder="请输入人民币开户行" v-decorator="['rmbBank']" />
         </a-form-item>
       </a-col>
       <a-col :span="12">
         <a-form-item label="人民币账号" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入人民币账号"
-            v-decorator="['rmbAccount', { rules: [{ required: true, message: '请输入人民币账号！' }] }]"
-          />
+          <a-input placeholder="请输入人民币账号" v-decorator="['rmbAccount']" />
         </a-form-item>
       </a-col>
     </a-row>
     <a-row>
       <a-col :span="12">
         <a-form-item label="美元开户行" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入美元开户行"
-            v-decorator="['usdBank', { rules: [{ required: true, message: '请输入美元开户行！' }] }]"
-          />
+          <a-input placeholder="请输入美元开户行" v-decorator="['usdBank']" />
         </a-form-item>
       </a-col>
       <a-col :span="12">
         <a-form-item label="美元账号" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-          <a-input
-            placeholder="请输入美元账号"
-            v-decorator="['usdAccount', { rules: [{ required: true, message: '请输入美元账号！' }] }]"
-          />
+          <a-input placeholder="请输入美元账号" v-decorator="['usdAccount']" />
         </a-form-item>
       </a-col>
     </a-row>
@@ -323,10 +265,16 @@ export default {
         item.WebKey = index + 1
       })
       this.ContactsData = res.data.contacts
-      this.form.setFieldsValue({
-        ...res.data,
-        WpropString
-      })
+      if (WpropString.length) {
+        this.form.setFieldsValue({
+          ...res.data,
+          WpropString
+        })
+      } else {
+        this.form.setFieldsValue({
+          ...res.data
+        })
+      }
     })
     this.TypeData = this.$options.filters['dictData']('djy_cust_contact_role')
     this.propStringData = this.$options.filters['dictData']('djy_cust_prop')
@@ -399,12 +347,15 @@ export default {
             }
           }
           let propString = ''
-          values.WpropString.split('["')[1]
-            .split('"]')[0]
-            .split('","')
-            .forEach(item2 => {
-              propString == '' ? (propString = `[${item2}]`) : (propString = `${propString}[${item2}]`)
-            })
+          if (values.WpropString) {
+            values.WpropString.split('["')[1]
+              .split('"]')[0]
+              .split('","')
+              .forEach(item2 => {
+                propString == '' ? (propString = `[${item2}]`) : (propString = `${propString}[${item2}]`)
+              })
+          }
+
           DjyCustomerEdit({ ...this.Data, ...values, propString: propString, contacts: this.ContactsData })
             .then(res => {
               if (res.success) {