Merge branch 'master' into dev

src/views/purchasingManage/supplierManage/components/addContactDialog.vue

@@ -597,9 +597,9 @@ export default {
           ]
         },
         otherRules: {
-          settlementMode: [
-            { required: true, message: '请输入结算方式', trigger: 'blur' }
-          ],
+          // settlementMode: [
+          //   { required: true, message: '请输入结算方式', trigger: 'blur' }
+          // ],
           taxRate: [
             { required: true, message: '请输入税率', trigger: 'change' }
           ]
@@ -832,7 +832,7 @@ export default {
         } catch (error) {
           // 表单验证未通过，不执行保存操作
         }
-       
+
       },
       cancel() {
         this.$nextTick(() => {
@@ -860,7 +860,9 @@ export default {
         if(this.tableLinkData && this.tableLinkData.length > 0){
           this.tableLinkData.forEach(e => e.status = e.status+"");
         }
-        this.otherForm.settlementMode = this.otherForm.settlementMode + "";
+        if(this.otherForm.settlementMode){
+          this.otherForm.settlementMode = this.otherForm.settlementMode + "";
+        }
         // 回显地址选择器
         if(this.form.addressId && this.form.addressId.length > 0){
           this.form.addressId = this.form.addressId.split(",");

src/views/saleManage/contact/components/addContactDialog.vue

@@ -597,9 +597,9 @@ export default {
           ]
         },
         otherRules: {
-          settlementMode: [
-            { required: true, message: '请输入结算方式', trigger: 'blur' }
-          ],
+          // settlementMode: [
+          //   { required: true, message: '请输入结算方式', trigger: 'blur' }
+          // ],
           taxRate: [
             { required: true, message: '请输入税率', trigger: 'change' }
           ]
@@ -832,7 +832,7 @@ export default {
         } catch (error) {
           // 表单验证未通过，不执行保存操作
         }
-       
+
       },
       cancel() {
         this.$nextTick(() => {
@@ -860,7 +860,10 @@ export default {
         if(this.tableLinkData && this.tableLinkData.length > 0){
           this.tableLinkData.forEach(e => e.status = e.status+"");
         }
-        this.otherForm.settlementMode = this.otherForm.settlementMode + "";
+        if(this.otherForm.settlementMode){
+          this.otherForm.settlementMode = this.otherForm.settlementMode + "";
+        }
+
         // 回显地址选择器
         if(this.form.addressId && this.form.addressId.length > 0){
           this.form.addressId = this.form.addressId.split(",");