diff --git a/src/views/expelled/除名修复管理/一移出受理.vue b/src/views/expelled/除名修复管理/一移出受理.vue
index efda77c..c4bd817 100644
--- a/src/views/expelled/除名修复管理/一移出受理.vue
+++ b/src/views/expelled/除名修复管理/一移出受理.vue
@@ -203,10 +203,10 @@
                       <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>
@@ -567,7 +567,7 @@ export default {
     }
   },
   mounted() {
-    this.bizId = this.$route.query.bizId
+    this.bizId = this.$route.query.bizId || this.$route.query.bizSeq
     expelledRepairGetBiz(this.bizId).then(res => {
       if (res.code === 0) {
         this.detailInfo = res.data
@@ -1071,7 +1071,7 @@ export default {
         nextPerformerNames: this.formData.nextPerformerNames,
         repairApproveInfo: {
           ...this.detailInfo.repairInfo,
-          acceptStatus: this.isAccept,
+          acceptStatus: this.isAgreeRepair,
           repairReason: this.repairReason,
           situation: this.formData.situation,
           remark: this.remRemark
diff --git a/src/views/expelled/除名修复管理/三移出审批.vue b/src/views/expelled/除名修复管理/三移出审批.vue
index 7ba1fd7..ebaa7f9 100644
--- a/src/views/expelled/除名修复管理/三移出审批.vue
+++ b/src/views/expelled/除名修复管理/三移出审批.vue
@@ -5,7 +5,7 @@
         <el-col :span="12">
           <div class="table-title">
             <img src="../../../assets/images/icon01.png" alt="" style="width:24px;margin-right:10px">
-            {{ isAgreeRepair === '1'? '除名修复审批表':'不予除名修复审批表' }}
+            {{ acceptStatus === '1'? '除名修复审批表':'不予除名修复审批表' }}
           </div>
         </el-col>
         <el-col :span="12">
@@ -25,14 +25,14 @@
         >
           <tr>
             <th width="20%">名称/姓名</th>
-            <td>{{ companyInfo.entname }}</td>
+            <td>{{ companyInfo?.repairInfo?.entName || '-' }}</td>
             <th width="20%">注册号/企业统一信用代码</th>
-            <td>{{ companyInfo.regno }}</td>
+            <td>{{ companyInfo?.repairInfo?.uscc || '-'}}</td>
           </tr>
           <tr>
             <th>作出决定的事实、理由、依据及主要内容</th>
             <td colspan="3">
-              <span style="display: block;text-indent: 1em;min-height:80px">{{ companyInfo.remreasons }}</span>
+              <span style="display: block;text-indent: 1em;min-height:80px">{{ companyInfo?.repairInfo?.situation || '-'}}</span>
             </td>
           </tr>
           <template v-if="historyLog && historyLog.length > 0">
@@ -41,10 +41,10 @@
               <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>
@@ -134,7 +134,7 @@
           <tr>
             <th>备注</th>
             <td colspan="3">
-              <span>{{ companyInfo.remRemark }}</span>
+              <span>{{ companyInfo?.repairInfo?.remark || '-' }}</span>
             </td>
           </tr>
           <tr>
@@ -142,7 +142,7 @@
               <span style="color:red">*</span>是否审批通过
             </th>
             <td colspan="3">
-              <el-radio-group v-model="formData.nextNodeID">
+              <el-radio-group v-model="formData.nextNodeId">
                 <el-radio label="endExptlist">通过</el-radio>
                 <el-radio label="exptlistEnter">回退</el-radio>
               </el-radio-group>
@@ -154,37 +154,6 @@
         </div>
       </div>
     </div>
-    <el-dialog
-      :title="dialogTitle"
-      :visible.sync="eidtDialog"
-      :close-on-click-modal="false"
-      width="60%"
-      center
-    >
-      <div class="firstEnt">
-        <el-form label-position="left" label-width="200px" :model="firstEnt" class="decForm">
-          <el-row>
-            <el-form-item label="主标题">
-              <span>{{ user.orgName }}</span>
-            </el-form-item>
-          </el-row>
-          <el-row>
-            <el-form-item label="副标题">
-              <span>{{ dialogTitle }}</span>
-            </el-form-item>
-          </el-row>
-          <el-row>
-            <el-form-item label="当事人">
-              <span>{{ companyInfo.entname }}</span>
-            </el-form-item>
-          </el-row>
-        </el-form>
-      </div>
-      <Editor ref="editorDialog" v-model="eidtContent" :is-clear="isClear" :is-disable="editorDisable" @getTextVal="getTextVal" @change="changeEditor" />
-      <span slot="footer" class="dialog-footer">
-        <el-button v-if="!editorDisable" type="primary" size="mini" @click="saveTempalte">保存</el-button>
-      </span>
-    </el-dialog>
     <el-dialog
       title="企业填报信息"
       :visible.sync="entInfoDialog"
@@ -202,35 +171,35 @@
       >
         <tr>
           <th width="20%">注册号/企业统一信用代码</th>
-          <td>{{ companyInfo.regno }}</td>
+          <td>{{ companyInfo?.repairInfo?.uscc || '-'}}</td>
         </tr>
-        <tr><th>企业名称</th><td>{{ companyInfo.entname }}</td></tr>
+        <tr><th>企业名称</th><td>{{ companyInfo?.repairInfo?.entName || '-'}}</td></tr>
         <tr>
           <th>申请时间</th>
-          <td colspan="2">{{ companyInfo.applyTime }}</td>
+          <td colspan="2">{{ companyInfo?.repairInfo?.applyDate || '-' }}</td>
         </tr>
         <tr>
           <th>申请人</th>
           <td colspan="2">
-            {{ companyInfo.applicant }}
+            {{ companyInfo?.repairInfo?.contactName || '-' }}
           </td>
         </tr>
         <tr>
-          <th>经营异常列入时间</th>
+          <th>除名时间</th>
           <td>
-            {{ tsabnlist.abntime }}
+            {{ companyInfo?.repairInfo?.removeDate || '-' }}
           </td>
         </tr>
         <tr>
-          <th>经营异常列入机关</th>
+          <th>除名列入机关</th>
           <td>
-            {{ tsabnlist.intoDecorg }}
+            {{ companyInfo?.repairInfo?.removeOrgName || '-' }}
           </td>
         </tr>
         <tr>
-          <th>经营异常列入原因</th>
+          <th>除名原因</th>
           <td>
-            {{ tsabnlist.spereasons }}
+            {{ companyInfo?.repairInfo?.situation || '-' }}
           </td>
         </tr>
       </table>
@@ -425,14 +394,13 @@ 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: {
-    Editor: editor
-  },
   data() {
     return {
       repairType: '1',
+      acceptStatus: '',
       entInfoDialog: false,
       isAccept: '',
       firstEnt: {},
@@ -451,7 +419,7 @@ export default {
       aicepsList: [], // 年报记录
       eGtAlterRecoderList: [], // 变更记录
       formData: {
-        nextNodeID: 'endExptlist',
+        nextNodeId: 'endExptlist',
         handledate: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
         opinion: '',
         remark: ''
@@ -526,15 +494,6 @@ export default {
       })
       this.formData.opinion = name
     },
-    isAgreeRepair: {
-      handler(newMsg, oldMsg) {
-        if (newMsg === '1') {
-          this.getRepairDecContent()
-        } else if (newMsg === '0') {
-          this.getNoRepairDecContent()
-        }
-      }
-    },
     specauseType() {
       if (this.specauseType === 'nb') {
         this.$set(this, 'fujianType', '未年报')
@@ -546,11 +505,14 @@ export default {
     }
   },
   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.tasklistid = this.$route.query.taskId
     this.type = this.$route.query.type
-
+    expelledRepairGetBiz(this.bizseq).then(res => {
+      this.companyInfo = res.data
+      this.acceptStatus = res.data.repairInfo.acceptStatus
+    })
     // 加载企业移出原因
     getConstant('CD74').then(res => {
       if (res.code === 0) {
@@ -595,63 +557,50 @@ export default {
     })
 
     // 加载待移出主体名单及 事实理由
-    getBizRemInfo(this.bizseq).then(res => {
-      if (res.code === 0) {
-        // 添加分页index
-        const list = []
-        let i = 1
-        const pageStart = (this.currentPage - 1) * this.pageSize
-        res.data.bizList.forEach(each => {
-          each.index = pageStart + i++
-          each.uscc = each.uniscid ? each.uniscid : each.regno // 有统一码显示统一码 没有用注册号
-          list.push(each)
-        })
-        this.entbase = list
-        this.tsabnlist = res.data.tsAbnList
-        const bizInfo = res.data.bizRemListMOdel
-        this.companyInfo = res.data.bizRemListMOdel
-        this.isAccept = bizInfo.isAccept
-        this.isAgreeRepair = bizInfo.isAgreeRepair
-        this.entname = bizInfo.entname
-        this.$set(this, 'reason', bizInfo.remexcpres)
-        this.specause = bizInfo.specause
-        this.remRemark = bizInfo.remRemark
-        this.specauseType = bizInfo.specauseType
-        // 分页处理
-        // this.total = this.entbase.length
-        // 计算页数
-        // this.calcPageData()
-        // if (this.specause === '1') {
-        //   this.isnb(bizInfo.abnlistid)
-        // }
-        this.check_py(this.tsabnlist.uniscid)
-      } else {
-        this.$message.error('加载异常名录主体信息失败')
-      }
-    })
-    if (this.type === 'farmer' || this.type === 'company') {
-      this.repairType = '1'
-    } else if (this.type === 'individual') {
-      this.repairType = '2'
-    }
-    this.loadAttachmentList()
+    // getBizRemInfo(this.bizseq).then(res => {
+    //   if (res.code === 0) {
+    //     const list = []
+    //     let i = 1
+    //     const pageStart = (this.currentPage - 1) * this.pageSize
+    //     res.data.bizList.forEach(each => {
+    //       each.index = pageStart + i++
+    //       each.uscc = each.uniscid ? each.uniscid : each.regno // 有统一码显示统一码 没有用注册号
+    //       list.push(each)
+    //     })
+    //     this.entbase = list
+    //     this.tsabnlist = res.data.tsAbnList
+    //     const bizInfo = res.data.bizRemListMOdel
+    //     this.companyInfo = res.data.bizRemListMOdel
+    //     this.isAccept = bizInfo.isAccept
+    //     this.isAgreeRepair = bizInfo.isAgreeRepair
+    //     this.entname = bizInfo.entname
+    //     this.$set(this, 'reason', bizInfo.remexcpres)
+    //     this.specause = bizInfo.specause
+    //     this.remRemark = bizInfo.remRemark
+    //     this.specauseType = bizInfo.specauseType
+    //     this.check_py(this.tsabnlist.uniscid)
+    //   } else {
+    //     this.$message.error('加载异常名录主体信息失败')
+    //   }
+    // })
+    // this.loadAttachmentList()
     // 获取主体年报记录
-    getaicepsYbList(this.bizseq).then(res => {
-      if (res.code === 0) {
-        this.aicepsList = res.data
-      } else {
-        this.$message.error('加载年报记录失败')
-      }
-    })
+    // getaicepsYbList(this.bizseq).then(res => {
+    //   if (res.code === 0) {
+    //     this.aicepsList = res.data
+    //   } else {
+    //     this.$message.error('加载年报记录失败')
+    //   }
+    // })
 
-    // 获取变更记录
-    geteGtAlterRecoderList(this.bizseq).then(res => {
-      if (res.code === 0) {
-        this.eGtAlterRecoderList = res.data
-      } else {
-        this.$message.error('加载变更记录失败')
-      }
-    })
+    // // 获取变更记录
+    // geteGtAlterRecoderList(this.bizseq).then(res => {
+    //   if (res.code === 0) {
+    //     this.eGtAlterRecoderList = res.data
+    //   } else {
+    //     this.$message.error('加载变更记录失败')
+    //   }
+    // })
   },
   methods: {
     // 番禺启示录
@@ -1043,18 +992,28 @@ export default {
         return this.$message.error('请输入部门负责人意见')
       }
       this.formData.isagree = '1'
-      if (this.formData.nextNodeID === 'exptlistEnter') {
+      if (this.formData.nextNodeId === 'exptlistEnter') {
         this.formData.isagree = '2'
       }
-      this.formData.nextPerformerids = ''
-      this.formData.bizseq = this.bizseq
+      this.formData.nextPerformerIds = ''
+      this.formData.bizId = this.bizseq
       this.formData.workflowid = this.workflowId
-      this.formData.tasklistid = this.tasklistid
+      this.formData.taskId = this.tasklistid
       this.formData.handler = this.user.nickname
       this.formData.handlerid = this.user.primaryKey
-      this.formData.opiniontype = '2'
-      this.formData.opinioncontent = this.formData.opinion
-      bizRemoveNext(this.formData).then(res => {
+      expelledRepairNextBiz({
+        ...this.formData,
+        nextNodeId: this.formData.nextNodeId,
+        repairApproveInfo: {
+          ...this.companyInfo.repairInfo
+        },
+        opinionQuery: {
+          opinioncontent: this.formData.opinion,
+          opiniontype: '2',
+          isagree: this.formData.isagree,
+          handledate: this.formData.handledate
+        }
+      }).then(res => {
         this.submitLoading = false
         if (res.code === 0) {
           this.$message.success('提交成功')
@@ -1240,5 +1199,7 @@ export default {
     }
   }
 }
-
+.submit-btn-box {
+  text-align: center;
+}
 </style>
diff --git a/src/views/expelled/除名修复管理/二移出审核.vue b/src/views/expelled/除名修复管理/二移出审核.vue
index 7da16e7..caf2096 100644
--- a/src/views/expelled/除名修复管理/二移出审核.vue
+++ b/src/views/expelled/除名修复管理/二移出审核.vue
@@ -4,7 +4,7 @@
       <el-col :span="12">
         <div class="table-title">
           <img src="../../../assets/images/icon01.png" alt="" style="width:24px;margin-right:10px">
-          {{ isAgreeRepair === '1'? '信用修复审批表':'不予信用修复审批表' }}
+          {{ acceptStatus === '1'? '除名修复审批表':'不予除名修复审批表' }}
         </div>
       </el-col>
       <el-col :span="12">
@@ -25,17 +25,16 @@
         >
           <tr>
             <th width="20%">名称/姓名</th>
-            <td>{{ companyInfo.entname }}</td>
+            <td>{{ companyInfo?.repairInfo?.entName || '-' }}</td>
             <th width="20%">注册号/企业统一信用代码</th>
-            <td>{{ companyInfo.regno }}</td>
+            <td>{{ companyInfo?.repairInfo?.uscc || '-'}}</td>
           </tr>
           <tr>
             <th>作出决定的事实、理由、依据及主要内容</th>
             <td colspan="3">
-              <span style="display: block;text-indent: 1em;min-height:80px">{{ companyInfo.remreasons }}</span>
+              <span style="display: block;text-indent: 1em;min-height:80px">{{ companyInfo?.repairInfo?.situation || '-'}}</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>
@@ -137,7 +136,7 @@
           <tr>
             <th>备注</th>
             <td colspan="3">
-              <span>{{ companyInfo.remRemark }}</span>
+              <span>{{ companyInfo?.repairInfo?.remark || '-' }}</span>
             </td>
           </tr>
           <tr>
@@ -145,16 +144,16 @@
               <span style="color:red">*</span>是否审核通过
             </th>
             <td colspan="3">
-              <el-radio-group v-model="formData.nextNodeID">
+              <el-radio-group v-model="formData.nextNodeId">
                 <el-radio label="approvelist">通过</el-radio>
                 <el-radio label="exptlistEnter">回退</el-radio>
               </el-radio-group>
             </td>
           </tr>
-          <tr v-if="formData.nextNodeID === 'approvelist'">
+          <tr v-if="formData.nextNodeId === 'approvelist'">
             <th><span style="color:red">*</span>审批人</th>
             <td colspan="3">
-              <el-select v-model="formData.nextPerformerids" placeholder="请选择审批人" filterable style="width:30%">
+              <el-select v-model="formData.nextPerformerIds" placeholder="请选择审批人" filterable style="width:30%">
                 <el-option
                   v-for="item in reviewer"
                   :key="'reviewer'+item.primaryKey"
@@ -170,38 +169,6 @@
         </div>
       </div>
     </div>
-    <el-dialog
-      :title="dialogTitle"
-      :visible.sync="eidtDialog"
-      :close-on-click-modal="false"
-      width="60%"
-      center
-    >
-      <div class="firstEnt">
-        <el-form label-position="left" label-width="200px" :model="firstEnt" class="decForm">
-          <el-row>
-            <el-form-item label="主标题">
-              <span>{{ user.orgName }}</span>
-            </el-form-item>
-          </el-row>
-          <el-row>
-            <el-form-item label="副标题">
-              <span>{{ dialogTitle }}</span>
-            </el-form-item>
-          </el-row>
-          <el-row>
-            <el-form-item label="当事人">
-              <span>{{ companyInfo.entname }}</span>
-            </el-form-item>
-          </el-row>
-        </el-form>
-      </div>
-      <Editor ref="editorDialog" v-model="eidtContent" :is-clear="isClear" :is-disable="editorDisable" @getTextVal="getTextVal" @change="changeEditor" />
-      <span slot="footer" class="dialog-footer">
-        <el-button v-if="!editorDisable" type="primary" size="mini" @click="saveTempalte">保存</el-button>
-        <!-- <el-button size="mini" @click="getEditorText">输出纯文本</el-button> -->
-      </span>
-    </el-dialog>
     <el-dialog
       title="企业填报信息"
       :visible.sync="entInfoDialog"
@@ -219,35 +186,35 @@
       >
         <tr>
           <th width="20%">注册号/企业统一信用代码</th>
-          <td>{{ companyInfo.regno }}</td>
+          <td>{{ companyInfo?.repairInfo?.uscc || '-'}}</td>
         </tr>
-        <tr><th>企业名称</th><td>{{ companyInfo.entname }}</td></tr>
+        <tr><th>企业名称</th><td>{{ companyInfo?.repairInfo?.entName || '-'}}</td></tr>
         <tr>
           <th>申请时间</th>
-          <td colspan="2">{{ companyInfo.applyTime }}</td>
+          <td colspan="2">{{ companyInfo?.repairInfo?.applyDate || '-' }}</td>
         </tr>
         <tr>
           <th>申请人</th>
           <td colspan="2">
-            {{ companyInfo.applicant }}
+            {{ companyInfo?.repairInfo?.contactName || '-' }}
           </td>
         </tr>
         <tr>
-          <th>经营异常列入时间</th>
+          <th>除名时间</th>
           <td>
-            {{ tsabnlist.abntime }}
+            {{ companyInfo?.repairInfo?.removeDate || '-' }}
           </td>
         </tr>
         <tr>
-          <th>经营异常列入机关</th>
+          <th>除名列入机关</th>
           <td>
-            {{ tsabnlist.intoDecorg }}
+            {{ companyInfo?.repairInfo?.removeOrgName || '-' }}
           </td>
         </tr>
         <tr>
-          <th>经营异常列入原因</th>
+          <th>除名原因</th>
           <td>
-            {{ tsabnlist.spereasons }}
+            {{ companyInfo?.repairInfo?.situation || '-' }}
           </td>
         </tr>
       </table>
@@ -260,12 +227,10 @@
         cellspacing="0"
       >
         <tr>
-          <!--<th rowspan="5" width="20%">移出严重违法失信企业名单证据材料</th>-->
           <th :rowspan="7" width="20%">证据材料</th>
           <td>
             <el-row style="border-left:0;">
-              <!--              <el-col :span="14">《商事主体移出经营异常名录(消除经营异常状态)申请表》</el-col>-->
-              <el-col :span="14">《信用修复申请书》</el-col>
+              <el-col :span="14">《除名修复申请书》</el-col>
               <el-col :span="10">
                 <el-upload
                   class="disabled-upload-remove"
@@ -278,8 +243,6 @@
                   :on-success="handleSuccess(1)"
                   :on-remove="handleRemove(1)"
                 >
-                  <!-- <el-button slot="trigger" type="primary" size="mini">上传</el-button>
-                            <el-button style="margin-left: 10px;" size="mini" @click="downLoadTemp(1)">下载模版</el-button> -->
                 </el-upload>
               </el-col>
             </el-row>
@@ -288,7 +251,7 @@
         <tr>
           <td>
             <el-row style="border-left:0;">
-              <el-col :span="14">《信用修复承诺书》</el-col>
+              <el-col :span="14">《除名修复承诺书》</el-col>
               <el-col :span="10">
                 <el-upload
                   class="disabled-upload-remove"
@@ -301,7 +264,6 @@
                   :on-success="handleSuccess(8)"
                   :on-remove="handleRemove(8)"
                 >
-                  <!-- <el-button slot="trigger" type="primary" size="mini">上传</el-button> -->
                 </el-upload>
               </el-col>
             </el-row>
@@ -310,7 +272,6 @@
         <tr>
           <td v-if="fujianType === '未年报'">
             <el-row style="border-left:0;">
-              <!--              <el-col :span="14">已公示年度报告信息截图</el-col>-->
               <el-col :span="14">履行法定义务、纠正违法行为的相关材料</el-col>
               <el-col :span="10">
                 <el-upload
@@ -324,8 +285,6 @@
                   :on-success="handleSuccess(7)"
                   :on-remove="handleRemove(7)"
                 >
-                  <!-- <el-button slot="trigger" type="primary" size="mini">上传</el-button> -->
-                  <!-- <el-button style="margin-left: 10px;" size="mini" @click="downLoadTemp(7)">下载模版</el-button> -->
                 </el-upload>
               </el-col>
             </el-row>
@@ -334,7 +293,6 @@
         <tr>
           <td v-if="fujianType === '实地查无'">
             <el-row style="border-left:0;">
-              <!--              <el-col :span="14">《企业公示信息实地核查记录表》或《准予变更登记（备案）通知书》</el-col>-->
               <el-col :span="14">履行法定义务、纠正违法行为的相关材料</el-col>
               <el-col :span="10">
                 <el-upload
@@ -375,7 +333,7 @@
         <tr>
           <td>
             <el-row style="border-left:0;">
-              <el-col :span="14">《移出经营异常名录授权委托书》</el-col>
+              <el-col :span="14">《除名修复授权委托书》</el-col>
               <el-col :span="10">
                 <el-upload
                   class="disabled-upload-remove"
@@ -439,25 +397,18 @@
 
 <script>
 import { removeAttachementById, listAttachmentByBizseq, uploadFile } from '@/api/attachment'
-import {
-  bizRemoveNext,
-  getBizRemInfo,
-  checknb,
-  getaicepsYbList, geteGtAlterRecoderList
+import { checknb
+  // getaicepsYbList, geteGtAlterRecoderList
 } from '@/api/abnormal'
 import { getUsersWithPermission } from '@/api/user'
-import { getContentsWithBizseq, getNewestOpinion, saveOrUpdateContent } from '@/api/credit'
+import { getNewestOpinion, saveOrUpdateContent } from '@/api/credit'
 import { taskOpinion } from '@/api/task'
-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: {
-    Editor: editor
-  },
   data() {
     return {
       repairType: '1',
@@ -477,11 +428,12 @@ export default {
       tasklistid: '',
       opinion: '',
       reason: '',
+      acceptStatus: '',
       companyInfo: {},
       aicepsList: [], // 年报记录
       eGtAlterRecoderList: [], // 变更记录
       formData: {
-        nextNodeID: 'approvelist',
+        nextNodeId: 'approvelist',
         opinion: '',
         handledate: this.$moment().format('YYYY-MM-DD HH:mm:ss')
       },
@@ -557,15 +509,6 @@ export default {
       })
       this.$set(this.formData, 'opinion', name)
     },
-    isAgreeRepair: {
-      handler(newMsg, oldMsg) {
-        if (newMsg === '1') {
-          this.getRepairDecContent()
-        } else if (newMsg === '0') {
-          this.getNoRepairDecContent()
-        }
-      }
-    },
     specauseType() {
       if (this.specauseType === 'nb') {
         this.$set(this, 'fujianType', '未年报')
@@ -579,11 +522,11 @@ export default {
   async mounted() {
     this.bizseq = this.$route.query.bizSeq // 获取跳转携带的参数bizseq
     this.workflowId = this.$route.query.workflowId
-    this.tasklistid = this.$route.query.tasklistid
+    this.tasklistid = this.$route.query.taskId
     this.type = this.$route.query.type
     expelledRepairGetBiz(this.bizseq).then(res => {
-      console.log(res)
-      this.companyInfo = res.data.repairInfo
+      this.companyInfo = res.data
+      this.acceptStatus = res.data.repairInfo.acceptStatus
     })
     // 加载企业移出原因
     getConstant('CD74').then(res => {
@@ -660,30 +603,25 @@ export default {
 
     // 加载审核人
     this.loadReviewer()
-    if (this.type === 'farmer' || this.type === 'company') {
-      this.repairType = '1'
-    } else if (this.type === 'individual') {
-      this.repairType = '2'
-    }
     this.loadAttachmentList()
 
     // 获取主体年报记录
-    getaicepsYbList(this.bizseq).then(res => {
-      if (res.code === 0) {
-        this.aicepsList = res.data
-      } else {
-        this.$message.error('加载年报记录失败')
-      }
-    })
+    // getaicepsYbList(this.bizseq).then(res => {
+    //   if (res.code === 0) {
+    //     this.aicepsList = res.data
+    //   } else {
+    //     this.$message.error('加载年报记录失败')
+    //   }
+    // })
 
-    // 获取变更记录
-    geteGtAlterRecoderList(this.bizseq).then(res => {
-      if (res.code === 0) {
-        this.eGtAlterRecoderList = res.data
-      } else {
-        this.$message.error('加载变更记录失败')
-      }
-    })
+    // // 获取变更记录
+    // geteGtAlterRecoderList(this.bizseq).then(res => {
+    //   if (res.code === 0) {
+    //     this.eGtAlterRecoderList = res.data
+    //   } else {
+    //     this.$message.error('加载变更记录失败')
+    //   }
+    // })
   },
   methods: {
     // 番禺启示录
@@ -927,52 +865,6 @@ export default {
         await this.$refs.editorDialog.$emit('clear')
       }
     },
-    // 获取不予受理决定书内容
-    getDisagreeDecContent() {
-      this.tswrittemplate.bizseq = this.bizseq
-      this.tswrittemplate.writsType = '51'
-      getContentsWithBizseq(this.tswrittemplate).then(res => {
-        if (res.code === 0) {
-          this.tswrittemplate.content = res.data.content
-        } else {
-          this.$message.error(res.msg)
-        }
-      })
-    },
-    // 获取不予信用修复决定书内容
-    getNoRepairDecContent() {
-      this.tswrittemplate.bizseq = this.bizseq
-      if (this.type === 'farmer' || this.type === 'company') {
-        this.$set(this.tswrittemplate, 'writsType', '55')
-      } else {
-        this.$set(this.tswrittemplate, 'writsType', '58')
-      }
-      this.tswrittemplate.type = this.type
-      getContentsWithBizseq(this.tswrittemplate).then(res => {
-        if (res.code === 0) {
-          this.tswrittemplate.content = res.data.content
-        } else {
-          this.$message.error(res.msg)
-        }
-      })
-    },
-    // 获取准予信用修复决定书内容
-    getRepairDecContent() {
-      this.tswrittemplate.bizseq = this.bizseq
-      if (this.type === 'farmer' || this.type === 'company') {
-        this.$set(this.tswrittemplate, 'writsType', '56')
-      } else {
-        this.$set(this.tswrittemplate, 'writsType', '59')
-      }
-      this.tswrittemplate.type = this.type
-      getContentsWithBizseq(this.tswrittemplate).then(res => {
-        if (res.code === 0) {
-          this.tswrittemplate.content = res.data.content
-        } else {
-          this.$message.error(res.msg)
-        }
-      })
-    },
     handleSuccess(index) {
       return (res, file) => {
         if (res.code === 0) {
@@ -1087,35 +979,45 @@ export default {
         this.submitLoading = false
         return this.$message.error('请输入经办机构负责人意见')
       }
-      if (this.formData.nextNodeID === 'approvelist' && this.$util.isEmpty(this.formData.nextPerformerids)) {
+      if (this.formData.nextNodeId === 'approvelist' && this.$util.isEmpty(this.formData.nextPerformerIds)) {
         this.submitLoading = false
         return this.$message.error('请选择审批人')
       }
       let name = ''
-      const userId = this.formData.nextPerformerids
+      const userId = this.formData.nextPerformerIds
       this.reviewer.forEach(each => {
         if (userId === each.primaryKey) {
           name = each.name
         }
       })
       this.formData.isagree = '1'
-      if (this.formData.nextNodeID === 'exptlistEnter') {
-        this.formData.nextPerformerids = ''
+      if (this.formData.nextNodeId === 'exptlistEnter') {
+        this.formData.nextPerformerIds = ''
         this.formData.isagree = '2'
       }
       for (const i in this.reviewer) {
-        if (this.reviewer[i].primaryKey === this.formData.nextPerformerids) {
+        if (this.reviewer[i].primaryKey === this.formData.nextPerformerIds) {
           this.formData.nextPerformerNames = this.reviewer[i].name
         }
       }
-      this.formData.bizseq = this.bizseq
+      this.formData.bizId = this.bizseq
       this.formData.workflowid = this.workflowId
-      this.formData.tasklistid = this.tasklistid
+      this.formData.taskId = this.tasklistid
       this.formData.handler = this.user.nickname
-      this.formData.handlerid = this.user.primaryKey
-      this.formData.opiniontype = '1'
-      this.formData.opinioncontent = this.formData.opinion
-      expelledRepairNextBiz(this.formData).then(res => {
+      expelledRepairNextBiz({
+        ...this.formData,
+        nextNodeId: this.formData.nextNodeId,
+        repairApproveInfo: {
+          ...this.companyInfo.repairInfo
+        },
+        opinionQuery: {
+          opinioncontent: this.formData.opinion,
+          handlerid: this.user.primaryKey,
+          opiniontype: '1',
+          isagree: this.formData.isagree,
+          handledate: this.formData.handledate
+        }
+      }).then(res => {
         this.submitLoading = false
         if (res.code === 0) {
           this.$message.success('提交成功')
@@ -1347,5 +1249,8 @@ $font-size-label:#666;
       text-align: $text-algin-left;
     }
   }
-  }
+}
+.submit-btn-box {
+  text-align: center;
+}
 </style>