From a48f1f67d31702964c8451224ea82ca7a103a13b Mon Sep 17 00:00:00 2001
From: cc_caijp <1049976610@qq.com>
Date: Mon, 12 Jan 2026 10:07:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B8=82=E5=9C=BA=E4=B8=BB=E4=BD=93=E9=99=A4?=
 =?UTF-8?q?=E5=90=8D=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expelled/除名修复管理/index.vue     | 85 ++++++++++---------
 .../除名修复管理/一移出受理.vue    | 71 +++++++++-------
 .../除名修复管理/三移出审批.vue    | 37 ++++++--
 .../除名修复管理/二移出审核.vue    | 36 ++++++--
 4 files changed, 142 insertions(+), 87 deletions(-)

diff --git a/src/views/expelled/除名修复管理/index.vue b/src/views/expelled/除名修复管理/index.vue
index d2f9930..5b57b5b 100644
--- a/src/views/expelled/除名修复管理/index.vue
+++ b/src/views/expelled/除名修复管理/index.vue
@@ -12,57 +12,55 @@
               </div>
             </el-row>
           </el-col>
-
-          <el-col :span="12">
-            <el-row>
-              <label class="label-name_2">除名原因：</label> <!-- clearable 可以清空选项  -->
-              <el-select
-                v-model="searchForm.specause"
-                clearable
-                size="mini"
-                placeholder="请选择列入原因"
-                class="custom"
-                @change="loadPage"
-              >
-                <el-option
-                  v-for="item in reasonList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-row>
-          </el-col>
-
-        </el-row>
-        <el-row>
           <el-col :span="12" class="mb10">
             <label class="label-name">主体名称：</label>
             <div class="search-input-box">
               <el-input v-model="searchForm.entName" clearable size="mini" type="text" class="search-input" placeholder="请输入主体名称（模糊）" @keyup.enter.native="loadPage" />
             </div>
           </el-col>
-          <el-col :span="12">
-            <el-row class="mb10">
-              <label class="label-name">除名日期：</label> <!-- value-format="yyyy-MM-dd" 指定日期发送格式  -->
-              <el-date-picker
-                v-model="searchForm.searchDate"
-                size="mini"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                @change="loadPage"
-              />
-            </el-row>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-row>-->
+<!--              <label class="label-name_2">除名原因：</label> &lt;!&ndash; clearable 可以清空选项  &ndash;&gt;-->
+<!--              <el-select-->
+<!--                v-model="searchForm.specause"-->
+<!--                clearable-->
+<!--                size="mini"-->
+<!--                placeholder="请选择列入原因"-->
+<!--                class="custom"-->
+<!--                @change="loadPage"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item in reasonList"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-row>-->
+<!--          </el-col>-->
         </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-row class="mb10">-->
+<!--              <label class="label-name">除名日期：</label> &lt;!&ndash; value-format="yyyy-MM-dd" 指定日期发送格式  &ndash;&gt;-->
+<!--              <el-date-picker-->
+<!--                v-model="searchForm.searchDate"-->
+<!--                size="mini"-->
+<!--                value-format="yyyy-MM-dd"-->
+<!--                type="daterange"-->
+<!--                range-separator="至"-->
+<!--                start-placeholder="开始日期"-->
+<!--                end-placeholder="结束日期"-->
+<!--                @change="loadPage"-->
+<!--              />-->
+<!--            </el-row>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row>
           <el-col :span="11" :offset="1">
             <div class="btn-box">
               <el-button size="mini" type="primary" @click="loadPage">查询</el-button>
-              <el-button size="mini" @click="searchForm.uscc = '';searchForm.主体名称=''">重置</el-button>
+              <el-button size="mini" @click="reset">重置</el-button>
             </div>
           </el-col>
         </el-row>
@@ -89,6 +87,7 @@
           <el-table-column prop="lerepName" label="法定代表人（负责人、经营者）" min-width="20%" align="left" />
           <el-table-column prop="removeDate" label="除名日期" min-width="15%" align="left" />
           <el-table-column prop="auditOpinion" :show-overflow-tooltip="true" label="除名原因" align="left" min-width="30%" />
+          <el-table-column prop="removeOrgName" label="除名机关" align="left" min-width="20%" />
           <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>
@@ -305,6 +304,7 @@ export default {
         size: this.pageParam.size,
         entity: {
           bizType: '2',
+          state: '10',
           ...this.searchForm
         }
       }).then(res => {
@@ -330,6 +330,11 @@ export default {
         //   }
         // })
       })
+    },
+    reset() {
+      this.searchForm.uscc = ''
+      this.searchForm.entName = ''
+      this.loadPage()
     }
   }
 }
