合同登记bug调整

src/views/jy/workClientInfo/WorkClientChooseForm.vue

@@ -16,8 +16,8 @@
           <el-form-item label="客户名称" prop="name">
             <el-input size="small" v-model="searchForm.name" placeholder="客户名称" clearable></el-input>
           </el-form-item>
-          <el-form-item label="客户编号" prop="no">
-            <el-input size="small" v-model="searchForm.no" placeholder="客户编号" clearable></el-input>
+          <el-form-item label="客户编号" prop="number">
+            <el-input size="small" v-model="searchForm.number" placeholder="客户编号" clearable></el-input>
           </el-form-item>
           <el-form-item label="客户类型" prop="clientType">
             <el-select v-model="searchForm.clientType" placeholder="请选择" style="width:100%" clearable>
@@ -68,7 +68,7 @@
           <vxe-column type="seq" width="40"></vxe-column>
           <vxe-column type="checkbox" width="60px"></vxe-column>
           <vxe-column width="" title="客户名称" align="center" field="name" tree-node></vxe-column>
-          <vxe-column width="" title="客户编号" align="center" field="no"></vxe-column>
+          <vxe-column width="" title="客户编号" align="center" field="number"></vxe-column>
           <vxe-column width="" title="客户类型" align="center" field="clientType">
             <template #default="scope">
               {{$dictUtils.getDictLabel('customer_type', scope.row.clientType, '-')}}
@@ -115,7 +115,7 @@
         dataList: [],
         searchForm: {
           name: '',
-          no: '',
+          number: '',
 			clientType: '',
 			companyIndustry: ''
         }
@@ -146,7 +146,7 @@
             let p = {
               id: item.id,
               name: item.name,
-              no: item.no,
+              number: item.number,
               type: item.type,
               industry: item.industry,
               companyLevel: item.companyLevel
@@ -167,6 +167,7 @@
           'orders': this.tablePage.orders,
           ...this.searchForm
         }).then((data) => {
+        	console.log('da',data)
           this.dataList = data.records
           this.tablePage.total = data.total
           this.loading = false

src/views/jy/workClientInfo/WorkClientChooseRadio.vue

@@ -16,8 +16,8 @@
           <el-form-item label="客户名称" prop="name">
             <el-input size="large" v-model="searchForm.name" placeholder="客户名称" clearable></el-input>
           </el-form-item>
-          <el-form-item label="客户编号" prop="no">
-            <el-input size="large" v-model="searchForm.no" placeholder="客户编号" clearable></el-input>
+          <el-form-item label="客户编号" prop="number">
+            <el-input size="large" v-model="searchForm.number" placeholder="客户编号" clearable></el-input>
           </el-form-item>
           <el-form-item label="客户类型" prop="clientType">
             <el-select v-model="searchForm.clientType" placeholder="请选择" style="width:100%" clearable>

src/views/jy/workContractInfo/ContractAddForm.vue

@@ -552,11 +552,14 @@
 					if(data.contractType){
 						this.showType(data.contractType)
 					}
-					this.contractService.findByPrimaryName(data.primaryLinkman).then((data)=>{
-
+					this.workClientService.findListByName(data.primaryLinkman).then((da)=>{
+						console.log('11',da)
+							this.inputForm.address=da[0].registerAddress
+							this.inputForm.uscCode=da[0].uscCode
+							this.inputForm.customerNo=da[0].number
 					})
 					this.inputForm.department=data.department
-					console.log('data',data.contractTypes)
+					console.log('data',data)
 					if (this.commonJS.isEmpty(this.inputForm.department)) {
 						this.inputForm.department = this.$store.state.user.office.id
 					}