From ab0081166e9d695445234e221c143cf39e856349 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Sat, 2 Jul 2022 15:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ParameterLibraryAdd/index.vue  | 205 +++++++++++++++++-
 .../components/PersonnelSelection/index.vue   |  12 +
 .../src/components/searchalonesplit/index.vue |   2 +-
 .../parameter/ParameterTemplate/index.vue     |   1 +
 .../ParameterItemCollectionList.vue           |   2 +-
 .../dialog/ParameterTemplateAdd.vue           | 137 +++++++++++-
 6 files changed, 336 insertions(+), 23 deletions(-)

diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue
index 80c226ea3..f77f108c5 100644
--- a/jero-web/src/components/ParameterLibraryAdd/index.vue
+++ b/jero-web/src/components/ParameterLibraryAdd/index.vue
@@ -12,16 +12,44 @@
       >
         <a-row :gutter='24'>
           <a-col :span='9'>
-            <a-form-model-item ref='region' :label="$t('NiONumber')" prop='region'>
-                <a-input
-                  v-model='form.nioNumber' :placeholder="$t('pleaseEnter')+$t('NiONumber')" />
-            </a-form-model-item>
+            <div class="box-title-text">
+              <div class="title-text">
+<!--                <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('NiONumber')">{{$t('NiONumber')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop='region'>
+<!--                <a-input class="box-input"-->
+<!--                         :disabled="disabled"-->
+<!--                         v-model="formInline[item.db_field_name]"-->
+<!--                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
+                                <a-input class="box-input" :title="$t('pleaseEnter')+$t('ParameterName')"
+                                  v-model='form.nioNumber' :placeholder="$t('pleaseEnter')+$t('NiONumber')" />
+              </a-form-model-item>
+            </div>
+<!--            <a-form-model-item ref='region' :label="$t('NiONumber')" prop='region' >-->
+<!--                <a-input-->
+<!--                  v-model='form.nioNumber' :placeholder="$t('pleaseEnter')+$t('NiONumber')" />-->
+<!--            </a-form-model-item>-->
           </a-col>
           <a-col :span='9'>
-            <a-form-model-item ref='paramsTemplateName' :label="$t('ParameterName')" prop='paramsTemplateName'>
-              <a-input
-                v-model='form.paramsName' :placeholder="$t('pleaseEnter')+$t('ParameterName')" />
-            </a-form-model-item>
+            <div class="box-title-text">
+              <div class="title-text">
+                <!--                <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('ParameterName')">{{$t('ParameterName')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop='region'>
+                <!--                <a-input class="box-input"-->
+                <!--                         :disabled="disabled"-->
+                <!--                         v-model="formInline[item.db_field_name]"-->
+                <!--                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
+                <a-input
+                  v-model='form.paramsName' :title="$t('pleaseEnter')+$t('ParameterName')" :placeholder="$t('pleaseEnter')+$t('ParameterName')" />
+              </a-form-model-item>
+            </div>
+<!--            <a-form-model-item ref='paramsTemplateName' :label="$t('ParameterName')" prop='paramsTemplateName'>-->
+<!--              <a-input-->
+<!--                v-model='form.paramsName' :placeholder="$t('pleaseEnter')+$t('ParameterName')" />-->
+<!--            </a-form-model-item>-->
           </a-col>
           <a-col :span='6' style='margin-top: 5px'>
             <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
@@ -29,15 +57,32 @@
           </a-col>
         </a-row>
         <a-row :gutter='24'>
-          <a-col :span='9'>
-            <a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='region'>
-              <a-form-model-item class='itemModel' prop='region'>
+          <a-col :span='10'>
+            <div class="box-title-text">
+              <div class="title-text">
+                <!--                <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop='region'>
+                <!--                <a-input class="box-input"-->
+                <!--                         :disabled="disabled"-->
+                <!--                         v-model="formInline[item.db_field_name]"-->
+                <!--                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
                 <j-dict-select-tag class='box-input' v-model='form.dutyTerritory'
                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                    :type="'select'"
+                                   :title="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                    :triggerChange='false' :dictCode="'duty_territory'" />
               </a-form-model-item>
-            </a-form-model-item>
+            </div>
+<!--            <a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='region'>-->
+<!--              <a-form-model-item class='itemModel' prop='region'>-->
+<!--                <j-dict-select-tag class='box-input' v-model='form.dutyTerritory'-->
+<!--                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+<!--                                   :type="'select'"-->
+<!--                                   :triggerChange='false' :dictCode="'duty_territory'" />-->
+<!--              </a-form-model-item>-->
+<!--            </a-form-model-item>-->
           </a-col>
           <a-col :span='9'>
           </a-col>