diff --git a/src/views/expelled/除名修复管理/一移出受理.vue b/src/views/expelled/除名修复管理/一移出受理.vue
index c4bd817..62d16c3 100644
--- a/src/views/expelled/除名修复管理/一移出受理.vue
+++ b/src/views/expelled/除名修复管理/一移出受理.vue
@@ -19,48 +19,55 @@
                   cellspacing="0"
                 >
                   <tr>
-                    <th width="20%">注册号/企业统一信用代码</th>
-                    <td>
-                      <!-- @click="seeDetail(companyInfo.pripid)" -->
-                      <el-link type="primary" style="font-size:16px">
-                        {{ detailInfo.repairInfo?.uscc || '-' }}
-                      </el-link>
-                    </td>
-                  </tr>
-                  <tr><th>企业名称</th>
+                    <th>企业名称</th>
                     <td>
                       {{ detailInfo?.repairInfo?.entName || '-' }}
                     </td>
                   </tr>
+                  <tr>
+                    <th width="20%">统一社会信用代码/注册号</th>
+                    <td>
+                      {{ detailInfo.repairInfo?.uscc || '-' }}
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>法定代表人（负责人、经营者）</th>
+                    <td colspan="2">{{ detailInfo?.repairInfo?.lerepName || '-' }}</td>
+                  </tr>
+                  <tr>
+                    <th>住所（经营场所）</th>
+                    <td colspan="2">{{ detailInfo?.repairInfo?.address || '-' }}</td>
+                  </tr>
                   <tr>
                     <th>申请时间</th>
                     <td colspan="2">{{ detailInfo?.repairInfo?.applyDate || '-' }}</td>
                   </tr>
-                  <tr>
-                    <th>法定代表人/经营者</th>
-                    <td colspan="2">{{ detailInfo?.repairInfo?.lerepName || '-' }}</td>
-                  </tr>
                   <tr>
                     <th><span style="color:red">*</span>申请人</th>
                     <td colspan="2">
                       <el-input v-model="detailInfo.repairInfo.contactName" placeholder="请输入申请人" />
-                      <!-- {{ companyInfo.applicant }} -->
                     </td>
                   </tr>
                   <tr>
-                    <th>除名时间</th>
+                    <th><span style="color:red">*</span>联系电话</th>
+                    <td colspan="2">
+                      <el-input v-model="detailInfo.repairInfo.contactPhone" placeholder="请输入联系电话" />
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>决定除名时间</th>
                     <td>
                       {{ detailInfo?.repairInfo?.removeDate || '' }}
                     </td>
                   </tr>
                   <tr>
-                    <th>除名机关</th>
+                    <th>决定除名机关</th>
                     <td>
                       {{ detailInfo?.repairInfo?.removeOrgName || '-' }}
                     </td>
                   </tr>
                   <tr>
-                    <th>除名原因</th>
+                    <th>决定除名原因</th>
                     <td>
                       {{ detailInfo?.repairInfo?.removeReason || '' }}
                     </td>
@@ -184,7 +191,6 @@
                     </td>
                   </tr>
                 </table> -->
-
               </div>
             </div>
             <div v-if="htopinions.length > 0" class="form">
@@ -199,7 +205,7 @@
                     cellspacing="0"
                   >
                     <tr v-for="(each,index) in htopinions" :key="'historyLog'+index">
-                      <th style="width: 20%;">历史退回原因</th>
+                      <th style="width: 20%;">历史审批意见</th>
                       <td colspan="3">
                         <span style="display: block;text-indent: 1em;min-height:80px">{{ each.opinioncontent }}</span>
                         <el-col :span="8" :offset="16">
@@ -232,22 +238,22 @@
                 </td>
               </tr>
               <tr v-if="isAccept === '1'">
-                <th><span style="color:red">*</span>是否予以除名修复</th>
+                <th><span style="color:red">*</span>是否受理除名修复</th>
                 <td colspan="3" class="radio">
                   <el-radio v-model="isAgreeRepair" label="1" style="font-size: unset">受理</el-radio>
                   <el-radio v-model="isAgreeRepair" label="0" style="font-size: unset">不受理</el-radio>
                 </td>
               </tr>
               <tr v-if="isAccept === '1' && isAgreeRepair === '1'">
-                <th><span style="color:red">*</span>移出原因</th>
+                <th><span style="color:red">*</span>除名修复原因</th>
                 <td colspan="3" class="radio">
-                  <el-input v-model="repairReason" placeholder="请输入移出原因" type="textarea" />
-                </td>u
+                  <el-input v-model="repairReason" placeholder="请输入除名修复原因" type="textarea" />
+                </td>
               </tr>
               <tr v-if="isAgreeRepair === '0'">
-                <th><span style="color:red">*</span>移出原因</th>
+                <th><span style="color:red">*</span>除名修复原因</th>
                 <td colspan="3" class="radio">
