From d31b3229c10905d9652e6555e1d88c08bcfcb2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 12 Apr 2023 15:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E9=80=80?=
 =?UTF-8?q?=E5=9B=9E=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 36 +++++++++++++++++++
 .../components/certificationList/index.vue    |  1 +
 .../components/listOfRegulations.vue          | 21 ++++++-----
 3 files changed, 50 insertions(+), 8 deletions(-)

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 6552e4762..2a5fcb150 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -183,6 +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">
@@ -379,6 +397,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">
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 168d6e0c3..e1fbe14d9 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -736,6 +736,7 @@
             align: 'left',
             dataIndex: 'flowStatusName',
             width: 180,
+            sorter: true,
             ellipsis: true
           },
           {
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 921e0824f..9e14d461d 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -418,14 +418,14 @@
                     {{ $t('deadlineForConfirmationDesignComplianceResponsibility') }}
                   </span>
                 </div>
-                <a-form-model-item class="itemModel" style="width: calc(100% - 220px)" prop="designComplianceDueDate">
+                <a-form-model-item class="itemModel" style="width: calc(100% - 220px)" prop="designDutyDueDate">
                   <a-date-picker class="box-input"
                                  :placeholder="$t('PleaseSelect')+$t('deadlineForConfirmationDesignComplianceResponsibility')"
-                                 @change="dateChange({db_field_name:'designComplianceDueDate'})"
+                                 @change="dateChange({db_field_name:'designDutyDueDate'})"
                                  format="YYYY-MM-DD"
                                  :disabledDate="disabledDate"
                                  :getCalendarContainer="(trigger) => trigger.parentNode"
-                                 v-model="formInline.designComplianceDueDate"
+                                 v-model="formInline.designDutyDueDate"
                                  style="width: 100%"/>
                 </a-form-model-item>
               </div>
@@ -441,14 +441,14 @@
                     {{ $t('deadlineForVerifyingComplianceResponsibilityConfirmation') }}
                   </span>
                 </div>
-                <a-form-model-item class="itemModel" style="width: calc(100% - 220px)" prop="deadlineDueDate">
+                <a-form-model-item class="itemModel" style="width: calc(100% - 220px)" prop="verifyDutyDueDate">
                   <a-date-picker class="box-input"
                                  :placeholder="$t('PleaseSelect')+$t('deadlineForVerifyingComplianceResponsibilityConfirmation')"
-                                 @change="dateChange({db_field_name:'deadlineDueDate'})"
+                                 @change="dateChange({db_field_name:'verifyDutyDueDate'})"
                                  format="YYYY-MM-DD"
                                  :disabledDate="disabledDate"
                                  :getCalendarContainer="(trigger) => trigger.parentNode"
-                                 v-model="formInline.deadlineDueDate"
+                                 v-model="formInline.verifyDutyDueDate"
                                  style="width: 100%"/>
                 </a-form-model-item>
               </div>
@@ -903,14 +903,14 @@
               trigger: 'change'
             }
           ],
-          designComplianceDueDate: [
+          designDutyDueDate: [
             {
               required: true,
               message: this.$t('deadlineForConfirmationDesignComplianceResponsibility') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
           ],
-          deadlineDueDate: [
+          verifyDutyDueDate: [
             {
               required: true,
               message: this.$t('deadlineForVerifyingComplianceResponsibilityConfirmation') + this.$t('cannotEmpty'),
@@ -2468,6 +2468,11 @@
                 this.updateFlowStatusBatch()
               }
               for (let i = 0; i < this.startProcessList.length; i++) {
+                if (this.startProcessList[i].type == 2){
+                  this.startProcessList[i].dataList.designDutyDueDate = this.formInline.designDutyDueDate
+                }else if(this.startProcessList[i].type == 4){
+                  this.startProcessList[i].dataList.verifyDutyDueDate = this.formInline.verifyDutyDueDate
+                }
                 this.startProcess(this.startProcessList[i].dataList, this.startProcessList[i].type, this.startProcessList[i].requestsNum)
               }
             }