Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs

src/views/expelled/除名修复管理/index.vue

@@ -83,13 +83,13 @@
           :header-cell-style="{background:'#8cc3fb',color:'#fff'}"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column prop="index" label="序号" min-width="30" align="center" />
+          <el-table-column prop="index" label="序号" min-width="10%" align="center" />
-          <el-table-column prop="uscc" :show-overflow-tooltip="true" label="统一社会信用代码/注册号" width="220px" align="left" />
+          <el-table-column prop="uscc" label="统一社会信用代码/注册号" min-width="25%" align="left" />
-          <el-table-column prop="entName" :show-overflow-tooltip="true" label="主体名称" width="150px" align="left" />
+          <el-table-column prop="entName" label="主体名称" min-width="25%" align="left" />
-          <el-table-column prop="enttypeName" :show-overflow-tooltip="true" label="主体类型" width="100" align="left" />
+          <el-table-column prop="lerepName" label="法定代表人（负责人、经营者）" min-width="20%" align="left" />
-          <el-table-column prop="abntime" label="除名日期" width="180" align="left" />
+          <el-table-column prop="removeDate" label="除名日期" min-width="15%" align="left" />
-          <el-table-column prop="reason" :show-overflow-tooltip="true" label="除名原因" align="left" :formatter="reasonFormat" />
+          <el-table-column prop="auditOpinion" :show-overflow-tooltip="true" label="除名原因" align="left" min-width="30%" />
-          <el-table-column label="操作" min-width="60" align="center" fixed="right">
+          <el-table-column label="操作" min-width="10%" align="center" fixed="right">
             <template slot-scope="scope">
               <el-button type="primary" size="mini" @click="check(scope.row)">办理</el-button>
             </template>

src/views/expelled/除名修复管理/一移出受理.vue

@@ -43,14 +43,14 @@
                   <tr>
                     <th><span style="color:red">*</span>申请人</th>
                     <td colspan="2">
-                      <el-input v-model="contactName" placeholder="请输入申请人" />
+                      <el-input v-model="detailInfo.repairInfo.contactName" placeholder="请输入申请人" />
                       <!-- {{ companyInfo.applicant }} -->
                     </td>
                   </tr>
                   <tr>
                     <th>除名时间</th>
                     <td>
-                      {{ detailInfo?.repairInfo?.applyDate || '' }}
+                      {{ detailInfo?.repairInfo?.removeDate || '' }}
                     </td>
                   </tr>
                   <tr>
@@ -638,7 +638,7 @@ export default {
       if (this.$util.isEmpty(this.repairReason)) {
         return this.$message.warning('请选择移出原因')
       }
-      if (this.$util.isEmpty(this.contactName)) {
+      if (this.$util.isEmpty(this.detailInfo.repairInfo.contactName)) {
         return this.$message.warning('请输入申请人')
       }
       this.activeName = 'second'
@@ -1069,15 +1069,20 @@ export default {
         nextNodeId: 'handleExptlist',
         nextPerformerIds: this.formData.nextPerformerids,
         nextPerformerNames: this.formData.nextPerformerNames,
-        repairApproveInfo: this.detailInfo.repairInfo,
+        repairApproveInfo: {
-        opinionQuery: {
+          ...this.detailInfo.repairInfo,
           acceptStatus: this.isAccept,
-          isAgreeRepair: this.isAgreeRepair,
-          contactName: this.contactName,
           repairReason: this.repairReason,
-          remreasons: this.formData.remreasons,
+          remark: this.remRemark
-          opinion: this.formData.opinion,
+        },
-          remRemark: this.remRemark
+        opinionQuery: {
+          bizseq: this.bizId,
+          workflowid: this.workflowid,
+          handler: this.user.nickname,
+          handlerid: this.user.primaryKey,
+          opiniontype: '0',
+          isagree: '1',
+          opinioncontent: this.formData.opinion
         }
       }
       expelledRepairNextBiz(params).then(res => {