From a676b546db7f7f96bcf1ff4a79b6ed9772c45f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 26 Oct 2023 09:40:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../certificationList/components/addModel.vue | 48 +++++++++----------
 .../components/deadlineForm.vue               | 20 ++++----
 .../components/certificationList/index.vue    |  8 ++--
 5 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index f7b84ed7c..722f78b1a 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1712,6 +1712,7 @@ module.exports = {
   returntofill: 'Return to fill',
   thereAreCurrentlyNoRegulationsToHandle: 'No regulations to be processed now',
   certificationSubmission: 'Application Submitted',
+  certificationSubmissionEndTime: 'Application Submitted End Time',
   upgradecompletion: 'Upgrade completion',
   implementedupgrade: 'Whether the implemented upgrade is consistent with the record',
   numberofvehicles: 'Number of vehicles that have completed upgrades',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index c7d04575e..29697e07a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1812,6 +1812,7 @@ module.exports = {
   expeditionProcess: '催办流程',
   thereAreCurrentlyNoRegulationsToHandle: '当前没有可处理的法规',
   certificationSubmission: '认证提交',
+  certificationSubmissionEndTime:'认证提交截止时间',
   upgradecompletion: '升级完成情况',
   implementedupgrade: '实施的升级是否和备案一致',
   numberofvehicles: '完成升级的车辆数',
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index 1fe20cf5e..f385f2e98 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -303,14 +303,14 @@
                   <div class="box-title-text">
                     <div class="title-text">
                       <span class="Required" v-if="item.deliverableType != '1635545748968783874'">*</span>
-                      <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
+                      <span class="title-text-text" :title="$t('certificationSubmissionEndTime')">{{$t('certificationSubmissionEndTime')}}</span>
                     </div>
                     <a-form-model-item class="itemModel"
                                        :prop="item.deliverableType == '1635545748968783874'?'':'dataList.'+index+'.endTime'"
-                                       :rules="[{ required: item.deliverableType == '1635545748968783874'?false:true, message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'},]"
+                                       :rules="[{ required: item.deliverableType == '1635545748968783874'?false:true, message: $t('certificationSubmissionEndTime') + $t('cannotEmpty'), trigger: 'change'},]"
                     >
                       <a-date-picker class="box-input"
-                                     :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                     :placeholder="$t('PleaseSelect')+$t('certificationSubmissionEndTime')"
                                      @change="dateChange({db_field_name:'endTime'},index)"
                                      format="YYYY-MM-DD"
                                      :disabledDate="disabledDate"
@@ -617,16 +617,16 @@
                 <div class="box-title-text">
                   <div class="title-text">
                     <span class="Required" v-if="formInline.deliverableType != '1635545748968783874'">*</span>
-                    <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
+                    <span class="title-text-text" :title="$t('certificationSubmissionEndTime')">{{$t('certificationSubmissionEndTime')}}</span>
                   </div>
                   <a-form-model-item class="itemModel"
                                      :prop="formInline.deliverableType == '1635545748968783874'?'':'endTime'"
                                      :rules="[{ required: formInline.deliverableType == '1635545748968783874'?false:true,
-                                 message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'}]"
+                                 message: $t('certificationSubmissionEndTime') + $t('cannotEmpty'), trigger: 'change'}]"
                   >
                     <a-date-picker class="box-input"
                                    :disabled="flowdisabled"
-                                   :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                   :placeholder="$t('PleaseSelect')+$t('certificationSubmissionEndTime')"
                                    @change="dateChange({db_field_name:'endTime'})"
                                    format="YYYY-MM-DD"
                                    :disabledDate="disabledDate"
@@ -655,22 +655,6 @@
                 </div>
               </a-col>
             </a-row>
-            <a-row :gutter="24">
-              <a-col :span="24">
-                <div class="box-title-text">
-                  <div class="title-text">
-                    <span class="title-text-text"
-                          :title="$t('remarks')">{{$t('remarks')}}</span>
-                  </div>
-                  <a-form-model-item class="itemModel-text" :prop="'remark'">
-                    <a-textarea
-                      style="width: 100%"
-                      :placeholder="$t('PleaseEnter')+$t('remarks')"
-                      v-model="formInline.remark" :rows="4"/>
-                  </a-form-model-item>
-                </div>
-              </a-col>
-            </a-row>
             <a-row :gutter="24">
               <a-col :span="12" v-if="formInline.taskConfirmEndTime">
                 <div class="box-title-text">
