通用流程节点提交新增“可跳过下一节点”（大中型评估申报非一般也不不过分管副总审核）

src/components/workflowBoard.vue

@@ -171,6 +171,7 @@ export default {
       commit.ifFeedback = this.nodeBusinessInfo.ifFeedback;
       commit.ifProductionFund = this.nodeBusinessInfo.ifProductionFund;
       commit.landIsRecord = this.nodeBusinessInfo.landIsRecord;
+      commit.ifSkip = this.nodeBusinessInfo.ifSkip;
       let isOk = true
       this.$emit('workflowCommitVerify',{"commit":commit},val =>{
         if (!val.state){

src/views/administration/assets/checkList.vue

@@ -114,7 +114,7 @@ export default {
             pageData: { records: [] },
             listQuery: {
                 page: 1,
-                size: 10,
+                size: 20,
                 descs: 'id',
             },
             cates: [],
@@ -131,7 +131,7 @@ export default {
             this.orderDate = '';
             this.listQuery = {
                 current: 1,
-                size: 10,
+                size: 20,
                 descs: 'id',
             }
             this.getList()

src/views/administration/major/checkList.vue

@@ -109,7 +109,7 @@ export default {
       pageData: { records: [] },
       listQuery: {
         page: 1,
-        size: 10,
+        size: 20,
         descs: 'id',
       },
       cates:[],
@@ -126,7 +126,7 @@ export default {
       this.orderDate = '';
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 20,
         descs: 'id',
       }
       this.getList()

src/views/administration/major/declareDetail.vue

@@ -78,7 +78,7 @@
         <el-row>
           <el-col :xs="24" :sm="12" :lg="12" :span="6">
             <el-form-item label="审核状态：" prop="declareResult" label-width="140px" class="postInfo-container-item">
-              <el-input :value="declareForm.declareResult"  readonly disabled>
+              <el-input :value="declareForm.declareResult"  :class="['filter-item','resaon_input']" readonly disabled>
               </el-input>
             </el-form-item>
             </el-col>
@@ -148,7 +148,9 @@ export default {
         businessSubId: null,
         businessId: null,
         currentInstanceNodeId: null,
-        production: []
+        production: [],
+        ifSkip:false,
+        currentNodeCode:null
       },
       doWorkflow: false,
       declareForm: {
@@ -192,6 +194,7 @@ export default {
         }).then(res => {
           if (res.code === 200 && res.data!=null) {
               this.nodeBusinessInfo.currentInstanceNodeId = res.data.instanceId;
+              this.nodeBusinessInfo.currentNodeCode = res.data.nodeCode;
           }
           this.$refs.board.getInstanceArray(this.nodeBusinessInfo.mainBusiness,this.nodeBusinessInfo.businessId);
         })
@@ -226,7 +229,14 @@ export default {
     },
     //提交节点
     commit(state){
-        this.$refs.board.commit(state);
+        if (this.declareForm.businessCate==='一般业务'  
+              && this.nodeBusinessInfo.currentNodeCode === 'DEPARTMENT_LEADER_CHECK'
+                && this.nodeBusinessInfo.mainBusiness === 'COMMISSION_DECLARE_MAJOR_EVALUATE'){
+               
+          this.nodeBusinessInfo.ifSkip = true;
+          
+        }
+       this.$refs.board.commit(state);
     },
 
   },
@@ -239,4 +249,10 @@ export default {
   top: 70px;
   right: 50px;
 }
+.resaon_input{
+    /deep/ .el-input__inner{
+      color: red !important;
+      font-weight: bold;
+    }
+  }
 </style>

src/views/income/major/declareDetail.vue

@@ -78,7 +78,7 @@
         <el-row>
           <el-col :xs="24" :sm="12" :lg="12" :span="6">
             <el-form-item label="审核状态：" prop="declareResult" label-width="140px" class="postInfo-container-item">
-              <el-input :value="declareForm.declareResult"  readonly disabled>
+              <el-input :value="declareForm.declareResult" :class="['filter-item','resaon_input']"  readonly disabled>
               </el-input>
             </el-form-item>
             </el-col>
@@ -239,4 +239,10 @@ export default {
   top: 70px;
   right: 50px;
 }
+.resaon_input{
+    /deep/ .el-input__inner{
+      color: red !important;
+      font-weight: bold;
+    }
+  }
 </style>

src/views/major/saveFileDoneList.vue

@@ -107,7 +107,7 @@ export default {
       pageData: { records: [] },
       listQuery: {
         page: 1,
-        size: 10,
+        size: 20,
         descs: 'id',
         keyword:null
       },
@@ -152,7 +152,7 @@ export default {
       this.saveFileDate='';
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 20,
         descs: 'id',
       }
       this.getList()
@@ -161,7 +161,7 @@ export default {
     searchList() {
       // 重置分页
       this.listQuery.page = 1
-      this.listQuery.size = 10
+      this.listQuery.size = 20
       if (this.saveFileDate){
         this.listQuery.startDate = this.saveFileDate[0]+' 00:00:00';
         this.listQuery.endDate = this.saveFileDate[1]+ ' 23:59:59';

src/views/major/saveFileTodoList.vue

@@ -124,7 +124,7 @@ export default {
       listLoading: false,
       listQuery: {
         page: 1,
-        size: 10,
+        size: 20,
         descs: 'id',
       },
       saveFileProduction:[],
@@ -140,7 +140,7 @@ export default {
       this.$router.push({ query: {} });
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 20,
         descs: 'id',
       }
       this.getList()
@@ -149,7 +149,7 @@ export default {
     searchList() {
       // 重置分页
       this.listQuery.page = 1
-      this.listQuery.size = 10
+      this.listQuery.size = 20
       this.getList()
     },
     getList() {

src/views/major/todoDetail.vue

@@ -1848,7 +1848,7 @@ export default {
           return 'evaluate'
         }
         if (check.includes(nodeCode)) {
-          return 'producution'
+          return 'quality'
         }
         if (saveCheck.includes(nodeCode)) {
           return 'finance'