From a3effc8b36e03ef65a01f4eb0958bb8ce69b50fe Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Fri, 10 Jun 2022 10:40:37 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parameterlist/components/addModel.vue     | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index bdeda0343..15d63b153 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -162,7 +162,7 @@
                       :title="$t('controlType')">{{$t('controlType')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="controlType">
-                  <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" allowClear v-model="formInline.controlType" @change='onSelectChange'>
+                  <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" allowClear v-model="formInline.controlType">
                     <a-select-option v-for="(item, key) in controlType" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
@@ -173,7 +173,7 @@
               </div>
             </a-col>
 <!--            控件校验-->
-            <a-col :span="12" v-if='SelectChangelabel'>
+            <a-col :span="12" v-if='this.formInline.controlType =="1" || this.formInline.controlType =="5" || this.formInline.controlType =="6" || this.formInline.controlType =="7" || this.formInline.controlType =="10"'>
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('controlVerification')">{{$t('controlVerification')}}</span>
@@ -192,7 +192,7 @@
           </a-row>
 <!--          控件备选值-->
           <a-row :gutter="24">
-            <a-col :span="12" v-if='inputChangelabel'>
+            <a-col :span="12" v-if='this.formInline.controlType =="2" || this.formInline.controlType =="3" || this.formInline.controlType =="5" || this.formInline.controlType =="6" || this.formInline.controlType =="8" || this.formInline.controlType =="9" || this.formInline.controlType =="10"'>
               <div class="box-title-text">
                 <div class="title-text">
                 <span class="Required">*</span>
@@ -209,7 +209,7 @@
               </div>
             </a-col>
 <!--          附件模板-->
-            <a-col :span="12" v-if='buttonChangelabel'>
+            <a-col :span="12" v-if='this.formInline.controlType =="4" || this.formInline.controlType =="7" || this.formInline.controlType =="8" || this.formInline.controlType =="9" || this.formInline.controlType =="10"'>
               <div class="box-title-text">
                 <div class="title-text">
                 <span class="title-text-text"
@@ -407,23 +407,6 @@ export default {
     this.getSysCategoryTree()
   },
   methods: {
-    onSelectChange() {
-      if(this.formInline.controlType =="1" || this.formInline.controlType =="5" || this.formInline.controlType =="6" || this.formInline.controlType =="7" || this.formInline.controlType =="10") {
-        this.SelectChangelabel = true
-      } else {
-        this.SelectChangelabel = false
-      }
-      if(this.formInline.controlType =="2" || this.formInline.controlType =="3" || this.formInline.controlType =="5" || this.formInline.controlType =="6" || this.formInline.controlType =="8" || this.formInline.controlType =="9" || this.formInline.controlType =="10") {
-        this.inputChangelabel = true
-      } else {
-        this.inputChangelabel = false
-      }
-      if(this.formInline.controlType =="4" || this.formInline.controlType =="7" || this.formInline.controlType =="8" || this.formInline.controlType =="9" || this.formInline.controlType =="10") {
-        this.buttonChangelabel = true
-      } else {
-        this.buttonChangelabel = false
-      }
-    },
     uploadSuccess(data) {
       let attIdList = []
       if (data && data.length > 0) {
@@ -462,6 +445,7 @@ export default {
         this.contentList = _tt
       } else {
         // 编辑 todo
+        console.log(val,'pppp')
         // console.log(this.contentListed,'this.contentListed')
         // val.forEach((item) => {
         //   this.contentListed.push({
@@ -511,13 +495,16 @@ export default {
       this.contentList = []
     },
     editModel(value) {
+      console.log(value,'oooo')
       this.contentListed = []
       this.visible = true
       this.formInline = value
+      console.log(this.formInline.controlType,'this.formInline.controlType')
       this.title = '编辑'
         value.certCategoryParamsInfoEOList.map((item, index) => {
           item.textVal = item.certCategory_dictText
           this.contentListed.push(item)
+          console.log(this.contentListed,'this.contentListedthis.contentListed')
         })
         this.contentList = this.contentListed
     },