@@ -690,6 +674,22 @@
                 </div>
               </a-col>
             </a-row>
+            <a-row :gutter="24">
+              <a-col :span="24">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text"
+                          :title="$t('remarks')">{{$t('remarks')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel-text" :prop="'remark'">
+                    <a-textarea
+                      style="width: 100%"
+                      :placeholder="$t('PleaseEnter')+$t('remarks')"
+                      v-model="formInline.remark" :rows="4"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
           </div>
           <!--        <a-row :gutter="24">-->
           <!--          <a-col :span="24">-->
@@ -1222,7 +1222,7 @@
   }
 
   .title-text {
-    width: 114px;
+    width: 124px;
     text-align: right;
     display: inline-block;
     font-weight: 500;
@@ -1242,7 +1242,7 @@
   }
 
   .itemModel {
-    width: calc(100% - 130px);
+    width: calc(100% - 140px);
     display: inline-block;
     margin-top: 2px;
     height: 40px;
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue b/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue
index 62d6ee45c..92ba9c97a 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue
@@ -13,16 +13,16 @@
         <a-row :gutter="24">
           <a-col :span="24">
             <div class="box-title-text-index">
-              <div class="title-text-index" style="width: 100px">
+              <div class="title-text-index" style="width: 140px">
                 <span class="Required">*</span>
                 <span class="title-text-text"
-                      :title="$t('cutoffTime')">
-                    {{ $t('cutoffTime') }}
+                      :title="titleName">
+                    {{ titleName }}
                   </span>
               </div>
               <a-form-model-item class="itemModel" style="width: calc(100% - 120px)" :prop="queryData.dutyDueDate">
                 <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
+                               :placeholder="$t('PleaseSelect')+titleName"
                                @change="dateChange({'db_field_name':queryData.dutyDueDate})"
                                format="YYYY-MM-DD"
                                :disabledDate="disabledDate"
@@ -50,13 +50,15 @@
         confirmLoading: false,
         formInline: {},
         rules: {},
-        queryData:{},
+        queryData: {},
+        titleName: ''
       }
     },
     methods: {
-      getData(val) {
+      getData(val, title) {
         this.queryData = val
         this.title = val.title
+        this.titleName = title || this.$t('cutoffTime')
         this.visible = true
         this.formInline = {}
         this.confirmLoading = false
@@ -65,16 +67,16 @@
           this.rules[val.dutyDueDate] = [
             {
               required: true,
-              message: this.$t('cutoffTime') + this.$t('cannotEmpty'),
+              message: this.titleName + this.$t('cannotEmpty'),
               trigger: 'change'
-            },
+            }
           ]
         })
       },
       handleOk() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
-            this.$emit('deadlineDataForm', this.queryData,this.formInline)
+            this.$emit('deadlineDataForm', this.queryData, this.formInline)
             this.confirmLoading = true
           }
         })
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 68de076af..eaf3fcca0 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -843,10 +843,10 @@
             scopedSlots: { customRender: 'DeliverablesResult' }
           },
           {
-            title: this.$t('closingDate'),
+            title: this.$t('certificationSubmissionEndTime'),
             align: 'left',
             dataIndex: 'endTime',
-            width: 130,
+            width: 150,
             sorter: true,
             ellipsis: true
           },
@@ -1424,7 +1424,7 @@
               dutyDueDate: 'inventoryVerifyEndTime',
               title: this.$t('release')
             }
-            this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)))
+            this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('inventoryVerifyEndTime'))
           } else {
             this.failedMessage(data)
           }
@@ -2070,7 +2070,7 @@
               title: this.$t('initiateTask'),
               NAId: NAId
             }
-            this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)))
+            this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('taskConfirmEndTime'))
             // this.submitTask(value, prompt, ids, notConditions, data, NAId)
           } else {
             this.failedMessage(data)