From e07dfe9ceb1acede7a998abe245cca19fcc5d0cc Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Thu, 16 Jun 2022 14:14:10 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parameterlist/components/addModel.vue     | 72 +++++++++----------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index e47f2a2dd..051196609 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -400,7 +400,7 @@ export default {
       SelectChangelabel: false, // 控件校验
       inputChangelabel: false, // 控件备选值校验
       buttonChangelabel: false, // 模板校验
-      contentListedEdit: [], // 认证类别编辑
+      contentListStart: [], // 认证类别编辑
     }
   },
   mounted() {
@@ -408,6 +408,22 @@ export default {
     this.getSysCategoryTree()
   },
   methods: {
+    getcontentListedEdit() {
+      getAction('sys/dict/getDictItems/cert_category', { }).then((res) => {
+        if (res.success) {
+          let tt = []
+          res.result.forEach((item) => {
+            let obj = {
+              isdisable: false,
+              certCategory: item.value
+            }
+            tt.push(Object.assign(obj,item))
+          })
+          this.contentListStart = tt
+          // this.contentList = tt
+        }
+      })
+    },
     uploadSuccess(data) {
       let attIdList = []
       if (data && data.length > 0) {
@@ -431,43 +447,20 @@ export default {
       })
     },
     Onchangelabel(val) {
-      // 新增
-      if(this.title === '新增') {
-        let _tt = []
+      let _tt = []
+      this.contentListStart.forEach((itemVal) => {
         val.forEach((item) => {
-          _tt.push({
-            textVal: item.text, // tab
-            certCategory: item.value, // 所属认证类别
-            paramsNumber: '', // 编号
-            paramsName: '', // 参数名称
-            description: ''// 参数说明
-          })
+          if(itemVal.value === item.value) {
+             _tt.push(itemVal)
+          }
         })
-        this.contentList = _tt
-      } else {
-        let _val = []
-        val.map((itemVal) => {
-          this.contentListedEdit.forEach((item) => {
-            if(item.certCategory == itemVal.value) {
-              itemVal.textVal = item.textVal
-              itemVal.certCategory = item.value
-              itemVal.paramsNumber = item.nioNumber
-              itemVal.paramsName = item.paramsName
-              itemVal.description = item.description
-            }
-          })
-           _val.push(itemVal)
-        })
-        this.contentList = _val
-      }
+      })
+      this.contentList = _tt
     },
     Onchange(val) {
       if(this.formInline.certCategory == '') {
         this.contentList = []
       }
-    },
-    callback() {
-
     },
     getSysCategoryTree() {
       getAction('/sys/category/getSysCategoryTree', {}).then((res) => {
@@ -491,6 +484,8 @@ export default {
       this.visible = true
       this.title = '新增'
       this.formInline = {}
+      //  获取认证类别
+      this.getcontentListedEdit()
       this.formInline.isMust = '0'
       this.formInline = {...this.formInline}
       this.contentListed = [] // 防止编辑数据带出
@@ -500,6 +495,7 @@ export default {
       })
     },
     editModel(value) {
+      this.contentList = []
       this.contentListed = []
       this.visible = true
       this.formInline = value
@@ -509,7 +505,7 @@ export default {
           this.contentListed.push(item)
         })
         this.contentList = this.contentListed
-        this.contentListedEdit = this.contentListed
+      console.log(this.contentList,'lllll')
     },
     handleCancel() {
       this.visible = false
@@ -546,11 +542,13 @@ export default {
           falg = 0
           return
         }
-        // 参数说明的限制
-        if(item.description.length > 200){
-          this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'200'+this.$t('Characters'))
-          falg = 0
-          return
+        if(item.description !== undefined && item.description !== null){
+          // 参数说明的限制
+          if(item.description.length > 200){
+            this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'200'+this.$t('Characters'))
+            falg = 0
+            return
+          }
         }
       })
       if(falg === 1) {