修改

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

@@ -25,39 +25,78 @@
             </td>
             <td class="table-key">统一社会信用代码</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
-              {{comProjectDetailInfo.corporatePerson ? comProjectDetailInfo.corporatePerson : "-"}}
+              <div class="normal-value" v-if="!comIsModify">
+                {{comProjectDetailInfo.creditCode ? comProjectDetailInfo.creditCode : "-"}}
+              </div>
+              <el-form-item label="" v-if="comIsModify">
+                <el-input v-model="comProjectDetailInfo.creditCode" clearable placeholder="请输入统一社会信用代码"></el-input>
+              </el-form-item>
             </td>
           </tr>
           <tr>
             <td class="table-key">登记状态</td>
-            <td>
-              {{comProjectDetailInfo.regAddress ? comProjectDetailInfo.regAddress : "-"}}
+            <td :class="[comIsModify ? 'td-none-padding' : '']">
+              <div class="normal-value" v-if="!comIsModify">
+                {{comProjectDetailInfo.businessStatus ? comProjectDetailInfo.businessStatus : "-"}}
+              </div>
+              <el-form-item label="" v-if="comIsModify">
+                <el-input v-model="comProjectDetailInfo.businessStatus" clearable placeholder="请输入登记状态"></el-input>
+              </el-form-item>
             </td>
             <td class="table-key">法人代表</td>
-            <td>
-              {{comProjectDetailInfo.corporatePerson ? comProjectDetailInfo.corporatePerson : "-"}}
+            <td :class="[comIsModify ? 'td-none-padding' : '']">
+              <div class="normal-value" v-if="!comIsModify">
+                {{comProjectDetailInfo.legalPerson ? comProjectDetailInfo.legalPerson : "-"}}
+              </div>
+              <el-form-item label="" v-if="comIsModify">
+                <el-input v-model="comProjectDetailInfo.legalPerson" clearable placeholder="请输入法人代表"></el-input>
+              </el-form-item>
             </td>
           </tr>
           <tr>
             <td class="table-key">成立日期</td>
-            <td>
-              {{comProjectDetailInfo.regAddress ? comProjectDetailInfo.regAddress : "-"}}
+            <td :class="[comIsModify ? 'td-none-padding' : '']">
+              <div class="normal-value" v-if="!comIsModify">
+                {{comProjectDetailInfo.regDate ? comProjectDetailInfo.regDate : "-"}}
+              </div>
+              <el-form-item label="" v-if="comIsModify">
+                <el-date-picker
+                  v-model="comProjectDetailInfo.regDate"
+                  type="date"
+                  placeholder="选择成立日期">
+                </el-date-picker>
+              </el-form-item>
             </td>
             <td class="table-key">注册资本</td>
-            <td>
-              {{comProjectDetailInfo.regAddress ? comProjectDetailInfo.regAddress : "-"}}
+            <td :class="[comIsModify ? 'td-none-padding' : '']">
+              <div class="normal-value" v-if="!comIsModify">
+                {{comProjectDetailInfo.regCapital ? comProjectDetailInfo.regCapital : "-"}}
+              </div>
+              <el-form-item label="" v-if="comIsModify">
+                <el-input v-model="comProjectDetailInfo.regCapital" clearable placeholder="请输入注册资本"></el-input>
+              </el-form-item>
             </td>
           </tr>
           <tr>
             <td class="table-key">注册地址</td>
-            <td colspan="3">
-              {{comProjectDetailInfo.regAddress ? comProjectDetailInfo.regAddress : "-"}}
+            <td colspan="3" :class="[comIsModify ? 'td-none-padding' : '']">
+              <div class="normal-value" v-if="!comIsModify">
+                {{comProjectDetailInfo.regAddress ? comProjectDetailInfo.regAddress : "-"}}
+              </div>
+              <el-form-item label="" v-if="comIsModify">
+                <el-input v-model="comProjectDetailInfo.regAddress" clearable placeholder="请输入注册地址"></el-input>
+              </el-form-item>
             </td>
           </tr>
           <tr>
             <td class="table-key">经营范围</td>
-            <td colspan="3">
-              {{comProjectDetailInfo.regAddress ? comProjectDetailInfo.regAddress : "-"}}
+            <td colspan="3" :class="[comIsModify ? 'td-none-padding' : '']">
+              <div class="normal-value" v-if="!comIsModify">
+                {{comProjectDetailInfo.businessScope ? comProjectDetailInfo.businessScope : "-"}}
+              </div>
+              <el-form-item label="" v-if="comIsModify">
+                <el-input type="textarea" :rows="2" v-model="comProjectDetailInfo.businessScope" clearable placeholder="请输入经营范围"></el-input>
+              </el-form-item>
             </td>
           </tr>
         </table>
@@ -486,6 +525,12 @@ export default {
         ["isNewAdvisoryBody", "isNewAdvisoryBody"],
         ["corporatePerson", "corporatePerson"],
         ["regAddress", "regAddress"],
+        ["creditCode", "creditCode"],
+        ["businessStatus", "businessStatus"],
+        ["legalPerson", "legalPerson"],
+        ["regDate", "regDate"],
+        ["regCapital", "regCapital"],
+        ["businessScope", "businessScope"],
       ]);
       this.setTemplateData(updateMap, data);
       console.log(this.comProjectDetailInfo);

dsk-operate-ui/src/views/detail/party-a/internalCooperation/affiliationRisk.vue

@@ -58,12 +58,12 @@
             </el-table-column>
             <el-table-column label="不良事由" min-width="120" :resizable="false">
               <template slot-scope="scope">
-                {{scope.row.blsy||"--"}}
+                {{scope.row.badReason||"--"}}
               </template>
             </el-table-column>
             <el-table-column label="不良行为情形" min-width="280" :resizable="false">
               <template slot-scope="scope">
-                {{scope.row.badReason||"--"}}
+                {{scope.row.badBehaviorSituation||"--"}}
               </template>
             </el-table-column>
             <el-table-column label="添加人" min-width="120" :resizable="false">

dsk-operate-ui/src/views/supplier/disableManagement/affiliationRisk.vue

@@ -86,12 +86,12 @@
           </el-table-column>
           <el-table-column label="不良事由" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.blsy||"--"}}
+              {{scope.row.badReason||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="不良行为情形" min-width="280" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.badReason||"--"}}
+              {{scope.row.badBehaviorSituation||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="添加人" min-width="150" :resizable="false">

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

@@ -531,8 +531,10 @@
           registerProvince: [],
           registerCity: [],
           approveDate2Start: null,
-          approveDate2End: null
+          approveDate2End: null,
+          laborCaptainIdCard: null
         }
+        this.isIdCardRepeat=''
         this.cusoomerInfolist()
       },
       cusoomerInfolist(){