From c83d0a2a33325eeceb13458fdc892bf6588cb940 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 21 Sep 2023 17:02:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 181 +++++++++---------
 .../components/batSetting.vue                 | 104 +++++-----
 .../components/certificationList/index.vue    |  12 +-
 3 files changed, 148 insertions(+), 149 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index aeb1aa03b..bb67b377b 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -113,27 +113,48 @@
                 <a-col :span="12">
                   <div class="box-title-text">
                     <div class="title-text">
-                      <span class="Required">*</span>
-                      <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+                      <span class="Required" v-if="item.deliverableType != '1635545748968783874'">*</span>
+                      <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
                     </div>
-                    <a-form-model-item
-                      class="itemModel"
-                      :prop="'dataList.'+index+'.configItem'"
-                      :rules="[{ required: true, message: $t('configurationItem') + $t('cannotEmpty'), trigger: 'blur'},
-                             {max: 300,message: $t('configurationItem') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
-                            }]"
+                    <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'},]"
                     >
-                      <a-input class="box-input"
-                               v-model.trim="item.configItem"
-                               :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
-                      <!--                      <j-dict-select-tag class="box-input" v-model="item.configItem"-->
-                      <!--                                         @input="handleInput('dataList.'+index+'.configItem')"-->
-                      <!--                                         :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
-                      <!--                                         :type="'select'"-->
-                      <!--                                         :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
+                      <a-date-picker class="box-input"
+                                     :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                     @change="dateChange({db_field_name:'endTime'},index)"
+                                     format="YYYY-MM-DD"
+                                     :disabledDate="disabledDate"
+                                     :getCalendarContainer="(trigger) => trigger.parentNode"
+                                     v-model="item.endTime"
+                                     style="width: 100%"/>
                     </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('configurationItem')">{{$t('configurationItem')}}</span>-->
+<!--                    </div>-->
+<!--                    <a-form-model-item-->
+<!--                      class="itemModel"-->
+<!--                      :prop="'dataList.'+index+'.configItem'"-->
+<!--                      :rules="[{ required: true, message: $t('configurationItem') + $t('cannotEmpty'), trigger: 'blur'},-->
+<!--                             {max: 300,message: $t('configurationItem') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'-->
+<!--                            }]"-->
+<!--                    >-->
+<!--                      <a-input class="box-input"-->
+<!--                               v-model.trim="item.configItem"-->
+<!--                               :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>-->
+<!--                      &lt;!&ndash;                      <j-dict-select-tag class="box-input" v-model="item.configItem"&ndash;&gt;-->
+<!--                      &lt;!&ndash;                                         @input="handleInput('dataList.'+index+'.configItem')"&ndash;&gt;-->
+<!--                      &lt;!&ndash;                                         :placeholder="$t('PleaseSelect')+$t('configurationItem')"&ndash;&gt;-->
+<!--                      &lt;!&ndash;                                         :type="'select'"&ndash;&gt;-->
+<!--                      &lt;!&ndash;                                         :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>&ndash;&gt;-->
+<!--                    </a-form-model-item>-->
+<!--                  </div>-->
+<!--                </a-col>-->
                 <a-col :span="12">
                   <div class="box-title-text">
                     <div class="title-text">
@@ -273,27 +294,7 @@
                     </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="item.deliverableType != '1635545748968783874'">*</span>
-                      <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</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'},]"
-                    >
-                      <a-date-picker class="box-input"
-                                     :placeholder="$t('PleaseSelect')+$t('closingDate')"
-                                     @change="dateChange({db_field_name:'endTime'},index)"
-                                     format="YYYY-MM-DD"
-                                     :disabledDate="disabledDate"
-                                     :getCalendarContainer="(trigger) => trigger.parentNode"
-                                     v-model="item.endTime"
-                                     style="width: 100%"/>
-                    </a-form-model-item>
-                  </div>
-                </a-col>
+
               </a-row>
 
               <!--              <a-row :gutter="24">-->
