修改

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency.vue

@@ -26,10 +26,10 @@
             <td class="table-key">统一社会信用代码</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.creditCode ? comProjectDetailInfo.creditCode : "-"}}
+                {{comProjectDetailInfo.advisoryBody.creditCode ? comProjectDetailInfo.advisoryBody.creditCode : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.creditCode" clearable placeholder="请输入统一社会信用代码"></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBody.creditCode" clearable placeholder="请输入统一社会信用代码"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -37,19 +37,19 @@
             <td class="table-key">登记状态</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.businessStatus ? comProjectDetailInfo.businessStatus : "-"}}
+                {{comProjectDetailInfo.advisoryBody.businessStatus ? comProjectDetailInfo.advisoryBody.businessStatus : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.businessStatus" clearable placeholder="请输入登记状态"></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBody.businessStatus" clearable placeholder="请输入登记状态"></el-input>
               </el-form-item>
             </td>
             <td class="table-key">法人代表</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.legalPerson ? comProjectDetailInfo.legalPerson : "-"}}
+                {{comProjectDetailInfo.advisoryBody.legalPerson ? comProjectDetailInfo.advisoryBody.legalPerson : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.legalPerson" clearable placeholder="请输入法人代表"></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBody.legalPerson" clearable placeholder="请输入法人代表"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -57,11 +57,11 @@
             <td class="table-key">成立日期</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.regDate ? comProjectDetailInfo.regDate : "-"}}
+                {{comProjectDetailInfo.advisoryBody.regDate ? comProjectDetailInfo.advisoryBody.regDate : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
                 <el-date-picker
-                  v-model="comProjectDetailInfo.regDate"
+                  v-model="comProjectDetailInfo.advisoryBody.regDate"
                   type="date"
                   placeholder="选择成立日期">
                 </el-date-picker>
@@ -70,10 +70,10 @@
             <td class="table-key">注册资本</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.regCapital ? comProjectDetailInfo.regCapital : "-"}}
+                {{comProjectDetailInfo.advisoryBody.regCapital ? comProjectDetailInfo.advisoryBody.regCapital : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.regCapital" clearable placeholder="请输入注册资本"></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBody.regCapital" clearable placeholder="请输入注册资本"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -81,10 +81,10 @@
             <td class="table-key">注册地址</td>
             <td colspan="3" :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.regAddress ? comProjectDetailInfo.regAddress : "-"}}
+                {{comProjectDetailInfo.advisoryBody.regAddress ? comProjectDetailInfo.advisoryBody.regAddress : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.regAddress" clearable placeholder="请输入注册地址"></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBody.regAddress" clearable placeholder="请输入注册地址"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -92,10 +92,10 @@
             <td class="table-key">经营范围</td>
             <td colspan="3" :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.businessScope ? comProjectDetailInfo.businessScope : "-"}}
