src/views/expelled/除名修复管理/二移出审核.vue

@@ -35,17 +35,16 @@
               <span style="display: block;text-indent: 1em;min-height:80px">{{ companyInfo.remreasons }}</span>
             </td>
           </tr>
-          {{ historyLog }}
           <template v-if="historyLog && historyLog.length > 0">
             <tr v-for="(each,index) in historyLog" :key="'historyLog'+index">
               <th>{{ each.label }}</th>
               <td colspan="3">
                 <span style="display: block;text-indent: 1em;min-height:80px">{{ each.opinioncontent }}</span>
                 <el-col :span="8" :offset="16">
-                  <label>{{ each.step }}人:</label>
+                  <label style="font-size: 0.37333rem">{{ each.step }}人:</label>
                   <span>{{ each.handler }}</span>
                   <label
-                    style="margin-left: 10px"
+                    style="font-size: 0.37333rem; margin-left: 10px"
                   >{{ each.step }}日期:</label>
                   <span style="display: inline-block">{{ each.handledate }}</span>
                 </el-col>
@@ -140,6 +139,22 @@
               <span>{{ companyInfo.remRemark }}</span>
             </td>
           </tr>
+          <tr>
+            <th>
+              文书
+            </th>
+            <td colspan="3">
+              <!-- <el-link v-if="isAccept === '0'" style="font-size: unset" @click="openDialog('disagreeDec')">不予受理决定书</el-link> -->
+              <el-link
+                v-if="companyInfo.isAgreeRepair === '0'"
+                type="primary"
+                :underline="false"
+                style="font-size: unset;border-bottom:1px solid #409EFF"
+                @click="openDialog('noCreidtRepair')"
+              >不予信用修复决定书</el-link>
+              <el-link v-if="companyInfo.isAgreeRepair === '1'" type="primary" :underline="false" style="font-size: unset;border-bottom:1px solid #409EFF" @click="openDialog('creidtRepair')">准予信用修复决定书</el-link>
+            </td>
+          </tr>
           <tr>
             <th>
               <span style="color:red">*</span>是否审核通过
@@ -347,7 +362,8 @@
                   :before-upload="beforeUpload"
                   :on-success="handleSuccess(2)"
                   :on-remove="handleRemove(2)"
-                />
+                >
+                </el-upload>
               </el-col>
             </el-row>
           </td>
@@ -367,7 +383,8 @@
                   :before-upload="beforeUpload"
                   :on-success="handleSuccess(9)"
                   :on-remove="handleRemove(9)"
-                />
+                >
+                </el-upload>
               </el-col>
             </el-row>
           </td>
@@ -387,7 +404,8 @@
                   :before-upload="beforeUpload"
                   :on-success="handleSuccess(3)"
                   :on-remove="handleRemove(3)"
-                />
+                >
+                </el-upload>
               </el-col>
             </el-row>
           </td>
@@ -407,7 +425,8 @@
                   :before-upload="beforeUpload"
                   :on-success="handleSuccess(4)"
                   :on-remove="handleRemove(4)"
-                />
+                >
+                </el-upload>
               </el-col>
             </el-row>
           </td>
@@ -429,7 +448,8 @@
               :on-success="handleSuccess(99)"
               :file-list="fileUri.file99"
               style="width:40%"
-            />
+            >
+            </el-upload>
           </td>
         </tr>
       </table>
@@ -442,6 +462,8 @@ import { removeAttachementById, listAttachmentByBizseq, uploadFile } from '@/api
 import {
   bizRemoveNext,
   getBizRemInfo,
+  removeBizRemListBySplistid,
+  getBizRemoveRecordList,
   checknb,
   getaicepsYbList, geteGtAlterRecoderList
 } from '@/api/abnormal'
@@ -452,7 +474,6 @@ import editor from '@/components/editor.vue'
 import { getConstant } from '@/api/system'
 import { isMenHu } from '@/utils/utils'
 import { checkPyBlacklist } from '@/api/pyBlacklist'
