前端：待办任务列表审批完自动跳回待办列表

src/dashoo.cn/frontend_web/src/components/oilcontract/submitPopup.vue

@@ -74,7 +74,7 @@
       </span>
     </el-dialog>
 
-    <!-- 复审 -->
+    <!-- 初审 复审 专业处室审核 -->
     <el-dialog title="审核" :close-on-click-modal="false" :visible.sync="dialogCommonAuditMakeSureVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="审核状态">
@@ -204,7 +204,7 @@ export default {
       type: null,
       default: 0
     },
-    //1是服务类合同
+    // 1是服务类合同
     isTecContract: {
       type: null,
       default: 0
@@ -234,6 +234,11 @@ export default {
     supplierType: {
       type: String,
       default: ''
+    },
+    // 是否从待办任务列表跳转过来的 1是
+    isTodo: {
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -284,7 +289,7 @@ export default {
     }
   },
   created () {
-    console.log(this.eveId, 'eveId')
+    // console.log(this.eveId, 'eveId')
     this.getFirAuditerByDept()
     this.getDictOptions()
     this.orgtreeChange(this.majorDept)
@@ -333,18 +338,22 @@ export default {
         AuditRemark: this.shenheForm.AuditorRemark
       }
       this.btnloading = true
-      console.log('业务处室专业审批, 提交参数: ', params)
+      // console.log('业务处室专业审批, 提交参数: ', params)
       let _this = this
-      var apiName = ['businessSeparateAudit', 'businessSeparateAuditYear']
+      let apiName = ['businessSeparateAudit', 'businessSeparateAuditYear']
       apiOilcontract[apiName[this.examineType]](this.formData.Id, params, this.$axios).then(res => {
         if (res.data.code === 0) {
-          console.log('审批提交，成功返回')
+          // console.log('审批提交，成功返回')
+          if (this.isTodo === '1') {
+            this.$router.push('/')
+          } else {
+            _this.$emit('refreshPage', {})
+            // _this.$refs['WfHistory'].getHistoryTask()
+          }
           this.$message({
             type: 'success',
             message: res.data.message
           })
-          _this.$emit('refreshPage', {})
-          // _this.$refs['WfHistory'].getHistoryTask()
         } else {
           this.$message({
             type: 'warning',
@@ -374,12 +383,16 @@ export default {
       let _this = this
       apiOilcontract.submitReviewAuditByBusiness(this.formData.Id, params, this.$axios).then(res => {
         if (res.data.code === 0) {
+          if (this.isTodo === '1') {
+            this.$router.push('/')
+          } else {
+            _this.$emit('refreshPage', {})
+            // _this.$refs['WfHistory'].getHistoryTask()
+          }
           this.$message({
             type: 'success',
             message: res.data.message
           })
-          _this.$emit('refreshPage', {})
-          // _this.$refs['WfHistory'].getHistoryTask()
         } else {
           this.$message({
             type: 'warning',
@@ -460,7 +473,7 @@ export default {
     // 确定提交
     commonAuditMakeSure () {
       let checkRes = this.commonAuditParamsCheck()
-      console.log('审批结果公共提交，参数检查结果', checkRes)
+      // console.log('审批结果公共提交，参数检查结果', checkRes)
       if (!checkRes) {
         return false
       }
@@ -469,28 +482,32 @@ export default {
         result: this.shenheForm.SuccessStatus,
         AuditRemark: this.shenheForm.AuditorRemark
       }
-      console.log('审批结果提交参数：', params)
+      // console.log('审批结果提交参数：', params)
       let _this = this
       var apiName = ['contractCommonAudit', 'contractCommonAuditYear']
       let evaStr = this.eveId.toString()
       let evaList = evaStr.split(',')
       apiOilcontract[apiName[this.examineType]](this.eveId, params, this.$axios).then(res => {
         if (res.data.code === 0) {
-          console.log('审批提交，成功返回')
+          // console.log('审批提交，成功返回')
+          if (this.isTodo === '1') {
+            this.$router.push('/')
+          } else {
+            if (evaList.length > 1) {
+              setTimeout(function () {
+                _this.$nextTick(() => {
+                  _this.$emit('refreshPage', {})
+                  // TODO loading
+                })
+              }, 5000)
+            }
+            _this.$emit('refreshPage', {})
+          }
           this.$message({
             type: 'success',
             message: res.data.message
           })
           // _this.$emit('tableLoading', {})
-          if (evaList.length > 1) {
-            setTimeout(function () {
-              _this.$nextTick(() => {
-                _this.$emit('refreshPage', {})
-                // TODO loading
-              })
-            }, 5000)
-          }
-          _this.$emit('refreshPage', {})
         } else {
           this.$message({
             type: 'warning',
@@ -737,7 +754,7 @@ export default {
       this.auditform.UnitId = this.UnitOrg
       this.auditform.CertId = this.certId
       this.loading = true
-      console.log('企业用户提交参数', this.auditform)
+      // console.log('企业用户提交参数', this.auditform)
       apiCert.companyAuditEntity(this.certId, this.auditform, this.$axios)
         .then(res => {
           if (res.data.code === 0) {

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

@@ -705,7 +705,7 @@
             } else {
               SupplierType = 'techedit'
             }
-            this.$router.push('oilsupplier/supplierstorage/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId + '&applytype=' + val.Type)
+            this.$router.push('oilsupplier/supplierstorage/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId + '&applytype=' + val.Type + '&is_todo=1')
           } else {
             // 到详情页面
             if (val.SupplierTypeCode === '01') {
@@ -719,7 +719,7 @@
             if (Number(val.Status) <= 0) {
               this.$router.push('oilsupplier/supplier/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId)
             } else {
-              this.$router.push('oilsupplier/supplieraudit/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId)
+              this.$router.push('oilsupplier/supplieraudit/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId + '&is_todo=1')
             }
           }
         } else if (val.Type == '2') { // 增项
@@ -737,7 +737,7 @@
           if (Number(val.Status) <= 0) {
             this.$router.push('oilsupplier/supplierappend/' + appendId + '/' + SupplierType + '?Id=' + val.Id + '&editFlag=1&sId=' + val.SupplierId)
           }
-          this.$router.push('oilsupplier/addtionaudit/' + val.Id + '/' + SupplierType)
+          this.$router.push('oilsupplier/addtionaudit/' + val.Id + '/' + SupplierType + '?is_todo=1')
         } else if (val.Type == '3') { // 年审
           if (val.SupplierTypeCode === '01') {
             SupplierType = 'auditoperation'
@@ -749,10 +749,10 @@
           if (Number(val.Status) <= 0) {
             this.$router.push('oilsupplier/annualaudit/' + val.SupplierId + '/' + SupplierType + '?certid=' + val.CertId + '&WorkflowId=' + val.WorkflowId + '&Status=' + val.Status + '&Step=' + val.Step + '&annualId=' + val.Id)
           } else {
-            this.$router.push('oilsupplier/annualaudit/' + val.SupplierId + '/' + SupplierType + '?certid=' + val.CertId + '&WorkflowId=' + val.WorkflowId + '&AnnualStatus=' + val.Status + '&annualId=' + val.Id + '&Step=' + val.Step)
+            this.$router.push('oilsupplier/annualaudit/' + val.SupplierId + '/' + SupplierType + '?certid=' + val.CertId + '&WorkflowId=' + val.WorkflowId + '&AnnualStatus=' + val.Status + '&annualId=' + val.Id + '&Step=' + val.Step + '&is_todo=1')
           }
         } else if (val.Type == '4') { // 信息变更
-          this.$router.push('/oilsupplier/infochangech/' + val.Id + '/auditoperation?InfoStatus=' + val.Status + '&SupId=' + val.SupplierId)
+          this.$router.push('/oilsupplier/infochangech/' + val.Id + '/auditoperation?InfoStatus=' + val.Status + '&SupId=' + val.SupplierId + '&is_todo=1')
         } else if (val.Type == '5') { // 企业注册
           this.initDataregister(val.Id)
         } else if (val.Type == '8') { // 发票
@@ -764,22 +764,31 @@
           this.initInvoiceDatas(val.Id)
           this.invoiceVisible = true
         } else if (val.Type == '9') { // 目录申请
-          this.$router.push('/oilsupplier/oilcatalogsub/' + val.Id + '/incomeedit')
-        } else if (val.Type == '10') { // 日常评价 评价呀
+          this.$router.push('/oilsupplier/oilcatalogsub/' + val.Id + '/incomeedit?is_todo=1')
+        } else if (val.Type == '10') { // 日常评价
           if (val.SupplierTypeCode == '01') {
             this.$router.push({
-              path: '/oilcontract/contract-goods/' + val.Id + '/evaluate'
+              path: '/oilcontract/contract-goods/' + val.Id + '/evaluate',
+              query: {
+                is_todo: 1
+              }
             })
           } else if (val.SupplierTypeCode == '02') {
             this.$router.push({
-              path: '/oilcontract/contract-basis/' + val.Id + '/evaluate'
+              path: '/oilcontract/contract-basis/' + val.Id + '/evaluate',
+              query: {
+                is_todo: 1
+              }
             })
           } else if (val.SupplierTypeCode == '03') {
             this.$router.push({
-              path: '/oilcontract/contract-service/' + val.Id + '/evaluate'
+              path: '/oilcontract/contract-service/' + val.Id + '/evaluate',
+              query: {
+                is_todo: 1
+              }
             })
           }
-        } else if (val.Type == '11') { // 年度评价 评价呀
+        } else if (val.Type == '11') { // 年度评价
           if (val.SupplierTypeCode == '01') {
             this.$router.push({
               path: '/oilcontract/contract-goods-year/' + val.Id + '/operation'
@@ -793,26 +802,29 @@
               path: '/oilcontract/contract-service-year/' + val.Id + '/operation'
             })
           }
-        } else if (val.Type == '12') { // 日常评价 评价呀
+        } else if (val.Type == '12') { // 日常评价
           if (val.SupplierTypeCode == '01') {
             this.$router.push({
               path: '/oilcontract/contract-goods/' + val.Id + '/evaluate',
               query: {
-                isBusiness: 1
+                isBusiness: 1,
+                is_todo: 1
               }
             })
           } else if (val.SupplierTypeCode == '02') {
             this.$router.push({
               path: '/oilcontract/contract-basis/' + val.Id + '/evaluate',
               query: {
-                isBusiness: 1
+                isBusiness: 1,
+                is_todo: 1
               }
             })
           } else if (val.SupplierTypeCode == '03') {
             this.$router.push({
               path: '/oilcontract/contract-service/' + val.Id + '/evaluate',
               query: {
-                isBusiness: 1
+                isBusiness: 1,
+                is_todo: 1
               }
             })
           }
@@ -1180,9 +1192,9 @@
       },
       timestampToTime (val) {
         let date = new Date(val) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
-        let offset_GMT = new Date().getTimezoneOffset()
-        if (offset_GMT !== -480) {
-          date = new Date(val + offset_GMT * 60 * 1000 + 8 * 60 * 60 * 1000)
+        let offsetGMT = new Date().getTimezoneOffset()
+        if (offsetGMT !== -480) {
+          date = new Date(val + offsetGMT * 60 * 1000 + 8 * 60 * 60 * 1000)
         }
         let Y = date.getFullYear() + '-'
         let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/evaluate.vue

@@ -207,7 +207,7 @@
       </el-tabs>
     </el-card>
 
-    <submit-popup ref="submitpopup" :eveId="parseInt(formData.Id)" :selectDeptBoolean2="true" :formData="formData"
+    <submit-popup ref="submitpopup" :eveId="parseInt(formData.Id)" :selectDeptBoolean2="true" :formData="formData" :isTodo="is_todo"
                   @refreshPage="refreshPage"></submit-popup>
 
 
@@ -243,6 +243,7 @@ export default {
 
   data () {
     return {
+      is_todo: '0',
       byBus: 0,
       isBusiness: 0,
       IsFinal: 0,
@@ -303,6 +304,9 @@ export default {
     this.serviceId = this.$route.params.opera // 评价的ID
     //  this.getDictOptions()
     this.byBus = this.$route.query.byBus == 1 ? 1 : 0
+    if (this.$route.query.is_todo == 1) {
+      this.is_todo = '1'
+    }
     this.IsFinal = this.$route.query.IsFinal
 
     if (this.IsFinal == undefined || this.IsFinal == '') this.IsFinal = 0
@@ -342,7 +346,7 @@ export default {
             } else {
               location.href = 'http://' + docurl
             }
-            console.log(location.href, 'href')
+            // console.log(location.href, 'href')
           }
         }).catch(err => {
           console.error(err)
@@ -362,7 +366,7 @@ export default {
       }).catch(err => {
         console.error(err)
       })
-      console.log(this.departmentBoolean, '专业处室评价tab1')
+      // console.log(this.departmentBoolean, '专业处室评价tab1')
       let data2 = {percode: 'oil_contract.Review.Check'}
       permissionApi.permissionIsauth(data2, this.$axios).then(res => {
         if (res.data.code == 0) {
@@ -375,7 +379,7 @@ export default {
       })
       let data3 = {percode: 'oil_contract.Review.Save'}
       permissionApi.permissionIsauth(data3, this.$axios).then(res => {
-        console.log('权限', res.data)
+        // console.log('权限', res.data)
         if (res.data.code == 0) {
           if (res.data.message == '有权限') {
             this.saveButton = true
@@ -429,16 +433,16 @@ export default {
     // 拿id查审核流程
     showIdDatas (id) {
       api.getEntityAndCert(id, this.$axios).then(res => {
-        console.log('拿id查编辑数据', res)
+        // console.log('拿id查编辑数据', res)
         this.entrydetail.business = ''
         let data = res.data
         this.formData = res.data
-        console.log(this.formData.Status, '专业处室评价tab')
+        // console.log(this.formData.Status, '专业处室评价tab')
         this.entrydetail.business = id
         this.entrydetail.instance = data.WorkflowId
         this.entrydetail.process = data.ProcessKey
         api.getEntity(data.ContractId, this.$axios).then(res => {
-          console.log('拿id查编辑数据合同数据', res)
+          // console.log('拿id查编辑数据合同数据', res)
           this.contractData = res.data
           //  this.onSelectType(this.formData.ContractClass)
           this.isAccess()
@@ -459,13 +463,13 @@ export default {
     //  审核
     commonAuditClick (index) {
       index = Number(index)
-      console.log(index, 'index')
+      // console.log(index, 'index')
       switch (index) {
         //  提交审核
         case 0:
           this.onSeaveBigAdd()
           this.$refs['submitpopup'].dialogVisibleCom = true
-          console.log(this.$refs['submitpopup'].dialogVisibleCom, this.$refs.submitpopup.dialogVisibleCom, 'dialogVisibleCom')
+          // console.log(this.$refs['submitpopup'].dialogVisibleCom, this.$refs.submitpopup.dialogVisibleCom, 'dialogVisibleCom')
           break
         //  初审
         case 1:
@@ -658,7 +662,7 @@ export default {
         Items: this.evaluation_list
       }
       api.saveSecEvaluation(this.formData.Id, data, this.$axios).then(res => {
-        console.log('新增', res)
+        // console.log('新增', res)
         if (res.data.code == 0) {
           this.$message({
             type: 'success',
@@ -700,7 +704,7 @@ export default {
         IsBusiness: isBusiness == 1 ? 1 : 0
       }
       api.updateContractEvaluate(this.formData.Id, formData, this.$axios).then(res => {
-        console.log('编辑11111', val)
+        // console.log('编辑11111', val)
         if (res.data.code == 0) {
           //  this.formData.Id = res.data.item
           if (val) {
@@ -742,7 +746,7 @@ export default {
         auditstepcode: this.auditstepcode,
         processkey: this.formData.ProcessKey
       }
-      console.log('params', params)
+      // console.log('params', params)
       apiCert.isAccess(params, this.$axios).then(res => {
         this.auditBtn = res.data
         if ((this.formData.Status == '3' || this.formData.Status == '4' || this.formData.Status == '7') && res.data) {

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/_opera/evaluate.vue

@@ -206,7 +206,7 @@
       </el-tabs>
     </el-card>
 
-    <submit-popup ref="submitpopup" :eveId="parseInt(formData.Id)" :supplierType="'01'" :formData="formData" @refreshPage="refreshPage"></submit-popup>
+    <submit-popup ref="submitpopup" :eveId="parseInt(formData.Id)" :supplierType="'01'" :formData="formData" :isTodo="is_todo" @refreshPage="refreshPage"></submit-popup>
 
 
   </div>
@@ -241,6 +241,7 @@ export default {
 
   data () {
     return {
+      is_todo: '0',
       isBusiness: 0,
       byBus: 0,
       IsFinal: 0,
@@ -297,6 +298,9 @@ export default {
     this.routeDataType = this.$route.query.type
     this.isBusiness = this.$route.query.isBusiness == 1 ? 1 : 0
     this.byBus = this.$route.query.byBus == 1 ? 1 : 0
+    if (this.$route.query.is_todo == 1) {
+      this.is_todo = '1'
+    }
     // console.log('跳转数据', this.routeData)
     this.serviceId = this.$route.params.opera
     // this.getDictOptions();
@@ -348,7 +352,7 @@ export default {
         percode: 'oil_contract.Review.Department'
       }
       permissionApi.permissionIsauth(data, this.$axios).then(res => {
-        console.log('权限', res.data)
+        // console.log('权限', res.data)
         if (res.data.code == 0) {
           if (res.data.message == '有权限') {
             this.departmentBoolean = true
@@ -361,7 +365,7 @@ export default {
         percode: 'oil_contract.Review.Check'
       }
       permissionApi.permissionIsauth(data1, this.$axios).then(res => {
-        console.log('权限', res.data)
+        // console.log('权限', res.data)
         if (res.data.code == 0) {
           if (res.data.message == '有权限') {
             this.checkBUtton = true
@@ -372,7 +376,7 @@ export default {
       })
       let data2 = {percode: 'oil_contract.Review.Save'}
       permissionApi.permissionIsauth(data2, this.$axios).then(res => {
-        console.log('权限', res.data)
+        // console.log('权限', res.data)
         if (res.data.code == 0) {
           if (res.data.message == '有权限') {
             this.saveButton = true
@@ -426,7 +430,7 @@ export default {
     // 拿id查审核流程
     showIdDatas (id) {
       api.getEntityAndCert(id, this.$axios).then(res => {
-        console.log('拿id查编辑数据', res)
+        // console.log('拿id查编辑数据', res)
         this.entrydetail.business = ''
         var data = res.data
         this.formData = res.data
@@ -434,7 +438,7 @@ export default {
         this.entrydetail.instance = data.WorkflowId
         this.entrydetail.process = data.ProcessKey
         api.getEntity(data.ContractId, this.$axios).then(res => {
-          console.log('拿id查编辑数据合同数据', res)
+          // console.log('拿id查编辑数据合同数据', res)
           this.contractData = res.data
           // this.onSelectType(this.formData.ContractClass)
           this.isAccess()
@@ -656,7 +660,7 @@ export default {
         Items: this.evaluation_list
       }
       api.saveSecEvaluation(this.formData.Id, data, this.$axios).then(res => {
-        console.log('新增', res)
+        // console.log('新增', res)
         if (res.data.code == 0) {
           this.$message({
             type: 'success',
@@ -677,7 +681,7 @@ export default {
         IsBusiness: isBusiness == 1 ? 1 : 0
       }
       api.addContractEvaluate(formData, this.$axios).then(res => {
-        console.log('新增', res)
+        // console.log('新增', res)
         if (res.data.code == 0) {
           this.formData.Id = res.data.item
           this.$message({

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/_opera/evaluate.vue

@@ -207,7 +207,7 @@
       </el-tabs>
     </el-card>
 
-    <submit-popup ref="submitpopup" :eveId="parseInt(formData.Id)" :isTecContract="1" :selectDeptBoolean="false" :formData="formData"
+    <submit-popup ref="submitpopup" :eveId="parseInt(formData.Id)" :isTecContract="1" :selectDeptBoolean="false" :formData="formData" :isTodo="is_todo"
                   @refreshPage="refreshPage"></submit-popup>
 
 
@@ -243,6 +243,7 @@ export default {
 
   data () {
     return {
+      is_todo: '0',
       byBus: 0,
       isBusiness: 0,
       IsFinal: 0,
@@ -298,10 +299,13 @@ export default {
     // this.routeData = this.$route.query.item
     this.routeDataType = this.$route.query.type
     this.isBusiness = this.$route.query.isBusiness == 1 ? 1 : 0
-    console.log('跳转数据', this.routeData)
+    // console.log('跳转数据', this.routeData)
     this.serviceId = this.$route.params.opera // 评价的ID
     // this.getDictOptions();
     this.byBus = this.$route.query.byBus == 1 ? 1 : 0
+    if (this.$route.query.is_todo == 1) {
+      this.is_todo = '1'
+    }
     this.IsFinal = this.$route.query.IsFinal
 
     if (this.IsFinal == undefined || this.IsFinal == '') this.IsFinal = 0
@@ -349,7 +353,7 @@ export default {
         percode: 'oil_contract.Review.Department'
       }
       permissionApi.permissionIsauth(data, this.$axios).then(res => {
-        console.log('权限', res.data)
+        // console.log('权限', res.data)
         if (res.data.code == 0) {
           if (res.data.message == '有权限') {
             this.departmentBoolean = true
@@ -362,7 +366,7 @@ export default {
         percode: 'oil_contract.Review.Check'
       }
       permissionApi.permissionIsauth(data1, this.$axios).then(res => {
-        console.log('权限', res.data)
+        // console.log('权限', res.data)
         if (res.data.code == 0) {
           if (res.data.message == '有权限') {
             this.checkBUtton = true
@@ -375,7 +379,7 @@ export default {
         percode: 'oil_contract.Review.Save'
       }
       permissionApi.permissionIsauth(data2, this.$axios).then(res => {
-        console.log('权限', res.data)
+        // console.log('权限', res.data)
         if (res.data.code == 0) {
           if (res.data.message == '有权限') {
             this.saveButton = true
@@ -429,7 +433,7 @@ export default {
     // 拿id查审核流程
     showIdDatas (id) {
       api.getEntityAndCert(id, this.$axios).then(res => {
-        console.log('拿id查编辑数据', res)
+        // console.log('拿id查编辑数据', res)
         this.entrydetail.business = ''
         var data = res.data
         this.formData = res.data
@@ -437,7 +441,7 @@ export default {
         this.entrydetail.instance = data.WorkflowId
         this.entrydetail.process = data.ProcessKey
         api.getEntity(data.ContractId, this.$axios).then(res => {
-          console.log('拿id查编辑数据合同数据', res)
+          // console.log('拿id查编辑数据合同数据', res)
           this.contractData = res.data
           // this.onSelectType(this.formData.ContractClass)
           this.isAccess()
@@ -659,7 +663,7 @@ export default {
         Items: this.evaluation_list
       }
       api.saveSecEvaluation(this.formData.Id, data, this.$axios).then(res => {
-        console.log('新增', res)
+        // console.log('新增', res)
         if (res.data.code == 0) {
           if (val) {
             this.$message({

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

@@ -930,6 +930,7 @@
         }
       }
       return {
+        is_todo: '0',
         equipmentList: [], // 企业主要设备
         performanceList: [], // 近三年主要业绩
         patentList: [], // 专利及专有技术
@@ -1258,6 +1259,9 @@
       this.serviceId = this.$route.params.opera
       this.AppendId = this.serviceId
       this.editFlag = '1'
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       this.getEntityById()
       this.getAppendApplyIsNeedPay()
       this.dialogFormData.SupplierCertAppendId = this.AppendId
@@ -1473,21 +1477,24 @@
           SupplierId: this.formData.SupplierId
         }
         this.btnLoading = true
-        console.log(params, '退回参数')
-        console.log(this.formData.Id, 'id')
+        // console.log(params, '退回参数')
+        // console.log(this.formData.Id, 'id')
         api2.updateIsStorage(this.formData.Id, params, this.$axios).then(res => {
           this.dialogVisibleBack = false
-          if (this.$refs['WfHistory']) {
-            this.$refs['WfHistory'].getHistoryTask()
-          }
           if (res.data.code === 0) {
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.getEntityById()
+              this.isAccess()
+              if (this.$refs['WfHistory']) {
+                this.$refs['WfHistory'].getHistoryTask()
+              }
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.getEntityById()
-            this.isAccess()
-            // this.$router.push('/')
             this.btnLoading = false
           } else {
             this.$message({
@@ -1519,10 +1526,14 @@
           let _this = this
           api2.updateIsStorage(this.formData.Id, params, this.$axios).then(res => {
             if (res.data.code === 0) {
-              _this.getEntityById()
-              _this.isAccess()
-              if (_this.$refs['WfHistory']) {
-                _this.$refs['WfHistory'].getHistoryTask()
+              if (this.is_todo === '1') {
+                this.$router.push('/')
+              } else {
+                _this.getEntityById()
+                _this.isAccess()
+                if (_this.$refs['WfHistory']) {
+                  _this.$refs['WfHistory'].getHistoryTask()
+                }
               }
               this.$message({
                 type: 'success',
@@ -1547,13 +1558,13 @@
       },
       // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核、企管法规处审核
       commonAuditClick () {
-        console.log('审批公共会话框')
+        // console.log('审批公共会话框')
         this.dialogCommonAuditMakeSureVisible = true
         this.radioChange()
       },
       commonAuditMakeSure () {
         let checkRes = this.commonAuditParamsCheck()
-        console.log('审批结果公共提交，参数检查结果', checkRes)
+        // console.log('审批结果公共提交，参数检查结果', checkRes)
         if (!checkRes) {
           return false
         }
@@ -1562,17 +1573,21 @@
           result: this.shenheForm.SuccessStatus,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('审批结果提交参数：', params)
+        // console.log('审批结果提交参数：', params)
         let _this = this
         api2.commonAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              _this.getEntityById()
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            _this.getEntityById()
-            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -1660,7 +1675,7 @@
       },
       // 二级单位分办审批会话框 ⬇
       secUnitSeparateAuditClick (val) {
-        console.log('二级单位分办审批会话框')
+        // console.log('二级单位分办审批会话框')
         this.auditOrgChange()
         this.btnstatus = val
         this.getFirAuditerByDept()
@@ -1669,7 +1684,7 @@
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
-        console.log('二级单位分办审批结果确认')
+        // console.log('二级单位分办审批结果确认')
         // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
@@ -1683,17 +1698,21 @@
           ThirdAudit: this.selectDept,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('二级单位分办审批结果提交参数：', params)
+        // console.log('二级单位分办审批结果提交参数：', params)
         let _this = this
         api2.separateAuditEntity(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              _this.getEntityById()
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            _this.getEntityById()
-            _this.isAccess()
             // _this.$refs['WfHistory'].getHistoryTask()
             _this.dialogSecUnitSeparateVisible = false
             _this.btnloading = false
@@ -1770,9 +1789,9 @@
       },
       // 专业处室分办审批
       businessOfficeSeparateAuditClick () {
-        console.log('专业处室分办审批提交按钮')
+        // console.log('专业处室分办审批提交按钮')
         this.auditOrgChange()
-        console.log('请求部门结束')
+        // console.log('请求部门结束')
         this.dialogBusinessOfficeSeparateAuditVisible = true
       },
       businessOfficeSeparateAuditMakeSure () {
@@ -1805,18 +1824,21 @@
           AuditRemark: this.shenheForm.AuditorRemark
         }
         this.btnloading = true
-        console.log('业务处室专业审批, 提交参数: ', params)
+        // console.log('业务处室专业审批, 提交参数: ', params)
         let _this = this
         api2.businessOfficeSeparateAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              _this.getEntityById()
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            _this.getEntityById()
-            _this.isAccess()
-            // _this.$refs['WfHistory'].getHistoryTask()
           } else {
             this.$message({
               type: 'warning',
@@ -1830,7 +1852,7 @@
         })
       },
       paySureClick () {
-        console.log('交费按钮')
+        // console.log('交费按钮')
         this.$confirm('是否确认交费', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1845,16 +1867,16 @@
         })
       },
       payMakeSure () {
-        console.log('交费结果确认')
+        // console.log('交费结果确认')
         this.loading = true
         let params = {
           payStatus: this.payStatus
         }
-        console.log('交费结果确认提交参数：', this.AppendId)
+        // console.log('交费结果确认提交参数：', this.AppendId)
         let _this = this
         api2.updatePayStatus(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('交费成功')
+            // console.log('交费成功')
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -1013,6 +1013,7 @@
         }
       }
       return {
+        is_todo: '0',
         equipmentList: [], // 企业主要设备
         performanceList: [], // 近三年主要业绩
         patentList: [], // 专利及专有技术
@@ -1343,6 +1344,9 @@
       this.serviceId = this.$route.params.opera
       this.AppendId = this.serviceId
       this.editFlag = '1'
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       this.getEntityById()
       this.getAppendApplyIsNeedPay()
       this.dialogFormData.SupplierCertAppendId = this.AppendId
@@ -1567,25 +1571,25 @@
       AuditEntity () {
         this.auditOrgChange()
         if (this.formData.Status === '3') {
-          console.log('11')
+          // console.log('11')
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {
-          console.log('22')
+          // console.log('22')
           this.dialogMakeSure2 = true
         } else if (this.formData.Status === '10') {
-          console.log('33')
+          // console.log('33')
           this.getFirAuditerByDept()
           this.changeOrgUnit(this.selectDept)
           this.dialogSecUnitSeparateVisible = true
         } else {
-          console.log('44')
+          // console.log('44')
           this.dialogMakeSure = true
           this.radioChange()
         }
       },
       // 二级单位分办审批会话框 ⬇
       secUnitSeparateAuditClick (val) {
-        console.log('二级单位分办审批会话框')
+        // console.log('二级单位分办审批会话框')
         this.auditOrgChange()
         this.btnstatus = val
         this.getFirAuditerByDept()
@@ -1594,7 +1598,7 @@
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
-        console.log('二级单位分办审批结果确认')
+        // console.log('二级单位分办审批结果确认')
         // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
@@ -1608,17 +1612,21 @@
           ThirdAudit: this.selectDept,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('二级单位分办审批结果提交参数：', params)
+        // console.log('二级单位分办审批结果提交参数：', params)
         let _this = this
         api2.separateAuditEntity(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              _this.getEntityById()
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            _this.getEntityById()
-            _this.isAccess()
             _this.btnloading = false
             _this.dialogSecUnitSeparateVisible = false
           } else {
@@ -1703,21 +1711,24 @@
           SupplierId: this.formData.SupplierId
         }
         this.btnLoading = true
-        console.log(params, '退回参数')
-        console.log(this.formData.Id, 'id')
+        // console.log(params, '退回参数')
+        // console.log(this.formData.Id, 'id')
         api2.updateIsStorage(this.formData.Id, params, this.$axios).then(res => {
           this.dialogVisibleBack = false
-          if (this.$refs['WfHistory']) {
-            this.$refs['WfHistory'].getHistoryTask()
-          }
           if (res.data.code === 0) {
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              if (this.$refs['WfHistory']) {
+                this.$refs['WfHistory'].getHistoryTask()
+                this.getEntityById()
+                this.isAccess()
+              }
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.getEntityById()
-            this.isAccess()
-            // this.$router.push('/')
             this.btnLoading = false
           } else {
             this.$message({
@@ -1746,10 +1757,14 @@
           let _this = this
           api2.updateIsStorage(this.formData.Id, params, this.$axios).then(res => {
             if (res.data.code === 0) {
-              _this.getEntityById()
-              _this.isAccess()
-              if (_this.$refs['WfHistory']) {
-                _this.$refs['WfHistory'].getHistoryTask()
+              if (this.is_todo === '1') {
+                this.$router.push('/')
+              } else {
+                _this.getEntityById()
+                _this.isAccess()
+                if (_this.$refs['WfHistory']) {
+                  _this.$refs['WfHistory'].getHistoryTask()
+                }
               }
               this.$message({
                 type: 'success',
@@ -1774,13 +1789,13 @@
       },
       // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核、企管法规处审核
       commonAuditClick () {
-        console.log('审批公共会话框')
+        // console.log('审批公共会话框')
         this.dialogCommonAuditMakeSureVisible = true
         this.radioChange()
       },
       commonAuditMakeSure () {
         let checkRes = this.commonAuditParamsCheck()
-        console.log('审批结果公共提交，参数检查结果', checkRes)
+        // console.log('审批结果公共提交，参数检查结果', checkRes)
         if (!checkRes) {
           return false
         }
@@ -1789,18 +1804,21 @@
           result: this.shenheForm.SuccessStatus,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('审批结果提交参数：', params)
+        // console.log('审批结果提交参数：', params)
         let _this = this
         api2.commonAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              _this.getEntityById()
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            _this.getEntityById()
-            _this.isAccess()
-            // _this.$refs['WfHistory'].getHistoryTask()
           } else {
             this.$message({
               type: 'warning',
@@ -1889,9 +1907,9 @@
       },
       // 专业处室分办审批
       businessOfficeSeparateAuditClick () {
-        console.log('专业处室分办审批提交按钮')
+        // console.log('专业处室分办审批提交按钮')
         this.auditOrgChange()
-        console.log('请求部门结束')
+        // console.log('请求部门结束')
         this.dialogBusinessOfficeSeparateAuditVisible = true
       },
       businessOfficeSeparateAuditMakeSure () {
@@ -1924,20 +1942,23 @@
           AuditRemark: this.shenheForm.AuditorRemark
         }
         this.btnloading = true
-        console.log('业务处室专业审批, 提交参数: ', params)
+        // console.log('业务处室专业审批, 提交参数: ', params)
         let _this = this
         api2.businessOfficeSeparateAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              _this.getEntityById()
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
             _this.btnloading = false
             _this.dialogBusinessOfficeSeparateAuditVisible = false
-            _this.getEntityById()
-            _this.isAccess()
-            // _this.$refs['WfHistory'].getHistoryTask()
           } else {
             this.$message({
               type: 'warning',
@@ -1951,12 +1972,12 @@
       },
       // 集中评审按钮
       concentrateAuditClick () {
-        console.log('集中评审按钮')
+        // console.log('集中评审按钮')
         this.dialogConcentrateAuditVisible = true
         this.radioChange()
       },
       concentrateAuditEntityMakeSure () {
-        console.log('集中评审提交审核结果')
+        // console.log('集中评审提交审核结果')
         let checkRes = this.concentrateAuditParamsCheck()
         if (!checkRes) {
           return false
@@ -1969,14 +1990,17 @@
         let _this = this
         api2.commonAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              _this.getEntityById()
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            _this.getEntityById()
-            _this.isAccess()
-            // _this.$refs['WfHistory'].getHistoryTask()
             _this.dialogConcentrateAuditVisible = false
             _this.btnloading = false
           } else {
@@ -1991,7 +2015,7 @@
         })
       },
       concentrateAuditParamsCheck () {
-        console.log('集中评审提交参数检查')
+        // console.log('集中评审提交参数检查')
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
@@ -2012,7 +2036,7 @@
         return true
       },
       paySureClick () {
-        console.log('交费按钮')
+        // console.log('交费按钮')
         this.$confirm('是否确认交费', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -2027,16 +2051,16 @@
         })
       },
       payMakeSure () {
-        console.log('交费结果确认')
+        // console.log('交费结果确认')
         this.loading = true
         let params = {
           payStatus: this.payStatus
         }
-        console.log('交费结果确认提交参数：', this.certId, this.AppendId)
+        // console.log('交费结果确认提交参数：', this.certId, this.AppendId)
         let _this = this
         api2.updatePayStatus(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('交费成功')
+            // console.log('交费成功')
             this.$message({
               type: 'success',
               message: res.data.message
@@ -2096,7 +2120,7 @@
           params
         })
           .then(res => {
-            console.log('这是', res.data.items)
+            // console.log('这是', res.data.items)
             _this.subfileList1 = res.data.items
             _this.currentItemCountProject = res.data.currentItemCount
             for (let idx in _this.subfileList1) {

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

@@ -911,6 +911,7 @@
         }
       }
       return {
+        is_todo: '0',
         equipmentList: [], // 企业主要设备
         performanceList: [], // 近三年主要业绩
         patentList: [], // 专利及专有技术
@@ -1260,6 +1261,9 @@
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.serviceId = this.$route.params.opera
       this.AppendId = this.serviceId
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       this.editFlag = '1'
       this.getEntityById()
       this.getAppendApplyIsNeedPay()
@@ -1503,21 +1507,24 @@
           SupplierId: this.formData.SupplierId
         }
         this.btnLoading = true
-        console.log(params, '退回参数')
-        console.log(this.formData.Id, 'id')
+        // console.log(params, '退回参数')
+        // console.log(this.formData.Id, 'id')
         api2.updateIsStorage(this.formData.Id, params, this.$axios).then(res => {
           this.dialogVisibleBack = false
-          if (this.$refs['WfHistory']) {
-            this.$refs['WfHistory'].getHistoryTask()
-          }
           if (res.data.code === 0) {
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              if (this.$refs['WfHistory']) {
+                this.$refs['WfHistory'].getHistoryTask()
+              }
+              this.getEntityById()
+              this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.getEntityById()
-            this.isAccess()
-            // this.$router.push('/')
             this.btnLoading = false
           } else {
             this.$message({
@@ -1549,10 +1556,14 @@
           let _this = this
           api2.updateIsStorage(this.formData.Id, params, this.$axios).then(res => {
             if (res.data.code === 0) {
-              _this.getEntityById()
-              _this.isAccess()
-              if (_this.$refs['WfHistory']) {
-                _this.$refs['WfHistory'].getHistoryTask()
+              if (this.is_todo === '1') {
+                this.$router.push('/')
+              } else {
+                _this.getEntityById()
+                _this.isAccess()
+                if (_this.$refs['WfHistory']) {
+                  _this.$refs['WfHistory'].getHistoryTask()
+                }
               }
               this.$message({
                 type: 'success',
@@ -1577,13 +1588,13 @@
       },
       // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核、企管法规处审核
       commonAuditClick () {
-        console.log('审批公共会话框')
+        // console.log('审批公共会话框')
         this.dialogCommonAuditMakeSureVisible = true
         this.radioChange()
       },
       commonAuditMakeSure () {
         let checkRes = this.commonAuditParamsCheck()
-        console.log('审批结果公共提交，参数检查结果', checkRes)
+        // console.log('审批结果公共提交，参数检查结果', checkRes)
         if (!checkRes) {
           return false
         }
@@ -1592,18 +1603,20 @@
           result: this.shenheForm.SuccessStatus,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('审批结果提交参数：', params)
+        // console.log('审批结果提交参数：', params)
         let _this = this
         api2.commonAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              _this.getEntityById()
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            _this.getEntityById()
-            _this.isAccess()
-            // _this.$refs['WfHistory'].getHistoryTask()
           } else {
             this.$message({
               type: 'warning',
@@ -1683,7 +1696,7 @@
       },
       // 二级单位分办审批会话框 ⬇
       secUnitSeparateAuditClick (val) {
-        console.log('二级单位分办审批会话框')
+        // console.log('二级单位分办审批会话框')
         this.auditOrgChange()
         this.btnstatus = val
         this.getFirAuditerByDept()
@@ -1692,7 +1705,7 @@
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
-        console.log('二级单位分办审批结果确认')
+        // console.log('二级单位分办审批结果确认')
         // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
@@ -1706,17 +1719,21 @@
           ThirdAudit: this.selectDept,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('二级单位分办审批结果提交参数：', params)
+        // console.log('二级单位分办审批结果提交参数：', params)
         let _this = this
         api2.separateAuditEntity(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              _this.getEntityById()
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            _this.getEntityById()
-            _this.isAccess()
             _this.dialogSecUnitSeparateVisible = false
             _this.btnloading = false
           } else {
@@ -1790,9 +1807,9 @@
       },
       // 专业处室分办审批
       businessOfficeSeparateAuditClick () {
-        console.log('专业处室分办审批提交按钮')
+        // console.log('专业处室分办审批提交按钮')
         this.auditOrgChange()
-        console.log('请求部门结束')
+        // console.log('请求部门结束')
         this.dialogBusinessOfficeSeparateAuditVisible = true
       },
       businessOfficeSeparateAuditMakeSure () {
@@ -1825,18 +1842,22 @@
           AuditRemark: this.shenheForm.AuditorRemark
         }
         this.btnloading = true
-        console.log('业务处室专业审批, 提交参数: ', params)
+        // console.log('业务处室专业审批, 提交参数: ', params)
         let _this = this
         api2.businessOfficeSeparateAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              _this.getEntityById()
+              _this.isAccess()
+              // _this.$refs['WfHistory'].getHistoryTask()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            _this.getEntityById()
-            _this.isAccess()
-            // _this.$refs['WfHistory'].getHistoryTask()
           } else {
             this.$message({
               type: 'warning',
@@ -1850,7 +1871,7 @@
         })
       },
       paySureClick () {
-        console.log('交费按钮')
+        // console.log('交费按钮')
         this.$confirm('是否确认交费', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1865,16 +1886,16 @@
         })
       },
       payMakeSure () {
-        console.log('交费结果确认')
+        // console.log('交费结果确认')
         this.loading = true
         let params = {
           payStatus: this.payStatus
         }
-        console.log('交费结果确认提交参数：', this.AppendId)
+        // console.log('交费结果确认提交参数：', this.AppendId)
         let _this = this
         api2.updatePayStatus(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('交费成功')
+            // console.log('交费成功')
             this.$message({
               type: 'success',
               message: res.data.message

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -1192,6 +1192,7 @@ export default {
         }
       }
       return {
+        is_todo: '0',
         backRemark: '',
         dialogVisibleBack: false,
         btnLoading: false,
@@ -1572,6 +1573,9 @@ export default {
       this.AnnualStatus = this.$route.query.AnnualStatus
       this.WorkflowId = this.$route.query.WorkflowId + ''
       this.annualId = this.$route.query.annualId
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       this.Step = parseInt(this.$route.query.Step)
       // this.getDictOptions()
       this.formData.Id = this.serviceId
@@ -1585,7 +1589,7 @@ export default {
     },
     methods: {
       setStorageRemark () {
-        console.log('不锐深状态', this.AnnualStatus)
+        // console.log('不锐深状态', this.AnnualStatus)
         if (this.AnnualStatus === '7') {
           this.shenheForm.AuditorRemark = '入库审批已通过。'
         }
@@ -1755,7 +1759,7 @@ export default {
       },
       // 二级单位分办
       secUnitSeparateAuditClick () {
-        console.log('二级单位分办审批会话框')
+        // console.log('二级单位分办审批会话框')
         this.getFirAuditerByDept()
         this.shenheForm.AnnualId = parseInt(this.annualId)
         this.dialogSecUnitSeparateVisible = true
@@ -1813,7 +1817,7 @@ export default {
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
         // this.shenheForm.SuccessStatus = 1
-        console.log('二级单位分办审批结果确认')
+        // console.log('二级单位分办审批结果确认')
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
           return false
@@ -1825,22 +1829,26 @@ export default {
           SecondAudit: this.fushenauditer,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('二级单位分办审批结果提交参数：', params)
+        // console.log('二级单位分办审批结果提交参数：', params)
         let _this = this
         annualapi.separateAuditEntity(this.shenheForm.AnnualId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              if (_this.$refs['WfHistory']) {
+                _this.$refs['WfHistory'].getHistoryTask()
+              }
+              _this.initDatas()
+              _this.getstatus(this.annualId)
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
             _this.dialogSecUnitSeparateVisible = false
-            if (_this.$refs['WfHistory']) {
-              _this.$refs['WfHistory'].getHistoryTask()
-            }
-            _this.initDatas()
-            _this.getstatus(this.annualId)
-            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -1853,7 +1861,7 @@ export default {
         })
       },
       paySureClick () {
-        console.log('交费按钮')
+        // console.log('交费按钮')
         this.$confirm('是否确认交费', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1868,15 +1876,15 @@ export default {
         })
       },
       payMakeSure () {
-        console.log('交费结果确认')
+        // console.log('交费结果确认')
         this.loading = true
         let params = {
           payStatus: this.payStatus
         }
-        console.log('交费结果确认提交参数：', params)
+        // console.log('交费结果确认提交参数：', params)
         annualapi.updatePayStatus(this.annualId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('交费成功')
+            // console.log('交费成功')
             this.initDatas()
             this.$message({
               type: 'success',
@@ -1906,7 +1914,7 @@ export default {
           }
           annualapi.commonAuditEntity(this.annualId, params, this.$axios).then(res => {
             if (res.data.code === 0) {
-              console.log('审批提交，成功返回')
+              // console.log('审批提交，成功返回')
               this.$message({
                 type: 'success',
                 message: res.data.message
@@ -2610,23 +2618,25 @@ export default {
           SupplierId: this.formData.Id
         }
         this.btnLoading = true
-        console.log(params, '退回参数')
-        console.log(this.shenheForm, 'id')
+        // console.log(params, '退回参数')
+        // console.log(this.shenheForm, 'id')
         annualapi.updateIsStorage(this.AnnualId, params, this.$axios).then(res => {
           this.dialogVisibleBack = false
-
-          if (this.$refs['WfHistory']) {
-            this.$refs['WfHistory'].getHistoryTask()
-          }
           if (res.data.code === 0) {
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              if (this.$refs['WfHistory']) {
+                this.$refs['WfHistory'].getHistoryTask()
+                this.initDatas()
+                this.isAccess()
+                this.getstatus(this.AnnualId)
+              }
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.initDatas()
-            this.isAccess()
-            this.getstatus(this.AnnualId)
-            // this.$router.push('/')
             this.btnLoading = false
           } else {
             this.$message({
@@ -2658,13 +2668,17 @@ export default {
           let _this = this
           annualapi.updateIsStorage(this.$route.query.annualId, params, this.$axios).then(res => {
             if (res.data.code === 0) {
-              this.initDatas()
-              if (_this.$refs['WfHistory']) {
-                _this.$refs['WfHistory'].getHistoryTask()
+              if (this.is_todo === '1') {
+                this.$router.push('/')
+              } else {
+                this.initDatas()
+                if (_this.$refs['WfHistory']) {
+                  _this.$refs['WfHistory'].getHistoryTask()
+                }
+                _this.getstatus(this.$route.query.annualId)
+                _this.isAccess()
               }
-              _this.getstatus(this.$route.query.annualId)
-              _this.isAccess()
-              console.log('已强制刷新历史审批流程')
+              // console.log('已强制刷新历史审批流程')
               this.$message({
                 type: 'success',
                 message: res.data.message
@@ -2687,14 +2701,14 @@ export default {
         })
       },
       commonAuditClick () {
-        console.log('审批公共会话框')
+        // console.log('审批公共会话框')
         this.shenheForm.AnnualId = parseInt(this.annualId)
         this.dialogCommonAuditMakeSureVisible = true
       },
       commonAuditMakeSure () {
-        console.log('审批结果公共提交')
+        // console.log('审批结果公共提交')
         let checkRes = this.commonAuditParamsCheck()
-        console.log(checkRes, '审批结果公共提交')
+        // console.log(checkRes, '审批结果公共提交')
         if (!checkRes) {
           return false
         }
@@ -2703,21 +2717,25 @@ export default {
           result: this.shenheForm.SuccessStatus,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('审批结果提交参数：', params)
+        // console.log('审批结果提交参数：', params)
         let _this = this
         annualapi.commonAuditEntity(this.shenheForm.AnnualId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              if (this.$refs['WfHistory']) {
+                this.$refs['WfHistory'].getHistoryTask()
+              }
+              _this.initDatas()
+              _this.getstatus(this.annualId)
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            if (this.$refs['WfHistory']) {
-              this.$refs['WfHistory'].getHistoryTask()
-            }
-            _this.initDatas()
-            _this.getstatus(this.annualId)
-            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/basicauditoperation.vue

@@ -1067,6 +1067,7 @@
         }
       }
       return {
+        is_todo: '0',
         backRemark: '',
         firOptions: [],
         btnLoading: false,
@@ -1446,11 +1447,13 @@
       if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
-
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       this.AnnualStatus = this.$route.query.AnnualStatus
       this.WorkflowId = this.$route.query.WorkflowId + ''
       this.annualId = this.$route.query.annualId
-      console.log(this.$route.query.annualId, 'ID')
+      // console.log(this.$route.query.annualId, 'ID')
       this.Step = parseInt(this.$route.query.Step)
       // this.getDictOptions()
       this.formData.Id = this.serviceId
@@ -1471,12 +1474,12 @@
             if (Format[1] != null && Format[1] != '' && Format[1] != undefined) {
               let pictureFormat = Format[1]
               if (pictureFormat == 'jpg' || pictureFormat == 'bmp' || pictureFormat == 'png' || pictureFormat == 'gif' || pictureFormat == 'jpeg') {
-                console.log('图片判断结果1')
+                // console.log('图片判断结果1')
                 return false
               }
             }
           }
-          console.log('图片判断结果2')
+          // console.log('图片判断结果2')
           return true
         }
       },
@@ -1524,7 +1527,7 @@
             for (let idx1 in _this.subfileList) {
               _this.subfileList[idx1].OldFileUrlList = _this.subfileList[idx1].OldFileUrl.split('$')
             }
-            console.log('基建1--企业资质重排列表：', _this.subfileList)
+            // console.log('基建1--企业资质重排列表：', _this.subfileList)
           })
           .catch(err => {
             console.error(err)
@@ -2190,23 +2193,26 @@
           SupplierId: this.formData.Id
         }
         this.btnLoading = true
-        console.log(params, '退回参数')
-        console.log(this.$route.query.annualId, 'id')
-        console.log(this.shenheForm, 'id')
+        // console.log(params, '退回参数')
+        // console.log(this.$route.query.annualId, 'id')
+        // console.log(this.shenheForm, 'id')
         annualapi.updateIsStorage(this.$route.query.annualId, params, this.$axios).then(res => {
           this.dialogVisibleBack = false
-          if (this.$refs['WfHistory']) {
-            this.$refs['WfHistory'].getHistoryTask()
-          }
           if (res.data.code === 0) {
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              if (this.$refs['WfHistory']) {
+                this.$refs['WfHistory'].getHistoryTask()
+              }
+              this.initDatas()
+              this.isAccess()
+              this.getstatus(this.AnnualId)
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.initDatas()
-            this.isAccess()
-            this.getstatus(this.AnnualId)
-            // this.$router.push('/')
             this.btnLoading = false
           } else {
             this.$message({
@@ -2236,16 +2242,20 @@
             SupplierId: this.formData.Id
           }
           let _this = this
-          console.log(this.$route.query.annualId, 'QWE')
+          // console.log(this.$route.query.annualId, 'QWE')
           annualapi.updateIsStorage(this.$route.query.annualId, params, this.$axios).then(res => {
             if (res.data.code === 0) {
-              this.initDatas()
-              if (_this.$refs['WfHistory']) {
-                _this.$refs['WfHistory'].getHistoryTask()
+              if (this.is_todo === '1') {
+                _this.$router.push('/')
+              } else {
+                this.initDatas()
+                if (_this.$refs['WfHistory']) {
+                  _this.$refs['WfHistory'].getHistoryTask()
+                }
+                _this.getstatus(this.$route.query.annualId)
+                _this.isAccess()
+                // console.log('已强制刷新历史审批流程')
               }
-              _this.getstatus(this.$route.query.annualId)
-              _this.isAccess()
-              console.log('已强制刷新历史审批流程')
               this.$message({
                 type: 'success',
                 message: res.data.message
@@ -2268,14 +2278,14 @@
         })
       },
       commonAuditClick () {
-        console.log('审批公共会话框')
+        // console.log('审批公共会话框')
         this.shenheForm.AnnualId = parseInt(this.annualId)
         this.dialogCommonAuditMakeSureVisible = true
       },
       commonAuditMakeSure () {
-        console.log('审批结果公共提交')
+        // console.log('审批结果公共提交')
         let checkRes = this.commonAuditParamsCheck()
-        console.log(checkRes, '审批结果公共提交')
+        // console.log(checkRes, '审批结果公共提交')
         if (!checkRes) {
           return false
         }
@@ -2284,21 +2294,25 @@
           result: this.shenheForm.SuccessStatus,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('审批结果提交参数：', params)
+        // console.log('审批结果提交参数：', params)
         let _this = this
         annualapi.commonAuditEntity(this.shenheForm.AnnualId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              _this.$router.push('/')
+            } else {
+              if (_this.$refs['WfHistory']) {
+                _this.$refs['WfHistory'].getHistoryTask()
+              }
+              _this.initDatas()
+              _this.getstatus(this.annualId)
+              _this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            if (_this.$refs['WfHistory']) {
-              _this.$refs['WfHistory'].getHistoryTask()
-            }
-            _this.initDatas()
-            _this.getstatus(this.annualId)
-            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -2334,7 +2348,7 @@
         return true
       },
       paySureClick () {
-        console.log('交费按钮')
+        // console.log('交费按钮')
         this.$confirm('是否确认交费', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -2349,15 +2363,15 @@
         })
       },
       payMakeSure () {
-        console.log('交费结果确认')
+        // console.log('交费结果确认')
         this.loading = true
         let params = {
           payStatus: this.payStatus
         }
-        console.log('交费结果确认提交参数：', params)
+        // console.log('交费结果确认提交参数：', params)
         annualapi.updatePayStatus(this.annualId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('交费成功')
+            // console.log('交费成功')
             this.initDatas()
             this.$message({
               type: 'success',
@@ -2387,7 +2401,7 @@
           }
           annualapi.commonAuditEntity(this.annualId, params, this.$axios).then(res => {
             if (res.data.code === 0) {
-              console.log('审批提交，成功返回')
+              // console.log('审批提交，成功返回')
               this.$message({
                 type: 'success',
                 message: res.data.message
@@ -2412,7 +2426,7 @@
       },
       // 二级单位分办
       secUnitSeparateAuditClick () {
-        console.log('二级单位分办审批会话框')
+        // console.log('二级单位分办审批会话框')
         this.getFirAuditerByDept()
         this.saveinfochange(1)
         this.shenheForm.AnnualId = parseInt(this.annualId)
@@ -2469,7 +2483,7 @@
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
-        console.log('二级单位分办审批结果确认')
+        // console.log('二级单位分办审批结果确认')
         // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
@@ -2482,21 +2496,25 @@
           SecondAudit: this.fushenauditer,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('二级单位分办审批结果提交参数：', params)
+        // console.log('二级单位分办审批结果提交参数：', params)
         let _this = this
         annualapi.separateAuditEntity(this.shenheForm.AnnualId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              _this.$router.push('/')
+            } else {
+              _this.initDatas()
+              _this.getstatus(this.annualId)
+              _this.isAccess()
+              if (_this.$refs['WfHistory']) {
+                _this.$refs['WfHistory'].getHistoryTask()
+              }
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            _this.initDatas()
-            _this.getstatus(this.annualId)
-            _this.isAccess()
-            if (_this.$refs['WfHistory']) {
-              _this.$refs['WfHistory'].getHistoryTask()
-            }
             _this.dialogSecUnitSeparateVisible = false
           } else {
             this.$message({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/techoperation.vue

@@ -993,6 +993,7 @@
         }
       }
       return {
+        is_todo: '0',
         backRemark: '',
         dialogVisibleBack: false,
         btnLoading: false,
@@ -1454,7 +1455,9 @@
       if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
-
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       this.AnnualStatus = this.$route.query.AnnualStatus
       this.WorkflowId = this.$route.query.WorkflowId + ''
       this.annualId = this.$route.query.annualId
@@ -1519,7 +1522,7 @@
             for (let idx1 in _this.subfileList) {
               _this.subfileList[idx1].OldFileUrlList = _this.subfileList[idx1].OldFileUrl.split('$')
             }
-            console.log('1520企业资质重排列表：', _this.subfileList)
+            // console.log('1520企业资质重排列表：', _this.subfileList)
           })
           .catch(err => {
             console.error(err)
@@ -1551,7 +1554,7 @@
       },
       // 二级单位分办
       secUnitSeparateAuditClick () {
-        console.log('二级单位分办审批会话框')
+        // console.log('二级单位分办审批会话框')
         this.getFirAuditerByDept()
         this.shenheForm.AnnualId = parseInt(this.annualId)
         this.dialogSecUnitSeparateVisible = true
@@ -1608,7 +1611,7 @@
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
         // this.shenheForm.SuccessStatus = 1
-        console.log('二级单位分办审批结果确认')
+        // console.log('二级单位分办审批结果确认')
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
           return false
@@ -1620,18 +1623,22 @@
           SecondAudit: this.fushenauditer,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('二级单位分办审批结果提交参数：', params)
+        // console.log('二级单位分办审批结果提交参数：', params)
         annualapi.separateAuditEntity(this.shenheForm.AnnualId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            // console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+              this.getstatus(this.shenheForm.AnnualId)
+              this.isAccess()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
             this.dialogSecUnitSeparateVisible = false
-            this.initDatas()
-            this.getstatus(this.shenheForm.AnnualId)
-            this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -2330,8 +2337,8 @@
           SupplierId: this.formData.Id
         }
         this.btnLoading = true
-        console.log(params, '退回参数')
-        console.log(this.shenheForm, 'id')
+        // console.log(params, '退回参数')
+        // console.log(this.shenheForm, 'id')
         annualapi.updateIsStorage(this.AnnualId, params, this.$axios).then(res => {
           this.dialogVisibleBack = false
 
@@ -2339,21 +2346,25 @@
             this.$refs['WfHistory'].getHistoryTask()
           }
           if (res.data.code === 0) {
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+              this.isAccess()
+              this.getstatus(this.AnnualId)
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.initDatas()
-            this.isAccess()
-            this.getstatus(this.AnnualId)
-            // this.$router.push('/')
+            this.btnLoading = false
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
+            this.btnLoading = false
           }
-          this.btnLoading = false
         }).catch(err => {
           this.dialogVisibleBack = false
           this.btnLoading = false
@@ -2377,25 +2388,30 @@
           let _this = this
           annualapi.updateIsStorage(this.$route.query.annualId, params, this.$axios).then(res => {
             if (res.data.code === 0) {
-              this.initDatas()
-              if (_this.$refs['WfHistory']) {
-                _this.$refs['WfHistory'].getHistoryTask()
+              if (this.is_todo === '1') {
+                this.$router.push('/')
+              } else {
+                this.initDatas()
+                if (_this.$refs['WfHistory']) {
+                  _this.$refs['WfHistory'].getHistoryTask()
+                }
+                _this.getstatus(this.$route.query.annualId)
+                _this.isAccess()
+                // console.log('已强制刷新历史审批流程')
               }
-              _this.getstatus(this.$route.query.annualId)
-              _this.isAccess()
-              console.log('已强制刷新历史审批流程')
               this.$message({
                 type: 'success',
                 message: res.data.message
               })
+              this.btnLoading = false
             } else {
               this.$message({
                 type: 'warning',
                 message: res.data.message
               })
+              this.btnLoading = false
             }
           })
-          this.btnLoading = false
         }).catch(() => {
           this.$message({
             type: 'info',
@@ -2405,14 +2421,14 @@
         })
       },
       commonAuditClick () {
-        console.log('审批公共会话框')
+        // console.log('审批公共会话框')
         this.shenheForm.AnnualId = parseInt(this.annualId)
         this.dialogCommonAuditMakeSureVisible = true
       },
       commonAuditMakeSure () {
-        console.log('审批结果公共提交')
+        // console.log('审批结果公共提交')
         let checkRes = this.commonAuditParamsCheck()
-        console.log(checkRes, '审批结果公共提交')
+        // console.log(checkRes, '审批结果公共提交')
         if (!checkRes) {
           return false
         }
@@ -2421,17 +2437,21 @@
           result: this.shenheForm.SuccessStatus,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('审批结果提交参数：', params)
+        // console.log('审批结果提交参数：', params)
         annualapi.commonAuditEntity(this.shenheForm.AnnualId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+              this.getstatus(this.shenheForm.AnnualId)
+              this.isAccess()
+            }
+            // console.log('审批提交，成功返回')
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.initDatas()
-            this.getstatus(this.shenheForm.AnnualId)
-            this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -2467,7 +2487,7 @@
         return true
       },
       paySureClick () {
-        console.log('交费按钮')
+        // console.log('交费按钮')
         this.$confirm('是否确认交费', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -2482,15 +2502,15 @@
         })
       },
       payMakeSure () {
-        console.log('交费结果确认')
+        // console.log('交费结果确认')
         this.loading = true
         let params = {
           payStatus: this.payStatus
         }
-        console.log('交费结果确认提交参数：', params)
+        // console.log('交费结果确认提交参数：', params)
         annualapi.updatePayStatus(this.annualId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('交费成功')
+            // console.log('交费成功')
             this.initDatas()
             this.$message({
               type: 'success',
@@ -2520,7 +2540,7 @@
           }
           annualapi.commonAuditEntity(this.annualId, params, this.$axios).then(res => {
             if (res.data.code === 0) {
-              console.log('审批提交，成功返回')
+              // console.log('审批提交，成功返回')
               this.$message({
                 type: 'success',
                 message: res.data.message

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -540,8 +540,8 @@
                 this.addLoading = false
                 this.$confirm(res.data.message)
                   .then(_ => {
-                    console.log('年审审批不到期不允许添加2222')
-                    // this.addannualdirect()
+                    console.log('企业发起 年审审批不到期不允许添加2222')
+                    this.addannualdirect()
                   })
                   .catch(_ => {})
               } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -540,11 +540,11 @@
                 })
                 this.addLoading = false
               } else if (res.data.code === -3) {
-                console.log('年审审批不到期不允许添加2222')
                 this.addLoading = false
                 this.$confirm(res.data.message)
                   .then(_ => {
-                    // this.addannualdirect()
+                    console.log('企业发起 年审审批不到期不允许添加2222')
+                    this.addannualdirect()
                   })
                   .catch(_ => {})
               } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -470,7 +470,7 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
               } else if (res.data.code === -3) {
                 this.$confirm(res.data.message)
                   .then(_ => {
-                    console.log('年审审批不到期不允许添加2222')
+                    console.log('二级单位发起 年审审批不到期不允许添加2222')
                     // this.addannualdirect()
                   })
                   .catch(_ => {})
@@ -543,7 +543,8 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
                 this.addLoading = false
                 this.$confirm(res.data.message)
                   .then(_ => {
-                    // this.addannualdirect()
+                    console.log('企业发起 年审审批不到期不允许添加2222')
+                    this.addannualdirect()
                   })
                   .catch(_ => {})
               } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -1227,6 +1227,7 @@
     },
     data () {
       return {
+        is_todo: '0',
         equipmentList: [], // 企业主要设备
         performanceList: [], // 近三年主要业绩
         patentList: [], // 专利及专有技术
@@ -1578,6 +1579,9 @@
       this.serviceId = this.$route.params.opera
       this.InfoStatus = this.$route.query.InfoStatus
       this.infoId = this.serviceId
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       this.getAccessedType()
       this.initDatas()
       this.auditget()
@@ -1757,13 +1761,16 @@
         api.separateAuditEntity(parseInt(this.infoId), params, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.dialogSecUnitSeparateVisible = false
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.$router.push('/')
           } else {
             this.$message({
               type: 'warning',
@@ -2380,13 +2387,16 @@
         api.commonAuditEntity(parseInt(this.infoId), params, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.dialogCommonAuditMakeSureVisible = false
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.$router.push('/')
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/_opera/incomeedit.vue

@@ -365,6 +365,7 @@
       }
 
       return {
+        is_todo: '0',
         formDataType: '',
         firOptions: [],
         showAddMarketDialog: false,
@@ -486,6 +487,9 @@
       }
     },
     created () {
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       this.formData.Type = this.$route.query.type
       if (this.$route.query.type == 6) {
         this.formDataType = '外部市场'
@@ -537,7 +541,11 @@
         let params = this.shenheForm
         api.auditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.dialogMakeSure = false
             this.$message({
               type: 'success',

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

@@ -1057,7 +1057,7 @@ export default {
           if (this.orgauditOptions == null || this.orgauditOptions.length === 0) {
             this.$message({
               type: 'warning',
-              message: '该单位没有分办人员！'
+              message: '该单位没有分办人员！1'
             })
             return false
           }
@@ -1619,7 +1619,7 @@ export default {
 
     // 保存信息
     saveEntity (val) {
-      console.log('2221111')
+      // console.log('2221111')
       let valid1 = false
       let valid2 = false
       this.$refs['GoodsInfo'].$refs['EntityForm'].validate((valid) => {
@@ -1675,9 +1675,9 @@ export default {
         if (this.authUser.Profile.IsCompanyUser === 1) {
           isCompanyUser = '1'
         }
-        console.log(isCompanyUser, 'isCompanyUser')
+        // console.log(isCompanyUser, 'isCompanyUser')
         api.signupCommercialNo(this.formData.CommercialNo, this.formData.Id, isCompanyUser, this.$axios).then(res => {
-          console.log(res, 'Item')
+          // console.log(res, 'Item')
           if (res.data.item) {
             this.$message({
               type: 'warning',
@@ -1991,7 +1991,7 @@ export default {
         CheckList: _this.goodsList
       })
       subApi.checkSubFile(params, this.$axios).then(res => {
-        console.log(res.data, 888)
+        // console.log(res.data, 888)
         if (res.data) {
           if (res.data[0].Code === '0') {
             this.$notify({
@@ -2212,7 +2212,7 @@ export default {
       if (this.orgauditOptions == null || this.orgauditOptions.length === 0) {
         this.$message({
           type: 'warning',
-          message: '该单位没有分办人员！'
+          message: '该单位没有分办人员！2'
         })
         return
       }
@@ -2220,7 +2220,7 @@ export default {
       this.auditform.UnitId = this.UnitOrg
       this.auditform.CertId = this.certId
       this.loading = true
-      console.log('企业用户提交参数', this.auditform)
+      // console.log('企业用户提交参数', this.auditform)
       apiCert.companyAuditEntity(this.certId, this.auditform, this.$axios)
         .then(res => {
           if (res.data.code === 0) {
@@ -2250,7 +2250,7 @@ export default {
       if (this.orgauditOptions == null || this.orgauditOptions.length === 0) {
         this.$message({
           type: 'warning',
-          message: '该单位没有分办人员！'
+          message: '该单位没有分办人员！3'
         })
         return
       }

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

@@ -477,6 +477,7 @@
 
     data () {
       return {
+        is_todo: '0',
         needPayAmount: 0,
         dialogVisibleCom: false,
         UnitOrgOptions: [],
@@ -655,6 +656,9 @@
       this.serviceId = this.$route.params.opera + ''
       this.certId = this.$route.query.certid + ''
       this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       if (this.serviceId !== 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId
       } else {
@@ -769,7 +773,6 @@
         this.auditform.UnitId = this.UnitOrg
         this.auditform.CertId = this.certId
         this.loading = true
-        console.log('企业用户提交参数', this.auditform)
         apiCert.companyAuditEntity(this.certId, this.auditform, this.$axios)
           .then(res => {
             if (res.data.code === 0) {
@@ -978,7 +981,6 @@
       },
       auditOrgChange (val) {
         let auditstepcode = ''
-        console.log('基建类申请状态', this.formData.Status)
         if (this.formData.Status === '1') {
           auditstepcode = 'SECOND_TRIAL'
         } else if (this.formData.Status === '3') {
@@ -994,9 +996,7 @@
         // console.log(deptid)
         // this.auditerOptions = []
         // this.auditer = ''
-        console.log('请求复审人员')
         api.getAuditerByDept(this.authUser.Profile.DepartmentId, auditstepcode, this.$axios).then(res => {
-          console.log('复审人员返回结果', res.data)
           this.secauditerOptions = res.data.item
         }).catch(err => {
           console.error(err)
@@ -1108,12 +1108,10 @@
         })
       },
       getFirAuditerByDept () {
-        console.log(this.authUser.Profile)
         let deptid = this.authUser.Profile.DepartmentId
         this.userOptions = []
         let auditstepcode = 'FIRST_TRIAL' // 初审人
         api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
-          console.log(res)
           this.firOptions = res.data.item
         }).catch(err => {
           console.error(err)
@@ -1138,9 +1136,7 @@
 
       // 业务处室接收——分办 ⬇
       businessOfficeSeparateAuditClick (val) {
-        console.log('业务处室接收————分办')
         this.auditOrgChange()
-        console.log('请求部门结束')
         this.dialogBusinessOfficeSeparateAuditVisible = true
       },
       businessOfficeSeparateAuditMakeSure () {
@@ -1173,11 +1169,13 @@
           ProfessionalAudit: this.ProfessionalAudit,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('业务处室专业审批, 提交参数: ', params)
         apiCert.businessOfficeSeparateAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1195,14 +1193,11 @@
         })
       },
       commonAuditClick () {
-        console.log('审批公共会话框')
         this.dialogCommonAuditMakeSureVisible = true
         this.radioChange()
       },
       commonAuditMakeSure () {
-        console.log('审批结果公共提交')
         let checkRes = this.commonAuditParamsCheck()
-        console.log(checkRes, '审批结果公共提交')
         if (!checkRes) {
           return false
         }
@@ -1211,11 +1206,13 @@
           result: this.shenheForm.SuccessStatus,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('审批结果提交参数：', params)
         apiCert.commonAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1268,12 +1265,10 @@
       },
       // 集中评审按钮
       concentrateAuditClick () {
-        console.log('集中评审按钮')
         this.dialogConcentrateAuditVisible = true
         this.radioChange()
       },
       concentrateAuditEntityMakeSure () {
-        console.log('集中评审提交审核结果')
         let checkRes = this.concentrateAuditParamsCheck()
         if (!checkRes) {
           return false
@@ -1285,8 +1280,11 @@
         }
         apiCert.commonAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1304,7 +1302,6 @@
         })
       },
       concentrateAuditParamsCheck () {
-        console.log('集中评审提交参数检查')
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
@@ -1326,7 +1323,6 @@
       },
       // 二级单位分办审批会话框 ⬇
       secUnitSeparateAuditClick (val) {
-        console.log('二级单位分办审批会话框')
         this.auditOrgChange()
         this.btnstatus = val
         this.getFirAuditerByDept()
@@ -1335,7 +1331,6 @@
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
-        console.log('二级单位分办审批结果确认')
         // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
@@ -1349,11 +1344,13 @@
           ThirdAudit: this.selectDept,
           AuditRemark: this.auditform.AuditRemark
         }
-        console.log('二级单位分办审批结果提交参数：', params)
         apiCert.separateAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1433,7 +1430,6 @@
         this.dialogAllocation = true
       },
       paySureClick () {
-        console.log('交费按钮')
         this.$confirm('是否确认交费', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1448,15 +1444,12 @@
         })
       },
       payMakeSure () {
-        console.log('交费结果确认')
         this.loading = true
         let params = {
           payStatus: this.payStatus
         }
-        console.log('交费结果确认提交参数：', params)
         apiCert.updatePayStatus(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('交费成功')
             this.initDatas()
             this.$message({
               type: 'success',

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

@@ -413,6 +413,7 @@
 
     data () {
       return {
+        is_todo: '0',
         needPayAmount: 0,
         firOptions: [],
         loading: false,
@@ -588,6 +589,9 @@
       this.serviceId = this.$route.params.opera + ''
       this.certId = this.$route.query.certid + ''
       this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       if (this.serviceId !== 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId
       } else {
@@ -631,7 +635,6 @@
           }
         } else {
           if (this.shenheForm.SuccessStatus === 1) {
-            console.log('初审')
             this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容）'
           } else {
             this.textplaceholder = '退回意见不能少于2个字'
@@ -973,10 +976,8 @@
         })
       },
       AuditEntity (val) {
-        console.log('专业审核01')
         this.auditOrgChange()
         this.btnstatus = val
-        console.log('专业审核01状态', this.formData.Status)
         if (this.formData.Status === '3') {
           this.dialogBusinessOfficeSeparateAuditVisible = true
         } else if (this.formData.Status === '1') {
@@ -986,20 +987,16 @@
           this.changeOrgUnit(this.selectDept)
           this.dialogSecUnitSeparateVisible = true
         } else {
-          console.log('专业审核05')
           this.dialogMakeSure = true
           this.radioChange()
         }
       },
       commonAuditClick () {
-        console.log('审批公共会话框')
         this.dialogCommonAuditMakeSureVisible = true
         this.radioChange()
       },
       commonAuditMakeSure () {
-        console.log('审批结果公共提交')
         let checkRes = this.commonAuditParamsCheck()
-        console.log(checkRes, '审批结果公共提交')
         if (!checkRes) {
           return false
         }
@@ -1008,11 +1005,13 @@
           result: this.shenheForm.SuccessStatus,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('审批结果提交参数：', params)
         apiCert.commonAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1065,7 +1064,6 @@
       },
       // 二级单位分办审批会话框 ⬇
       secUnitSeparateAuditClick (val) {
-        console.log('二级单位分办审批会话框')
         this.auditOrgChange()
         this.btnstatus = val
         this.getFirAuditerByDept()
@@ -1074,7 +1072,6 @@
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
-        console.log('二级单位分办审批结果确认')
         // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
@@ -1088,11 +1085,13 @@
           ThirdAudit: this.selectDept,
           AuditRemark: this.auditform.AuditRemark
         }
-        console.log('二级单位分办审批结果提交参数：', params)
         apiCert.separateAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1170,9 +1169,7 @@
       },
       // 业务处室接收——分办 ⬇
       businessOfficeSeparateAuditClick (val) {
-        console.log('业务处室接收————分办')
         this.auditOrgChange()
-        console.log('请求部门结束')
         this.dialogBusinessOfficeSeparateAuditVisible = true
       },
       businessOfficeSeparateAuditMakeSure () {
@@ -1205,11 +1202,13 @@
           ProfessionalAudit: this.ProfessionalAudit,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('业务处室专业审批, 提交参数: ', params)
         apiCert.businessOfficeSeparateAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1228,12 +1227,10 @@
       },
       // 集中评审按钮
       concentrateAuditClick () {
-        console.log('集中评审按钮')
         this.dialogConcentrateAuditVisible = true
         this.radioChange()
       },
       concentrateAuditEntityMakeSure () {
-        console.log('集中评审提交审核结果')
         let checkRes = this.concentrateAuditParamsCheck()
         if (!checkRes) {
           return false
@@ -1245,8 +1242,11 @@
         }
         apiCert.commonAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1264,7 +1264,6 @@
         })
       },
       concentrateAuditParamsCheck () {
-        console.log('集中评审提交参数检查')
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
@@ -1285,7 +1284,6 @@
         return true
       },
       paySureClick () {
-        console.log('交费按钮')
         this.$confirm('是否确认交费', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1300,15 +1298,12 @@
         })
       },
       payMakeSure () {
-        console.log('交费结果确认')
         this.loading = true
         let params = {
           payStatus: this.payStatus
         }
-        console.log('交费结果确认提交参数：', this.certId)
         apiCert.updatePayStatus(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('交费成功')
             this.initDatas()
             this.$message({
               type: 'success',

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

@@ -435,6 +435,7 @@
 
     data () {
       return {
+        is_todo: '0',
         needPayAmount: 0,
         firOptions: [],
         loading: false,
@@ -607,6 +608,9 @@
       this.serviceId = this.$route.params.opera + ''
       this.certId = this.$route.query.certid + ''
       this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       if (this.serviceId !== 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId
       } else {
@@ -873,7 +877,6 @@
         } else {
           return
         }
-        console.log(auditstepcode, 'auditstepcode')
         // let deplist = []
         // deplist = this.companyid.split(",")
         // let deptid = deplist[deplist.length - 1]
@@ -992,13 +995,10 @@
         })
       },
       getFirAuditerByDept () {
-        console.log(this.authUser.Profile)
         let deptid = this.authUser.Profile.DepartmentId
-        console.log(deptid, 'deptid')
         this.userOptions = []
         let auditstepcode = 'FIRST_TRIAL' // 初审人
         api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
-          console.log(res)
           this.firOptions = res.data.item
         }).catch(err => {
           console.error(err)
@@ -1022,17 +1022,14 @@
 
       // 二级单位分办审批会话框 ⬇
       secUnitSeparateAuditClick (val) {
-        console.log('二级单位分办审批会话框')
         this.auditOrgChange()
         this.btnstatus = val
         this.getFirAuditerByDept()
-        console.log(this.selectDept, 'selectDept')
         this.changeOrgUnit(this.selectDept)
         this.dialogSecUnitSeparateVisible = true
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
-        console.log('二级单位分办审批结果确认')
         // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
@@ -1046,11 +1043,13 @@
           ThirdAudit: this.selectDept,
           AuditRemark: this.auditform.AuditRemark
         }
-        console.log('二级单位分办审批结果提交参数：', params)
         apiCert.separateAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1127,14 +1126,11 @@
         return true
       },
       commonAuditClick () {
-        console.log('审批公共会话框')
         this.dialogCommonAuditMakeSureVisible = true
         this.radioChange()
       },
       commonAuditMakeSure () {
-        console.log('审批结果公共提交')
         let checkRes = this.commonAuditParamsCheck()
-        console.log(checkRes, '审批结果公共提交')
         if (!checkRes) {
           return false
         }
@@ -1143,11 +1139,13 @@
           result: this.shenheForm.SuccessStatus,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('审批结果提交参数：', params)
         apiCert.commonAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1200,9 +1198,7 @@
       },
       // 业务处室分办点击
       businessOfficeSeparateAuditClick (val) {
-        console.log('业务处室接收————分办')
         this.auditOrgChange()
-        console.log('请求部门结束')
         this.dialogBusinessOfficeSeparateAuditVisible = true
       },
       // 业务处室分办提交
@@ -1236,11 +1232,13 @@
           ProfessionalAudit: this.ProfessionalAudit,
           AuditRemark: this.shenheForm.AuditorRemark
         }
-        console.log('业务处室专业审批, 提交参数: ', params)
         apiCert.businessOfficeSeparateAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1259,12 +1257,10 @@
       },
       // 集中评审按钮
       concentrateAuditClick () {
-        console.log('集中评审按钮')
         this.dialogConcentrateAuditVisible = true
         this.radioChange()
       },
       concentrateAuditEntityMakeSure () {
-        console.log('集中评审提交审核结果')
         let checkRes = this.concentrateAuditParamsCheck()
         if (!checkRes) {
           return false
@@ -1276,8 +1272,11 @@
         }
         apiCert.commonAuditEntity(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('审批提交，成功返回')
-            this.initDatas()
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            } else {
+              this.initDatas()
+            }
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1295,7 +1294,6 @@
         })
       },
       concentrateAuditParamsCheck () {
-        console.log('集中评审提交参数检查')
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
@@ -1317,7 +1315,6 @@
       },
       // 确认交费点击
       paySureClick () {
-        console.log('交费按钮')
         this.$confirm('是否确认交费', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1332,15 +1329,12 @@
         })
       },
       payMakeSure () {
-        console.log('交费结果确认')
         this.loading = true
         let params = {
           payStatus: this.payStatus
         }
-        console.log('交费结果确认提交参数：', params)
         apiCert.updatePayStatus(this.certId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log('交费成功')
             this.initDatas()
             this.$message({
               type: 'success',

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

@@ -277,8 +277,6 @@
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
-  import apiCertAppend from '@/pages/oilsupplier/supplierappend'
-  import apiAnnual from '@/pages/oilsupplier/annualaudit'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
@@ -321,6 +319,7 @@
 
     data () {
       return {
+        is_todo: '0',
         auditBtn: false,
         auditstepcode: '',
         btnLoading: false,
@@ -484,6 +483,9 @@
       if (this.$route.query.applytype) {
         this.applyType = this.$route.query.applytype + ''
       }
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       if (this.serviceId !== 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId
       } else {
@@ -512,7 +514,6 @@
           BackRemark: this.backRemark,
           SupplierId: this.formData.Id
         }
-        console.log('入库审批驳回参数:', params)
         this.btnLoading = true
         apiCert.updateIsStorage(this.certId, params, this.$axios).then(res => {
           this.dialogVisibleBack = false
@@ -520,14 +521,15 @@
           if (this.$refs['WfHistory']) {
             this.$refs['WfHistory'].getHistoryTask()
           }
-          console.log('已强制刷新历史审批流程')
           if (res.data.code === 0) {
             this.$message({
               type: 'success',
               message: res.data.message
             })
             this.btnLoading = false
-            // this.$router.push('/') // TODO
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            }
           } else {
             this.$message({
               type: 'warning',
@@ -596,14 +598,15 @@
             if (this.$refs['WfHistory']) {
               this.$refs['WfHistory'].getHistoryTask()
             }
-            console.log('已强制刷新历史审批流程')
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
                 message: res.data.message
               })
               this.btnLoading = false
-              // this.$router.push('/') // TODO 是否跳回首页
+              if (this.is_todo === '1') {
+                this.$router.push('/')
+              }
             } else {
               this.$message({
                 type: 'warning',

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

@@ -278,8 +278,6 @@
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
-  import apiCertAppend from '@/pages/oilsupplier/supplierappend'
-  import apiAnnual from '@/pages/oilsupplier/annualaudit'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
@@ -323,6 +321,7 @@
 
     data () {
       return {
+        is_todo: '0',
         auditBtn: false,
         auditstepcode: '',
         btnLoading: false,
@@ -484,9 +483,11 @@
         this.certId = this.$route.query.certid + ''
       }
       if (this.$route.query.applytype) {
-        console.log('申请类型', this.$route.query.applytype)
         this.applyType = this.$route.query.applytype + ''
       }
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       if (this.serviceId !== 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId
       } else {
@@ -529,7 +530,9 @@
               message: res.data.message
             })
             this.btnLoading = false
-            // this.$router.push('/')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            }
           } else {
             this.$message({
               type: 'warning',
@@ -575,7 +578,6 @@
         })
       },
       confirm () {
-        console.log('物资类表单', this.formData)
         if (this.formData.WZAccessCardNo === '') {
           this.$message({
             type: 'warning',
@@ -602,12 +604,14 @@
               if (_this.$refs['WfHistory']) {
                 _this.$refs['WfHistory'].getHistoryTask()
               }
-              console.log('已强制刷新历史审批流程')
               this.$message({
                 type: 'success',
                 message: res.data.message
               })
               this.btnLoading = false
+              if (this.is_todo === '1') {
+                this.$router.push('/')
+              }
             } else {
               this.$message({
                 type: 'warning',
@@ -743,7 +747,6 @@
             if (this.formData.Status != 0) {
               this.add_flat = false
             }
-            console.log(this.add_flat, '添加标示')
             this.$refs['GoodsInfo'].CityAry = []
             this.$refs['GoodsInfo'].CityAry.push(this.formData.Province)
             this.$refs['GoodsInfo'].CityAry.push(this.formData.City)
@@ -760,7 +763,6 @@
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
-            console.log('流程审批的参数', this.entrydetail)
             this.backhistroy.certId = this.certId
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             if (this.certId && this.formDataCert.WorkflowId) {
@@ -825,7 +827,7 @@
 
       auditOrgChang (val) {
         let deptid = val[val.length - 1]
-        console.log(deptid)
+        // console.log(deptid)
         this.auditerOption = []
         this.auditer = ''
         let auditstepcode = 'FIRST_TRIAL'

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

@@ -286,8 +286,6 @@
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
-  import apiCertAppend from '@/pages/oilsupplier/supplierappend'
-  import apiAnnual from '@/pages/oilsupplier/annualaudit'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
@@ -330,6 +328,7 @@
 
     data () {
       return {
+        is_todo: '0', // 是否是待办任务列表跳转过来的，默认0 否
         auditBtn: false,
         auditstepcode: '',
         btnLoading: false,
@@ -492,6 +491,9 @@
       if (this.$route.query.applytype) {
         this.applyType = this.$route.query.applytype + ''
       }
+      if (this.$route.query.is_todo == 1) {
+        this.is_todo = '1'
+      }
       if (this.serviceId !== 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId
       } else {
@@ -528,14 +530,15 @@
           if (this.$refs['WfHistory']) {
             this.$refs['WfHistory'].getHistoryTask()
           }
-          console.log('已强制刷新历史审批流程')
           if (res.data.code === 0) {
             this.$message({
               type: 'success',
               message: res.data.message
             })
             this.btnLoading = false
-            // this.$router.push('/')
+            if (this.is_todo === '1') {
+              this.$router.push('/')
+            }
           } else {
             this.$message({
               type: 'warning',
@@ -605,13 +608,14 @@
               if (this.$refs['WfHistory']) {
                 this.$refs['WfHistory'].getHistoryTask()
               }
-              console.log('已强制刷新历史审批流程')
               this.$message({
                 type: 'success',
                 message: res.data.message
               })
               this.btnLoading = false
-              // this.$router.push('/') //TODO
+              if (this.is_todo === '1') {
+                this.$router.push('/')
+              }
             } else {
               this.$message({
                 type: 'warning',