+                {{comProjectDetailInfo.advisoryBody.businessScope ? comProjectDetailInfo.advisoryBody.businessScope : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input type="textarea" :rows="2" v-model="comProjectDetailInfo.businessScope" clearable placeholder="请输入经营范围"></el-input>
+                <el-input type="textarea" :rows="2" v-model="comProjectDetailInfo.advisoryBody.businessScope" clearable placeholder="请输入经营范围"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -490,6 +490,7 @@ export default {
             this.searchTimer = setTimeout(async () => {
               try {
                 const result = await this.searchConsultingHandle(keywords.toString().trim());
+                console.log(result,"resultresultresult")
                 if (result) {
                   this.updateTemplate(result);
                 }
@@ -521,16 +522,15 @@ export default {
       const updateMap = new Map([
         ["advisoryBody.advisoryBodyName", "advisoryBodyName"],
         ["advisoryBody.advisoryBodyCid", "advisoryBodyCid"],
-        ["advisoryBody.businessScope", "businessScope"],
         ["isNewAdvisoryBody", "isNewAdvisoryBody"],
         ["corporatePerson", "corporatePerson"],
-        ["regAddress", "regAddress"],
-        ["creditCode", "creditCode"],
-        ["businessStatus", "businessStatus"],
-        ["legalPerson", "legalPerson"],
-        ["regDate", "regDate"],
-        ["regCapital", "regCapital"],
-        ["businessScope", "businessScope"],
+        ["advisoryBody.regAddress", "regAddress"],
+        ["advisoryBody.creditCode", "creditCode"],
+        ["advisoryBody.businessStatus", "businessStatus"],
+        ["advisoryBody.legalPerson", "legalPerson"],
+        ["advisoryBody.regDate", "regDate"],
+        ["advisoryBody.regCapital", "regCapital"],
+        ["advisoryBody.businessScope", "businessScope"],
       ]);
       this.setTemplateData(updateMap, data);
       console.log(this.comProjectDetailInfo);
@@ -569,10 +569,11 @@ export default {
       this.searchTimer = null;
     },
     async updateConsultingDetail() {
+      console.log("1111")
       try {
         const flag = await this.$refs["comProjectDetailForm"].validate();
-        const customFormFlag = await this.$refs["customDesignFormTemplate"].validate();
-        if (flag && customFormFlag) {
+        // const customFormFlag =await this.$refs["customDesignFormTemplate"].validate();
+        if (flag) {
           // 通过验证校验咨询机构是否存在
           const result = await this.searchConsultingHandle(this.comProjectDetailInfo.advisoryBody.advisoryBodyName);
           if (result.advisoryBodyCid) {
@@ -582,14 +583,19 @@ export default {
               projectKey: this.projectKey,
               advisoryBodyCid: _temp.advisoryBody.advisoryBodyCid,
               advisoryBodyName: _temp.advisoryBody.advisoryBodyName ?? "",
-              businessScope: _temp.advisoryBody.businessScope ?? "",
               projectLeader: _temp.advisoryBodyProject.projectLeader ?? "",
               projectLeaderMajor: _temp.advisoryBodyProject.projectLeaderMajor ?? "",
               projectLeaderPhone: _temp.advisoryBodyProject.projectLeaderPhone ?? "",
-              projectLeaderPhone: _temp.advisoryBodyProject.projectLeaderPhone ?? "",
               settleStartTime: _temp.advisoryBodyProject.settleStartTime ?? "",
               settleFinishTime: _temp.advisoryBodyProject.settleFinishTime ?? "",
               isFinalJudgeUnit: _temp.advisoryBodyProject.isFinalJudgeUnit ?? "",
+              regAddress: _temp.advisoryBody.regAddress ?? "",
+              creditCode: _temp.advisoryBody.creditCode ?? "",
+              businessStatus: _temp.advisoryBody.businessStatus ?? "",
+              legalPerson: _temp.advisoryBody.legalPerson ?? "",
+              regDate: _temp.advisoryBody.regDate ?? "",
+              regCapital: _temp.advisoryBody.regCapital ?? "",
+              businessScope: _temp.advisoryBody.businessScope ?? "",
             };
             const customFormData = this.saveCutomFormData();
             const customFormParamsData = {

dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue

@@ -174,9 +174,9 @@ export default {
       formColum: [
         { label: '序号', prop: "staticSerialNumber", type: "index", lock: true, fixed: false, uid: v4() },
         { label: '项目列表', prop: 'projectName', width: "220px", lock: true, fixed: false, slot: true, uid: v4(), showOverflowTooltip: true },
+        { label: '项目编码', prop: 'projectCode', width: "121px", uid: v4() },
         { label: '业主单位', prop: 'ownerName', slot: true, uid: v4(), width: "185px", showOverflowTooltip: true },
         { label: '咨询机构名称', prop: 'advisoryBodyName', width: "172px", slot: true, uid: v4(), showOverflowTooltip: true },
-        { label: '项目编码', prop: 'projectCode', width: "121px", uid: v4() },
         { label: '省市', prop: 'provinceName', width: "100px", uid: v4() },
         { label: '项目承接类型', prop: 'isinvestproject', width: "100px", uid: v4() },
         { label: '工程基础大类', prop: 'projectType1', minWidth: "100px", uid: v4() },

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue

@@ -374,11 +374,11 @@
           <el-input type="text" placeholder="请输入劳务队长姓名" v-model="queryParam.leaderName"></el-input>
         </el-form-item>
         <el-form-item label="劳务队长身份证号码" class="row" prop="laborCaptainIdcard" :style="tip ?'margin-bottom:0px;':'margin-bottom:16px;'">
-          <el-input type="text" placeholder="请输入劳务队长身份证号码" @input="inputLaborLeaderId" v-model="queryParam.laborCaptainIdcard"></el-input>
+          <el-input type="text" placeholder="请输入劳务队长身份证号码" @blur="inputLaborLeaderId" v-model="queryParam.laborCaptainIdcard" onkeyup="this.value=this.value.replace(/[^\w_]/g,'');"></el-input>
           <p class="tip" v-if="tip" style="color:#ff4949;">该身份证号已归属其他供应商企业。<span style="color:#0081FF;cursor: pointer;" @click="handleClick">查看异常</span></p>
         </el-form-item>
         <el-form-item label="联系电话" class="row" prop="laborCaptainPhone">
-          <el-input type="text" placeholder="请输入联系电话" v-model="queryParam.laborCaptainPhone"></el-input>
+          <el-input type="text" placeholder="请输入联系电话" v-model="queryParam.laborCaptainPhone" oninput="if(value.length>11)value=value.slice(0,11)" onkeyup="value = value.replace(/[^\d]/g,'');"></el-input>
         </el-form-item>
         <el-form-item label="队伍规模" class="row">
           <el-input type="text" placeholder="请输入队伍规模" v-model="queryParam.serviceTeamPersonnum"></el-input>