Merge remote-tracking branch 'origin/master'

src/views/modules/cw/workContract/ContractFileForm.vue

@@ -336,6 +336,7 @@
         returnForm: {
           departmentName: '', // 部门名称
           customerId: '',  // 客户id
+          address: '',
           uscCode: '',
           filedNo: '',
           confirmFiledNo: '',
@@ -364,6 +365,7 @@
         inputForm: {
           departmentName: '', // 部门名称
           customerId: '',  // 客户id
+          address: '',
           uscCode: '',
           customerNo: '',
           contractFee: '',
@@ -515,6 +517,7 @@
         this.inputForm = {
           departmentName: '', // 部门名称
           customerId: '',  // 客户id
+          address: '',
           uscCode: '',
           customerNo: '',
           contractFee: '',
@@ -659,7 +662,7 @@
             no: list.no,
             name: list.name
           }
-          // console.log('list', list)
+          console.log('list', list)
           this.inputForm.customerNo = list.no
           this.inputForm.uscCode = list.uscCode
           this.inputForm.address = list.address

src/views/modules/cw/workContract/ContractFilePaperForm.vue

@@ -340,6 +340,7 @@
         returnForm: {
           departmentName: '', // 部门名称
           customerId: '',  // 客户id
+          address: '',
           uscCode: '',
           filedNo: '',
           confirmFiledNo: '',
@@ -368,6 +369,7 @@
         inputForm: {
           departmentName: '', // 部门名称
           customerId: '',  // 客户id
+          address: '',
           uscCode: '',
           customerNo: '',
           contractFee: '',
@@ -521,6 +523,7 @@
         this.inputForm = {
           departmentName: '', // 部门名称
           customerId: '',  // 客户id
+          address: '',
           uscCode: '',
           customerNo: '',
           contractFee: '',