der提交加参数

jero-web/src/common/lang/en-us.js

@@ -865,4 +865,5 @@ module.exports = {
   pleaseConfirmationResults:'Please select the compliance status according to the engineering confirmation results',
   pleaseReviewTask:'Please add the engineering confirmation information for this review task',
   pleaseWillBeReturned:'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned',
+  pleaseSubmitStatus:'Please submit the data confirmed by the project in the confirmation status',
 }

jero-web/src/common/lang/zh-cn.js

@@ -870,4 +870,5 @@ module.exports = {
   pleaseConfirmationResults:'请根据工程确认结果选择符合性状态',
   pleaseReviewTask:'请您添加对该条审查任务的工程确认信息',
   pleaseWillBeReturned:'请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回',
+  pleaseSubmitStatus:'请把工程确认的数据都点为确认状态进行提交',
 }

jero-web/src/views/processCenter/components/engineeringConfirmation.vue

@@ -49,13 +49,12 @@
       </span>
       <span slot="operation" slot-scope="result">
          <a class="text"
-            v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
-            :disabled="!result.createUser"
+            v-if="$route.query.TaskKey == 'zrrclrw' && result.createUser"
             @click="edit(result,$t('edit'))">
            {{$t('edit')}}
          </a>
            <a class="text"
-              v-if="$route.query.TaskKey == 'zrrclrw' && result.status"
+              v-if="$route.query.TaskKey == 'zrrclrw' && result.status && !result.createUser"
               :disabled="!result.status"
               @click="confirm(result)">
              <span v-if="result.status == 'NotDone'">
@@ -66,13 +65,12 @@
              </span>
          </a>
          <a class="text"
-            v-if="$route.query.TaskKey == 'zrrclrw'"
+            v-if="$route.query.TaskKey == 'zrrclrw' && result.status != 'haveDone' && !result.createUser"
             @click="answerClick(result,$t('replyFromProjectContactPerson'))">
            {{$t('answer')}}
          </a>
          <a class="text"
-            v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
-            :disabled="!result.createUser"
+            v-if="$route.query.TaskKey == 'zrrclrw' && result.createUser"
             @click="deleted(result)">
            {{$t('deleteLib')}}
          </a>
@@ -434,7 +432,7 @@
           {
             title: this.$t('operation'),
             align: 'left',
-            width: 300,
+            width: 160,
             scopedSlots: { customRender: 'operation' }
           }
         ],

jero-web/src/views/processCenter/components/taskCirculationHistory.vue

@@ -46,26 +46,22 @@
             title: this.$t('operationNode'),
             dataIndex: 'name',
             align: 'left',
-            width:'20%',
           },
           {
             title: this.$t('Operator'),
             dataIndex: 'assignee',
             align: 'left',
-            width:'20%',
           },
           {
             title: this.$t('result'),
             dataIndex: 'reviewResult',
             align: 'left',
-            width:'20%',
             scopedSlots: { customRender: 'reviewResult' }
           },
           {
             title: this.$t('opinion'),
             dataIndex: 'approvalOpinion',
             align: 'left',
-            width:'20%',
           },
           {
             title: this.$t('operationTime'),

jero-web/src/views/processCenter/processForm/taskListProcess/index.vue

@@ -260,21 +260,23 @@
           if (this.$route.query.TaskKey == 'dreDispose') {
             this.dreSubmit(res)
           } else {
-            // let dataSource = this.$refs.engineeringConfirmationRef.dataSource
-            // let isTrue
-            // for (let i = 0; i < dataSource.length; i++) {
-            //   if (dataSource[i].status == 'status' || !dataSource[i].status) {
-            //     isTrue = true
-            //   } else {
-            //     isTrue = false
-            //     this.$message.warning('')
-            //     return
-            //   }
-            // }
-            // if (isTrue) {
-            //
-            // }
-            this.completeTask(res)
+            if (this.$route.query.TaskKey == 'zrrclrw') {
+              let dataSource = this.$refs.engineeringConfirmationRef.dataSource
+              let isTrue
+              for (let i = 0; i < dataSource.length; i++) {
+                if (dataSource[i].status == 'haveDone' || !dataSource[i].status) {
+                  isTrue = true
+                } else {
+                  isTrue = false
+                  this.$message.warning(this.$t('pleaseSubmitStatus'))
+                  this.loading = false
+                  return
+                }
+              }
+              if (isTrue) {
+                this.completeTask(res)
+              }
+            }
           }
         })
       },