前端： 准入申请在专业处室审核后增加企管法规处审核环节；准入+增项在流程到交费环节后允许申请用户撤回该申请。

src/dashoo.cn/frontend_web/src/api/oilsupplier/supplierappend.js

@@ -117,5 +117,32 @@ export default {
       method: 'post',
       params: params
     })
+  },
+  /**
+   * 交费后撤回增项申请
+   * @param id
+   * @param params
+   * @param myAxios
+   * @returns {*}
+   */
+  recallApply (id, params, myAxios) {
+    return myAxios({
+      url: 'suppliercertappend/recall-apply/' + id,
+      method: 'post',
+      params: params
+    })
+  },
+  /**
+   * 获取增项需要支付的金额
+   * @param params
+   * @param myAxios
+   * @returns {*}
+   */
+  getAppendApplyIsNeedPay (params, myAxios) {
+    return myAxios({
+      url: '/suppliercertappend/check-need-pay',
+      method: 'get',
+      params: params
+    })
   }
 }

src/dashoo.cn/frontend_web/src/api/oilsupplier/suppliercert.js

@@ -194,5 +194,32 @@ export default {
       method: 'post',
       params: params
     })
+  },
+  /**
+   * 撤回申请
+   * @param id
+   * @param params
+   * @param myAxios
+   * @returns {*}
+   */
+  recallApply (id, params, myAxios) {
+    return myAxios({
+      url: 'suppliercert/recall-apply/' + id,
+      method: 'post',
+      params: params
+    })
+  },
+  /**
+   * 获取需要支付的金额
+   * @param params
+   * @param myAxios
+   * @returns {*}
+   */
+  getAccessApplyIsNeedPay (params, myAxios) {
+    return myAxios({
+      url: '/suppliercert/check-need-pay',
+      method: 'get',
+      params: params
+    })
   }
 }

src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

@@ -2,7 +2,7 @@
   <div>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>准入范围</span>
+        <span style="font-weight: bold">准入范围<span v-if="needPayAmount > 0 && !['7', '8', '11'].includes(status)" style="font-size: 12px; font-weight: normal; color: red">&nbsp;(需交费：{{needPayAmount}}元)</span></span>
         <span style="margin-left: 600px">
           准入编码&nbsp;
           <el-input size="mini" v-model="Code" style="width:10%" clearable placeholder="准入编码"></el-input>
@@ -140,6 +140,14 @@
       candelete: {
         type: Boolean,
         default: false
+      },
+      needPayAmount: {
+        type: null,
+        default: ''
+      },
+      status: {
+        type: String,
+        default: ''
       }
     },
     computed: {

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist2.vue

@@ -3,7 +3,7 @@
     <el-card class="box-card">
       <div slot="header"
            class="clearfix">
-        <span style="font-weight: bold">准入范围</span>
+        <span style="font-weight: bold">准入范围<span v-if="needPayAmount > 0 && !['7', '8', '11'].includes(status)" style="font-size: 12px; font-weight: normal; color: red">&nbsp;(需交费：{{needPayAmount}}元)</span></span>
         <span style="margin-left: 600px">
           准入编码&nbsp;
           <el-input size="mini" v-model="Code" clearable style="width:10%" placeholder="准入编码"></el-input>
@@ -315,6 +315,14 @@
       Grade: {
         type: String,
         default: ''
+      },
+      needPayAmount: {
+        type: null,
+        default: ''
+      },
+      status: {
+        type: String,
+        default: ''
       }
     },
     computed: {

src/dashoo.cn/frontend_web/src/components/oilsupplier/techlist.vue

@@ -2,7 +2,7 @@
   <div>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span style="font-weight: bold">准入范围</span>
+        <span style="font-weight: bold">准入范围<span v-if="needPayAmount > 0 && !['7', '8', '11'].includes(status)" style="font-size: 12px; font-weight: normal; color: red">&nbsp;(需交费：{{needPayAmount}}元)</span></span>
         <span style="margin-left: 600px">
           准入编码&nbsp;
           <el-input size="mini" v-model="Code" style="width:10%" placeholder="准入编码"></el-input>
@@ -124,6 +124,14 @@
       candelete: {
         type: Boolean,
         default: false
+      },
+      needPayAmount: {
+        type: null,
+        default: ''
+      },
+      status: {
+        type: String,
+        default: ''
       }
     },
     computed: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -513,7 +513,7 @@
             </el-card>
             <el-card class="box-card" style="margin-top: 10px; margin-bottom: 10px">
               <div slot="header">
-                <span><i class="icon icon-table2"></i> 准入范围</span>
+                <span><i class="icon icon-table2"></i> 准入范围<span v-if="needPayAmount > 0 && !['7', '8', '11'].includes(formData.Status)" style="font-size: 12px; font-weight: normal; color: red">&nbsp;(需交费：{{needPayAmount}}元)</span></span>
                 <div style="float:right; margin-right: -45px">
                   <el-input size="mini" v-model="addAccessCodeSearch" style="width:50%;" clearable placeholder="准入编码"></el-input>
                   &nbsp;
@@ -806,6 +806,7 @@
         }
       }
       return {
+        needPayAmount: 0,
         // 新增准入范围分页参数
         currentPageAddAccess: 1,
         sizeAddAccess: 10,
@@ -1114,6 +1115,7 @@
       this.AppendId = this.serviceId
       this.editFlag = '1'
       this.getEntityById()
+      this.getAppendApplyIsNeedPay()
       this.dialogFormData.SupplierCertAppendId = this.AppendId
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
@@ -2275,7 +2277,17 @@
         }
         return retUrl
       },
-
+      // 获取增项是否交费及金额
+      getAppendApplyIsNeedPay () {
+        let params = {
+          appendId: this.AppendId
+        }
+        api2.getAppendApplyIsNeedPay(params, this.$axios).then(res => {
+          if (res.status === 200) {
+            this.needPayAmount = res.data
+          }
+        })
+      },
       // 列表排序功能
       orderby (column) {
         if (column.order == 'ascending') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -583,7 +583,7 @@
             </el-card>
             <el-card class="box-card" style="margin-top: 10px; margin-bottom: 10px">
               <div slot="header">
-                <span><i class="icon icon-table2"></i> 准入范围</span>
+                <span><i class="icon icon-table2"></i> 准入范围<span v-if="needPayAmount > 0 && !['7', '8', '11'].includes(formData.Status)" style="font-size: 12px; font-weight: normal; color: red">&nbsp;(需交费：{{needPayAmount}}元)</span></span>
                 <div style="float:right; margin-right: -45px">
                   <el-input size="mini" v-model="addAccessCodeSearch" style="width:50%;" clearable placeholder="准入编码"></el-input>
                   &nbsp;
@@ -888,6 +888,7 @@
         }
       }
       return {
+        needPayAmount: 0,
         // 新增准入范围分页参数
         currentPageAddAccess: 1,
         sizeAddAccess: 10,
@@ -1198,6 +1199,7 @@
       this.AppendId = this.serviceId
       this.editFlag = '1'
       this.getEntityById()
+      this.getAppendApplyIsNeedPay()
       this.dialogFormData.SupplierCertAppendId = this.AppendId
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
@@ -2428,7 +2430,17 @@
         }
         return retUrl
       },
