Merge branch 'crm_16.8' into debug

src/views/financialManagement/contractProgress-component/Compliance.vue

@@ -283,7 +283,12 @@
   }
   // 合同编号选中
   const selectContractNo= async (value)=>{
-    let selectItem=contractNoInfo.contractNoArray.find(item=>item.contract_code == value)
+    let searchValue = value
+     if(compliance.form.contract_source==0){
+      searchValue = value.contract_code
+      compliance.form.contract_code = value.contract_code
+    }
+    let selectItem=contractNoInfo.contractNoArray.find(item=>item.contract_code == searchValue)
     if(selectItem.contract_business_type_int==2){
       // 代付合同
       compliance.form.has_payment=1
@@ -602,13 +607,11 @@
   }
   // 合同编号远程搜索
   const contractNoSearch=(value)=>{
-    const regex = /^HZEQ\d{11}$/;
-    if((regex.test(value) && compliance.form.contract_source==0) || (compliance.form.contract_source!=0 &&  value.trim())){
+       if(!value.trim()) return
        contractNoQuery.keyword=value
        contractNoQuery.current=1
        contractNoInfo.contractNoArray=[]
        getContractSearchListFun()
-    }
   }
   const loadContractNoMore=()=>{
     if(contractNoInfo.contractNoArray.length >=contractNoInfo.contractNoTotal) return 
@@ -630,6 +633,21 @@
     contractNoInfo.contractNoLoading = false;
   }
 
+const getContractSearchListFunT = async (value,cb) => {
+   const regex = /^HZEQ\d{11}$/;
+    if(!regex.test(value)) return
+    contractNoQuery.keyword=value
+    cb([])
+    contractNoInfo.contractNoLoading = true;
+    const res = await getContractSealList(contractNoQuery)
+        // : await getContractSearchList(contractNoQuery);
+    if (res.code === 200) {
+      contractNoInfo.contractNoArray = contractNoInfo.contractNoArray.concat(res.data.list || []);
+      contractNoInfo.contractNoTotal = res.data.page.total;
+      cb(contractNoInfo.contractNoArray)
+    }
+    contractNoInfo.contractNoLoading = false;
+  }
   // 销售选中
   const selectSeller=(value)=>{
     compliance.form.seller_ids=value+''
@@ -804,13 +822,20 @@
               </el-select>
             </el-form-item>
             <el-form-item label="合同编号" prop="contract_code" id="selectContract">
-              <!-- <el-input v-model="compliance.form.contract_code" placeholder="请输入合同编号"
-              v-if="compliance.form.contract_source==0" >
-                <template #prefix v-if="compliance.form.has_payment==1">
-                  <span>{{ compliance.form.has_invoice==1?'代付方':'实际使用方' }}</span>
+                   <el-autocomplete
+                    v-if="compliance.form.contract_source==0" 
+                    v-model="compliance.form.contract_code"
+                    :fetch-suggestions="getContractSearchListFunT"
+                    clearable
+                    style="min-width: 320px;width: 15vw;"
+                    placeholder="请搜索合同编号"
+                    @select="selectContractNo"
+                  >
+                 <template #default="{ item }">
+                  <div>{{ item.contract_code }}</div>
                 </template>
-              </el-input> -->
-              <scrollableSelect :loadMoreMethod="loadContractNoMore" v-model="compliance.form.contract_code" placeholder="请搜索合同编号" 
+                  </el-autocomplete>
+              <scrollableSelect v-else :loadMoreMethod="loadContractNoMore" v-model="compliance.form.contract_code" placeholder="请搜索合同编号" 
               :searchMethod="contractNoSearch" @change="selectContractNo" useLoading :isLoading="contractNoInfo.contractNoLoading" 
               >
                 <template #prefix v-if="compliance.form.has_payment==1">