@@ -358,24 +359,63 @@
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
-                    <span class="Required">*</span>
-                    <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+                    <span class="Required" v-if="formInline.deliverableType != '1635545748968783874'">*</span>
+                    <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
                   </div>
-                  <a-form-model-item
-                    class="itemModel"
-                    :prop="'configItem'"
+                  <a-form-model-item class="itemModel-multi"
+                                     :prop="formInline.deliverableType == '1635545748968783874'?'':'dutyPersonName'"
+                                     :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
+                                 message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'}]"
                   >
-                    <a-input class="box-input"
-                             v-model.trim="formInline.configItem"
-                             :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
-                    <!--                    <j-dict-select-tag class="box-input" v-model="formInline.configItem"-->
-                    <!--                                       @input="handleInput('configItem')"-->
-                    <!--                                       :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
-                    <!--                                       :type="'select'"-->
-                    <!--                                       :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
+                    <PersonnelSelection
+                      :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
+                      :personneQuery="formInline"
+                      :isSingleChoice="true"
+                      v-if="personnelVisible"
+                      @change="PersonnelSelectionChange"
+                      :disabled="disabled"
+                      v-model="formInline.dutyPersonName"/>
                   </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-col :span="12">-->
+<!--                <div class="box-title-text">-->
+<!--                  <div class="title-text">-->
+<!--                    <span class="Required">*</span>-->
+<!--                    <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>-->
+<!--                  </div>-->
+<!--                  <a-form-model-item-->
+<!--                    class="itemModel"-->
+<!--                    :prop="'configItem'"-->
+<!--                  >-->
+<!--                    <a-input class="box-input"-->
+<!--                             v-model.trim="formInline.configItem"-->
+<!--                             :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>-->
+<!--                    &lt;!&ndash;                    <j-dict-select-tag class="box-input" v-model="formInline.configItem"&ndash;&gt;-->
+<!--                    &lt;!&ndash;                                       @input="handleInput('configItem')"&ndash;&gt;-->
+<!--                    &lt;!&ndash;                                       :placeholder="$t('PleaseSelect')+$t('configurationItem')"&ndash;&gt;-->
+<!--                    &lt;!&ndash;                                       :type="'select'"&ndash;&gt;-->
+<!--                    &lt;!&ndash;                                       :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>&ndash;&gt;-->
+<!--                  </a-form-model-item>-->
+<!--                </div>-->
+<!--              </a-col>-->
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
@@ -528,28 +568,6 @@
                   </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('personLiable')">{{$t('personLiable')}}</span>
-                  </div>
-                  <a-form-model-item class="itemModel-multi"
-                                     :prop="formInline.deliverableType == '1635545748968783874'?'':'dutyPersonName'"
-                                     :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
-                                 message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'}]"
-                  >
-                    <PersonnelSelection
-                      :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
-                      :personneQuery="formInline"
-                      :isSingleChoice="true"
-                      v-if="personnelVisible"
-                      @change="PersonnelSelectionChange"
-                      :disabled="disabled"
-                      v-model="formInline.dutyPersonName"/>
-                  </a-form-model-item>
-                </div>
-              </a-col>
             </a-row>
             <a-row :gutter="24">
               <a-col :span="12">
@@ -593,25 +611,6 @@
                 </div>
               </a-col>
             </a-row>
-            <a-row :gutter="24">
-              <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-form-model>
       </a-spin>
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
index e50c44aad..f768e4616 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
@@ -9,58 +9,6 @@
     @cancel="handleCancel"
   >
     <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-      <a-row :gutter="24">