-                  <el-input v-model="repairReason" placeholder="请输入移出原因" type="textarea" />
+                  <el-input v-model="repairReason" placeholder="请输入除名修复原因" type="textarea" />
                 </td>
               </tr>
             </table>
@@ -272,15 +278,15 @@
               cellspacing="0"
             >
               <tr>
-                <th width="20%">名称/姓名</th>
+                <th width="20%">企业名称</th>
                 <td>{{ detailInfo?.repairInfo?.entName || '-' }}</td>
-                <th width="20%">注册号/企业统一信用代码</th>
+                <th width="20%">统一社会信用代码/注册号</th>
                 <td>{{ detailInfo.repairInfo?.uscc || '-' }}</td>
               </tr>
               <tr>
                 <th><span style="color:red">*</span>作出决定的事实、理由、依据及主要内容</th>
                 <td colspan="3">
-                  <el-input v-model="formData.situation" type="textarea" :autosize="{ minRows: 4}" maxlength="500" show-word-limit placeholder="请输入作出决定的事实、理由、依据及主要内容" style="width:100%" />
+                  <el-input v-model="formData.situation" type="textarea" :autosize="{ minRows: 4 }" maxlength="500" show-word-limit placeholder="请输入作出决定的事实、理由、依据及主要内容" style="width:100%" />
                 </td>
               </tr>
               <template v-if="historyLog && historyLog.length > 0">
@@ -314,7 +320,7 @@
               <tr>
                 <th><span style="color:red">*</span>经办人意见</th>
                 <td colspan="3">
-                  <el-input v-model="formData.opinion" type="textarea" :autosize="{ minRows: 2}" placeholder="1000字内" style="width:100%" />
+                  <el-input v-model="formData.opinion" type="textarea" :autosize="{ minRows: 2 }" placeholder="1000字内" style="width:100%" />
                 </td>
               </tr>
               <tr>
