From 9a0007442d3eacb9d6e6386c35192bf2dbafc661 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 19 May 2022 21:39:20 +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

---
 .../virtualList/components/addModel.vue       |   8 +-
 .../virtualList/components/editModel.vue      | 152 +++++++++---------
 .../views/documentTools/virtualList/index.vue |   8 +-
 .../projectManagement/components/TaskList.vue |   6 +-
 .../components/TaskListModel.vue              |  12 +-
 .../components/batSetting.vue                 |  68 +++++++-
 .../currentStatusOfTheProjectEcharts.vue      |   2 +-
 .../components/listAddModel.vue               |   8 +-
 .../components/listOfRegulations.vue          |  31 +++-
 9 files changed, 185 insertions(+), 110 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
index 4203bc568..ec82418de 100644
--- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
@@ -40,7 +40,7 @@
                                  :triggerChange="false" :dictCode="'state'"/>
             </div>
           </a-col>
-          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+          <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="12" :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>
@@ -265,8 +265,7 @@
   }
 
   .title-text {
-    width: 20%;
-    min-width: 110px;
+    width: 33px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;
@@ -281,9 +280,8 @@
 
   .box-input {
     display: inline-block;
-    width: 70%;
+    width: 100%;
     height: 38px;
-    margin-top: 2px;
   }
 
   .box-button {
diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index 62d14c0ae..2e93313ab 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -55,13 +55,17 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
+                <span class="title-text-text"
+                      :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="wvtaId">
-                <a-input class="box-input"
-                         :disabled="false"
-                         v-model="formInline.wvtaId"
-                         :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
+              <a-form-model-item class="itemModel-multi" prop="region">
+                <!--                <a-input class="box-input"-->
+                <!--                         :disabled="true"-->
+                <!--                         v-model="formInline.region_dictText"/>-->
+                <j-multi-select-tag class="box-input" v-model="formInline.region"
+                                    :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'region'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -117,6 +121,24 @@
               </a-form-model-item>
             </div>
           </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('implementationCategory')">{{$t('implementationCategory')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="implementType">
+                <j-dict-select-tag class="box-input" v-model="formInline.implementType"
+                                   :disabled="disabled"
+                                   @input="handleInput('implementType')"
+                                   :placeholder="$t('PleaseSelect')+$t('implementationCategory')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'implement_type'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -134,8 +156,6 @@
               </a-form-model-item>
             </div>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -154,6 +174,21 @@
               </a-form-model-item>
             </div>
           </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="wvtaId">
+                <a-input class="box-input"
+                         :disabled="false"
+                         v-model="formInline.wvtaId"
+                         :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -171,6 +206,39 @@
             </div>
           </a-col>
         </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="attestationRank">
+                <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"
+                                   :disabled="disabled"
+                                   @input="handleInput('attestationRank')"
+                                   :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'attestation_rank'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('applicableSupplement')">{{$t('applicableSupplement')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="applicableSupplement">
+                <a-input class="box-input"
+                         :disabled="false"
+                         v-model="formInline.applicableSupplement"
+                         :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
@@ -209,74 +277,6 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="Required">*</span>
-                <span class="title-text-text"
-                      :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="attestationRank">
-                <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"
-                                   :disabled="disabled"
-                                   @input="handleInput('attestationRank')"
-                                   :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'attestation_rank'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('implementationCategory')">{{$t('implementationCategory')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="implementType">
-                <j-dict-select-tag class="box-input" v-model="formInline.implementType"
-                                   :disabled="disabled"
-                                   @input="handleInput('implementType')"
-                                   :placeholder="$t('PleaseSelect')+$t('implementationCategory')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'implement_type'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
-              </div>
-              <a-form-model-item class="itemModel-multi" prop="region">
-                <!--                <a-input class="box-input"-->
-                <!--                         :disabled="true"-->
-                <!--                         v-model="formInline.region_dictText"/>-->
-                <j-multi-select-tag class="box-input" v-model="formInline.region"
-                                    :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
-                                    :type="'select'"
-                                    :triggerChange="false" :dictCode="'region'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('applicableSupplement')">{{$t('applicableSupplement')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="applicableSupplement">
-                <a-input class="box-input"
-                         :disabled="false"
-                         v-model="formInline.applicableSupplement"
-                         :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
         <a-row :gutter="24">
           <a-col :span="24">
             <div class="box-title-text">
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index 95e35e94f..66d090504 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -178,7 +178,7 @@
         total: 0,
         pageSize: 10,
         pageNo: 1,
-        title: '新增',
+        title: this.$t('newlyAdded'),
         columns: [
           {
             title: this.$t('VirtualListName'),
@@ -217,7 +217,7 @@
       },
       //添加
       handleAdd() {
-        this.title = '新增'
+        this.title = this.$t('newlyAdded')
         this.formInline = {}
         this.visible = true
         this.$nextTick(() => {
@@ -249,7 +249,7 @@
       },
       //编辑
       edit(item) {
-        this.title = '编辑'
+        this.title = this.$t('edit')
         this.formInline = JSON.parse(JSON.stringify(item))
         this.visible = true
         this.$nextTick(() => {
@@ -514,7 +514,7 @@
   .drawer-bootom-button {
     position: absolute;
     bottom: 0;
-    z-index:100;
+    z-index: 100;
     width: 100%;
     border-top: 1px solid #e8e8e8;
     padding: 10px 16px;
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index b9d1bdc8b..6626f9ec9 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -231,12 +231,14 @@
         CurrentColor: {
           '1': '#f3dddd',
           '2': '#f6ebdb',
-          '3': '#dbf6e2'
+          '3': '#dbf6e2',
+          '4': '#ddf3f4'
         },
         CurrentColorBox: {
           '1': '#E83030',
           '2': '#FDA71C',
-          '3': '#26BD4B'
+          '3': '#26BD4B',
+          '4': '#00B3BE'
         },
         url: {
           list: '/project/projectTaskInventoryEO/list',
diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue
index fa98a23c3..80e5e71e0 100644
--- a/jero-web/src/views/projectManagement/components/TaskListModel.vue
+++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue
@@ -73,11 +73,12 @@
                             {{ $t('green') }}
                      </span>
                 </a-select-option>
-                <!--                <a-select-option :key="3" :value="3">-->
-                <!--                     <span style="display: inline-block;width: 100%">-->
-                <!--                            {{ $t('blue') }}-->
-                <!--                     </span>-->
-                <!--                </a-select-option>-->
+
+                <a-select-option :value="'4'">
+                       <span style="display: inline-block;width: 100%">
+                             {{ $t('blue') }}
+                        </span>
+                </a-select-option>
               </a-select>
             </a-form-model-item>
           </div>
@@ -143,6 +144,7 @@
             this.disabled = true
           }
         }
+        console.log(val.conditionAssessment)
         this.formInline = val
         this.$nextTick(() => {
           this.$refs.ruleForm.clearValidate()
diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue
index 6b65bc210..d0e883b8e 100644
--- a/jero-web/src/views/projectManagement/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/components/batSetting.vue
@@ -1,7 +1,7 @@
 <template>
   <a-modal
     :title="$t('batSetting')"
-    :width="900"
+    :width="1200"
     :visible="visible"
     :confirm-loading="confirmLoading"
     :maskClosable="false"
@@ -39,6 +39,22 @@
             </a-form-model-item>
           </div>
         </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi" prop="region">
+              <j-multi-select-tag class="box-input" v-model="formInline.region"
+                                  :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'region'"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text">
@@ -53,17 +69,53 @@
             </a-form-model-item>
           </div>
         </a-col>
+      </a-row>
+      <a-row :gutter="24">
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text">
               <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
             </div>
+            <a-form-model-item class="itemModel-multi">
+              <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'duty_territory'"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="'implementTime'">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('vehicleInProductionDate')"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             @change="dateChange({db_field_name:'implementTime'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.implementTime"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
+            </div>
             <a-form-model-item class="itemModel">
-              <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                 @input="handleInput('dutyTerritory')"
-                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                 :type="'select'"
-                                 :triggerChange="false" dictCode="duty_territory"/>
+              <a-date-picker class="box-input"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             :placeholder="$t('PleaseSelect')+$t('ImplementationDate')"
+                             @change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1"
+                             style="width: 100%"/>
             </a-form-model-item>
           </div>
         </a-col>
@@ -85,6 +137,8 @@
             </a-form-model-item>
           </div>
         </a-col>
+      </a-row>
+      <a-row :gutter="24">
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text">
@@ -244,7 +298,7 @@
   }
 
   .title-text {
-    width: 84px;
+    width: 174px;
     text-align: right;
     display: inline-block;
     font-weight: 500;
diff --git a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
index 2626209ce..e0643e3c7 100644
--- a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
+++ b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
@@ -121,7 +121,7 @@
         let color = []
         if (dataSource && dataSource.length > 0) {
           dataSource.forEach(res => {
-            if (res.color == '0') {
+            if (res.color == '4') {
               data.push({
                 value: res.conditionAssessmentCount,
                 name: this.$t('blue')
diff --git a/jero-web/src/views/projectManagement/components/listAddModel.vue b/jero-web/src/views/projectManagement/components/listAddModel.vue
index 43fe69fbc..04c3b0601 100644
--- a/jero-web/src/views/projectManagement/components/listAddModel.vue
+++ b/jero-web/src/views/projectManagement/components/listAddModel.vue
@@ -40,7 +40,7 @@
                                  :triggerChange="false" :dictCode="'state'"/>
             </div>
           </a-col>
-          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+          <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="12" :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>
@@ -249,8 +249,7 @@
   }
 
   .title-text {
-    width: 20%;
-    min-width: 110px;
+    width: 33px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;
@@ -265,9 +264,8 @@
 
   .box-input {
     display: inline-block;
-    width: 70%;
+    width: 100%;
     height: 38px;
-    margin-top: 2px;
   }
 
   .box-button {
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 7992d6d61..2a3d8d034 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -356,14 +356,14 @@
             title: this.$t('listConfirmationStatus'),
             align: 'center',
             dataIndex: 'inventoryAffirmStatusName',
-            width: 180,
+            width: 240,
             scopedSlots: { customRender: 'titleName' }
           },
           {
             title: this.$t('taskAffirmStatus'),
             align: 'center',
             dataIndex: 'taskAffirmStatusName',
-            width: 180,
+            width: 240,
             scopedSlots: { customRender: 'titleName' }
           },
           // {
@@ -395,13 +395,13 @@
           {
             title: this.$t('ImplementationDate'),
             align: 'center',
-            width: 140,
+            width: 200,
             dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1'
           },
           {
             title: this.$t('vehicleInProductionDate'),
             align: 'center',
-            width: 140,
+            width: 220,
             dataIndex: 'implementTime'
           },
           {
@@ -421,7 +421,7 @@
           {
             title: this.$t('applicableSupplement'),
             align: 'center',
-            width: 180,
+            width: 220,
             dataIndex: 'applicableSupplement',
             scopedSlots: { customRender: 'titleName' }
           },
@@ -500,6 +500,13 @@
                 dataIndex: 'designDueDate',
                 align: 'center',
                 width: 140
+              },
+              {
+                title: this.$t('descriptionDeliverables'),
+                dataIndex: 'designRemark',
+                align: 'center',
+                width: 220,
+                scopedSlots: { customRender: 'titleName' }
               }
             ]
           },
@@ -532,6 +539,13 @@
                 dataIndex: 'prehomoDueDate',
                 align: 'center',
                 width: 140
+              },
+              {
+                title: this.$t('descriptionDeliverables'),
+                dataIndex: 'prehomoRemark',
+                align: 'center',
+                width: 220,
+                scopedSlots: { customRender: 'titleName' }
               }
             ]
           },
@@ -564,6 +578,13 @@
                 dataIndex: 'verifyDueDate',
                 align: 'center',
                 width: 140
+              },
+              {
+                title: this.$t('descriptionDeliverables'),
+                dataIndex: 'verifyRemark',
+                align: 'center',
+                width: 220,
+                scopedSlots: { customRender: 'titleName' }
               }
             ]
           },