修改任务清单的流程

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

@@ -6,8 +6,8 @@
       </div>
     </div>
     <div class="header-content">
+      <!--      v-if="$route.query.TaskKey == 'zrrclrw'"-->
       <div class="operator-text"
-           v-if="$route.query.TaskKey == 'zrrclrw'"
            @click="distributionEngineerClick($t('distributionEngineer'))">
         <a-icon type="audit"/>
         {{ $t('distributionEngineer') }}
@@ -18,6 +18,10 @@
         <a-icon type="sound"/>
         {{ $t('reminderHandling') }}
       </div>
+      <a class="text"
+         @click="detailsClick()">
+        {{$t('details')}}
+      </a>
       <div class="operator-text"
            v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
            @click="distributionEngineerClick($t('addFeedback'))">
@@ -89,6 +93,23 @@
               </a-form-model-item>
             </div>
           </a-col>
+          <a-col :span="24" v-if="title == $t('distributionEngineer')">
+            <div v-if="formInline.userName">
+              <div class="box-title-text" v-for="item in formInline.userName.split(',')">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="item">{{item}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="engineerFeedbackContent">
+                  <a-textarea
+                    :placeholder="$t('PleaseEnter')+$t('feedbackFromTheEngineer')"
+                    :disabled="false"
+                    v-model="formInline.engineerFeedbackContent" :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </div>
+          </a-col>
           <a-col :span="24" v-if="title == $t('addFeedback') || title == $t('edit')">
             <div class="box-title-text">
               <div class="title-text">
@@ -324,6 +345,18 @@
             fixed: 'left',
             customRender: (text, record, index) => `${index + 1}`
           },
+          {
+            title: this.$t('completedBy'),
+            dataIndex: 'createBy',
+            ellipsis: true,
+            align: 'center'
+          },
+          {
+            title: this.$t('completedTime'),
+            dataIndex: 'createTime',
+            ellipsis: true,
+            align: 'center'
+          },
           {
             title: this.$t('feedbackFromTheEngineer'),
             dataIndex: 'engineerFeedbackContent',
@@ -337,18 +370,6 @@
             ellipsis: true,
             scopedSlots: { customRender: 'Deliverables' }
           },
-          {
-            title: this.$t('completedBy'),
-            dataIndex: 'createBy',
-            ellipsis: true,
-            align: 'center'
-          },
-          {
-            title: this.$t('completedTime'),
-            dataIndex: 'createTime',
-            ellipsis: true,
-            align: 'center'
-          },
           {
             title: this.$t('replyFromProjectContactPerson'),
             dataIndex: 'engineeringInterfacePersonReply',
@@ -499,7 +520,7 @@
         })
       },
       detailsClick(val) {
-        this.formInlineDetails = val
+        this.formInlineDetails = val || {}
         this.visibleDetails = true
       },
       PersonnelSelectionChange(value, id) {

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

@@ -45,6 +45,10 @@
       projectInformationId: {
         type: String,
         default: ''
+      },
+      queryProject: {
+        type: Object,
+        default: {}
       }
     },
     data() {
@@ -60,6 +64,9 @@
         getAction(this.url.urlFrom, { id: this.projectInformationId }).then((res) => {
           if (res.success) {
             this.queryForm = res.result[0] || {}
+            if (this.queryProject) {
+              this.queryForm = { ...this.queryForm, ...this.queryProject }
+            }
           } else {
             this.queryForm = {}
           }

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

@@ -34,7 +34,7 @@
         dataSource: [],
         loading: false,
         reviewResult: {
-          'launch':this.$t('Launch'),
+          'launch': this.$t('Launch'),
           'Compliance': this.$t('accord'),
           'Non-Compliance': this.$t('nonConformity'),
           'To be tracked': this.$t('Tracked'),
@@ -81,10 +81,9 @@
     methods: {
       getList() {
         let query = {
-          prcId: this.$route.query.actiProcInstId,
-          prcType: this.$route.query.flowType
+          actiProcInstId: this.$route.query.actiProcInstId
         }
-        getAction('/workFlow/queryProcessHistoryByPrcId', query).then((res) => {
+        getAction('/wkflow/processHistoryEO/list', query).then((res) => {
           this.dataSource = res
         })
       }