From 84502915b6b5030b0ea68ffe868b5f0b9acd1062 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 15:49:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E2=80=9D=E8=AE=A4=E8=AF=81=E7=B1=BB=E5=9E=8B=E2=80=9C?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectDetails/index.vue                  |   2 +-
 .../certificationList/components/addModel.vue | 244 +++++++++---------
 .../components/certificationList/index.vue    |   7 +
 .../components/listOfRegulations.vue          |  47 ++--
 .../projectRegulationTasks/index.vue          |  12 +-
 5 files changed, 168 insertions(+), 144 deletions(-)

diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
index ff42b43b5..d0e39fd0a 100644
--- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue
+++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
@@ -226,7 +226,7 @@
           '1': '法规工程师',
           '2': '认证工程师',
           '4': '法规工程师/认证工程师',
-          '11': '领导角色',
+          '11': 'R&H Manager',
           '12': '系统管理员',
           '13': 'Viewer',
           '14': '品牌管理员',
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 fa0fede77..acea53c59 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -161,66 +161,20 @@
                     <div class="title-text">
                       <span class="Required">*</span>
                       <span class="title-text-text"
-                            :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                            :title="$t('certificationType')">{{$t('certificationType')}}</span>
                     </div>
-                    <a-form-model-item class="itemModel"
-                                       style="display: inline-block"
-                                       :prop="'dataList.'+index+'.deliverableType'"
-                                       :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
+                    <a-form-model-item class="itemModel-multi"
+                                       :prop="'dataList.'+index+'.attestationType'"
+                                       :rules="[{ required: true, message: $t('certificationType') + $t('cannotEmpty'), trigger: 'change'},]"
                     >
