From 5bc76d8e5ff6478ae39f5a8f1ec563fd70d2392f Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 18 Apr 2022 13:54:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=87=E6=A1=A3=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=9A=84=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   4 +-
 jero-web/src/common/lang/zh-cn.js             |   4 +-
 .../projectManagement/components/addModel.vue |  11 +-
 .../components/listEditModel.vue              | 202 +++++++++++-------
 .../components/listOfRegulations.vue          | 138 ++++++++++--
 5 files changed, 248 insertions(+), 111 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 4cd98bed4..80da7601b 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -661,5 +661,7 @@ module.exports = {
   initiateTaskConfirmation: 'Initiate task confirmation',
   alteration: 'alteration',
   fixedPlate: 'Fixed plate',
-  taskAffirmStatus: 'task Affirm Status'
+  taskAffirmStatus: 'task Affirm Status',
+  listConfirmationStatus:'List confirmation status',
+  ListConfirmationDeadline:'List confirmation deadline',
 }
\ 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 be98cf89f..7c7076046 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -665,5 +665,7 @@ module.exports = {
   initiateTaskConfirmation:'发起任务确认',
   alteration:'变更',
   fixedPlate:'定版',
-  taskAffirmStatus:'任务发布状态',
+  taskAffirmStatus:'任务确认状态',
+  listConfirmationStatus:'清单确认状态',
+  ListConfirmationDeadline:'清单确认截止时间',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue
index f4a45ae96..b04f2c84c 100644
--- a/jero-web/src/views/projectManagement/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/addModel.vue
@@ -32,12 +32,11 @@
                 <span class="title-text-text" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="targetMarket">
-                <j-dict-select-tag class="box-input" v-model="formInline.targetMarket"
-                                   :disabled="disabled"
-                                   @input="handleInput('targetMarket')"
-                                   :placeholder="$t('PleaseSelect')+$t('targetMarket')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'region'"/>
+                <j-multi-select-tag class="box-input" v-model="formInline.targetMarket"
+                                    :disabled="disabled"
+                                    :placeholder="$t('PleaseSelect')+$t('targetMarket')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'region'"/>
               </a-form-model-item>
             </div>
           </a-col>
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index dfe8c13ac..703140dab 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -189,11 +189,17 @@
                 <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'regulatoryEngineer'">
-                <PersonnelSelection :query="{db_field_name:'regulatoryEngineer',db_field_txt:$t('regulatoryEngineer')}"
-                                    :personneQuery="formInline"
-                                    @change="PersonnelSelectionChange"
-                                    :disabled="disabled"
-                                    v-model="formInline.regulatoryEngineer"/>
+
+                <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
+                          v-model="formInline.regulatoryEngineer">
+                  <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
+                           {{ item.text || item.label }}
+                     </span>
+                  </a-select-option>
+                </a-select>
               </a-form-model-item>
             </div>
           </a-col>
@@ -205,11 +211,16 @@
                 <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'certifiedEngineer'">
-                <PersonnelSelection :query="{db_field_name:'certifiedEngineer',db_field_txt:$t('certifiedEngineer')}"
-                                    :personneQuery="formInline"
-                                    @change="PersonnelSelectionChange"
-                                    :disabled="disabled"
-                                    v-model="formInline.certifiedEngineer"/>
+                <a-select :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')"
+                          v-model="formInline.certifiedEngineer">
+                  <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
+                           {{ item.text || item.label }}
+                     </span>
+                  </a-select-option>
+                </a-select>
               </a-form-model-item>
             </div>
           </a-col>
@@ -219,12 +230,16 @@
                 <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
-                <PersonnelSelection
-                  :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
-                  :personneQuery="formInline"
-                  @change="PersonnelSelectionChange"
-                  :disabled="disabled"
-                  v-model="formInline.engineeringInterfacePerson"/>
+                <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                          v-model="formInline.engineeringInterfacePerson">
+                  <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
+                           {{ item.text || item.label }}
+                     </span>
+                  </a-select-option>
+                </a-select>
               </a-form-model-item>
             </div>
           </a-col>
@@ -239,7 +254,7 @@
                 <a-textarea
                   :placeholder="$t('PleaseEnter')+$t('remarks')"
                   :disabled="disabled"
-                  v-model="formInline.remarks" :rows="4"/>
+                  v-model="formInline.remark" :rows="4"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -255,12 +270,12 @@
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="typeOfDeliverables">
-                <j-dict-select-tag class="box-input" v-model="formInline.typeOfDeliverables"
+                <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"
                                    :disabled="disabled"
-                                   @input="handleInput('typeOfDeliverables')"
+                                   @input="handleInput('designDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
+                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -270,11 +285,11 @@
                 <span class="title-text-text"
                       :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="deliverableTemplate">
+              <a-form-model-item class="itemModel" prop="designDeliverableTemplate">
                 <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('deliverableTemplate')">
-                  {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' ||
-                  formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                          @click="clickButtonToUpload('designDeliverableTemplate')">
+                  {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
+                  formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                   }}
                 </a-button>
               </a-form-model-item>
@@ -288,13 +303,13 @@
                 <span class="title-text-text"
                       :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="Sponsor">
-                <j-dict-select-tag class="box-input" v-model="formInline.Sponsor"
+              <a-form-model-item class="itemModel" prop="designInitiator">
+                <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"
                                    :disabled="disabled"
-                                   @input="handleInput('Sponsor')"
+                                   @input="handleInput('designInitiator')"
                                    :placeholder="$t('PleaseSelect')+$t('Sponsor')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
+                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -304,13 +319,13 @@
                 <span class="title-text-text"
                       :title="$t('personLiable')">{{$t('personLiable')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="personLiable">
-                <j-dict-select-tag class="box-input" v-model="formInline.personLiable"
+              <a-form-model-item class="itemModel" prop="designDuty">
+                <j-dict-select-tag class="box-input" v-model="formInline.designDuty"
                                    :disabled="disabled"
-                                   @input="handleInput('personLiable')"
+                                   @input="handleInput('designDuty')"
                                    :placeholder="$t('PleaseSelect')+$t('personLiable')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
+                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -322,12 +337,12 @@
                 <span class="title-text-text"
                       :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'cutoffTime'">
+              <a-form-model-item class="itemModel" :prop="'designDueDate'">
                 <a-date-picker class="box-input"
                                :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
-                               @change="dateChange({db_field_name:'cutoffTime'})"
+                               @change="dateChange({db_field_name:'designDueDate'})"
                                format="YYYY-MM-DD"
-                               v-model="formInline.cutoffTime"
+                               v-model="formInline.designDueDate"
                                :disabled="disabled"
                                style="width: 100%"/>
               </a-form-model-item>
@@ -344,13 +359,13 @@
                 <span class="title-text-text"
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="typeOfDeliverables">
-                <j-dict-select-tag class="box-input" v-model="formInline.typeOfDeliverables"
+              <a-form-model-item class="itemModel" prop="prehomoDeliverableType">
+                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"
                                    :disabled="disabled"
-                                   @input="handleInput('typeOfDeliverables')"
+                                   @input="handleInput('prehomoDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
+                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -360,11 +375,12 @@
                 <span class="title-text-text"
                       :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="deliverableTemplate">
+              <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">
                 <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('deliverableTemplate')">
-                  {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' ||
-                  formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                          @click="clickButtonToUpload('prehomoDeliverableTemplate')">
+                  {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''
+                  ||
+                  formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                   }}
                 </a-button>
               </a-form-model-item>
@@ -378,13 +394,13 @@
                 <span class="title-text-text"
                       :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="Sponsor">
-                <j-dict-select-tag class="box-input" v-model="formInline.Sponsor"
+              <a-form-model-item class="itemModel" prop="prehomoInitiator">
+                <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"
                                    :disabled="disabled"
-                                   @input="handleInput('Sponsor')"
+                                   @input="handleInput('prehomoInitiator')"
                                    :placeholder="$t('PleaseSelect')+$t('Sponsor')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
+                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -394,13 +410,13 @@
                 <span class="title-text-text"
                       :title="$t('personLiable')">{{$t('personLiable')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="personLiable">
-                <j-dict-select-tag class="box-input" v-model="formInline.personLiable"
+              <a-form-model-item class="itemModel" prop="prehomoDuty">
+                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"
                                    :disabled="disabled"
-                                   @input="handleInput('personLiable')"
+                                   @input="handleInput('prehomoDuty')"
                                    :placeholder="$t('PleaseSelect')+$t('personLiable')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
+                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -412,12 +428,12 @@
                 <span class="title-text-text"
                       :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'cutoffTime'">
+              <a-form-model-item class="itemModel" :prop="'prehomoDueDate'">
                 <a-date-picker class="box-input"
                                :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
-                               @change="dateChange({db_field_name:'cutoffTime'})"
+                               @change="dateChange({db_field_name:'prehomoDueDate'})"
                                format="YYYY-MM-DD"
-                               v-model="formInline.cutoffTime"
+                               v-model="formInline.prehomoDueDate"
                                :disabled="disabled"
                                style="width: 100%"/>
               </a-form-model-item>
@@ -434,13 +450,13 @@
                 <span class="title-text-text"
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="typeOfDeliverables">
-                <j-dict-select-tag class="box-input" v-model="formInline.typeOfDeliverables"
+              <a-form-model-item class="itemModel" prop="verifyDeliverableType">
+                <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"
                                    :disabled="disabled"
-                                   @input="handleInput('typeOfDeliverables')"
+                                   @input="handleInput('verifyDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
+                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -450,11 +466,11 @@
                 <span class="title-text-text"
                       :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="deliverableTemplate">
+              <a-form-model-item class="itemModel" prop="verifyDeliverableTemplate">
                 <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('deliverableTemplate')">
-                  {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' ||
-                  formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                          @click="clickButtonToUpload('verifyDeliverableTemplate')">
+                  {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' ||
+                  formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                   }}
                 </a-button>
               </a-form-model-item>
@@ -468,13 +484,13 @@
                 <span class="title-text-text"
                       :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="Sponsor">
-                <j-dict-select-tag class="box-input" v-model="formInline.Sponsor"
+              <a-form-model-item class="itemModel" prop="verifyInitiator">
+                <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"
                                    :disabled="disabled"
-                                   @input="handleInput('Sponsor')"
+                                   @input="handleInput('verifyInitiator')"
                                    :placeholder="$t('PleaseSelect')+$t('Sponsor')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
+                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -484,13 +500,13 @@
                 <span class="title-text-text"
                       :title="$t('personLiable')">{{$t('personLiable')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="personLiable">
-                <j-dict-select-tag class="box-input" v-model="formInline.personLiable"
+              <a-form-model-item class="itemModel" prop="verifyDuty">
+                <j-dict-select-tag class="box-input" v-model="formInline.verifyDuty"
                                    :disabled="disabled"
-                                   @input="handleInput('personLiable')"
+                                   @input="handleInput('verifyDuty')"
                                    :placeholder="$t('PleaseSelect')+$t('personLiable')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
+                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -502,12 +518,12 @@
                 <span class="title-text-text"
                       :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'cutoffTime'">
+              <a-form-model-item class="itemModel" :prop="'verifyDueDate'">
                 <a-date-picker class="box-input"
                                :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
-                               @change="dateChange({db_field_name:'cutoffTime'})"
+                               @change="dateChange({db_field_name:'verifyDueDate'})"
                                format="YYYY-MM-DD"
-                               v-model="formInline.cutoffTime"
+                               v-model="formInline.verifyDueDate"
                                :disabled="disabled"
                                style="width: 100%"/>
               </a-form-model-item>
@@ -527,7 +543,7 @@
 <script>
   import Standardselection from '@/components/Standardselection/index'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
-  import { getAction, postAction } from '@/api/manage'
+  import { getAction, postAction, putAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
   import moment from 'moment'
 
@@ -538,21 +554,25 @@
       PersonnelSelection,
       uploadFile
     },
+    props: ['url'],
     data() {
       return {
         visible: false,
         confirmLoading: false,
         rules: {},
         formInline: {},
+        regulatoryEngineerList: [],
         disabled: false
       }
     },
     mounted() {
     },
     methods: {
-      editModel() {
+      editModel(item) {
         this.visible = true
-        this.formInline = {}
+        this.$nextTick(() => {
+          this.formInline = item
+        })
       },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
@@ -582,7 +602,24 @@
         this.visible = false
       },
       handleSubmit() {
-
+        let formInline = JSON.parse(JSON.stringify(this.formInline))
+        Object.keys(formInline).forEach(res => {
+          if (formInline[res] && formInline[res] instanceof Array) {
+            formInline[res] = formInline[res].join(',')
+          }
+        })
+        this.confirmLoading = true
+        putAction(this.url.editModel, formInline).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('editModelList')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
       },
       handleInput(value) {
         this.$nextTick(() => {
@@ -590,10 +627,6 @@
           this.$refs.ruleForm.validateField([value])
         })
       },
-      StandardselectionChange(value, id) {
-        this.formInline[value + '_id'] = id
-        this.formInline = { ...this.formInline }
-      },
       dateChange(item) {
         this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
       },
@@ -652,6 +685,13 @@
     line-height: 38px;
     height: 38px;
   }
+  .ant-input-disabled {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+
+  .ant-select-disabled {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
 </style>
 <style scoped>
   .box-title-text {
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index cba13cb20..f0b1c0c64 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -11,7 +11,7 @@
               <span>{{$t('standard')}}</span>
             </div>
             <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                     v-model="queryParam.standard"></a-input>
+                     v-model="queryParam.serialNumber"></a-input>
           </div>
         </a-col>
         <a-col :md="6" :sm="8">
@@ -42,7 +42,7 @@
     </div>
     <div class="table-operator">
       <div style="float: left;margin-bottom: 19px;margin-left: 20px">
-        <div class="operator-text">
+        <div class="operator-text" @click="initiateListConfirmationcClick">
           <a-icon type="solution"/>
           {{$t('initiateListConfirmation')}}
         </div>
@@ -108,7 +108,38 @@
       </a-table>
     </div>
     <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
-    <listEditModel :url="url" ref="editModelRef"/>
+    <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
+    <a-modal
+      :title="$t('ListConfirmationDeadline')"
+      :width="500"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-index">
+              <div class="title-text-index">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('TaskCutOffTime')">{{$t('TaskCutOffTime')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"
+                               @change="dateChange({db_field_name:'TaskCutOffTime'})"
+                               format="YYYY-MM-DD"
+                               v-model="formInline.TaskCutOffTime"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
   </a-card>
 </template>
 
@@ -117,6 +148,7 @@
   import listAddModel from './listAddModel'
   import listEditModel from './listEditModel'
   import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import moment from 'moment'
 
   export default {
     name: 'listOfRegulations',
@@ -160,6 +192,18 @@
             ellipsis: true,
             fixed: 'left'
           },
+          {
+            title: this.$t('listConfirmationStatus'),
+            align: 'center',
+            ellipsis: true,
+            dataIndex: 'inventoryAffirmStatusName'
+          },
+          {
+            title: this.$t('taskAffirmStatus'),
+            align: 'center',
+            ellipsis: true,
+            dataIndex: 'taskAffirmStatusName'
+          },
           // {
           //   title: this.$t('taskReleaseStatus'),
           //   align: 'center',
@@ -175,7 +219,7 @@
             title: this.$t('implementationCategory'),
             align: 'center',
             ellipsis: true,
-            dataIndex: 'implementType'
+            dataIndex: 'implementType_dictText'
           },
           {
             title: this.$t('ImplementationDate'),
@@ -237,17 +281,17 @@
             children: [
               {
                 title: this.$t('Deliverables'),
-                dataIndex: 'designDeliverableTemplate',
+                dataIndex: 'designDeliverableTemplateName',
                 align: 'center'
               },
               {
                 title: this.$t('Sponsor'),
-                dataIndex: 'designInitiator',
+                dataIndex: 'designInitiator_dictText',
                 align: 'center'
               },
               {
                 title: this.$t('personLiable'),
-                dataIndex: 'designDuty',
+                dataIndex: 'designDuty_dictText',
                 align: 'center'
               },
               {
@@ -262,17 +306,17 @@
             children: [
               {
                 title: this.$t('Deliverables'),
-                dataIndex: 'prehomoDeliverableTemplate',
+                dataIndex: 'prehomoDeliverableTemplateName',
                 align: 'center'
               },
               {
                 title: this.$t('Sponsor'),
-                dataIndex: 'prehomoInitiator',
+                dataIndex: 'prehomoInitiator_dictText',
                 align: 'center'
               },
               {
                 title: this.$t('personLiable'),
-                dataIndex: 'prehomoDuty',
+                dataIndex: 'prehomoDuty_dictText',
                 align: 'center'
               },
               {
@@ -287,17 +331,17 @@
             children: [
               {
                 title: this.$t('Deliverables'),
-                dataIndex: 'verifyDeliverableTemplate',
+                dataIndex: 'verifyDeliverableTemplateName',
                 align: 'center'
               },
               {
                 title: this.$t('Sponsor'),
-                dataIndex: 'verifyInitiator',
+                dataIndex: 'verifyInitiator_dictText',
                 align: 'center'
               },
               {
                 title: this.$t('personLiable'),
-                dataIndex: 'verifyDuty',
+                dataIndex: 'verifyDuty_dictText',
                 align: 'center'
               },
               {
@@ -307,12 +351,6 @@
               }
             ]
           },
-          {
-            title: this.$t('taskAffirmStatus'),
-            align: 'center',
-            ellipsis: true,
-            dataIndex: 'taskAffirmStatusName'
-          },
           {
             title: this.$t('operation'),
             align: 'center',
@@ -321,13 +359,17 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
+        confirmLoading: false,
         selectedRowKeys: [],
+        visible: false,
+        formInline: {},
+        rules: {},
         queryParam: {},
         url: {
           addModelList: '/document/bussDocumentLibraryEO/queryPageInfoDummy',
           list: '/project/projectLawsInventoryEO/list',
           addModel: 'project/projectLawsInventoryEO/add',
-          edit: '/project/projectLawsInventoryEO/edit',
+          editModel: '/project/projectLawsInventoryEO/edit',
           deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
           deleteOne: '/project/projectLawsInventoryEO/delete'
         },
@@ -422,7 +464,36 @@
             this.loading = false
           }
         })
-      }
+      },
+      initiateListConfirmationcClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          this.dataSource.forEach(res => {
+            selectedRowKeys.forEach(val => {
+              if (res.id == val) {
+                if (res.inventoryAffirmStatus == 'Not started' || res.inventoryAffirmStatus == 'rejected') {
+                  this.visible = true
+                  this.formInline = {}
+                } else {
+                  this.$message.warning(this.$t('selectLeastOne'))
+                }
+              }
+            })
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      handleOk() {
+
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      },
+      dateChange(item) {
+        this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+      },
     }
   }
 </script>
@@ -497,6 +568,11 @@
     margin-bottom: 10px;
   }
 
+  .box-title-text-index {
+    line-height: 1.4;
+    display: flex;
+  }
+
   .title-text {
     width: 32px;
     color: #000F16;
@@ -511,13 +587,31 @@
     text-overflow: ellipsis;
   }
 
+  .title-text-index {
+    width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    line-height: 40px;
+  }
+
   .box-input {
     display: inline-block;
     width: 70%;
     height: 38px;
     margin-top: 2px;
   }
-
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
   .box-button {
     height: 38px;
   }