-import { expelledRepairNextBiz, expelledRepairGetBiz } from '@/api/除名公告'
 
 export default {
   components: {
@@ -577,14 +598,11 @@ export default {
     }
   },
   async mounted() {
-    this.bizseq = this.$route.query.bizSeq // 获取跳转携带的参数bizseq
+    this.bizseq = this.$route.query.bizseq // 获取跳转携带的参数bizseq
     this.workflowId = this.$route.query.workflowId
     this.tasklistid = this.$route.query.tasklistid
     this.type = this.$route.query.type
-    expelledRepairGetBiz(this.bizseq).then(res => {
+
-      console.log(res)
-      this.companyInfo = res.data.repairInfo
-    })
     // 加载企业移出原因
     getConstant('CD74').then(res => {
       if (res.code === 0) {
@@ -598,6 +616,7 @@ export default {
         this.reasonOptions = list
       }
     })
+
     // // 加载处办记录
     taskOpinion(this.workflowId).then(res => {
       if (res.code === 0) {
@@ -630,33 +649,36 @@ export default {
       }
     })
     // 加载待移出主体名单及 事实理由
-    // getBizRemInfo(this.bizseq).then(res => {
+    getBizRemInfo(this.bizseq).then(res => {
-    //   if (res.code === 0) {
+      if (res.code === 0) {
-    //     const list = []
+        // 添加分页index
-    //     let i = 1
+        const list = []
-    //     const pageStart = (this.currentPage - 1) * this.pageSize
+        let i = 1
-    //     res.data.bizList.forEach(each => {
+        const pageStart = (this.currentPage - 1) * this.pageSize
-    //       each.index = pageStart + i++
+        res.data.bizList.forEach(each => {
-    //       each.uscc = each.uniscid ? each.uniscid : each.regno // 有统一码显示统一码 没有用注册号
+          each.index = pageStart + i++
-    //       list.push(each)
+          each.uscc = each.uniscid ? each.uniscid : each.regno // 有统一码显示统一码 没有用注册号
-    //     })
+          list.push(each)
-    //     this.entbase = list
+        })
-    //     this.tsabnlist = res.data.tsAbnList
+        this.entbase = list
-    //     const bizInfo = res.data.bizRemListMOdel
+        this.tsabnlist = res.data.tsAbnList
-    //     this.companyInfo = res.data.bizRemListMOdel
+        const bizInfo = res.data.bizRemListMOdel
-    //     this.isAccept = bizInfo.isAccept
+        this.companyInfo = res.data.bizRemListMOdel
-    //     this.isAgreeRepair = bizInfo.isAgreeRepair
+        this.isAccept = bizInfo.isAccept
-    //     this.entname = bizInfo.entname
+        this.isAgreeRepair = bizInfo.isAgreeRepair
-    //     this.specause = bizInfo.specause
+        this.entname = bizInfo.entname
-    //     this.remRemark = bizInfo.remRemark
+        // this.$set(this, 'reason', bizInfo.remexcpres)
-    //     this.specauseType = bizInfo.specauseType
+        this.specause = bizInfo.specause
-    //     this.total = this.entbase.length
+        this.remRemark = bizInfo.remRemark
+        this.specauseType = bizInfo.specauseType
+        // 分页处理
+        this.total = this.entbase.length
 
-    //     this.check_py(this.tsabnlist.uniscid)
+        this.check_py(this.tsabnlist.uniscid)
-    //   } else {
+      } else {
-    //     this.$message.error('加载异常名录主体信息失败')
+        this.$message.error('加载异常名录主体信息失败')
-    //   }
+      }
-    // })
+    })
 
     // 加载审核人
     this.loadReviewer()
@@ -1115,7 +1137,7 @@ export default {
       this.formData.handlerid = this.user.primaryKey
       this.formData.opiniontype = '1'
       this.formData.opinioncontent = this.formData.opinion
-      expelledRepairNextBiz(this.formData).then(res => {
+      bizRemoveNext(this.formData).then(res => {
         this.submitLoading = false
         if (res.code === 0) {
           this.$message.success('提交成功')
@@ -1142,11 +1164,25 @@ export default {
     },
     // 加载审批人
     loadReviewer() {
-      getUsersWithPermission('', this.user.orgId).then(res => {
+      if (this.type === 'farmer') {
+        getUsersWithPermission('agricultureRecoverExamine', this.user.orgId).then(res => {
           if (res.code === 0) {
             this.reviewer = res.data
           }
         })
+      } else if (this.type === 'individual') {
+        getUsersWithPermission('individualRecoverExamine', this.user.orgId).then(res => {
+          if (res.code === 0) {
+            this.reviewer = res.data
+          }
+        })
+      } else if (this.type === 'company') {
+        getUsersWithPermission('exptRemoveApprove', this.user.orgId).then(res => {
+          if (res.code === 0) {
+            this.reviewer = res.data
+          }
+        })
+      }
     },
     // 下载模版
     downLoadTemp(type) {

src/views/todo/index.vue

@@ -3621,26 +3621,6 @@ export default {
           })
           break
         }
-        // 除名修复管理
-        case '1001': {
-          let path = ''
-          if (row.currentNodeOrBizStatus === 'exptlistEnter') {
-            path = 'removeAccept'
-          } else if (row.currentNodeOrBizStatus === 'handleExptlist') {
-            path = 'removeReview'
-          } else if (row.currentNodeOrBizStatus === 'approvelist') {
-            path = 'removeExamine'
-          }
-          this.$router.push({
-            path: '/expelled/' + path,
-            query: {
-              taskId: row.tasklistid,
-              bizSeq: row.bizseqid,
-              workflowId: row.workflowid
-            }
-          })
-          break
-        }
         // 信用风险异议申请
         case '36': {
           const path = '/crgs/#/schedule/dissentFirstCheck?bizseq=' + row.bizseqid + '&workflowid=' + row.workflowid + '&uscc=' + row.uscc + '&currentNode=' + row.currentNodeOrBizStatus