From 84205f832844262e41734083ee39854326a1a616 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Fri, 21 Oct 2022 13:44:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectRegulationTasks/components/SentList.vue       | 5 ++++-
 .../projectRegulationTasks/components/dealtWith.vue      | 5 ++++-
 .../projectRegulationTasks/components/doneList.vue       | 9 +++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index 66e4ff628..227033dbd 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -21,7 +21,10 @@
           <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" :title="text">{{text}}</a>
+        <a @click="standardInformationClick(record)" v-if="text" :title="text">
+          {{text}}
+        </a>
+         <span v-else>--</span>
       </span>
     </a-table>
     <div class="page" v-if="dataSource && dataSource.length > 0">
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index 22a3cd251..da56168b1 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -19,7 +19,10 @@
           <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" :title="text">{{text}}</a>
+        <a @click="standardInformationClick(record)" v-if="text" :title="text">
+          {{text}}
+        </a>
+        <span v-else>--</span>
       </span>
     </a-table>
     <div class="page" v-if="dataSource && dataSource.length > 0">
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
index 7b70d0870..7681f074b 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
@@ -18,10 +18,15 @@
              @click="viewClick(record)">{{$t('view')}}</a>
       </span>
       <span slot="RelatedItems" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
+          <a @click="RelatedItemsClick(record)" :title="text">
+            {{text}}
+          </a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" :title="text">{{text}}</a>
+        <a @click="standardInformationClick(record)" v-if="text" :title="text">
+          {{text}}
+        </a>
+        <span v-else>--</span>
       </span>
     </a-table>
     <div class="page" v-if="dataSource && dataSource.length > 0">

From 5265f070fdc1a64e641328427186d821990973b4 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Fri, 21 Oct 2022 15:36:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reviewedByThePersonInCharge.vue           | 20 ++++++++++++++++---
 .../components/taskCirculationHistory.vue     |  2 +-
 .../processForm/processDetails/index.vue      |  5 ++++-
 .../components/SentList.vue                   | 14 ++++++-------
 .../components/doneList.vue                   | 14 ++++++-------
 .../components/SentList.vue                   | 14 ++++++-------
 .../components/doneList.vue                   | 14 ++++++-------
 7 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index fc760921f..d6b425ba9 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -72,7 +72,7 @@
         </a-col>
       </a-row>
       <a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
-        <a-col :span="12">
+        <a-col :span="12" v-if="$route.query.isDisplay">
           <div class="box-title-text">
             <div class="title-text-fq">
               <span class="Required" v-if="$route.query.isDisplay">*</span>
@@ -88,16 +88,30 @@
             </a-form-model-item>
           </div>
         </a-col>
