From 4685935d372b3f1b2f74958c7017b6d3c96e4d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 17 Apr 2023 14:11:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=91=E5=B8=83=E3=80=81=E5=8F=91=E8=B5=B7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=9A=84=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  2 +
 jero-web/src/common/lang/zh-cn.js             |  2 +
 .../certificationList/components/addModel.vue | 73 ++++++++++++++-----
 3 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 2e7c429b4..87f63b799 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1794,4 +1794,6 @@ module.exports = {
   verifyProcessStatus:'Verify Process Status',
   design:'Design',
   verify:'Verify',
+  inventoryVerifyEndTime:'Inventory Verify End Time',
+  taskConfirmEndTime:'Task Confirm End Time',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 256ea6e7f..d0291abba 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1896,4 +1896,6 @@ module.exports = {
   verifyProcessStatus:'验证流程状态',
   design:'设计',
   verify:'验证',
+  inventoryVerifyEndTime:'清单校核截止时间',
+  taskConfirmEndTime:'责任确认截止时间',
 }
\ No newline at end of file
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 2a5fcb150..fa0fede77 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -183,24 +183,24 @@
                     </a-form-model-item>
                   </div>
                 </a-col>
-<!--                <a-col :span="12">-->
-<!--                  <div class="box-title-text">-->
-<!--                    <div class="title-text">-->
-<!--                      <span class="Required">*</span>-->
-<!--                      <span class="title-text-text"-->
-<!--                            :title="$t('certificationType')">{{$t('certificationType')}}</span>-->
-<!--                    </div>-->
-<!--                    <a-form-model-item class="itemModel-multi"-->
-<!--                                       :prop="'dataList.'+index+'.attestationType'"-->
-<!--                                       :rules="[{ required: true, message: $t('certificationType') + $t('cannotEmpty'), trigger: 'change'},]"-->
-<!--                    >-->
-<!--                      <j-multi-select-tag class="box-input" v-model="item.attestationType"-->
-<!--                                         :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
-<!--                                         :type="'select'"-->
-<!--                                         :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>-->
-<!--                    </a-form-model-item>-->
-<!--                  </div>-->
-<!--                </a-col>-->
+                <!--                <a-col :span="12">-->
+                <!--                  <div class="box-title-text">-->
+                <!--                    <div class="title-text">-->
+                <!--                      <span class="Required">*</span>-->
+                <!--                      <span class="title-text-text"-->
+                <!--                            :title="$t('certificationType')">{{$t('certificationType')}}</span>-->
+                <!--                    </div>-->
+                <!--                    <a-form-model-item class="itemModel-multi"-->
+                <!--                                       :prop="'dataList.'+index+'.attestationType'"-->
+                <!--                                       :rules="[{ required: true, message: $t('certificationType') + $t('cannotEmpty'), trigger: 'change'},]"-->
+                <!--                    >-->
+                <!--                      <j-multi-select-tag class="box-input" v-model="item.attestationType"-->
+                <!--                                         :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
+                <!--                                         :type="'select'"-->
+                <!--                                         :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>-->
+                <!--                    </a-form-model-item>-->
+                <!--                  </div>-->
+                <!--                </a-col>-->
                 <a-col :span="12">
                   <div class="box-title-text">
                     <div class="title-text">
@@ -512,6 +512,43 @@
                 </div>
               </a-col>
             </a-row>
+            <a-row :gutter="24">
+              <a-col :span="12" v-if="formInline.inventoryVerifyEndTime">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text"
+                          :title="$t('inventoryVerifyEndTime')">{{$t('inventoryVerifyEndTime')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel">
+                    <a-date-picker class="box-input"
+                                   @change="dateChange({db_field_name:'inventoryVerifyEndTime'})"
+                                   format="YYYY-MM-DD"
+                                   :disabled="true"
+                                   :disabledDate="disabledDate"
+                                   :getCalendarContainer="(trigger) => trigger.parentNode"
+                                   v-model="formInline.inventoryVerifyEndTime"
+                                   style="width: 100%"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12" v-if="formInline.taskConfirmEndTime">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text" :title="$t('taskConfirmEndTime')">{{$t('taskConfirmEndTime')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel">
+                    <a-date-picker class="box-input"
+                                   @change="dateChange({db_field_name:'taskConfirmEndTime'})"
+                                   format="YYYY-MM-DD"
+                                   :disabled="true"
+                                   :disabledDate="disabledDate"
+                                   :getCalendarContainer="(trigger) => trigger.parentNode"
+                                   v-model="formInline.taskConfirmEndTime"
+                                   style="width: 100%"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
           </div>
           <!--        <a-row :gutter="24">-->
           <!--          <a-col :span="24">-->