From 7c64025f9f2cb7231317db9ff2d3655066e12522 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 19 May 2022 20:32:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BB=BB=E5=8A=A1=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/engineeringConfirmation.vue    |  11 +-
 .../reviewedByThePersonInCharge.vue           |  28 +-
 .../processForm/taskListProcess/index.vue     |  15 +-
 .../ProjectDetails/index.vue                  | 252 +++++++++---------
 .../ProjectDetails/index.vue                  |   4 +-
 .../projectManagement/components/TaskList.vue |   5 +
 6 files changed, 163 insertions(+), 152 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index f485910d0..902c8a6e5 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -7,19 +7,19 @@
     </div>
     <div class="header-content">
       <div class="operator-text"
-           v-if="$route.query.TaskKey == 'zrrclrw'"
+           v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
            @click="distributionEngineerClick($t('distributionEngineer'),1)">
         <a-icon type="audit"/>
         {{ $t('distributionEngineer') }}
       </div>
       <div class="operator-text"
-           v-if="$route.query.TaskKey == 'zrrclrw'"
+           v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
            @click="reminderHandling()">
         <a-icon type="sound"/>
         {{ $t('reminderHandling') }}
       </div>
       <div class="operator-text"
-           v-if="$route.query.TaskKey == 'zrrclrw'"
+           v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
            @click="distributionEngineerClick($t('addFeedback'),2)">
         <a-icon type="plus-circle"/>
         {{ $t('addFeedback') }}
