性能验证修复6717

src/views/business/performNew/experimental.vue

@@ -603,7 +603,7 @@ export default {
         data.liuChengId = this.instid
         data.liuChengShenPiShi = this.$common.getDateNow(19)
       }else if(data.shiFouGuoShen === '已退回'){
-        data.shiFouGuoShen = '已编制'
+        data.shiFouGuoShen = '已'+this.currentName 
       }
       agree({ 
         opinion: '同意',
@@ -958,7 +958,8 @@ export default {
     showToolBarsBtn(key) {
       const status = (this.form && this.form.shiFouGuoShen) || '已暂存'
       // 已暂存状态显示流程图,导出pdf,关闭,保存,提交,终止按钮
-      if (status === '已暂存' || status === '已退回') {
+      
+      if (status === '已暂存' || (status === '已退回' && this.currentName == '编制')) {
         this.internalReadonly = false
         return !['flowChart', 'approvalHistory','pdf', 'cancel', 'save','doEndProcess', 'submit'].includes(key)
       }
@@ -980,7 +981,7 @@ export default {
         this.internalReadonly = true
         return !['flowChart','approvalHistory', 'pdf', 'cancel'].includes(key)
       }
-      
+      this.internalReadonly = true
       // 默认显示流程图,导出pdf,关闭,保存,提交按钮
       return !['flowChart','approvalHistory', 'pdf', 'cancel', 'save', 'submit'].includes(key)
     },

src/views/business/performNew/experimentalView.vue

@@ -242,6 +242,7 @@ export default {
       formId: this.params.recordId,
       instid:'',
       taskId:'',
+      taskStatus:'',
       form: {
         xingNengZhiBia: '',
         fangAnLeiXing: '',
@@ -380,6 +381,7 @@ export default {
         key: 'xnyzcxlcid',
         params: [instid]
       });
+      this.taskStatus = taskres.variables.data[0]?.NAME_ || '';
       return taskres.variables.data[0]?.ID_ || '';
     },
     getpdf() {
@@ -646,7 +648,7 @@ export default {
         data.liuChengId = this.instid
         data.liuChengShenPiShi = this.$common.getDateNow(19)
       }else if(data.shiFouGuoShen === '已退回'){
-        data.shiFouGuoShen = '已编制'
+        data.shiFouGuoShen = '已'+this.taskStatus
       }
       agree({ 
         opinion: '同意',
@@ -944,8 +946,8 @@ export default {
       }
       
       const status = (this.form && this.form.shiFouGuoShen) || '已暂存'
-      
-      if (status === '已暂存' || status === '已退回') {
+      if (status === '已暂存' || (status === '已退回' && this.taskStatus == '编制')) {
+        this.internalReadonly = false
         return !['flowChart','approvalHistory', 'pdf', 'cancel', 'save', 'submit'].includes(key)
       }
       
@@ -964,7 +966,7 @@ export default {
       if (status === '已完成' || status === '已终止') {
         return !['flowChart','approvalHistory', 'pdf', 'cancel'].includes(key)
       }
-      
+      this.internalReadonly = true
       return !['flowChart', 'pdf', 'cancel', 'save', 'submit'].includes(key)
     },
     getSubmitLabel() {