Z преди 1 година
родител
ревизия
18908e446d
променени са 1 файла, в които са добавени 54 реда и са изтрити 33 реда
  1. 54 33
      src/views/saleManage/contact/components/addContactDialog.vue

+ 54 - 33
src/views/saleManage/contact/components/addContactDialog.vue

@@ -55,18 +55,15 @@
             </el-col>
             <el-col :span="8">
               <el-form-item
-                label="客户代号"
-                prop="serialNo"
-                :rules="{
-                  required: clientEnvironmentId != 4 ? true : false,
-                  message: '请输入',
-                  trigger: 'change'
-                }"
+                label="统一信用代码	"
+                prop="unifiedSocialCreditCode"
+                class="form_item_label"
               >
                 <el-input
                   placeholder="请输入"
-                  v-model="form.serialNo"
-                  maxlength="50"
+                  v-model="form.unifiedSocialCreditCode"
+                  maxlength="18"
+                  @change="unifiedSocialCreditCodeChange"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -80,16 +77,21 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+
             <el-col :span="8">
               <el-form-item
-                label="统一信用代码	"
-                prop="unifiedSocialCreditCode"
-                class="form_item_label"
+                label="客户代号"
+                prop="serialNo"
+                :rules="{
+                  required: false,
+                  message: '请输入',
+                  trigger: 'change'
+                }"
               >
                 <el-input
                   placeholder="请输入"
-                  v-model="form.unifiedSocialCreditCode"
-                  maxlength="18"
+                  v-model="form.serialNo"
+                  maxlength="50"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -268,8 +270,21 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+         
+          </el-row>
+        </el-form>
+        <el-form
+          label-width="120px"
+          ref="otherForm"
+          class="el-form-box"
+          :model="otherForm"
+          :rules="otherRules"
+        >
+          <el-row>
             <el-col :span="24">
-              <el-form-item label="收件人地址">
+              <el-form-item label="收件人地址"
+            
+              prop="addressId">
                 <el-cascader
                   clearable
                   v-model="otherForm.addressId"
@@ -811,7 +826,7 @@ export default {
       enterpriseProfile: '',
       englishName: '',
       taxpayerQualification: '',
-      qualificationCensorship: '1'
+      qualificationCensorship: '2'
     };
     let otherFormDef = {
       settlementMode: '',
@@ -1056,9 +1071,9 @@ export default {
           { required: true, message: '请输入授信额度', trigger: 'blur' }
         ],
 
-        addressId: [
-          { required: true, message: '请选择地址', trigger: 'change' }
-        ],
+        // addressId: [
+        //   { required: true, message: '请选择地址', trigger: 'change' }
+        // ],
         qualificationCensorship: [
           { required: true, message: '请选择', trigger: 'change' }
         ]
@@ -1067,7 +1082,7 @@ export default {
         // settlementMode: [
         //   { required: true, message: '请输入结算方式', trigger: 'blur' }
         // ],
-        taxRate: [{ required: true, message: '请输入税率', trigger: 'change' }]
+        addressId: [{ required: true, message: '请选择地址', trigger: 'change' }]
       },
       options: {
         cityData,
@@ -1223,6 +1238,11 @@ export default {
 
       // this.reload();
     },
+    //获取客户代号
+    unifiedSocialCreditCodeChange(val){
+
+      this.form.serialNo=val.slice(-4);
+    },
     // 选择负责人部门
     change_principalDep(id) {
       const info = this.groupData.find((e) => e.id == id);
@@ -1291,18 +1311,19 @@ export default {
         });
       });
     },
-    // otherFormValid() {
-    //   return new Promise((resolve, reject) => {
-    //     this.$refs.otherForm.validate((valid) => {
-    //       if (!valid) {
-    //         this.activeName = 4;
-    //         reject(false);
-    //       } else {
-    //         resolve(true);
-    //       }
-    //     });
-    //   });
-    // },
+    otherFormValid() {
+      return new Promise((resolve, reject) => {
+        this.$refs.otherForm.validate((valid) => {
+          console.log(valid,'valid')
+          if (!valid) {
+            this.activeName = 1;
+            reject(false);
+          } else {
+            resolve(true);
+          }
+        });
+      });
+    },
     tableLinkDataValid() {
       return new Promise((resolve, reject) => {
         if (this.tableLinkData.length == 0) {
@@ -1317,7 +1338,7 @@ export default {
     getValidate() {
       return Promise.all([
         this.formValid(),
-        // this.otherFormValid(),
+        this.otherFormValid(),
         this.tableLinkDataValid()
       ]);
     },