From ccc0cb55127352ee9938de606af55f6ba2a68a21 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 16 Nov 2022 16:06:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParameterItemCollectionList.vue           | 12 +++++
 .../dialog/ParameterTemplateAdd.vue           | 51 +++++++++++--------
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index af4d3d3b7..e81676aa6 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -603,6 +603,18 @@
             text: this.$t('parameterBatch'),
             dictCode: 'params_batch'
           },
+          {
+            type: '',
+            value: 'sdt',
+            text: this.$t('sdt'),
+            dictCode: 'sdt'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+          {
+            type: '',
+            value: 'dre',
+            text: this.$t('dre'),
+            dictCode: 'dre'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
         ],
         selectedRowKeys: [],
         textLoading: false,
diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
index 088a28d55..b4e221ac3 100644
--- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
+++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
@@ -16,7 +16,7 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('title')">{{$t('title')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop='title'>
+              <a-form-model-item class="itemModel" prop='title'>
                 <!--                <a-input class="box-input"-->
                 <!--                         :disabled="disabled"-->
                 <!--                         v-model="formInline[item.db_field_name]"-->
@@ -38,12 +38,13 @@
           <a-col :span='11'>
             <div class="box-title-text">
               <div class="title-text">
+                <span class="Required">*</span>
                 <span class="title-text-text"
                       :title="$t('relatedProjectVersion')">{{$t('relatedProjectVersion')}}</span>
               </div>
-              <a-form-model-item class="itemModel" style="height: 40px">
-                <a-select mode="multiple"
-                          class="box-input"
+              <a-form-model-item class="itemModel" prop='projectVersion'>
+                <a-select
+                          class="box-input propbox"
                           style="width: 100%"
                           v-model='formData.projectVersion'
                           :placeholder="$t('PleaseSelect')+$t('relatedProjectVersion')">
@@ -224,19 +225,23 @@
               trigger: 'blur'
             }
           ],
-          explanation: [
-            {
-              max: 500,
-              message: this.$t('explain') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
-              trigger: 'blur'
-            }
-          ]
+          projectVersion: [
+            { required: true, message: this.$t('PleaseSelect')+this.$t('relatedProjectVersion'), trigger: 'change' },
+          ],
+          // explanation: [
+          //   {
+          //     max: 500,
+          //     message: this.$t('explain') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+          //     trigger: 'blur'
+          //   }
+          // ]
         },
         areaTable: [],
         flag: false,  //表单提交标识
         spinLoading: false,
         confirmLoading: false,
         selectedRowKeys: [],
+        projectName:'',
         num:'',
         pageNo: 1,
         pageSize: 10,
@@ -261,6 +266,10 @@
       }
     },
     mounted() {
+      let str =this.$route.query.projectName
+      let index = str.lastIndexOf("-");
+      this.projectName = str.substr(index+1,str.length);
+      this.formData.projectVersion = this.projectName
       this.loadData()
       this.getProjectVersion()
     },
@@ -328,11 +337,11 @@
         // 编辑一行的数据
         this.num = num
         let query = JSON.parse(JSON.stringify(edit))
-        if (query.projectVersion) {
-          query.projectVersion = query.projectVersion.split(',')
-        }else{
-          query.projectVersion = []
-        }
+        // if (query.projectVersion) {
+        //   query.projectVersion = query.projectVersion.split(',')
+        // }else{
+        //   query.projectVersion = []
+        // }
         this.row = query
         this.formData = { ...query }
         this.selectedRowKeys = query.paramsTemplateId.split(',')
@@ -344,9 +353,9 @@
         } else if (this.selectedRowKeys.length > 1) {
           this.$message.warning(this.$t('OnlyOneSelected'))
         } else {
-          if (this.formData.title !== undefined) {
-            this.formData.title = this.formData.title.trim()
-          }
+          // if (this.formData.title !== undefined) {
+          //   this.formData.title = this.formData.title.trim()
+          // }
           this.$refs.ruleForm.validate(valid => {
             if (valid) {
               this.flag = true
@@ -469,7 +478,9 @@
       color: red;
     }
   }
-
+  /deep/.propbox .ant-form-explain{
+    margin-top: -17px !important;
+  }
   .drawer-bootom-button {
     position: absolute;
     bottom: 0;