除名修复移出受理70%

src/api/除名公告.js

@@ -72,3 +72,35 @@ export function expelledAnnouncementList(data) {
   })
 }
 
+// 启动除名修复业务
+export function expelledRepairStartBiz(data) {
+  return request({
+    url: '/expelled/repair/startBiz',
+    method: 'post',
+    data
+  })
+}
+
+// 除名修复业务审批流程
+export function expelledRepairNextBiz(data) {
+  const form = new FormData()
+  console.log(form)
+  console.log(data)
+  for (const key in data) {
+    form.append(key, data[key])
+  }
+  console.log(form)
+  return request({
+    url: '/expelled/repair/nextBiz',
+    method: 'post',
+    data: form
+  })
+}
+
+export function expelledRepairGetBiz(bizId) {
+  return request({
+    url: `/expelled/repair/getBiz?bizId=${bizId}`,
+    method: 'get'
+  })
+}
+

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

@@ -8,7 +8,7 @@
             <el-row class="mb10">
               <label class="label-name_1">统一社会信用代码/注册号：</label>
               <div class="search-input-box_1">
-                <el-input v-model="searchForm.searchUscc" clearable size="mini" type="text" class="search-input" placeholder="请输入统一社会信用代码/注册号" @keyup.enter.native="search" />
+                <el-input v-model="searchForm.uscc" clearable size="mini" type="text" class="search-input" placeholder="请输入统一社会信用代码/注册号" @keyup.enter.native="loadPage" />
               </div>
             </el-row>
           </el-col>
@@ -22,6 +22,7 @@
                 size="mini"
                 placeholder="请选择列入原因"
                 class="custom"
+                @change="loadPage"
               >
                 <el-option
                   v-for="item in reasonList"
@@ -36,9 +37,9 @@
         </el-row>
         <el-row>
           <el-col :span="12" class="mb10">
-            <label class="label-name">主体名称(模糊)：</label>
+            <label class="label-name">主体名称：</label>
             <div class="search-input-box">
-              <el-input v-model="searchForm.searchName" clearable size="mini" type="text" class="search-input" placeholder="请输入主体名称（模糊）" @keyup.enter.native="search" />
+              <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">
@@ -52,6 +53,7 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
+                @change="loadPage"
               />
             </el-row>
           </el-col>
@@ -59,8 +61,8 @@
         <el-row>
           <el-col :span="11" :offset="1">
             <div class="btn-box">
-              <el-button size="mini" type="primary" @click="search">查询</el-button>
+              <el-button size="mini" type="primary" @click="loadPage">查询</el-button>
-              <el-button size="mini" @click="searchForm.searchUscc = '';searchForm.searchName='';searchForm.reportYear='';searchForm.searchDate='';searchForm.specause=''">重置</el-button>
+              <el-button size="mini" @click="searchForm.uscc = '';searchForm.主体名称=''">重置</el-button>
             </div>
           </el-col>
         </el-row>
@@ -82,18 +84,14 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column prop="index" label="序号" min-width="30" align="center" />
-          <el-table-column label="统一社会信用代码/注册号" min-width="100" align="left">
+          <el-table-column prop="uscc" :show-overflow-tooltip="true" label="统一社会信用代码/注册号" width="220px" align="left" />
+          <el-table-column prop="entName" :show-overflow-tooltip="true" label="主体名称" width="150px" align="left" />
+          <el-table-column prop="enttypeName" :show-overflow-tooltip="true" label="主体类型" width="100" align="left" />
+          <el-table-column prop="abntime" label="除名日期" width="180" align="left" />
+          <el-table-column prop="reason" :show-overflow-tooltip="true" label="除名原因" align="left" :formatter="reasonFormat" />
+          <el-table-column label="操作" min-width="60" align="center" fixed="right">
             <template slot-scope="scope">
-              {{ scope.row.uniscid ||scope.row.regno }}
+              <el-button type="primary" size="mini" @click="check(scope.row)">办理</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column prop="entname" :show-overflow-tooltip="true" label="主体名称" min-width="150" align="left" />
-          <el-table-column prop="enttypeName" :show-overflow-tooltip="true" label="主体类型" min-width="60" align="left" />
-          <el-table-column prop="abntime" label="除名日期" min-width="50" align="left" />
-          <el-table-column prop="specause" :show-overflow-tooltip="true" label="除名原因" min-width="150" align="left" :formatter="reasonFormat" />
-          <el-table-column label="操作" min-width="60" align="center">
-            <template slot-scope="scope">
-              <el-button type="primary" size="mini" @click="check(scope.row.abnlistid,scope.row.specause,scope.row.pripid,scope.row.abntime)">办理</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -102,7 +100,7 @@
             <el-col :span="24">
               <el-pagination
                 :disabled="loading"
