From dde807ed2e0118aa279cabf9479a0006af270f1f Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 24 May 2022 09:56:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/libraryPush/index.vue |   4 +-
 .../components/nonConformance.vue             |   9 +-
 .../projectNonConformance/index.vue           | 215 +++++++++---------
 .../projectStatusBoard/index.vue              |   4 +-
 4 files changed, 123 insertions(+), 109 deletions(-)

diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue
index f0d742aac..52d9b8fba 100644
--- a/jero-web/src/components/libraryPush/index.vue
+++ b/jero-web/src/components/libraryPush/index.vue
@@ -110,14 +110,14 @@
           this.confirmLoading = false
           this.submitLoading = false
           if (res.success) {
-            this.$message.success(res.message)
+            this.$message.success(this.$t('OperationSuccessful'))
             this.userIds = []
             this.visible = false
             this.visibleTree = false
             this.$emit('clearSelected')
             eventBUs.$emit('searchReset')
           } else {
-            this.$message.warning(res.message)
+            this.$message.warning(this.$t('operationFailed'))
           }
         })
       },
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index ed65ead17..82ac313b9 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -213,7 +213,8 @@
           serialNumber: val.serialNumber,
           actiProcInstId: val.prcId,
           primaryKeyId: val.projectTaskInventoryDetailId,