-
+      // 获取增项是否交费及金额
+      getAppendApplyIsNeedPay () {
+        let params = {
+          appendId: this.AppendId
+        }
+        api2.getAppendApplyIsNeedPay(params, this.$axios).then(res => {
+          if (res.status === 200) {
+            this.needPayAmount = res.data
+          }
+        })
+      },
       // 列表排序功能
       orderby (column) {
         if (column.order == 'ascending') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -497,7 +497,7 @@
             </el-card>
             <el-card class="box-card" style="margin-top: 10px; margin-bottom: 10px">
               <div slot="header">
-                <span><i class="icon icon-table2"></i> 准入范围</span>
+                <span><i class="icon icon-table2"></i> 准入范围<span v-if="needPayAmount > 0 && !['7', '8', '11'].includes(formData.Status)" style="font-size: 12px; font-weight: normal; color: red">&nbsp;(需交费：{{needPayAmount}}元)</span></span>
                 <div style="float:right; margin-right: -45px">
                   <el-input size="mini" v-model="addAccessCodeSearch" style="width:50%;" clearable placeholder="准入编码"></el-input>
                   &nbsp;
@@ -787,6 +787,7 @@
         }
       }
       return {
+        needPayAmount: 0,
         // 新增准入范围分页参数
         currentPageAddAccess: 1,
         sizeAddAccess: 10,
@@ -1117,6 +1118,7 @@
       this.AppendId = this.serviceId
       this.editFlag = '1'
       this.getEntityById()
+      this.getAppendApplyIsNeedPay()
       this.dialogFormData.SupplierCertAppendId = this.AppendId
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
@@ -2272,7 +2274,17 @@
         }
         return retUrl
       },
