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

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

@@ -35,16 +35,17 @@
               <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 style="font-size: 0.37333rem">{{ each.step }}人:</label>
+                  <label>{{ each.step }}人:</label>
                   <span>{{ each.handler }}</span>
                   <label
-                    style="font-size: 0.37333rem; margin-left: 10px"
+                    style="margin-left: 10px"
                   >{{ each.step }}日期:</label>
                   <span style="display: inline-block">{{ each.handledate }}</span>
                 </el-col>
@@ -139,22 +140,6 @@
               <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>是否审核通过
@@ -362,8 +347,7 @@
                   :before-upload="beforeUpload"
                   :on-success="handleSuccess(2)"
                   :on-remove="handleRemove(2)"
-                >
+                />
-                </el-upload>
               </el-col>
             </el-row>
           </td>
@@ -383,8 +367,7 @@
                   :before-upload="beforeUpload"
                   :on-success="handleSuccess(9)"
                   :on-remove="handleRemove(9)"
-                >
+                />
-                </el-upload>
               </el-col>
             </el-row>
           </td>
@@ -404,8 +387,7 @@
                   :before-upload="beforeUpload"
                   :on-success="handleSuccess(3)"
                   :on-remove="handleRemove(3)"
-                >
+                />
-                </el-upload>
               </el-col>
             </el-row>
           </td>
@@ -425,8 +407,7 @@
                   :before-upload="beforeUpload"
                   :on-success="handleSuccess(4)"
                   :on-remove="handleRemove(4)"
-                >
+                />
-                </el-upload>
               </el-col>
             </el-row>
           </td>
@@ -448,8 +429,7 @@
               :on-success="handleSuccess(99)"
               :file-list="fileUri.file99"
               style="width:40%"
-            >
+            />
-            </el-upload>
           </td>
         </tr>
       </table>
@@ -462,8 +442,6 @@ import { removeAttachementById, listAttachmentByBizseq, uploadFile } from '@/api
 import {
   bizRemoveNext,
   getBizRemInfo,
-  removeBizRemListBySplistid,
-  getBizRemoveRecordList,
   checknb,
   getaicepsYbList, geteGtAlterRecoderList
 } from '@/api/abnormal'
@@ -474,6 +452,7 @@ 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: {
@@ -598,11 +577,14 @@ 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) {
@@ -616,7 +598,6 @@ export default {
         this.reasonOptions = list
       }
     })
-
     // // 加载处办记录
     taskOpinion(this.workflowId).then(res => {
       if (res.code === 0) {
@@ -649,36 +630,33 @@ export default {
       }
     })
     // 加载待移出主体名单及 事实理由
-    getBizRemInfo(this.bizseq).then(res => {
+    // getBizRemInfo(this.bizseq).then(res => {
-      if (res.code === 0) {
+    //   if (res.code === 0) {
-        // 添加分页index
+    //     const list = []
-        const list = []
+    //     let i = 1
-        let i = 1
+    //     const pageStart = (this.currentPage - 1) * this.pageSize
-        const pageStart = (this.currentPage - 1) * this.pageSize
+    //     res.data.bizList.forEach(each => {
-        res.data.bizList.forEach(each => {
+    //       each.index = pageStart + i++
-          each.index = pageStart + i++
+    //       each.uscc = each.uniscid ? each.uniscid : each.regno // 有统一码显示统一码 没有用注册号
-          each.uscc = each.uniscid ? each.uniscid : each.regno // 有统一码显示统一码 没有用注册号
+    //       list.push(each)
-          list.push(each)
+    //     })
-        })
+    //     this.entbase = list
-        this.entbase = list
+    //     this.tsabnlist = res.data.tsAbnList
-        this.tsabnlist = res.data.tsAbnList
+    //     const bizInfo = res.data.bizRemListMOdel
-        const bizInfo = res.data.bizRemListMOdel
+    //     this.companyInfo = res.data.bizRemListMOdel
-        this.companyInfo = res.data.bizRemListMOdel
+    //     this.isAccept = bizInfo.isAccept
-        this.isAccept = bizInfo.isAccept
+    //     this.isAgreeRepair = bizInfo.isAgreeRepair
-        this.isAgreeRepair = bizInfo.isAgreeRepair
+    //     this.entname = bizInfo.entname
-        this.entname = bizInfo.entname
+    //     this.specause = bizInfo.specause
-        // this.$set(this, 'reason', bizInfo.remexcpres)
+    //     this.remRemark = bizInfo.remRemark
-        this.specause = bizInfo.specause
+    //     this.specauseType = bizInfo.specauseType
-        this.remRemark = bizInfo.remRemark
+    //     this.total = this.entbase.length
-        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()
@@ -1137,7 +1115,7 @@ export default {
       this.formData.handlerid = this.user.primaryKey
       this.formData.opiniontype = '1'
       this.formData.opinioncontent = this.formData.opinion
-      bizRemoveNext(this.formData).then(res => {
+      expelledRepairNextBiz(this.formData).then(res => {
         this.submitLoading = false
         if (res.code === 0) {
           this.$message.success('提交成功')
@@ -1164,25 +1142,11 @@ export default {
     },
     // 加载审批人
     loadReviewer() {
-      if (this.type === 'farmer') {
+      getUsersWithPermission('', this.user.orgId).then(res => {
-        getUsersWithPermission('agricultureRecoverExamine', this.user.orgId).then(res => {
+        if (res.code === 0) {
-          if (res.code === 0) {
+          this.reviewer = res.data
-            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,6 +3621,26 @@ 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