-                :page-size="pageParam.pageSize"
+                :page-size="pageParam.size"
                 :total="pageParam.total"
                 :page-sizes="[10, 20, 30, 40,50,100,200]"
                 layout="slot,total, sizes, prev, pager, next, jumper"
@@ -110,8 +108,8 @@
                 @current-change="pageIndexChange"
               >
                 <span>
-                  第 {{ pageParam.curPage }} 页 /
+                  第 {{ pageParam.current }} 页 /
-                  共 {{ (pageParam.total !== 0 ? parseInt((pageParam.total + pageParam.pageSize - 1)/pageParam.pageSize) : 1) }} 页
+                  共 {{ (pageParam.total !== 0 ? parseInt((pageParam.total + pageParam.size - 1)/pageParam.size) : 1) }} 页
                 </span>
               </el-pagination>
             </el-col>
@@ -126,24 +124,16 @@
     >
       <span>{{ prompt }}</span>
       <span slot="footer" class="dialog-footer">
-        <el-button v-if="details.length>0" type="primary" @click="showDetails = true">查看详情</el-button>
         <el-button type="primary" :loading="subloading" @click="startTask(abnlistidParam)">确定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :visible.sync="showDetails" title="市场主体一年内因实地查无的除名记录">
-      <el-table :data="details" tooltip-effect="dark" size="mini" style="width: 100%; min-height: 380px" :fit="true">
-        <el-table-column prop="entname" :show-overflow-tooltip="true" label="主体名称" min-width="150" align="left" />
-        <el-table-column prop="specause" :show-overflow-tooltip="true" label="除名原因" min-width="180" align="left" :formatter="reasonFormat" />
-        <el-table-column prop="remdate" :show-overflow-tooltip="true" label="除名日期" min-width="80" align="left" />
-      </el-table>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { commonPage, bizRemListValidateBiz } from '@/api/abnormal'
 import { startBizRemove } from '@/api/abnormal'
 import { getConstant } from '@/api/system'
+import { expelledAnnouncementList, expelledRepairStartBiz } from '@/api/除名公告'
 export default {
   components: {
   },
@@ -152,12 +142,12 @@ export default {
       subloading: false,
       abnlistidParam: '',
       templateDialog1: false,
-      showDetails: false,
       prompt: '',
       details: [],
       selection: [],
       searchForm: {
-        entertype: 'individual'
+        uscc: '',
+        entName: ''
       },
       reasonList: [], // 几种列入原因
       reason: '',
@@ -166,10 +156,9 @@ export default {
       showFixed: false,
       tableData: [],
       pageParam: {
-        customParamMap: { entertype: 'individual' },
+        current: 1,
-        curPage: 1,
         total: 0,
-        pageSize: 10
+        size: 10
       }
     }
   },
@@ -189,7 +178,7 @@ export default {
         this.reasonList = list
       }
     })
-    // this.loadPage()
+    this.loadPage()
     window.addEventListener('scroll', this.handleScroll, true)
   },
   methods: {
@@ -222,44 +211,27 @@ export default {
       })
       return name
     },