-        <a-col :span="name == $t('changeSetting') ? 24 : 12"
-               v-if="name == $t('BatchSetting') || name == $t('changeSetting')">
-          <div class="box-title-text">
-            <div class="title-text">
-              <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
-            </div>
-            <a-form-model-item class="itemModel">
-              <a-input class="box-input"
-                       v-model.trim="formInline.configItem"
-                       :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
-
-              <!--              <j-dict-select-tag class="box-input" v-model="formInline.configItem"-->
-              <!--                                 @input="handleInput('configItem')"-->
-              <!--                                 :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
-              <!--                                 :type="'select'"-->
-              <!--                                 :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
-            </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('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
-            </div>
-            <a-form-model-item class="itemModel">
-<!--              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"-->
-<!--                        class="box-input"-->
-<!--                        allowClear-->
-<!--                        optionFilterProp="label"-->
-<!--                        :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-<!--                        v-model="formInline.sdt">-->
-<!--                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"-->
-<!--                                 :key="item.key"-->
-<!--                                 :label="item.name"-->
-<!--                                 :value="item.value">-->
-<!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
-<!--                           {{ item.name }}-->
-<!--                     </span>-->
-<!--                </a-select-option>-->
-<!--              </a-select>-->
-              <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
-                                  :isSingleChoice="true"
-                                  :personneQuery="formInline"
-                                  v-if="visible"
-                                  @change="PersonnelSelectionChange"
-                                  v-model="formInline.sdt"/>
-            </a-form-model-item>
-          </div>
-        </a-col>
-
-      </a-row>
       <a-row :gutter="24" v-if="name == $t('BatchSetting')">
         <a-col :span="12">
           <div class="box-title-text">
@@ -179,6 +127,58 @@
           </div>
         </a-col>
       </a-row>
+      <a-row :gutter="24">
+        <!--        <a-col :span="name == $t('changeSetting') ? 24 : 12"-->
+        <!--               v-if="name == $t('BatchSetting') || name == $t('changeSetting')">-->
+        <!--          <div class="box-title-text">-->
+        <!--            <div class="title-text">-->
+        <!--              <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>-->
+        <!--            </div>-->
+        <!--            <a-form-model-item class="itemModel">-->
+        <!--              <a-input class="box-input"-->
+        <!--                       v-model.trim="formInline.configItem"-->
+        <!--                       :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>-->
+
+        <!--              &lt;!&ndash;              <j-dict-select-tag class="box-input" v-model="formInline.configItem"&ndash;&gt;-->
+        <!--              &lt;!&ndash;                                 @input="handleInput('configItem')"&ndash;&gt;-->
+        <!--              &lt;!&ndash;                                 :placeholder="$t('PleaseSelect')+$t('configurationItem')"&ndash;&gt;-->
+        <!--              &lt;!&ndash;                                 :type="'select'"&ndash;&gt;-->
+        <!--              &lt;!&ndash;                                 :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>&ndash;&gt;-->
+        <!--            </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('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <!--              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"-->
+              <!--                        class="box-input"-->
+              <!--                        allowClear-->
+              <!--                        optionFilterProp="label"-->
+              <!--                        :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+              <!--                        v-model="formInline.sdt">-->
+              <!--                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"-->
+              <!--                                 :key="item.key"-->
+              <!--                                 :label="item.name"-->
+              <!--                                 :value="item.value">-->
+              <!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
+              <!--                           {{ item.name }}-->
+              <!--                     </span>-->
+              <!--                </a-select-option>-->
+              <!--              </a-select>-->
+              <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
+                                  :isSingleChoice="true"
+                                  :personneQuery="formInline"
+                                  v-if="visible"
+                                  @change="PersonnelSelectionChange"
+                                  v-model="formInline.sdt"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
       <a-row :gutter="24" v-if="name == $t('BatchSetting') && roleSwitchingCode == 2">
         <a-col :span="24">
           <div class="box-title-text">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 78e18618d..b66b269b0 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -167,12 +167,12 @@
                 {{ $t('add') }}
               </div>
               <!--              添加配置-->
-              <div @click="addConfigurationClick"
-                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"
-                   class="operator-text-title">
-                <a-icon type="plus"/>
-                {{ $t('addConfiguration') }}
-              </div>
+<!--              <div @click="addConfigurationClick"-->
+<!--                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"-->
+<!--                   class="operator-text-title">-->
+<!--                <a-icon type="plus"/>-->
+<!--                {{ $t('addConfiguration') }}-->
+<!--              </div>-->
               <!--              模板下载-->
               <div @click="handleModule"
                    v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"