优化强制注销问题

src/common/js/utils.js

@@ -274,6 +274,9 @@ export default {
       case '32' : return '公告待审核'
       case '33' : return '公告待审批'
       case '34' : return '注销待受理'
+      case 'handle' : return '经办'
+      case 'approve' : return '审批'
+      case 'nullify' : return '作废'
       case 'endRevoke' : return '审批通过'
       case 'overRevoke' : return '审批不通过'
         // 批量吊销 end
@@ -358,6 +361,31 @@ export default {
         return '未知节点状态'
     }
   },
+  /**
+     * 获取强制注销业务状态名称
+     * @param {string} statusCode 状态码
+     * @returns {string} 业务状态名称
+     */
+  getForceDeregisterStatusName(statusCode) {
+    switch (statusCode) {
+      case '0':
+        return '待受理'
+      case '1':
+        return '待审核'
+      case '2':
+        return '待审批'
+      case '3':
+        return '已通过'
+      case '4':
+        return '未通过'
+      case '5':
+        return '已作废'
+      case '6':
+        return '转办'
+      default:
+        return '未知状态'
+    }
+  },
   /**
      * 是否为空字串
      * @param {string} str 源字符串

src/views/forceNotice/component/DeleteEntListDialog.vue

@@ -10,6 +10,7 @@
       v-model="tableData"
       :fields="fields"
       :table-config="tableConfig"
+      :selected.sync="selectedRows"
       :emit-load-on-create="true"
       :on-load="loadData"
     />
@@ -28,6 +29,7 @@ export default {
     return {
       visible: false,
       tableData: [],
+      selectedRows: [],
       fields: [
         {
           type: 'input',
@@ -98,6 +100,7 @@ export default {
   },
   methods: {
     open() {
+      this.selectedRows = []
       this.visible = true
     },
     loadData(pageParam) {
@@ -114,7 +117,7 @@ export default {
       })
     },
     confirmDelete() {
-      const selectedRows = this.$refs.deleteTable.getSelection()
+      const selectedRows = this.$refs.deleteTable.getSelected()
       this.$emit('confirm', selectedRows)
       this.visible = false
     }

src/views/forceNotice/force/doc.vue

@@ -132,7 +132,12 @@ export default {
     },
     open(data) {
       this.visible = true
-      this.data = data
+      data = data || {}
+      this.data = {
+        ...data,
+        incAbnDecisionMap: data.incAbnDecisionMap || {},
+        remAbnDecisionMap: data.remAbnDecisionMap || {}
+      }
     },
     downloadDoc() {
       this.visible = false

src/views/forceNotice/force/handle.vue

@@ -144,7 +144,6 @@
           v-model="entListTableData"
           :fields="entListFields"
           :table-config="entListTableConfig"
-          :buttons="entListButtons"
           :emit-load-on-create="true"
           :on-load="loadEntListData"
         />

src/views/forceNotice/inclusion/doc.vue

@@ -25,11 +25,11 @@
           <table border="1" cellspacing="0">
             <tr>
               <td colspan="1">主体名称</td>
-              <td colspan="3">{{ data.entname }}</td>
+              <td colspan="3">{{ data.entName }}</td>
             </tr>
             <tr>
               <td colspan="1">统一社会信用代码/注册号</td>
-              <td colspan="3">{{ data.uniscid }}</td>
+              <td colspan="3">{{ data.uniscId }}</td>
             </tr>
             <tr>
               <td colspan="1">事实和理由</td>

src/views/forceNotice/inclusion/handle.vue

@@ -160,6 +160,10 @@ import {
   xrForceDeregisterSpeProcessControl,
   xrOpinionListByBizSeqNo
 } from '@/api/force'
+import {
+  xrForceDeregisterSpeAddForceDeregisterSpe,
+  xrForceDeregisterSpeDeleteForceDeregisterSpe
+} from '@/api/auto-baseapi'
 import EntList from '@/views/forceNotice/component/EntList.vue'
 import DeleteEntListDialog from '@/views/forceNotice/component/DeleteEntListDialog.vue'
 
@@ -685,14 +689,27 @@ export default {
     },
     // 添加主体回调
     addEntities(selectedEntities) {
-      // 将选中的主体添加到 entListTableData 中
+      const pripIdList = selectedEntities.map(entity => entity.pripid)
-      this.entListTableData = [...this.entListTableData, ...selectedEntities]
+      xrForceDeregisterSpeAddForceDeregisterSpe({
+        bizSeqNo: this.$route.query.bizSeqNo,
+        pripIdList
+      }).then((res) => {
+        if (res.code === 0) {
+          this.$message.success('添加主体成功')
+          this.$refs.EntListTable.reset()
+        }
+      })
     },
     deleteEntities(selectedEntities) {
-      const selectedIds = selectedEntities.map(entity => entity.pripid)
+      const requests = selectedEntities.map(entity =>
-      this.entListTableData = this.entListTableData.filter(
+        xrForceDeregisterSpeDeleteForceDeregisterSpe({ forceSpeId: entity.forceSpeId })
-        entity => !selectedIds.includes(entity.pripid)
       )
+      Promise.all(requests).then((resList) => {
+        if (resList.every(res => res.code === 0)) {
+          this.$message.success('删除主体成功')
+        }
+        this.$refs.EntListTable.reset()
+      })
     },
     // 跳转到企业详情页
     goToEntDetail(row) {

src/views/todo/index.vue

@@ -3631,7 +3631,9 @@ export default {
           each.bustypename = each.bustype === '50' && each.subBusType != null
             ? this.$util.getTaskBusinessTypeName(each.bustype + '-' + each.subBusType)
             : this.$util.getTaskBusinessTypeName(each.bustype)
-          each.busStatusName = this.$util.getTaskNodeName(each.currentNodeOrBizStatus)
+          each.busStatusName = each.bustype === '50'
+            ? this.$util.getTaskNodeName(each.lastNode)
+            : this.$util.getTaskNodeName(each.currentNodeOrBizStatus)
           // 异议类型判断是否打印受理/不受理通知书
           each.isPassDissentApply = false
           if (each.bustype === '6') {