@@ -291,6 +336,89 @@ export default {
   display: flex;
   justify-content: center;
 }
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  /*align-items: center;*/
+}
+
+.title-text {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+  height: 40px;
+  margin-bottom: 24px;
+}
+
+.itemModel-text {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.header-text {
+  font-size: 16px;
+  font-weight: bold;
+  margin-left: 15px;
+  /*border-bottom: 1px #d9d9d9 dashed;*/
+  height: 30px;
+  margin-bottom: 30px;
+}
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+.button-text {
+  height: 38px;
+  width: calc(100% - 100px);
+  line-height: 38px;
+  background: #fff;
+  border: 1px #00B3BE solid;
+  color: #00B3BE;
+}
+
+.button-text-text {
+  position: absolute;
+  right: -10px;
+  top: -21px;
+  display: inline-block;
+  padding: 6px;
+  border-radius: 50%;
+  background: red;
+  text-align: center;
+  line-height: 6px;
+  color: #fff;
+}
 </style>
 <style lang='less'>
 .area-module {
@@ -304,4 +432,57 @@ export default {
     }
   }
 }
+</style>
+<style>
+.formAdd .ant-form-item-label {
+  width: 130px;
+}
+
+.formAdd .ant-form-item-control-wrapper {
+  display: inline-block;
+  width: 100%;
+}
+
+/*.formAdd .ant-form-item {*/
+/*  margin-bottom: 20px;*/
+/*}*/
+
+.itemModel .ant-form-item-control-wrapper {
+  width: 100%;
+}
+
+.itemModel-text .ant-form-item-control-wrapper {
+  width: 100% !important;
+}
+
+.box-input .ant-select-selection--single {
+  height: 38px;
+}
+
+.box-input .ant-select-selection--multiple {
+  height: 38px;
+}
+
+.box-input .ant-select-selection__rendered {
+  line-height: 38px;
+  height: 38px;
+}
+
+.box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+  margin-top: 6px;
+}
+
+.box-input .ant-calendar-picker {
+  line-height: 38px;
+  height: 38px;
+}
+
+.box-input .ant-calendar-picker-input {
+  height: 38px;
+}
+
+.box-input .ant-input-number-input-wrap {
+  line-height: 38px;
+  height: 38px;
+}
 </style>
\ No newline at end of file
diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 51c2f5a7a..cacd06643 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -3,10 +3,14 @@
     <div class="box-title-text" v-if="!isInput">
       <a-input class="box-input" :value="value" @input="indexclick($event)"
                :disabled="true"
+               :title="value"
                :placeholder="$t('PleaseSelect')+query.db_field_txt"/>
       <a-button type="primary" class="button-box" @click="standardClick">
         {{this.$t('PersonnelSelection')}}
       </a-button>
+      <a-button type="primary" class="button-box" @click="standardDelete">
+        {{this.$t('delete')}}
+      </a-button>
     </div>
     <div class="box-title-text" v-if="isInput">
       <a-input :class="{'box-input':!isClass}" :value="value"
@@ -86,6 +90,9 @@
         this.queryDepartUserTreeList()
         this.visible = true
       },
+      standardDelete(){
+        this.$emit('input', null)
+      },
       // onSelect(selectedKeys, info) {
       //   console.log(selectedKeys)
       //   this.selectedKey = selectedKeys