-          TaskKey: val.status == 'NotDone' ? val.taskDefinitionKey : 'hhhhh'
+          TaskKey:  val.taskDefinitionKey,
+          isDisplay: val.status == 'NotDone' ? true : false
         }
         switch (num) {
           case '2':
@@ -222,6 +223,8 @@
             query.personLiable = 'designDutyName'
             query.typeOfDeliverables = 'designDeliverableType_dictText'
             query.deliverableTemplate = 'designDeliverableTemplate'
+            query.DueDate = 'designDueDate'
+            query.remarks = 'designRemark'
             break
           case '3':
             query.flowType = 3
@@ -229,6 +232,8 @@
             query.personLiable = 'prehomoDutyName'
             query.typeOfDeliverables = 'prehomoDeliverableType_dictText'
             query.deliverableTemplate = 'prehomoDeliverableTemplate'
+            query.DueDate = 'prehomoDueDate'
+            query.remarks = 'prehomoRemark'
             break
           case '4':
             query.flowType = 4
@@ -236,6 +241,8 @@
             query.personLiable = 'verifyDutyName'
             query.typeOfDeliverables = 'verifyDeliverableType_dictText'
             query.deliverableTemplate = 'verifyDeliverableTemplate'
+            query.DueDate = 'verifyDueDate'
+            query.remarks = 'verifyRemark'
             break
         }
         let newUrl = this.$router.resolve({
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index ce79a14d7..f822af33a 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -2,133 +2,133 @@
   <a-card :bordered="false">
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
-      <a-row :gutter="24">
-        <a-col :md="6" :sm="8">
-          <div class="box-title-text">
-            <div class="title-text" :title="$t('standard')">
-              <span>{{$t('standard')}}</span>
-            </div>
-            <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                     v-model="queryParam.serialNumber"></j-input>
-          </div>
-        </a-col>
-        <a-col :md="6" :sm="8">
-          <div class="box-title-text">
-            <div class="title-text" :title="$t('title')">
-              <span>{{$t('title')}}</span>
-            </div>
-            <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                     v-model="queryParam.title"></j-input>
-          </div>
-        </a-col>
-        <a-col :md="6" :sm="8">
-          <div class="box-title-text">
-            <div class="title-text" :title="$t('areaOfResponsibility')">
-              <span>{{$t('areaOfResponsibility')}}</span>
-            </div>
-            <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                               :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                               :type="'select'"
-                               :triggerChange="false" :dictCode="'duty_territory'"/>
-          </div>
-        </a-col>
-        <template v-if="toggleSearchStatus">
+        <a-row :gutter="24">
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
-              <div class="title-text" :title="$t('ProcessType')">
-                <span>{{$t('ProcessType')}}</span>
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
               </div>
-              <a-select allowClear
-                        class="box-input"
-                        v-model="queryParam.flowType"
-                        :placeholder="$t('PleaseSelect')+$t('ProcessType')">
-                <a-select-option :value="this.$t('designComplianceReview')">
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('areaOfResponsibility')">
+                <span>{{$t('areaOfResponsibility')}}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('ProcessType')">
+                  <span>{{$t('ProcessType')}}</span>
+                </div>
+                <a-select allowClear
+                          class="box-input"
+                          v-model="queryParam.flowType"
+                          :placeholder="$t('PleaseSelect')+$t('ProcessType')">
+                  <a-select-option :value="this.$t('designComplianceReview')">
                <span class="itemOption">
                      {{ $t('designComplianceReview') }}
                </span>
-                </a-select-option>
-                <a-select-option :value="this.$t('preHomeConfirmation')">
+                  </a-select-option>
+                  <a-select-option :value="this.$t('preHomeConfirmation')">
                <span class="itemOption">
                      {{ $t('preHomeConfirmation') }}
                </span>
-                </a-select-option>
-                <a-select-option :value="this.$t('verificationComplianceReview')">
+                  </a-select-option>
+                  <a-select-option :value="this.$t('verificationComplianceReview')">
                <span class="itemOption">
                      {{ $t('verificationComplianceReview') }}
                </span>
-                </a-select-option>
-              </a-select>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('RelatedItems')">
-                <span>{{$t('RelatedItems')}}</span>
+                  </a-select-option>
+                </a-select>
               </div>
-              <a-select allowClear
-                        class="box-input"
-                        v-model="queryParam.projectName"
-                        :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
-                <a-select-option v-for="(item, key) in projectNameList"
-                                 :key="key"
-                                 :value="item.projectName">
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('RelatedItems')">
+                  <span>{{$t('RelatedItems')}}</span>
+                </div>
+                <a-select allowClear
+                          class="box-input"
+                          v-model="queryParam.projectName"
+                          :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
+                  <a-select-option v-for="(item, key) in projectNameList"
+                                   :key="key"
+                                   :value="item.projectName">
                      <span style="display: inline-block;width: 100%" :title=" item.projectName ">
                            {{ item.projectName}}
                      </span>
-                </a-select-option>
-              </a-select>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('problemType')">
-                <span>{{$t('problemType')}}</span>
+                  </a-select-option>
+                </a-select>
               </div>
-              <a-select allowClear
-                        class="box-input"
-                        v-model="queryParam.problemType"
-                        :placeholder="$t('PleaseSelect')+$t('problemType')">
-                <a-select-option :value="$t('inconformity')">
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('problemType')">
+                  <span>{{$t('problemType')}}</span>
+                </div>
+                <a-select allowClear
+                          class="box-input"
+                          v-model="queryParam.problemType"
+                          :placeholder="$t('PleaseSelect')+$t('problemType')">
+                  <a-select-option :value="$t('inconformity')">
                <span class="itemOption">
                      {{ $t('nonConformity') }}
                </span>
-                </a-select-option>
-                <a-select-option :value="$t('toTrack')">
+                  </a-select-option>
+                  <a-select-option :value="$t('toTrack')">
                <span class="itemOption">
                      {{ $t('Tracked') }}
                </span>
-                </a-select-option>
-              </a-select>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('Sponsor')">
-                <span>{{$t('Sponsor')}}</span>
+                  </a-select-option>
+                </a-select>
               </div>
-              <PersonnelSelection :query="{db_field_name:'initiator',db_field_txt:$t('Sponsor')}"
-                                  :isInput="true"
-                                  class="box-input"
-                                  :personneQuery="queryParam"
-                                  @change="PersonnelSelectionChange"
-                                  v-model="queryParam.initiatorName"/>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('personLiable')">
-                <span>{{$t('personLiable')}}</span>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('Sponsor')">
+                  <span>{{$t('Sponsor')}}</span>
+                </div>
+                <PersonnelSelection :query="{db_field_name:'initiator',db_field_txt:$t('Sponsor')}"
+                                    :isInput="true"
+                                    class="box-input"
+                                    :personneQuery="queryParam"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="queryParam.initiatorName"/>
               </div>
-              <PersonnelSelection :query="{db_field_name:'duty',db_field_txt:$t('personLiable')}"
-                                  :isInput="true"
-                                  class="box-input"
-                                  :personneQuery="queryParam"
-                                  @change="PersonnelSelectionChange"
-                                  v-model="queryParam.dutyName"/>
-            </div>
-          </a-col>
-        </template>
-        <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('personLiable')">
+                  <span>{{$t('personLiable')}}</span>
+                </div>
+                <PersonnelSelection :query="{db_field_name:'duty',db_field_txt:$t('personLiable')}"
+                                    :isInput="true"
+                                    class="box-input"
+                                    :personneQuery="queryParam"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="queryParam.dutyName"/>
+              </div>
+            </a-col>
+          </template>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
@@ -138,7 +138,7 @@
                  </a>
                </a-col>
       </span>
-      </a-row>
+        </a-row>
       </a-form>
     </div>
     <div class="table-operator">
@@ -349,7 +349,8 @@
           serialNumber: val.serialNumber,
           actiProcInstId: val.prcId,
           primaryKeyId: val.projectTaskInventoryDetailId,
-          TaskKey: val.status == 'NotDone' ? val.taskDefinitionKey : 'hhhhh'
+          TaskKey: val.taskDefinitionKey,
+          isDisplay: val.status == 'NotDone' ? true : false
         }
         switch (num) {
           case '2':
@@ -358,6 +359,8 @@
             query.personLiable = 'designDutyName'
             query.typeOfDeliverables = 'designDeliverableType_dictText'
             query.deliverableTemplate = 'designDeliverableTemplate'
+            query.DueDate = 'designDueDate'
+            query.remarks = 'designRemark'
             break
           case '3':
             query.flowType = 3
@@ -365,6 +368,8 @@
             query.personLiable = 'prehomoDutyName'
             query.typeOfDeliverables = 'prehomoDeliverableType_dictText'
             query.deliverableTemplate = 'prehomoDeliverableTemplate'
+            query.DueDate = 'prehomoDueDate'
+            query.remarks = 'prehomoRemark'
             break
           case '4':
             query.flowType = 4
@@ -372,6 +377,8 @@
             query.personLiable = 'verifyDutyName'
             query.typeOfDeliverables = 'verifyDeliverableType_dictText'
             query.deliverableTemplate = 'verifyDeliverableTemplate'
+            query.DueDate = 'verifyDueDate'
+            query.remarks = 'verifyRemark'
             break
         }
         let newUrl = this.$router.resolve({
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
index a71cd8432..b2a372396 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
@@ -285,7 +285,7 @@
             left: 'right'
           },
           tooltip: {
-            position: 'top',
+            position: 'left',
             formatter: function(params) {
               return (
                 timeDataList[params.value[3]].name + '<br/>' +
@@ -294,7 +294,7 @@
             }
           },
           grid: {
-            top: 0,
+            top: 10,
             left: 40,
             right: 40,
             containLabel: true