-
+      // 获取增项是否交费及金额
+      getAppendApplyIsNeedPay () {
+        let params = {
+          appendId: this.AppendId
+        }
+        api2.getAppendApplyIsNeedPay(params, this.$axios).then(res => {
+          if (res.status === 200) {
+            this.needPayAmount = res.data
+          }
+        })
+      },
       // 列表排序功能
       orderby (column) {
         if (column.order == 'ascending') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -60,6 +60,9 @@
           <el-button v-if="parseInt(IsCompanyUser) !== 1 && formData.Status <= 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批
           </el-button>
+          <el-button v-if="parseInt(totalTab) >= 3 && formData.Status == 6" type="primary" size="mini" style="float: right;margin-left: 25px" @click="recallApplyClick()" :loading="recallApplyBtn">
+            撤回
+          </el-button>
         </span>
       </div>
 
@@ -321,6 +324,8 @@
                          @close="getbuslist"
                          :canadd="add_flat"
                          :candelete="delete_flat"
+                         :status="formData.Status"
+                         :needPayAmount="needPayAmount"
                          height="360px"></business-list>
         </el-tab-pane>
 
@@ -451,6 +456,12 @@
                :close-on-click-modal="false"
                :visible.sync="dialogVisibleCom"
                width="520px">
+      <div slot="title">
+        <span style="line-height: 24px; font-size: 18px; color: #303133">
+          提交
+          <span v-if="needPayAmount > 0" style="font-size: 12px; color: red">(需交费{{ needPayAmount }}元)</span>
+        </span>
+      </div>
       <el-form ref="searchForm"
                label-width="100px">
         <el-row>
@@ -491,6 +502,32 @@
       </span>
     </el-dialog>
 
+    <el-dialog title="撤回"
+               :close-on-click-modal="false"
+               :visible.sync="recallApplyVisible"
+               width="520px">
+      <el-form label-width="60px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="原因">
+              <el-input v-model="auditform.AuditRemark"
+                        type="textarea"
+                        placeholder="请输入撤回原因">
+              </el-input>
+              <span><i class="el-icon-warning" style="color: red" />&nbsp;&nbsp;撤回后需重新发起申请，请慎重选择！</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="mini"
+                   @click="recallApplyVisible = false">取 消</el-button>
+        <el-button size="mini"
+                   type="primary"
+                   @click="recallApplyConfirm" :loading="loading">确定</el-button>
+      </span>
+    </el-dialog>
     <!--<choose-auditor ref="chooseAuditor"-->
                     <!--@close="setAuditer"-->
                     <!--@hideChooseAuditer="chooseAuditorVisible=false"-->
@@ -586,6 +623,9 @@ export default {
       }
     }
     return {
+      recallApplyVisible: false, // 撤回申请弹出框
+      recallApplyBtn: false,
+      needPayAmount: 0,
       showcy: false,
       firOptions: [],
       loading: false,
@@ -864,6 +904,7 @@ export default {
       this.initDatas()
     }
     this.orgtreeChange(this.majorDept)
+    this.getAccessApplyIsNeedPay()
     // this.changeOrgUnit(this.selectDept)
   },
   methods: {
@@ -1501,6 +1542,7 @@ export default {
           this.formData.Id = res.data.item.split('_')[0]
           this.certId = res.data.item.split('_')[1]
           this.initDatas()
+          this.getAccessApplyIsNeedPay()
           this.$message({
             type: 'success',
             message: res.data.message
@@ -1524,6 +1566,7 @@ export default {
           this.formData.Id = res.data.item.split('_')[0]
           this.certId = res.data.item.split('_')[1]
           this.initDatas()
+          this.getAccessApplyIsNeedPay()
         } else {
           this.$message({
             type: 'warning',
@@ -1540,6 +1583,7 @@ export default {
           // 更新子表
           // this.updateNumberEntity()
           this.initDatas()
+          this.getAccessApplyIsNeedPay()
         } else {
           this.$message({
             type: 'warning',
@@ -1557,6 +1601,7 @@ export default {
           // 更新子表
           // this.updateNumberEntity()
           this.initDatas()
+          this.getAccessApplyIsNeedPay()
           this.$message({
             type: 'success',
             message: res.data.message
@@ -1904,7 +1949,66 @@ export default {
           console.error(err)
         })
     },
-
+    // 交费环节发现错误 撤回
+    recallApplyClick () {
+      this.recallApplyVisible = true
+    },
+    // 确认撤回按钮
+    recallApplyConfirm () {
+      if (!this.auditform.AuditRemark) {
+        this.$message({
+          type: 'warning',
+          message: '请输入撤回原因！'
+        })
+        return false
+      }
+      if (this.auditform.AuditRemark.trim().length < 2) {
+        this.$message({
+          type: 'warning',
+          message: '撤回原因不能少于2个字！'
+        })
+        return false
+      }
+      this.recallApplyVisible = false
+      this.recallApplyBtn = true
+      let params = {
+        result: '0',
+        AuditRemark: this.auditform.AuditRemark
+      }
+      apiCert.recallApply(this.certId, params, this.$axios).then(res => {
+        if (res.data.code === 0) {
+          this.initDatas()
+          this.$refs['WfHistory'].getHistoryTask()
+          this.$message({
+            type: 'success',
+            message: '申请撤回成功！'
+          })
+          this.recallApplyBtn = false
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '申请撤回失败！'
+          })
+          this.recallApplyBtn = false
+        }
+        this.recallApplyVisible = false
+        this.loading = false
+      }).catch(err => {
+        console.error(err)
+        this.recallApplyBtn = false
+      })
+    },
+    // 判断当前申请是否需要交费及交费金额
+    getAccessApplyIsNeedPay () {
+      let params = {
+        certId: this.certId
+      }
+      apiCert.getAccessApplyIsNeedPay(params, this.$axios).then(res => {
+        if (res.status === 200) {
+          this.needPayAmount = res.data
+        }
+      })
+    },
     nexStepCB () {
       this.formData.Step += 1
     },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -59,6 +59,9 @@
           <el-button v-if="parseInt(IsCompanyUser) !== 1 && parseInt(totalTab) >= 3 && formData.Status <= 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批
           </el-button>
+          <el-button v-if="parseInt(totalTab) >= 3 && formData.Status == 6" type="primary" size="mini" style="float: right;margin-left: 25px" @click="recallApplyClick()" :loading="recallApplyBtn">
+            撤回
+          </el-button>
           <!--<el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>-->
           <!--<router-link :to="'/oilsupplier/supplier/goodslist'">-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回</el-button>-->
@@ -342,6 +345,8 @@
                       :canadd="add_flat"
                       :candelete="delete_flat"
                       :operType="formData.OperType"
+                      :status="formData.Status"
+                      :needPayAmount="needPayAmount"
                       :Grade="formData.Grade"
                       height="360px"
                       @tab-click="tabclick()"
@@ -485,6 +490,12 @@
                :close-on-click-modal="false"
                :visible.sync="dialogVisibleCom"
                width="520px">
+      <div slot="title">
+        <span style="line-height: 24px; font-size: 18px; color: #303133">
+          提交
+          <span v-if="needPayAmount > 0" style="font-size: 12px; color: red">(需交费{{ needPayAmount }}元)</span>
+        </span>
+      </div>
       <el-form ref="searchForm"
                label-width="100px">
         <el-row>
@@ -530,6 +541,32 @@
       </span>
     </el-dialog>
 
+    <el-dialog title="撤回"
+               :close-on-click-modal="false"
+               :visible.sync="recallApplyVisible"
+               width="520px">
+      <el-form label-width="60px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="原因">
+              <el-input v-model="auditform.AuditRemark"
+                        type="textarea"
+                        placeholder="请输入撤回原因">
+                <span><i class="el-icon-warning" style="color: red" />&nbsp;&nbsp;撤回后需重新发起申请，请慎重选择！</span>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="mini"
+                   @click="recallApplyVisible = false">取 消</el-button>
+        <el-button size="mini"
+                   type="primary"
+                   @click="recallApplyConfirm" :loading="loading">确定</el-button>
+      </span>
+    </el-dialog>
     <!--<choose-auditor ref="chooseAuditor"-->
                     <!--@close="setAuditer"-->
                     <!--@hideChooseAuditer="chooseAuditorVisible=false"-->
@@ -625,6 +662,9 @@ export default {
       }
     }
     return {
+      recallApplyVisible: false, // 撤回申请弹出框
+      recallApplyBtn: false,
+      needPayAmount: 0,
       showcy: false,
       loading: false,
       WorkerTotal: 0,
@@ -884,6 +924,7 @@ export default {
     if (this.$route.query.certid) {
       this.certId = this.$route.query.certid + ''
     }
+    this.getAccessApplyIsNeedPay()
     if (this.serviceId !== 'add' && this.serviceId > 0) {
       this.formData.Id = this.serviceId
     } else {
@@ -1692,6 +1733,7 @@ export default {
             this.formData.Id = res.data.item.split('_')[0]
             this.certId = res.data.item.split('_')[1]
             this.initDatas()
+            this.getAccessApplyIsNeedPay()
           } else {
             this.$message({
               type: 'warning',
@@ -1713,6 +1755,7 @@ export default {
             // 更新子表
             // this.updateNumberEntity()
             _this.initDatas()
+            this.getAccessApplyIsNeedPay()
             _this.goodsloading = false
           } else {
             _this.goodsloading = false
@@ -1738,6 +1781,7 @@ export default {
             this.formData.Id = res.data.item.split('_')[0]
             this.certId = res.data.item.split('_')[1]
             this.initDatas()
+            this.getAccessApplyIsNeedPay()
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1765,6 +1809,7 @@ export default {
             // 更新子表
             // this.updateNumberEntity()
             _this.initDatas()
+            this.getAccessApplyIsNeedPay()
             _this.goodsloading = false
             _this.$message({
               type: 'success',
@@ -1985,7 +2030,55 @@ export default {
         console.error(err)
       })
     },
-
+    // 交费环节发现错误 撤回
+    recallApplyClick () {
+      this.recallApplyVisible = true
+    },
+    // 确认撤回按钮
+    recallApplyConfirm () {
+      if (!this.auditform.AuditRemark) {
+        this.$message({
+          type: 'warning',
+          message: '请输入撤回原因！'
+        })
+        return false
+      }
+      if (this.auditform.AuditRemark.trim().length < 2) {
+        this.$message({
+          type: 'warning',
+          message: '撤回原因不能少于2个字！'
+        })
+        return false
+      }
+      this.recallApplyVisible = false
+      this.recallApplyBtn = true
+      let params = {
+        result: '0',
+        AuditRemark: this.auditform.AuditRemark
+      }
+      apiCert.recallApply(this.certId, params, this.$axios).then(res => {
+        if (res.data.code === 0) {
+          this.initDatas()
+          this.$refs['WfHistory'].getHistoryTask()
+          this.$message({
+            type: 'success',
+            message: '申请撤回成功！'
+          })
+          this.recallApplyBtn = false
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '申请撤回失败！'
+          })
+          this.recallApplyBtn = false
+        }
+        this.recallApplyVisible = false
+        this.loading = false
+      }).catch(err => {
+        console.error(err)
+        this.recallApplyBtn = false
+      })
+    },
     setAuditer (val, name) {
       this.auditer = val
       this.auditerName = name
@@ -2187,7 +2280,17 @@ export default {
           console.error(err)
         })
     },
-
+    // 判断当前申请是否需要交费及交费金额
+    getAccessApplyIsNeedPay () {
+      let params = {
+        certId: this.certId
+      }
+      apiCert.getAccessApplyIsNeedPay(params, this.$axios).then(res => {
+        if (res.status === 200) {
+          this.needPayAmount = res.data
+        }
+      })
+    },
     jstimehandle (val) {
       if (val === '') {
         return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -49,6 +49,9 @@
           <el-button v-if="parseInt(IsCompanyUser) !== 1 && formData.Status <= 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批
           </el-button>
+          <el-button v-if="parseInt(totalTab) >= 3 && formData.Status == 6" type="primary" size="mini" style="float: right;margin-left: 25px" @click="recallApplyClick()" :loading="recallApplyBtn">
+            撤回
+          </el-button>
         </span>
       </div>
 
@@ -315,6 +318,8 @@
                      @close="getbuslist"
                      :canadd="add_flat"
                      :candelete="delete_flat"
+                     :status="formData.Status"
+                     :needPayAmount="needPayAmount"
                      height="360px"></tech-list>
         </el-tab-pane>
 
@@ -451,6 +456,12 @@
                :close-on-click-modal="false"
                :visible.sync="dialogVisibleCom"
                width="520px">
+      <div slot="title">
+        <span style="line-height: 24px; font-size: 18px; color: #303133">
+          提交
+          <span v-if="needPayAmount > 0" style="font-size: 12px; color: red">(需交费{{ needPayAmount }}元)</span>
+        </span>
+      </div>
       <el-form ref="searchForm"
                label-width="100px">
         <el-row>
@@ -491,6 +502,32 @@
       </span>
     </el-dialog>
 
+    <el-dialog title="撤回"
+               :close-on-click-modal="false"
+               :visible.sync="recallApplyVisible"
+               width="520px">
+      <el-form label-width="60px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="原因">
+              <el-input v-model="auditform.AuditRemark"
+                        type="textarea"
+                        placeholder="请输入撤回原因">
+              </el-input>
+              <span><i class="el-icon-warning" style="color: red" />&nbsp;&nbsp;撤回后需重新发起申请，请慎重选择！</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="mini"
+                   @click="recallApplyVisible = false">取 消</el-button>
+        <el-button size="mini"
+                   type="primary"
+                   @click="recallApplyConfirm" :loading="loading">确定</el-button>
+      </span>
+    </el-dialog>
     <choose-auditor-fen ref="chooseAuditorFen"
                         @close="setAuditerFen"
                         @hideChooseAuditer="chooseAuditorVisibleFen=false"
@@ -582,6 +619,9 @@ export default {
       }
     }
     return {
+      recallApplyVisible: false, // 撤回申请弹出框
+      recallApplyBtn: false,
+      needPayAmount: 0,
       showcy: false,
       firOptions: [],
       loading: false,
@@ -837,6 +877,7 @@ export default {
     if (this.$route.query.certid) {
       this.certId = this.$route.query.certid + ''
     }
+    this.getAccessApplyIsNeedPay()
     if (this.serviceId !== 'add' && this.serviceId > 0) {
       this.formData.Id = this.serviceId
     } else {
@@ -1506,6 +1547,7 @@ export default {
           this.formData.Id = res.data.item.split('_')[0]
           this.certId = res.data.item.split('_')[1]
           this.initDatas()
+          this.getAccessApplyIsNeedPay()
         } else {
           this.$message({
             type: 'warning',
@@ -1522,6 +1564,7 @@ export default {
           // 更新子表
           // this.updateNumberEntity()
           this.initDatas()
+          this.getAccessApplyIsNeedPay()
         } else {
           this.$message({
             type: 'warning',
@@ -1541,6 +1584,7 @@ export default {
           this.formData.Id = res.data.item.split('_')[0]
           this.certId = res.data.item.split('_')[1]
           this.initDatas()
+          this.getAccessApplyIsNeedPay()
           this.$message({
             type: 'success',
             message: res.data.message
@@ -1562,6 +1606,7 @@ export default {
           // 更新子表
           // this.updateNumberEntity()
           this.initDatas()
+          this.getAccessApplyIsNeedPay()
           this.$message({
             type: 'success',
             message: res.data.message
@@ -1910,6 +1955,66 @@ export default {
           console.error(err)
         })
     },
+    // 交费环节发现错误 撤回
+    recallApplyClick () {
+      this.recallApplyVisible = true
+    },
+    // 确认撤回按钮
+    recallApplyConfirm () {
+      if (!this.auditform.AuditRemark) {
+        this.$message({
+          type: 'warning',
+          message: '请输入撤回原因！'
+        })
+        return false
+      }
+      if (this.auditform.AuditRemark.trim().length < 2) {
+        this.$message({
+          type: 'warning',
+          message: '撤回原因不能少于2个字！'
+        })
+        return false
+      }
+      this.recallApplyVisible = false
+      this.recallApplyBtn = true
+      let params = {
+        result: '0',
+        AuditRemark: this.auditform.AuditRemark
+      }
+      apiCert.recallApply(this.certId, params, this.$axios).then(res => {
+        if (res.data.code === 0) {
+          this.initDatas()
+          this.$refs['WfHistory'].getHistoryTask()
+          this.$message({
+            type: 'success',
+            message: '申请撤回成功！'
+          })
+          this.recallApplyBtn = false
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '申请撤回失败！'
+          })
+          this.recallApplyBtn = false
+        }
+        this.recallApplyVisible = false
+        this.loading = false
+      }).catch(err => {
+        console.error(err)
+        this.recallApplyBtn = false
+      })
+    },
+    // 判断当前申请是否需要交费及交费金额
+    getAccessApplyIsNeedPay () {
+      let params = {
+        certId: this.certId
+      }
+      apiCert.getAccessApplyIsNeedPay(params, this.$axios).then(res => {
+        if (res.status === 200) {
+          this.needPayAmount = res.data
+        }
+      })
+    },
     jstimehandle (val) {
       if (val === '') {
         return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/basislist.vue

@@ -136,6 +136,8 @@
                   style="color:#F56C6C">集中评审未通过</span>
             <span v-if="scope.row.Status=='6'"
                   style="color:#E6A23C">待交费</span>
+            <span v-if="scope.row.Status=='-6'"
+                  style="color:#F56C6C">用户撤回</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
             <el-tooltip effect="light" placement="top-start">
@@ -148,6 +150,10 @@
                   style="color:#E6A23C">已暂停</span>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag=='3'"
                   style="color:#dd6161">已取消</span>
+            <span v-if="scope.row.Status=='9'"
+                  style="color:#E6A23C">待企管法规处审批</span>
+            <span v-if="scope.row.Status=='-9'"
+                  style="color:#F56C6C">企管法规处审批未通过</span>
           </template>
         </el-table-column>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/goodslist.vue

@@ -135,6 +135,8 @@
                   style="color:#F56C6C">集中评审未通过</span>
             <span v-if="scope.row.Status=='6'"
                   style="color:#E6A23C">待交费</span>
+            <span v-if="scope.row.Status=='-6'"
+                  style="color:#F56C6C">用户撤回</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
             <el-tooltip effect="light" placement="top-start">
@@ -147,6 +149,10 @@
                   style="color:#E6A23C">已暂停</span>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag=='3'"
                   style="color:#dd6161">已取消</span>
+            <span v-if="scope.row.Status=='9'"
+                  style="color:#E6A23C">待企管法规处审批</span>
+            <span v-if="scope.row.Status=='-9'"
+                  style="color:#F56C6C">企管法规处审批未通过</span>
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/index.vue

@@ -85,7 +85,10 @@
             <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
             <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
+            <span v-if="scope.row.Status=='-6'" style="color:#F56C6C">用户撤回</span>
             <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
+            <span v-if="scope.row.Status=='9'" style="color:#E6A23C">待企管法规处审批</span>
+            <span v-if="scope.row.Status=='-9'" style="color:#F56C6C">企管法规处审批未通过</span>
             <el-tooltip effect="light" placement="top-start">
               <div slot="content">退回原因：<br/>{{scope.row.BackRemark}}</div>
               <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/techlist.vue

@@ -136,6 +136,8 @@
                   style="color:#F56C6C">集中评审未通过</span>
             <span v-if="scope.row.Status=='6'"
                   style="color:#E6A23C">待交费</span>
+            <span v-if="scope.row.Status=='-6'"
+                  style="color:#F56C6C">用户撤回</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
             <el-tooltip effect="light" placement="top-start">
@@ -148,6 +150,10 @@
                   style="color:#E6A23C">已暂停</span>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag=='3'"
                   style="color:#dd6161">已取消</span>
+            <span v-if="scope.row.Status=='9'"
+                  style="color:#E6A23C">待企管法规处审批</span>
+            <span v-if="scope.row.Status=='-9'"
+                  style="color:#F56C6C">企管法规处审批未通过</span>
           </template>
         </el-table-column>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -33,6 +33,9 @@
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
             v-if="formData.Id != '' && currentStatus <= 0 && parseInt(IsCompanyUser) === 1">提交
           </el-button>
+          <el-button v-if="IsCompanyUser == 1 && formData.Id !='' && currentStatus == 6" type="primary" size="mini" style="margin-right: 8px" @click="recallApplyClick()" :loading="recallApplyBtn">
+            撤回
+          </el-button>
           <router-link :to="'/oilsupplier/supplierappend/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -575,7 +578,7 @@
                 :candelete="delete_flat" height="360px" style="margin-top: 20px"></goods-list> -->
                 <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px); margin-bottom: 5px">
                   <div slot="header">
-                    <span><i class="icon icon-table2"></i> 新增准入范围</span>
+                    <span><i class="icon icon-table2"></i> 新增准入范围 <span v-if="needPayAmount > 0" style="font-size: 12px; font-weight: normal; color: red">(需交费：{{needPayAmount}}元)</span></span>
                     <div style="float:right; margin-right: -45px">
                       <el-input size="mini" v-model="addAccessCodeSearch" style="width:40%;" clearable placeholder="准入编码"></el-input>
                       &nbsp;
@@ -773,6 +776,9 @@
     </el-dialog>
 
     <el-dialog title="分办" :close-on-click-modal="false" :visible.sync="dialogComSubmitToSeparateUnitVisible" width="520px">
+      <template slot="title">
+        <div style="line-height: 24px; font-size: 18px; color: #303133">分办 <span v-if="needPayAmount > 0" style="font-size: 12px; font-weight: normal; color: red">(需交费：{{needPayAmount}}元)</span></div>
+      </template>
       <el-form ref="searchForm" label-width="100px">
         <el-row>
           <el-col :span="24">
@@ -828,6 +834,33 @@
       </el-table>
     </el-dialog>
 
+    <el-dialog title="撤回"
+               :close-on-click-modal="false"
+               :visible.sync="recallApplyVisible"
+               width="520px">
+      <el-form label-width="60px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="原因">
+              <el-input v-model="auditform.AuditRemark"
+                        type="textarea"
+                        placeholder="请输入撤回原因">
+              </el-input>
+              <span><i class="el-icon-warning" style="color: red" />&nbsp;&nbsp;撤回后需重新发起申请，请慎重选择！</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="mini"
+                   @click="recallApplyVisible = false">取 消</el-button>
+        <el-button size="mini"
+                   type="primary"
+                   @click="recallApplyConfirm" :loading="loading">确定</el-button>
+      </span>
+    </el-dialog>
+
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
     <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
@@ -1029,6 +1062,9 @@
         }
       }
       return {
+        recallApplyVisible: false, // 撤回申请弹出框
+        recallApplyBtn: false,
+        needPayAmount: 0,
         currentStatus: 0,
         // 全部准入范围分页参数
         currentPageAllAccess: 1,
@@ -1530,6 +1566,7 @@
       this.Id = this.$route.query.Id
       this.editFlag = this.$route.query.editFlag
       this.supplierId = this.$route.query.sId
+      this.getAppendApplyIsNeedPay()
       if (this.editFlag == '1' && this.Id !== '') {
         this.getEntityById()
         this.dialogFormData.SupplierCertAppendId = this.Id
@@ -2941,6 +2978,7 @@
               })
               // 关闭dialog
               this.getEntityById()
+              this.getAppendApplyIsNeedPay()
               this.dialogVisible = false
             } else {
               this.$message({
@@ -2971,6 +3009,7 @@
                     message: response.data.message
                   })
                   _this.getEntityById()
+                  _this.getAppendApplyIsNeedPay()
                 } else {
                   _this.$message({
                     type: 'warning',
@@ -3033,6 +3072,65 @@
             console.error(err)
           })
       },
+      getAppendApplyIsNeedPay () {
+        let params = {
+          appendId: this.Id
+        }
+        api2.getAppendApplyIsNeedPay(params, this.$axios).then(res => {
+          if (res.status === 200) {
+            this.needPayAmount = res.data
+          }
+        })
+      },
+      // 交费环节发现错误 撤回
+      recallApplyClick () {
+        this.recallApplyVisible = true
+      },
+      // 确认撤回按钮
+      recallApplyConfirm () {
+        if (!this.auditform.AuditRemark) {
+          this.$message({
+            type: 'warning',
+            message: '请输入撤回原因！'
+          })
+          return false
+        }
+        if (this.auditform.AuditRemark.trim().length < 2) {
+          this.$message({
+            type: 'warning',
+            message: '撤回原因不能少于2个字！'
+          })
+          return false
+        }
+        this.recallApplyVisible = false
+        this.recallApplyBtn = true
+        let params = {
+          result: '0',
+          AuditRemark: this.auditform.AuditRemark
+        }
+        api2.recallApply(this.Id, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.getEntityById()
+            // this.$refs['WfHistory'].getHistoryTask()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.recallApplyBtn = false
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+            this.recallApplyBtn = false
+          }
+          this.recallApplyVisible = false
+          this.loading = false
+        }).catch(err => {
+          console.error(err)
+          this.recallApplyBtn = false
+        })
+      },
       handleAreaChange (value) {
         this.supplierData.Province = value[0]
         this.supplierData.City = value[1]

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -32,6 +32,9 @@
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
             v-if="formData.Id !='' && currentStatus <= 0 && IsCompanyUser == 1">提交
           </el-button>
+          <el-button v-if="IsCompanyUser == 1 && formData.Id !='' && currentStatus == 6" type="primary" size="mini" style="margin-right: 8px" @click="recallApplyClick()" :loading="recallApplyBtn">
+            撤回
+          </el-button>
           <router-link :to="'/oilsupplier/supplierappend/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -631,7 +634,7 @@
                 :candelete="delete_flat" height="360px" style="margin-top: 20px"></goods-list> -->
                 <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px); margin-bottom: 5px">
                   <div slot="header">
-                    <span><i class="icon icon-table2"></i> 新增准入范围</span>
+                    <span><i class="icon icon-table2"></i> 新增准入范围 <span v-if="needPayAmount > 0" style="font-size: 12px; font-weight: normal; color: red">(需交费：{{needPayAmount}}元)</span></span>
                     <div style="float:right; margin-right: -45px">
                       <el-input size="mini" v-model="addAccessCodeSearch" style="width:40%;" clearable placeholder="准入编码"></el-input>
                       &nbsp;
@@ -967,6 +970,9 @@
     </el-dialog>
 
     <el-dialog title="分办" :close-on-click-modal="false" :visible.sync="dialogComSubmitToSeparateUnitVisible" width="520px">
+      <template slot="title">
+        <div style="line-height: 24px; font-size: 18px; color: #303133">分办 <span v-if="needPayAmount > 0" style="font-size: 12px; font-weight: normal; color: red">(需交费：{{needPayAmount}}元)</span></div>
+      </template>
       <el-form ref="searchForm" label-width="100px">
         <el-row>
           <el-col :span="24">
@@ -1022,6 +1028,32 @@
       </el-table>
     </el-dialog>
 
+    <el-dialog title="撤回"
+               :close-on-click-modal="false"
+               :visible.sync="recallApplyVisible"
+               width="520px">
+      <el-form label-width="60px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="原因">
+              <el-input v-model="auditform.AuditRemark"
+                        type="textarea"
+                        placeholder="请输入撤回原因">
+              </el-input>
+              <span><i class="el-icon-warning" style="color: red" />&nbsp;&nbsp;撤回后需重新发起申请，请慎重选择！</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="mini"
+                   @click="recallApplyVisible = false">取 消</el-button>
+        <el-button size="mini"
+                   type="primary"
+                   @click="recallApplyConfirm" :loading="loading">确定</el-button>
+      </span>
+    </el-dialog>
 
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
@@ -1241,6 +1273,9 @@
         }
       }
       return {
+        recallApplyVisible: false, // 撤回申请弹出框
+        recallApplyBtn: false,
+        needPayAmount: 0,
         currentStatus: 0,
         // 全部准入范围分页参数
         currentPageAllAccess: 1,
@@ -1775,6 +1810,7 @@
       this.Id = this.$route.query.Id
       this.supplierId = this.$route.query.sId
       this.editFlag = this.$route.query.editFlag
+      this.getAppendApplyIsNeedPay()
       if (this.editFlag == '1' && this.Id !== '') {
         this.getEntityById()
         this.dialogFormData.SupplierCertAppendId = this.Id
@@ -3192,6 +3228,7 @@
                     message: response.data.message
                   })
                   _this.getEntityById()
+                  _this.getAppendApplyIsNeedPay()
                 } else {
                   _this.$message({
                     type: 'warning',
@@ -3428,7 +3465,65 @@
             console.error(err)
           })
       },
-
+      getAppendApplyIsNeedPay () {
+        let params = {
+          appendId: this.Id
+        }
+        api2.getAppendApplyIsNeedPay(params, this.$axios).then(res => {
+          if (res.status === 200) {
+            this.needPayAmount = res.data
+          }
+        })
+      },
+      // 交费环节发现错误 撤回
+      recallApplyClick () {
+        this.recallApplyVisible = true
+      },
+      // 确认撤回按钮
+      recallApplyConfirm () {
+        if (!this.auditform.AuditRemark) {
+          this.$message({
+            type: 'warning',
+            message: '请输入撤回原因！'
+          })
+          return false
+        }
+        if (this.auditform.AuditRemark.trim().length < 2) {
+          this.$message({
+            type: 'warning',
+            message: '撤回原因不能少于2个字！'
+          })
+          return false
+        }
+        this.recallApplyVisible = false
+        this.recallApplyBtn = true
+        let params = {
+          result: '0',
+          AuditRemark: this.auditform.AuditRemark
+        }
+        api2.recallApply(this.Id, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.getEntityById()
+            // this.$refs['WfHistory'].getHistoryTask()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.recallApplyBtn = false
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+            this.recallApplyBtn = false
+          }
+          this.recallApplyVisible = false
+          this.loading = false
+        }).catch(err => {
+          console.error(err)
+          this.recallApplyBtn = false
+        })
+      },
       getDictOptions () {
         let params = {
           status: this.formData.Status,
@@ -3584,6 +3679,7 @@
               this.getMySortList()
               this.getsubfile()
               this.initData2019()
+              this.getAppendApplyIsNeedPay()
             } else {
               this.loading = false
               this.$message({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -33,6 +33,9 @@
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
             v-if="formData.Id !='' && currentStatus <= 0 && IsCompanyUser == 1">提交
           </el-button>
+          <el-button v-if="IsCompanyUser == 1 && formData.Id !='' && currentStatus == 6" type="primary" size="mini" style="margin-right: 8px" @click="recallApplyClick()" :loading="recallApplyBtn">
+            撤回
+          </el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -572,7 +575,7 @@
               <el-col :span="12">
                 <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px); margin-bottom: 5px">
                   <div slot="header">
-                    <span><i class="icon icon-table2"></i> 新增准入范围</span>
+                    <span><i class="icon icon-table2"></i> 新增准入范围 <span v-if="needPayAmount > 0" style="font-size: 12px; font-weight: normal; color: red">(需交费：{{needPayAmount}}元)</span></span>
                     <div style="float:right; margin-right: -45px">
                       <el-input size="mini" v-model="addAccessCodeSearch" style="width:40%;" clearable placeholder="准入编码"></el-input>
                       &nbsp;
@@ -773,6 +776,9 @@
     </el-dialog>
 
     <el-dialog title="分办" :close-on-click-modal="false" :visible.sync="dialogComSubmitToSeparateUnitVisible" width="520px">
+      <template slot="title">
+        <div style="line-height: 24px; font-size: 18px; color: #303133">分办 <span v-if="needPayAmount > 0" style="font-size: 12px; font-weight: normal; color: red">(需交费：{{needPayAmount}}元)</span></div>
+      </template>
       <el-form ref="searchForm" label-width="100px">
         <el-row>
           <el-col :span="24">
@@ -828,6 +834,33 @@
       </el-table>
     </el-dialog>
 
+    <el-dialog title="撤回"
+               :close-on-click-modal="false"
+               :visible.sync="recallApplyVisible"
+               width="520px">
+      <el-form label-width="60px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="原因">
+              <el-input v-model="auditform.AuditRemark"
+                        type="textarea"
+                        placeholder="请输入撤回原因">
+              </el-input>
+              <span><i class="el-icon-warning" style="color: red" />&nbsp;&nbsp;撤回后需重新发起申请，请慎重选择！</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="mini"
+                   @click="recallApplyVisible = false">取 消</el-button>
+        <el-button size="mini"
+                   type="primary"
+                   @click="recallApplyConfirm" :loading="loading">确定</el-button>
+      </span>
+    </el-dialog>
+
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
       <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
@@ -1037,6 +1070,9 @@
         }
       }
       return {
+        recallApplyVisible: false, // 撤回申请弹出框
+        recallApplyBtn: false,
+        needPayAmount: 0,
         currentStatus: 0,
         // 全部准入范围分页参数
         currentPageAllAccess: 1,
@@ -1543,6 +1579,7 @@
       this.Id = this.$route.query.Id
       this.supplierId = this.$route.query.sId
       this.editFlag = this.$route.query.editFlag
+      this.getAppendApplyIsNeedPay()
       if (this.editFlag == '1' && this.Id !== '') {
         this.getEntityById()
         this.dialogFormData.SupplierCertAppendId = this.Id
@@ -2966,6 +3003,7 @@
               _this.dialogVisible = false
               // 更新增项分类表
               _this.getEntityById()
+              _this.getAppendApplyIsNeedPay()
             } else {
               _this.$message({
                 type: 'warning',
@@ -2999,6 +3037,7 @@
                     message: response.data.message
                   })
                   _this.getEntityById()
+                  _this.getAppendApplyIsNeedPay()
                 } else {
                   _this.$message({
                     type: 'warning',
@@ -3048,6 +3087,16 @@
         this.newSubfileForm.EffectDate = ''
         this.newSubfileForm.OtherRemark = ''
       },
+      getAppendApplyIsNeedPay () {
+        let params = {
+          appendId: this.Id
+        }
+        api2.getAppendApplyIsNeedPay(params, this.$axios).then(res => {
+          if (res.status === 200) {
+            this.needPayAmount = res.data
+          }
+        })
+      },
       getorgtreelist () {
         let _this = this
         let params = {
@@ -3063,7 +3112,55 @@
             console.error(err)
           })
       },
-
+      // 交费环节发现错误 撤回
+      recallApplyClick () {
+        this.recallApplyVisible = true
+      },
+      // 确认撤回按钮
+      recallApplyConfirm () {
+        if (!this.auditform.AuditRemark) {
+          this.$message({
+            type: 'warning',
+            message: '请输入撤回原因！'
+          })
+          return false
+        }
+        if (this.auditform.AuditRemark.trim().length < 2) {
+          this.$message({
+            type: 'warning',
+            message: '撤回原因不能少于2个字！'
+          })
+          return false
+        }
+        this.recallApplyVisible = false
+        this.recallApplyBtn = true
+        let params = {
+          result: '0',
+          AuditRemark: this.auditform.AuditRemark
+        }
+        api2.recallApply(this.Id, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.getEntityById()
+            // this.$refs['WfHistory'].getHistoryTask()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.recallApplyBtn = false
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+            this.recallApplyBtn = false
+          }
+          this.recallApplyVisible = false
+          this.loading = false
+        }).catch(err => {
+          console.error(err)
+          this.recallApplyBtn = false
+        })
+      },
       getDictOptions () {
         let params = {
           status: this.formData.Status,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -71,6 +71,7 @@
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
+              <span v-if="scope.row.Status=='-6'" style="color:#F56C6C">用户撤回</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -70,6 +70,7 @@
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
+              <span v-if="scope.row.Status=='-6'" style="color:#F56C6C">用户撤回</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/index.vue

@@ -73,6 +73,7 @@
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
+              <span v-if="scope.row.Status=='-6'" style="color:#F56C6C">用户撤回</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -71,6 +71,7 @@
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
+              <span v-if="scope.row.Status=='-6'" style="color:#F56C6C">用户撤回</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -21,6 +21,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="businessOfficeSeparateAuditClick()" v-if="auditBtn && this.formData.Status == '3'">提交专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && this.formData.Status == '4'">专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="concentrateAuditClick()" v-if="auditBtn && this.formData.Status == '5'">集中评审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && this.formData.Status == 9">企管法规处审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="auditBtn && this.formData.Status == '10'">分办</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>
@@ -161,7 +162,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" :candelete="delete_flat" :canadd="add_flat"
+          <business-list ref="businessList" :data.sync="businessList" :candelete="delete_flat" :canadd="add_flat" :needPayAmount="needPayAmount" :status="formData.Status"
                          height="360px"></business-list>
         </el-tab-pane>
 
@@ -476,6 +477,7 @@
 
     data () {
       return {
+        needPayAmount: 0,
         dialogVisibleCom: false,
         UnitOrgOptions: [],
         UnitOrg: '',
@@ -659,6 +661,7 @@
         this.formData.Id = 0
       }
       this.getDictOptions()
+      this.getAccessApplyIsNeedPay()
       this.initDatas()
       this.changeOrgUnit(this.selectDept)
       // this.getorgtreelist()
@@ -892,6 +895,8 @@
             } else if (this.formData.Status === '6') {
               this.auditTitle = '确认交费'
               this.auditstepcode = 'PAYING_FEE'
+            } else if (this.formData.Status === '9') {
+              this.auditstepcode = 'PROF_REGULATION'
             } else if (this.formData.Status === '10') {
               this.auditTitle = '分办'
               this.auditstepcode = 'SUB_OFFICE_JS'
@@ -920,7 +925,6 @@
         // this.auditOrgChang(this.auditer)
       },
       orgunitChange (val) {
-        console.log('近来个啥', val)
         if (!val) {
           return false
         }
@@ -1565,7 +1569,17 @@
         }
         this.checkstatus()
       },
-
+      // 判断当前申请是否需要交费及交费金额
+      getAccessApplyIsNeedPay () {
+        let params = {
+          certId: this.certId
+        }
+        apiCert.getAccessApplyIsNeedPay(params, this.$axios).then(res => {
+          if (res.status === 200) {
+            this.needPayAmount = res.data
+          }
+        })
+      },
       checkstatus () {
         let params = this.shenheForm
         let audit = {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -15,6 +15,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 2">复审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="businessOfficeSeparateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 3">提交专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 4">专业审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 9">企管法规处审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="concentrateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 5">集中评审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 10">分办</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>-->
@@ -158,7 +159,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <goods-list ref="goodsList" :data.sync="goodsList" :canadd="add_flat"  :candelete="delete_flat" height="360px"></goods-list>
+          <goods-list ref="goodsList" :data.sync="goodsList" :canadd="add_flat" :needPayAmount="needPayAmount" :status="formData.Status" :candelete="delete_flat" height="360px"></goods-list>
         </el-tab-pane>
 
         <el-tab-pane label="流程查看">
@@ -412,6 +413,7 @@
 
     data () {
       return {
+        needPayAmount: 0,
         firOptions: [],
         loading: false,
         btnstatus: '',
@@ -591,6 +593,7 @@
       } else {
         this.formData.Id = 0
       }
+      this.getAccessApplyIsNeedPay()
       this.getDictOptions()
       this.initDatas()
       // this.orgtreeChange(this.majorDept)
@@ -765,6 +768,8 @@
               }
             } else if (this.formData.Status === '6') {
               this.auditstepcode = 'PAYING_FEE'
+            } else if (this.formData.Status === '9') {
+              this.auditstepcode = 'PROF_REGULATION'
             } else if (this.formData.Status === '10') {
               this.auditstepcode = 'SUB_OFFICE_WZ'
             }
@@ -1455,7 +1460,17 @@
           console.error(err)
         })
       },
-
+      // 判断当前申请是否需要交费及交费金额
+      getAccessApplyIsNeedPay () {
+        let params = {
+          certId: this.certId
+        }
+        apiCert.getAccessApplyIsNeedPay(params, this.$axios).then(res => {
+          if (res.status === 200) {
+            this.needPayAmount = res.data
+          }
+        })
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -18,6 +18,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="businessOfficeSeparateAuditClick()" v-if="auditBtn && this.formData.Status == '3'">提交专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && this.formData.Status == '4'">专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="concentrateAuditClick()" v-if="auditBtn && this.formData.Status == '5'">集中评审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && this.formData.Status== 9">企管法规处审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="auditBtn && this.formData.Status == '10'">分办</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>-->
@@ -158,7 +159,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <tech-list ref="techList" :data.sync="techList" :candelete="delete_flat"
+          <tech-list ref="techList" :data.sync="techList" :candelete="delete_flat" :needPayAmount="needPayAmount" :status="formData.Status"
                      :canadd="add_flat" height="360px"></tech-list>
         </el-tab-pane>
 
@@ -434,6 +435,7 @@
 
     data () {
       return {
+        needPayAmount: 0,
         firOptions: [],
         loading: false,
         btnstatus: '',
@@ -610,6 +612,7 @@
       } else {
         this.formData.Id = 0
       }
+      this.getAccessApplyIsNeedPay()
       this.getDictOptions()
       this.initDatas()
       // this.changeOrgUnit(this.selectDept)
@@ -764,6 +767,8 @@
               }
             } else if (this.formData.Status === '6') {
               this.auditstepcode = 'PAYING_FEE'
+            } else if (this.formData.Status === '9') {
+              this.auditstepcode = 'PROF_REGULATION'
             } else if (this.formData.Status === '10') {
               this.auditstepcode = 'SUB_OFFICE_JF'
             }
@@ -1481,7 +1486,17 @@
           console.error(err)
         })
       },
-
+      // 判断当前申请是否需要交费及交费金额
+      getAccessApplyIsNeedPay () {
+        let params = {
+          certId: this.certId
+        }
+        apiCert.getAccessApplyIsNeedPay(params, this.$axios).then(res => {
+          if (res.status === 200) {
+            this.needPayAmount = res.data
+          }
+        })
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'