-                      <!--
-                       :maxTagCount="1"
-                       tree-checkable-->
-                      <a-tree-select
-                        tree-node-filter-prop="title"
-                        v-model="item.deliverableType"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        class="box-input"
-                        style="width: 100%"
-                        :tree-data="DeliverableTreeList"
-                        :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                      />
+                      <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">
-                    <span class="title-text-text"
-                          :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
-                    </div>
-                    <a-form-model-item class="itemModel" prop="deliverableTemplate">
-                      <a-button type="primary" class="button-text"
-                                @click="clickButtonToUpload('deliverableTemplate',index,true)">
-                        {{ (item.deliverableTemplate === 'null' || item.deliverableTemplate === ''
-                        ||
-                        item.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                        }}
-                      </a-button>
-                    </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">
@@ -249,7 +203,55 @@
                     </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="Required">*</span>
+                      <span class="title-text-text"
+                            :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel"
+                                       style="display: inline-block"
+                                       :prop="'dataList.'+index+'.deliverableType'"
+                                       :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
+                    >
+                      <!--
+                       :maxTagCount="1"
+                       tree-checkable-->
+                      <a-tree-select
+                        tree-node-filter-prop="title"
+                        v-model="item.deliverableType"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        style="width: 100%"
+                        :tree-data="DeliverableTreeList"
+                        :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                      />
+                    </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('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel" prop="deliverableTemplate">
+                      <a-button type="primary" class="button-text"
+                                @click="clickButtonToUpload('deliverableTemplate',index,true)">
+                        {{ (item.deliverableTemplate === 'null' || item.deliverableTemplate === ''
+                        ||
+                        item.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                        }}
+                      </a-button>
+                    </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">
@@ -374,67 +376,26 @@
               </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('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
-                  </div>
-                  <a-form-model-item class="itemModel"
-                                     style="display: inline-block"
-                                     :prop="'deliverableType'"
-                  >
-                    <a-tree-select
-                      tree-node-filter-prop="title"
-                      v-model="formInline.deliverableType"
-                      :maxTagCount="1"
-                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                      class="box-input"
-                      style="width: 100%"
-                      :tree-data="DeliverableTreeList"
-                      :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                    />
-                  </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="title-text-text"
-                          :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+                          :title="$t('certificationType')">{{$t('certificationType')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" prop="deliverableTemplate">
-                    <a-button type="primary" class="button-text"
-                              @click="clickButtonToUpload('deliverableTemplate')">
-                      {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === ''
-                      ||
-                      formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                      }}
-                    </a-button>
+                  <a-form-model-item class="itemModel-multi"
+                                     :prop="'attestationType'"
+                                     :rules="[{ required: true, message: $t('certificationType') + $t('cannotEmpty'), trigger: 'change'},]"
+                  >
+                    <j-multi-select-tag class="box-input" v-model="formInline.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-row>
-
-            <a-row :gutter="24">
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
@@ -464,25 +425,46 @@
                   </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="Required" v-if="formInline.deliverableType != '1635545748968783874'">*</span>
-                    <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</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'}]"
+                                     style="display: inline-block"
+                                     :prop="'deliverableType'"
                   >
-                    <a-date-picker class="box-input"
-                                   :placeholder="$t('PleaseSelect')+$t('closingDate')"
-                                   @change="dateChange({db_field_name:'endTime'})"
-                                   format="YYYY-MM-DD"
-                                   :disabledDate="disabledDate"
-                                   :getCalendarContainer="(trigger) => trigger.parentNode"
-                                   v-model="formInline.endTime"
-                                   style="width: 100%"/>
+                    <a-tree-select
+                      tree-node-filter-prop="title"
+                      v-model="formInline.deliverableType"
+                      :maxTagCount="1"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      class="box-input"
+                      style="width: 100%"
+                      :tree-data="DeliverableTreeList"
+                      :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                    />
+                  </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('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" prop="deliverableTemplate">
+                    <a-button type="primary" class="button-text"
+                              @click="clickButtonToUpload('deliverableTemplate')">
+                      {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === ''
+                      ||
+                      formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                      }}
+                    </a-button>
                   </a-form-model-item>
                 </div>
               </a-col>
@@ -511,6 +493,28 @@
                   </a-form-model-item>
                 </div>
               </a-col>
+              <a-col :span="12">
+                <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>
+                  </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'}]"
+                  >
+                    <a-date-picker class="box-input"
+                                   :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                   @change="dateChange({db_field_name:'endTime'})"
+                                   format="YYYY-MM-DD"
+                                   :disabledDate="disabledDate"
+                                   :getCalendarContainer="(trigger) => trigger.parentNode"
+                                   v-model="formInline.endTime"
+                                   style="width: 100%"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
             </a-row>
             <a-row :gutter="24">
               <a-col :span="12" v-if="formInline.inventoryVerifyEndTime">
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 04b959873..47a745ca8 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -691,6 +691,13 @@
             width: 180,
             ellipsis: true
           },
+          {
+            title: this.$t('certificationType'),
+            align: 'left',
+            dataIndex: 'attestationTypeName',
+            width: 180,
+            ellipsis: true
+          },
           {
             title: this.$t('engineeringInterfacePerson'),
             align: 'left',
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index d28a56c74..faa147f1c 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -136,9 +136,16 @@
           <a-icon type="export" :rotate="-90"/>
           {{ $t('modifyOperator') }}
         </div>
+        <!--              复制-->
+        <div @click="copyClick" v-if="this.roleSwitchingCode == '1'"
+             class="operator-text">
+          <a-icon type="copy"/>
+          {{ $t('copy') }}
+        </div>
         <!--        列表设置-->
         <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize"
-                      placement="bottomRight" v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1'">
+                      placement="bottomRight"
+                      v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'">
           <template slot="title" id="popconfirmmize">
             <div style="max-height:360px;overflow:scroll;overflow-x: auto;">
               <a-checkbox
@@ -301,24 +308,24 @@
           <!--                 @click="viewClick(record)">-->
           <!--                {{ $t('view') }}-->
           <!--              </a>-->
-              <a class="text-operation"
-                 v-if="(
-                   record.verifyFlowStatus == 'List to be released' ||
-                   record.verifyFlowStatus == 'Regulatory engineer returns' ||
-                   record.verifyFlowStatus == 'Compliance' ||
-                   record.verifyFlowStatus == 'Non-Compliance' ||
-                   record.verifyFlowStatus == 'To be tracked' ||
-                   record.verifyFlowStatus == 'NA')
-                   && (record.designFlowStatus == 'List to be released' ||
-                   record.designFlowStatus == 'Regulatory engineer returns' ||
-                   record.designFlowStatus == 'Compliance' ||
-                   record.designFlowStatus == 'Non-Compliance' ||
-                   record.designFlowStatus == 'To be tracked' ||
-                   record.designFlowStatus == 'NA')
-                   && roleSwitchingCode == 0"
-                 @click="deleteLib(record)">
-                {{ $t('deleteLib') }}
-              </a>
+          <!--              <a class="text-operation"-->
+          <!--                 v-if="(-->
+          <!--                   record.verifyFlowStatus == 'List to be released' ||-->
+          <!--                   record.verifyFlowStatus == 'Regulatory engineer returns' ||-->
+          <!--                   record.verifyFlowStatus == 'Compliance' ||-->
+          <!--                   record.verifyFlowStatus == 'Non-Compliance' ||-->
+          <!--                   record.verifyFlowStatus == 'To be tracked' ||-->
+          <!--                   record.verifyFlowStatus == 'NA')-->
+          <!--                   && (record.designFlowStatus == 'List to be released' ||-->
+          <!--                   record.designFlowStatus == 'Regulatory engineer returns' ||-->
+          <!--                   record.designFlowStatus == 'Compliance' ||-->
+          <!--                   record.designFlowStatus == 'Non-Compliance' ||-->
+          <!--                   record.designFlowStatus == 'To be tracked' ||-->
+          <!--                   record.designFlowStatus == 'NA')-->
+          <!--                   && roleSwitchingCode == 0"-->
+          <!--                 @click="deleteLib(record)">-->
+          <!--                {{ $t('deleteLib') }}-->
+          <!--              </a>-->
               <a class="text-operation"
                  @click="resultReportedClick(record)">
                 {{ $t('resultReported') }}
@@ -2389,7 +2396,7 @@
               title: this.$t('operation'),
               align: 'left',
               fixed: 'right',
-              width: long == 'zh-cn' ? 180 : 246,
+              width: long == 'zh-cn' ? 140 : 186,
               scopedSlots: { customRender: 'operation' }
             })
             this.columnsAll.forEach((item) => {
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
index beb513a27..39239535b 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
@@ -30,9 +30,12 @@
                         class="box-input"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         allowClear
+                        showSearch
+                        optionFilterProp="label"
                         v-model="queryParam.flowType">
                 <a-select-option v-for="(item, key) in taskTypeList"
                                  :key="key"
+                                 :label="item.name"
                                  :value="item.value">
                      <span style="display: inline-block;width: 100%" :title=" item.name">
                            {{ item.name }}
@@ -44,16 +47,19 @@
           <template v-if="toggleSearchStatus">
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
-                <div class="title-text" :title="$t('ProcessStatus')">
-                  <span>{{$t('ProcessStatus')}}</span>
+                <div class="title-text" :title="$t('Tasknode')">
+                  <span>{{$t('Tasknode')}}</span>
                 </div>
-                <a-select :placeholder="$t('PleaseSelect')+$t('ProcessStatus')"
+                <a-select :placeholder="$t('PleaseSelect')+$t('Tasknode')"
                           class="box-input"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
+                          showSearch
+                          optionFilterProp="label"
                           v-model="queryParam.status">
                   <a-select-option v-for="(item, key) in taskStatusList"
                                    :key="key"
+                                   :label="item.name"
                                    :value="item.value">
                      <span style="display: inline-block;width: 100%" :title=" item.name">
                            {{ item.name }}