@@ -641,6 +647,9 @@ export default {
       if (this.$util.isEmpty(this.detailInfo.repairInfo.contactName)) {
         return this.$message.warning('请输入申请人')
       }
+      if (this.$util.isEmpty(this.detailInfo.repairInfo.contactPhone)) {
+        return this.$message.warning('请输入联系电话')
+      }
       this.activeName = 'second'
     },
     tableRowClassName({ row, rowIndex }) {
@@ -1037,7 +1046,7 @@ export default {
       }
       if (this.isAccept === '1' && this.$util.isEmpty(this.repairReason) && this.isAgreeRepair === '1') {
         this.submitLoading = false
-        return this.$message.error('请选择移出原因')
+        return this.$message.error('请输入除名修复原因')
       }
       if (this.isAccept === '1' && this.$util.isEmpty(this.formData.nextPerformerids)) {
         this.submitLoading = false
@@ -1082,7 +1091,7 @@ export default {
           handler: this.user.nickname,
           handlerid: this.user.primaryKey,
           opiniontype: '0',
-          isagree: '1',
+          isagree: this.isAgreeRepair,
           opinioncontent: this.formData.opinion
         }
       }
diff --git a/src/views/expelled/除名修复管理/三移出审批.vue b/src/views/expelled/除名修复管理/三移出审批.vue
index ebaa7f9..1f51244 100644
--- a/src/views/expelled/除名修复管理/三移出审批.vue
+++ b/src/views/expelled/除名修复管理/三移出审批.vue
@@ -169,11 +169,19 @@
         cellpadding="0"
         cellspacing="0"
       >
+        <tr><th>企业名称</th><td>{{ companyInfo?.repairInfo?.entName || '-'}}</td></tr>
         <tr>
-          <th width="20%">注册号/企业统一信用代码</th>
+          <th width="20%">统一社会信用代码/注册号</th>
           <td>{{ companyInfo?.repairInfo?.uscc || '-'}}</td>
         </tr>
-        <tr><th>企业名称</th><td>{{ companyInfo?.repairInfo?.entName || '-'}}</td></tr>
+        <tr>
+          <th width="20%">法定代表人（负责人、经营者）</th>
+          <td>{{ companyInfo?.repairInfo?.lerepName || '-'}}</td>
+        </tr>
+        <tr>
+          <th width="20%">住所（经营场所）</th>
+          <td>{{ companyInfo?.repairInfo?.address || '-'}}</td>
+        </tr>
         <tr>
           <th>申请时间</th>
           <td colspan="2">{{ companyInfo?.repairInfo?.applyDate || '-' }}</td>
@@ -185,21 +193,27 @@
           </td>
         </tr>
         <tr>
-          <th>除名时间</th>
+          <th>联系电话</th>
+          <td colspan="2">
+            {{ companyInfo?.repairInfo?.contactPhone || '-' }}
+          </td>
+        </tr>
+        <tr>
+          <th>决定除名时间</th>
           <td>
             {{ companyInfo?.repairInfo?.removeDate || '-' }}
           </td>
         </tr>
         <tr>
-          <th>除名列入机关</th>
+          <th>决定除名机关</th>
           <td>
             {{ companyInfo?.repairInfo?.removeOrgName || '-' }}
           </td>
         </tr>
         <tr>
-          <th>除名原因</th>
+          <th>决定除名原因</th>
           <td>
-            {{ companyInfo?.repairInfo?.situation || '-' }}
+            {{ companyInfo?.repairInfo?.removeReason || '-' }}
           </td>
         </tr>
       </table>
@@ -1002,15 +1016,22 @@ export default {
       this.formData.handler = this.user.nickname
       this.formData.handlerid = this.user.primaryKey
       expelledRepairNextBiz({
-        ...this.formData,
+        bizId: this.bizseq,
+        taskId: this.tasklistid,
         nextNodeId: this.formData.nextNodeId,
+        nextPerformerIds: '',
+        nextPerformerNames: '',
         repairApproveInfo: {
           ...this.companyInfo.repairInfo
         },
         opinionQuery: {
-          opinioncontent: this.formData.opinion,
+          bizseq: this.bizseq,
+          workflowid: this.workflowId,
+          handler: this.user.nickname,
+          handlerid: this.user.primaryKey,
           opiniontype: '2',
           isagree: this.formData.isagree,
+          opinioncontent: this.formData.opinion,
           handledate: this.formData.handledate
         }
       }).then(res => {
diff --git a/src/views/expelled/除名修复管理/二移出审核.vue b/src/views/expelled/除名修复管理/二移出审核.vue
index caf2096..98f33cf 100644
--- a/src/views/expelled/除名修复管理/二移出审核.vue
+++ b/src/views/expelled/除名修复管理/二移出审核.vue
@@ -184,11 +184,19 @@
         cellpadding="0"
         cellspacing="0"
       >
+        <tr><th>企业名称</th><td>{{ companyInfo?.repairInfo?.entName || '-'}}</td></tr>
         <tr>
-          <th width="20%">注册号/企业统一信用代码</th>
+          <th width="20%">统一社会信用代码/注册号</th>
           <td>{{ companyInfo?.repairInfo?.uscc || '-'}}</td>
         </tr>
-        <tr><th>企业名称</th><td>{{ companyInfo?.repairInfo?.entName || '-'}}</td></tr>
+        <tr>
+          <th width="20%">法定代表人（负责人、经营者）</th>
+          <td>{{ companyInfo?.repairInfo?.lerepName || '-'}}</td>
+        </tr>
+        <tr>
+          <th width="20%">住所（经营场所）</th>
+          <td>{{ companyInfo?.repairInfo?.address || '-'}}</td>
+        </tr>
         <tr>
           <th>申请时间</th>
           <td colspan="2">{{ companyInfo?.repairInfo?.applyDate || '-' }}</td>
@@ -200,21 +208,27 @@
           </td>
         </tr>
         <tr>
-          <th>除名时间</th>
+          <th>联系电话</th>
+          <td colspan="2">
+            {{ companyInfo?.repairInfo?.contactPhone || '-' }}
+          </td>
+        </tr>
+        <tr>
+          <th>决定除名时间</th>
           <td>
             {{ companyInfo?.repairInfo?.removeDate || '-' }}
           </td>
         </tr>
         <tr>
-          <th>除名列入机关</th>
+          <th>决定除名机关</th>
           <td>
             {{ companyInfo?.repairInfo?.removeOrgName || '-' }}
           </td>
         </tr>
         <tr>
-          <th>除名原因</th>
+          <th>决定除名原因</th>
           <td>
-            {{ companyInfo?.repairInfo?.situation || '-' }}
+            {{ companyInfo?.repairInfo?.removeReason || '-' }}
           </td>
         </tr>
       </table>
@@ -1005,16 +1019,22 @@ export default {
       this.formData.taskId = this.tasklistid
       this.formData.handler = this.user.nickname
       expelledRepairNextBiz({
-        ...this.formData,
+        bizId: this.bizseq,
+        taskId: this.tasklistid,
         nextNodeId: this.formData.nextNodeId,
+        nextPerformerIds: this.formData.nextPerformerIds,
+        nextPerformerNames: this.formData.nextPerformerNames,
         repairApproveInfo: {
           ...this.companyInfo.repairInfo
         },
         opinionQuery: {
-          opinioncontent: this.formData.opinion,
+          bizseq: this.bizseq,
+          workflowid: this.workflowId,
+          handler: this.user.nickname,
           handlerid: this.user.primaryKey,
           opiniontype: '1',
           isagree: this.formData.isagree,
+          opinioncontent: this.formData.opinion,
           handledate: this.formData.handledate
         }
       }).then(res => {