@@ -448,12 +448,13 @@
       }
     },
     mounted() {
+      this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
       this.getList()
     },
     computed: {
       columns() {
         let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
-        if (this.$route.query.TaskKey != 'zrrclrw') {
+        if (this.$route.query.TaskKey != 'zrrclrw' || !this.$route.query.isDisplay) {
           for (var i = 0; i < columnResult.length; i++) {
             if (columnResult[i].title === this.$t('operation')) {
               columnResult.splice(i, 1)
@@ -467,7 +468,7 @@
     methods: {
       pageOnChange(page, pageSize) {
         this.pageNo = page
-        this.getList()
+        this.getDetails()
       },
       handleOk() {
         this.$refs.ruleForm.validate(valid => {
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index a0e46efe9..8a919040e 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -10,12 +10,12 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="Required" v-if="$route.query.TaskKey == 'zrrclrw'">*</span>
+              <span class="Required" v-if="$route.query.TaskKey == 'zrrclrw' && $route.query.isDisplay">*</span>
               <span class="title-text-text" :title="$t('reviewResults')">{{$t('reviewResults')}}</span>
             </div>
-            <a-form-model-item class="itemModel" :prop="$route.query.TaskKey == 'fqrsh'?'':'reviewResult'">
+            <a-form-model-item class="itemModel" :prop="!$route.query.isDisplay?'':'reviewResult'">
               <a-radio-group style="margin-top: 2px"
-                             :disabled="$route.query.TaskKey == 'fqrsh'?true:false"
+                             :disabled="!$route.query.isDisplay?true:false"
                              class="box-input"
                              v-model="formInline.reviewResult">
                 <a-radio value="Compliance">
@@ -42,7 +42,9 @@
               <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="approvalOpinion">
-              <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" v-model="formInline.approvalOpinion"
+              <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
+                          :disabled="!$route.query.isDisplay?true:false"
+                          v-model="formInline.approvalOpinion"
                           :rows="4"/>
             </a-form-model-item>
           </div>
@@ -67,14 +69,14 @@
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text-fq">
-              <span class="Required" v-if="this.queryPersonInCharge.status != 'haveDone'">*</span>
+              <span class="Required" v-if="$route.query.isDisplay">*</span>
               <span class="title-text-text"
                     :title="$t('feedbackFromTheEngineer')">{{$t('feedbackFromTheEngineer')}}</span>
             </div>
             <a-form-model-item class="itemModel"
-                               :prop="this.queryPersonInCharge.status == 'haveDone'?'':'engineerFeedbackContent'">
+                               :prop="!$route.query.isDisplay?'':'engineerFeedbackContent'">
               <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackFromTheEngineer')"
-                          :disabled="this.queryPersonInCharge.status == 'haveDone'?true:false"
+                          :disabled="!$route.query.isDisplay?true:false"
                           v-model="formInline.engineerFeedbackContent"
                           :rows="4"/>
             </a-form-model-item>
@@ -85,11 +87,11 @@
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text-fq">
-              <span class="Required" v-if="this.queryPersonInCharge.status != 'haveDone'">*</span>
+              <span class="Required" v-if="this.$route.query.isDisplay">*</span>
               <span class="title-text-text"
                     :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
             </div>
-            <a-form-model-item class="itemModel" :prop="this.queryPersonInCharge.status == 'haveDone'?'':'fileId'">
+            <a-form-model-item class="itemModel" :prop="!this.$route.query.isDisplay?'':'fileId'">
               <a-button type="primary" class="button-text"
                         @click="clickButtonToUpload('fileId')">
                 {{ (formInline.fileId === 'null' || formInline.fileId === '' ||
@@ -140,7 +142,9 @@
               <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="approvalOpinion">
-              <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" v-model="formInline.approvalOpinion"
+              <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
+                          :disabled="!$route.query.isDisplay?true:false"
+                          v-model="formInline.approvalOpinion"
                           :rows="4"/>
             </a-form-model-item>
           </div>
@@ -148,7 +152,7 @@
       </a-row>
     </a-form-model>
     <uploadFile ref="uploadFile"
-                :disabled="this.queryPersonInCharge.status == 'haveDone'?true:false"
+                :disabled="!$route.query.isDisplay?true:false"
                 @uploadSuccess="uploadSuccess"/>
   </div>
 </template>
@@ -205,6 +209,7 @@
       }
     },
     mounted() {
+      this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
       if (this.queryBy) {
         this.formInline.reviewResult = this.queryBy.reviewResult || undefined
         this.formInline.approvalOpinion = ''
@@ -214,7 +219,6 @@
         this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements
         this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent
         this.formInline.fileId = this.queryPersonInCharge.fileId
-        console.log(this.formInline)
         this.formInline = { ...this.formInline }
       }
     },
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 3465650e1..7c565020e 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -147,19 +147,19 @@
     },
     computed: {
       isSendBack() {
-        if (this.$route.query.TaskKey == 'fqrsh') {
+        if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) {
           return true
         }
         return false
       },
       isTerminationProcess() {
-        if (this.$route.query.TaskKey == 'fqrsh') {
+        if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) {
           return true
         }
         return false
       },
       isAdopt() {
-        if (this.$route.query.TaskKey == 'fqrsh') {
+        if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) {
           if (this.queryBy.reviewResult == 'Compliance' || this.queryBy.reviewResult == 'NA') {
             return true
           }
@@ -167,9 +167,9 @@
         return false
       },
       isSubmit() {
-        if (this.$route.query.TaskKey == 'zrrclrw') {
+        if (this.$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay) {
           return true
-        } else if (this.$route.query.TaskKey == 'dreDispose') {
+        } else if (this.$route.query.TaskKey == 'dreDispose' && this.$route.query.isDisplay) {
           if (!this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') {
             return true
           }
@@ -177,7 +177,7 @@
         return false
       },
       isResubmit() {
-        if (this.$route.query.TaskKey == 'dreDispose') {
+        if (this.$route.query.TaskKey == 'dreDispose' && this.$route.query.isDisplay) {
           if (this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') {
             return true
           }
@@ -187,6 +187,7 @@
     },
     mounted() {
       let _this = this
+      this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
       let query = {
         actiProcInstId: this.$route.query.actiProcInstId,
         createBy: this.userInfo().username
@@ -272,7 +273,7 @@
           projectTaskInventoryId: this.$route.query.projectTaskInventoryId,
           deliveryRequirements: val.deliveryRequirements
         }
-        postAction(this.url.dreSubmit, query).then((res) => {
+        putAction(this.url.dreSubmit, query).then((res) => {
 
         })
       },
diff --git a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue
index 7d8efe6c1..dc15a49ad 100644
--- a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue
+++ b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="doc-detail">
-<!--    认证参数收集——清单信息-->
+    <!--    认证参数收集——清单信息-->
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
           <span style="line-height: 74px;display: inline-block;float: left">
@@ -65,144 +65,144 @@
 </template>
 
 <script>
-import TaskList from '@/views/projectManagement/components/TaskList'
-import listOfRegulations from '@/views/projectManagement/components/listOfRegulations'
-import ProjectDetailsName from '@/views/projectManagement/components/ProjectDetails'
-import ParameterItemCollectionList from '../../components/ParameterItemCollectionList'
-import nonConformance from '@/views/projectManagement/components/nonConformance'
-import updateLog from '@/components/UpdateLog/index'
-import historicalVersionList from '@/views/projectManagement/components/historicalVersionList'
-import commentList from '@/views/projectManagement/components/commentList'
+  import TaskList from '@/views/projectManagement/components/TaskList'
+  import listOfRegulations from '@/views/projectManagement/components/listOfRegulations'
+  import ProjectDetailsName from '@/views/projectManagement/components/ProjectDetails'
+  import ParameterItemCollectionList from '../../components/ParameterItemCollectionList'
+  import nonConformance from '@/views/projectManagement/components/nonConformance'
+  import updateLog from '@/components/UpdateLog/index'
+  import historicalVersionList from '@/views/projectManagement/components/historicalVersionList'
+  import commentList from '@/views/projectManagement/components/commentList'
 
-export default {
-  name: 'ProjectDetails',
-  components: {
-    TaskList,
-    listOfRegulations,
-    ProjectDetailsName,
-    ParameterItemCollectionList,
-    nonConformance,
-    updateLog,
-    historicalVersionList,
-    commentList
-  },
-  data() {
-    return {
-      title: this.$t('projectDetails'),
-      textTitle: '认证参数收集',
-      url: {
-        logList: '',
-        historicalVersionUrl: ''
+  export default {
+    name: 'ProjectDetails',
+    components: {
+      TaskList,
+      listOfRegulations,
+      ProjectDetailsName,
+      ParameterItemCollectionList,
+      nonConformance,
+      updateLog,
+      historicalVersionList,
+      commentList
+    },
+    data() {
+      return {
+        title: this.$t('projectDetails'),
+        textTitle: '认证参数收集',
+        url: {
+          logList: '/project/projectLawsInventoryLogEO/page',
+          historicalVersionUrl: ''
+        },
+        paramsManifest: {}
+      }
+    },
+    mounted() {
+      this.textColor()
+      // 清单信息
+      this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
+    },
+    methods: {
+      textColor() {
+        let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
+        if (textColor && textColor.length > 0) {
+          textColor[0].classList.remove('Virtual-detail-left-text-color')
+        }
+        let text = document.getElementsByClassName('Virtual-detail-left-text')
+        if (text && text.length > 0) {
+          text[4].classList.add('Virtual-detail-left-text-color')
+        }
       },
-      paramsManifest: {},
-    }
-  },
-  mounted() {
-    this.textColor()
-    // 清单信息
-    this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
-  },
-  methods: {
-    textColor() {
-      let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
-      if (textColor && textColor.length > 0) {
-        textColor[0].classList.remove('Virtual-detail-left-text-color')
+      textClick(num, name) {
+        this.textTitle = name
+        let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
+        if (textColor && textColor.length > 0) {
+          textColor[0].classList.remove('Virtual-detail-left-text-color')
+        }
+        let text = document.getElementsByClassName('Virtual-detail-left-text')
+        text[num].classList.add('Virtual-detail-left-text-color')
+      },
+      UpdateLogClick() {
+        this.$refs.updateLogRef.getList({ projectLibraryId: this.$route.query.id })
+      },
+      historicalVersionClick() {
+        this.$refs.historicalVersionListRef.getList()
+      },
+      commentClick() {
+        this.$refs.commentListRef.getData()
       }
-      let text = document.getElementsByClassName('Virtual-detail-left-text')
-      if (text && text.length > 0) {
-        text[4].classList.add('Virtual-detail-left-text-color')
-      }
-    },
-    textClick(num, name) {
-      this.textTitle = name
-      let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
-      if (textColor && textColor.length > 0) {
-        textColor[0].classList.remove('Virtual-detail-left-text-color')
-      }
-      let text = document.getElementsByClassName('Virtual-detail-left-text')
-      text[num].classList.add('Virtual-detail-left-text-color')
-    },
-    UpdateLogClick() {
-      this.$refs.updateLogRef.getList()
-    },
-    historicalVersionClick() {
-      this.$refs.historicalVersionListRef.getList()
-    },
-    commentClick() {
-      this.$refs.commentListRef.getData()
     }
   }
-}
 </script>
 
 <style lang="less" scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 
-.doc-detail {
-  background: #fff;
-  height: 100%;
-
-  .Virtual-detail-header {
-    width: 100%;
-    height: 68px;
-    line-height: 68px;
-    padding: 0 32px 0 32px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 2px #eff1f3 solid;
+  .doc-detail {
     background: #fff;
-
-    .Virtual-detail-title {
-      display: inline-block;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-      font-size: 20px;
-      font-weight: 400;
-      color: #040B29;
-      line-height: 68px;
-    }
-
-    .doc-detail-right {
-      width: 800px;
-      line-height: 68px;
-      display: flex;
-    }
-  }
-
-  .Virtual-detail-left {
-    width: 240px;
-    padding: 16px 24px;
-    box-sizing: border-box;
-    font-size: 16px;
-    line-height: 3;
-    float: left;
-
-    .Virtual-detail-left-text {
-      padding: 2px 12px;
-      cursor: pointer;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-
-  .Virtual-detail-right {
-    border-left: 2px #eff1f3 solid;
-    width: calc(100% - 240px);
     height: 100%;
-    float: left;
-    overflow: auto;
+
+    .Virtual-detail-header {
+      width: 100%;
+      height: 68px;
+      line-height: 68px;
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 2px #eff1f3 solid;
+      background: #fff;
+
+      .Virtual-detail-title {
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        font-size: 20px;
+        font-weight: 400;
+        color: #040B29;
+        line-height: 68px;
+      }
+
+      .doc-detail-right {
+        width: 800px;
+        line-height: 68px;
+        display: flex;
+      }
+    }
+
+    .Virtual-detail-left {
+      width: 240px;
+      padding: 16px 24px;
+      box-sizing: border-box;
+      font-size: 16px;
+      line-height: 3;
+      float: left;
+
+      .Virtual-detail-left-text {
+        padding: 2px 12px;
+        cursor: pointer;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+
+    .Virtual-detail-right {
+      border-left: 2px #eff1f3 solid;
+      width: calc(100% - 240px);
+      height: 100%;
+      float: left;
+      overflow: auto;
+    }
   }
-}
 
-.Virtual-detail-left-text-color {
-  background: #eff1f3;
-  border-radius: 4px;
-}
+  .Virtual-detail-left-text-color {
+    background: #eff1f3;
+    border-radius: 4px;
+  }
 
-.Virtual-detail-text-right {
+  .Virtual-detail-text-right {
 
-}
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
index 7b96e95d9..e4c4eac73 100644
--- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue
+++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
@@ -90,7 +90,7 @@
         title: this.$t('projectDetails'),
         textTitle: '项目详情',
         url: {
-          logList: '',
+          logList: '/project/projectLawsInventoryLogEO/page',
           historicalVersionUrl: ''
         }
       }
@@ -119,7 +119,7 @@
         text[num].classList.add('Virtual-detail-left-text-color')
       },
       UpdateLogClick() {
-        this.$refs.updateLogRef.getList()
+        this.$refs.updateLogRef.getList({projectLibraryId: this.$route.query.id})
       },
       historicalVersionClick() {
         this.$refs.historicalVersionListRef.getList()
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 4fc3d75f9..b9d1bdc8b 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -273,6 +273,8 @@
       },
       verifyTaskClick(val, num, isTrue) {
         let query = {}
+        console.log(typeof isTrue)
+        return
         switch (num) {
           case 1:
             query = {
@@ -284,6 +286,7 @@
               studioEngineer: this.$route.query.studioEngineer,
               serialNumber: val.serialNumber,
               TaskKey: val.designTaskDefinitionKey,
+              isDisplay: isTrue,
               flowType: 2,
               Sponsor: 'designInitiatorName',
               personLiable: 'designDutyName',
@@ -306,6 +309,7 @@
               serialNumber: val.serialNumber,
               TaskKey: val.prehomoTaskDefinitionKey,
               flowType: 3,
+              isDisplay: isTrue,
               id: this.$route.query.id,
               Sponsor: 'prehomoInitiatorName',
               personLiable: 'prehomoDutyName',
@@ -329,6 +333,7 @@
               projectTaskInventoryId: val.projectLawsInventoryId,
               TaskKey: val.verifyTaskDefinitionKey,
               flowType: 4,
+              isDisplay: isTrue,
               Sponsor: 'verifyInitiatorName',
               personLiable: 'verifyDutyName',
               typeOfDeliverables: 'verifyDeliverableType_dictText',