@@ -151,6 +158,11 @@
       },
       indexclick(event) {
         this.$emit('input', event.target.value)
+        this.departId = ''
+        this.searchModel = ''
+        this.userIds = []
+        this.userName = []
+        this.defaultCheckedKeys = []
       },
       onSearch(e) {
         this.gData = []
diff --git a/jero-web/src/components/searchalonesplit/index.vue b/jero-web/src/components/searchalonesplit/index.vue
index 2d51da06b..77bfd3a66 100644
--- a/jero-web/src/components/searchalonesplit/index.vue
+++ b/jero-web/src/components/searchalonesplit/index.vue
@@ -23,7 +23,7 @@
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+            <a-input class="box-input" style='width: 226px' :placeholder="$t('PleaseEnter')+item.db_field_txt"
                      v-model="queryParam[item.db_field_name]"></a-input>
           </div>
           <div class="box-title-text" v-else-if="item.field_show_type == '2'">
diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue
index 3929a5a96..bfa9d8529 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/index.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue
@@ -200,6 +200,7 @@ export default {
   methods: {
     handleCancel() {
       this.areaVisible=false
+      this.$refs['ruleForm'].resetFields()
     },
     handleSubmit() {
       if( this.formInline.paramsTemplateName !== undefined) {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 9bc09aff5..36cc966c7 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -164,7 +164,7 @@
       </div>
     </div>
     <!--  添加--->
-    <a-modal v-model="areaVisible" :title="$t('ParameterLibrary')" width='750px' :footer="null">
+    <a-modal v-model="areaVisible" :title="$t('ParameterLibrary')" width='850px' :footer="null">
       <parameter-library-add v-if='areaVisible' :paramsManifest='paramsManifest' @areaVisible='areaVisible = false'
                              @GetgetTableList='GetgetTableList'/>
     </a-modal>
diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
index d50ea3fc4..bf8781520 100644
--- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
+++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
@@ -5,7 +5,7 @@
         class='tag-module'
         ref='ruleForm'
         :model='formData'
-        :rules='rules'
+        :rules="rules"
         :label-col='labelCol'
         :wrapper-col='wrapperCol'
       >
@@ -24,21 +24,57 @@
         </a-row>
         <a-row :gutter='24'>
           <a-col :span='9'>
-            <a-form-model-item ref='region' :label="$t('zoneOfApplication')" prop='region'>
-              <a-form-model-item class='itemModel' prop='region'>
+            <div class="box-title-text" style="margin-left: -58px;">
+              <div class="title-text">
+                <!--                <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop='region'>
+                <!--                <a-input class="box-input"-->
+                <!--                         :disabled="disabled"-->
+                <!--                         v-model="formInline[item.db_field_name]"-->
+                <!--                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
+<!--                <a-input-->
+<!--                  :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"-->
+<!--                  v-model='form.paramsTemplateName'/>-->
                 <j-dict-select-tag class='box-input' v-model='form.region'
                                    :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
                                    :type="'select'"
+                                   :title="$t('PleaseSelect')+$t('zoneOfApplication')"
                                    :triggerChange='false' :dictCode="'region'"/>
               </a-form-model-item>
-            </a-form-model-item>
+            </div>
+<!--            <a-form-model-item ref='region' :label="$t('zoneOfApplication')" prop='region'>-->
+<!--              <a-form-model-item class='itemModel' prop='region'>-->
+<!--                <j-dict-select-tag class='box-input' v-model='form.region'-->
+<!--                                   :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"-->
+<!--                                   :type="'select'"-->
+<!--                                   :triggerChange='false' :dictCode="'region'"/>-->
+<!--              </a-form-model-item>-->
+<!--            </a-form-model-item>-->
           </a-col>
           <a-col :span='9'>
-            <a-form-model-item ref='paramsTemplateName' :label="$t('parameterTemplate')" prop='paramsTemplateName'>
-              <a-input
-                :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"
-                v-model='form.paramsTemplateName'/>
-            </a-form-model-item>
+            <div class="box-title-text">
+              <div class="title-text">
+                <!--                <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop='region'>
+                <!--                <a-input class="box-input"-->
+                <!--                         :disabled="disabled"-->
+                <!--                         v-model="formInline[item.db_field_name]"-->
+                <!--                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
+                <a-input
+                  :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"
+                  :title="$t('PleaseSelect')+$t('parameterTemplate')"
+                  v-model='form.paramsTemplateName'/>
+              </a-form-model-item>
+            </div>
+<!--            <a-form-model-item ref='paramsTemplateName' :label="$t('parameterTemplate')" prop='paramsTemplateName'>-->
+<!--              <a-input-->
+<!--                :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"-->
+<!--                v-model='form.paramsTemplateName'/>-->
+<!--            </a-form-model-item>-->
           </a-col>
           <a-col :span='6' style='margin-top: 5px'>
             <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
@@ -346,6 +382,89 @@
     color: red;
     margin-right: 4px;
   }
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 114px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    height: 40px;
+    margin-bottom: 24px;
+  }
+
+  .itemModel-text {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .header-text {
+    font-size: 16px;
+    font-weight: bold;
+    margin-left: 15px;
+    /*border-bottom: 1px #d9d9d9 dashed;*/
+    height: 30px;
+    margin-bottom: 30px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .button-text-text {
+    position: absolute;
+    right: -10px;
+    top: -21px;
+    display: inline-block;
+    padding: 6px;
+    border-radius: 50%;
+    background: red;
+    text-align: center;
+    line-height: 6px;
+    color: #fff;
+  }
 </style>
 <style lang='less'>
   .area-module {