+        <a-col :span="24" v-else>
+          <div class="box-title-text">
+            <div class="title-text-fq">
+              <span class="title-text-text"
+                    :title="$t('feedbackFromTheEngineer')">{{$t('feedbackFromTheEngineer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <span class="text-header">
+                {{formInline.engineerFeedbackContent}}lsdk fjlsdk说的翻开历史大家饭卡里说的发精神独立开发就收到分厘卡电视机反倒是风口浪尖是发流口水的房间第三方
+                代课老师发决定是否考虑的健身房了多少积分独立思考就点十六分就的说服力士大夫但是
+              </span>
+            </a-form-model-item>
+          </div>
+        </a-col>
       </a-row>
       <a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text-fq">
-<!--              <span class="Required" v-if="this.$route.query.isDisplay">*</span>-->
+              <!--              <span class="Required" v-if="this.$route.query.isDisplay">*</span>-->
               <span class="title-text-text"
                     :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
             </div>
-<!--            :prop="!this.$route.query.isDisplay?'':'fileId'"-->
+            <!--            :prop="!this.$route.query.isDisplay?'':'fileId'"-->
             <a-form-model-item class="itemModel">
               <a-button type="primary" class="button-text"
                         @click="clickButtonToUpload('fileId')">
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index 8c64c8228..145539870 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -80,7 +80,7 @@
     methods: {
       getList() {
         let query = {
-          actiProcInstId: this.$route.query.actiProcInstId
+          actiProcInstId: this.$route.query.actiProcInstId || this.$route.query.prcId
         }
         this.loading = true
         getAction('/wkflow/processHistoryEO/list', query).then((res) => {
diff --git a/jero-web/src/views/processCenter/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
index 875ca81b0..f3ab23d05 100644
--- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue
+++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
@@ -15,6 +15,7 @@
     </div>
     <regulatoryCirculationHistory :isTrue="isTrue"
                                   v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/>
+    <taskCirculationHistory v-else-if="$route.query.prcType == '2' || $route.query.prcType == '3' || $route.query.prcType == '4'"/>
     <circulationHistory v-else/>
   </div>
 </template>
@@ -22,6 +23,7 @@
 <script>
   import circulationHistory from '../../components/circulationHistory'
   import regulatoryCirculationHistory from '../../components/regulatoryCirculationHistory'
+  import taskCirculationHistory from '../../components/taskCirculationHistory'
   import axios from 'axios'
   import Vue from 'vue'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -30,7 +32,8 @@
     name: 'processDetails',
     components: {
       circulationHistory,
-      regulatoryCirculationHistory
+      regulatoryCirculationHistory,
+      taskCirculationHistory
     },
     data() {
       return {
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index 227033dbd..bc4798bdf 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -89,13 +89,13 @@
             ellipsis: true,
             width: 170
           },
-          // {
-          //   title: this.$t('TaskCutOffTime'),
-          //   align: 'center',
-          //   dataIndex: 'endTime',
-          //   ellipsis: true,
-          //   width: 170
-          // },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
           {
             title: this.$t('taskStatus'),
             align: 'center',
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
index 7681f074b..c2e60396f 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
@@ -95,13 +95,13 @@
             ellipsis: true,
             width: 170
           },
-          // {
-          //   title: this.$t('TaskCutOffTime'),
-          //   align: 'center',
-          //   dataIndex: 'endTime',
-          //   ellipsis: true,
-          //   width: 170
-          // },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
           {
             title: this.$t('taskStatus'),
             align: 'center',
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
index 4fe67c660..f162279f5 100644
--- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
@@ -78,13 +78,13 @@
             ellipsis: true,
             width: 170
           },
-          // {
-          //   title: this.$t('TaskCutOffTime'),
-          //   align: 'center',
-          //   dataIndex: 'TaskCutOffTime',
-          //   ellipsis: true,
-          //   width: 170
-          // },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
           {
             title: this.$t('taskStatus'),
             align: 'center',
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
index 10309f1ff..7617fae4f 100644
--- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
@@ -75,13 +75,13 @@
             ellipsis: true,
             width: 170
           },
-          // {
-          //   title: this.$t('TaskCutOffTime'),
-          //   align: 'center',
-          //   dataIndex: 'TaskCutOffTime',
-          //   ellipsis: true,
-          //   width: 170
-          // },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
           {
             title: this.$t('taskStatus'),
             align: 'center',

From 32b203efc7ca80a9dfac468459298d9a34a8af0a Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Fri, 21 Oct 2022 15:45:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/processCenter/components/feedbackInformation.vue | 7 ++++---
 .../components/reviewedByThePersonInCharge.vue             | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index b41d9eb10..4db812447 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -23,7 +23,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
                 <a-form-model-item class="itemModel"
@@ -58,7 +58,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text"
                         :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
                 </div>
@@ -75,7 +75,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
                 </div>
                 <a-form-model-item class="itemModel"
@@ -109,6 +109,7 @@
               </div>
             </a-col>
           </a-row>
+
         </div>
       </a-form-model>
     </div>
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index d6b425ba9..4a32cd3bb 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -96,8 +96,7 @@
             </div>
             <a-form-model-item class="itemModel">
               <span class="text-header">
-                {{formInline.engineerFeedbackContent}}lsdk fjlsdk说的翻开历史大家饭卡里说的发精神独立开发就收到分厘卡电视机反倒是风口浪尖是发流口水的房间第三方
-                代课老师发决定是否考虑的健身房了多少积分独立思考就点十六分就的说服力士大夫但是
+                {{formInline.engineerFeedbackContent}}
               </span>
             </a-form-model-item>
           </div>