-    check(abnlistid, specause, pripid, abntime) {
+    check(row) {
-      return bizRemListValidateBiz(abnlistid).then(({ code, data }) => {
+      this.$confirm('是否确认启动待办', '提示', {
-        if (data.length > 0) {
+        confirmButtonText: '确定',
-          this.$message.error(data[0].reason)
+        cancelButtonText: '取消',
-        } else {
+        type: 'warning'
-          this.abnlistidParam = abnlistid
+      }).then(() => {
-          this.templateDialog1 = true
+        return expelledRepairStartBiz(row).then(({ code, data }) => {
-          this.prompt = '是否确认启动待办'
+          if (code === 0) {
-        }
+            this.$message.success('除名修复业务启动成功')
+            this.$router.push({ path: '/expelled/removeAccept', query: { bizId: data.bizId }})
+          } else {
+            this.$message.error('除名修复业务启动失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
       })
     },
-    // 启动待办
-    startTask(abnlistid) {
-      this.subloading = true
-      startBizRemove('', abnlistid, 'individual').then(res => {
-        this.subloading = false
-        if (res.code === 0) {
-          this.$router.push({ path: '/credit/company/removeaccept', query: { tasklistid: res.data.tasklistid, bizseq: res.data.bizseq, type: 'individual' }})
-        } else if (res.code === 3002) {
-          this.subloading = false
-          this.prompt = res.msg
-          this.templateDialog1 = true
-        } else {
-          this.subloading = false
-          this.$message.error(res.msg)
-        }
-      })
-    },
-    // 搜索
-    search() {
-      this.pageParam.customParamMap = this.searchForm
-      this.pageParam.curPage = 1
-      this.loadPage()
-    },
-    // 分页多选插件回调
-    removeCallback(index, row) {
-      this.$refs.multipleTable.toggleRowSelection(row, false)
-    },
     // 全选按钮事件
     selectAll() {
       const table = this.$refs.multipleTable
@@ -315,41 +287,48 @@ export default {
       }
     },
     // 当前分页改变
-    pageIndexChange(curPage) {
+    pageIndexChange(current) {
-      this.pageParam.curPage = curPage
+      this.pageParam.current = current
       this.loadPage()
     },
     // 分页大小改变
-    pageSizeChange(pageSize) {
+    pageSizeChange(size) {
-      this.pageParam.pageSize = pageSize
+      this.pageParam.size = size
       this.loadPage()
     },
     // 加载分页
     loadPage() {
       if (this.loading) return
       this.loading = true
-      commonPage(this.pageParam).then(res => {
+      expelledAnnouncementList({
+        current: this.pageParam.current,
+        size: this.pageParam.size,
+        entity: {
+          bizType: '2',
+          ...this.searchForm
+        }
+      }).then(res => {
         this.loading = false
         const list = []
         let i = 1
-        const pageStart = (this.pageParam.curPage - 1) * this.pageParam.pageSize
+        const pageStart = (this.pageParam.current - 1) * this.pageParam.size
         res.data.records.forEach(each => {
           each.index = pageStart + i++
           list.push(each)
         })
         this.tableData = list
         this.pageParam.total = res.data.total
-        const selection = JSON.parse(JSON.stringify(this.selection))
+        // const selection = JSON.parse(JSON.stringify(this.selection))
-        this.$nextTick(() => {
+        // this.$nextTick(() => {
-          for (const i in list) {
+        //   for (const i in list) {
-            const each = list[i]
+        //     const each = list[i]
-            for (const j in selection) {
+        //     for (const j in selection) {
-              if (each.pripid === selection[j].pripid) {
+        //       if (each.pripid === selection[j].pripid) {
-                this.$refs.multipleTable.toggleRowSelection(each, true)
+        //         this.$refs.multipleTable.toggleRowSelection(each, true)
-              }
+        //       }
-            }
+        //     }
-          }
+        //   }
-        })
+        // })
       })
     }
   }
@@ -359,7 +338,7 @@ export default {
 <style lang="scss" scoped>
 .main-content{
   background: #fff;
-  padding: 10pt;
+  padding: 20px;
   .content-header{
     background: white;
     .search-body{
@@ -457,9 +436,9 @@ export default {
 
 </style>
 <style lang="scss">
-.content-body .el-table-column--selection .cell{
+// .content-body .el-table-column--selection .cell{
-  padding-right: 0px;
+  // padding-right: 0px;
-}
+// }
 .fixed-bottom {
   .el-pagination {
     text-align: right!important;

src/views/todo/index.vue

@@ -378,7 +378,7 @@
                     <!-- <div v-if="tableData[scope.$index].busstatus != 2"> -->
                     <div>
                       <!-- <el-button type="primary" size="mini" @click="$message.info('该业务已经停止办理')">办理</el-button> -->
-                      <el-button type="primary" size="mini" @click="gotoHandle(scope.row)">办理</el-button>
+                      <el-button type="primary" size="mini" @click="gotoHandle(scope.row)">办理1</el-button>
                       <el-button
                         v-if="tableData[scope.$index].isPassDissentApply"
                         type="primary"