From 855206754c9d8c239d8a1c6e796e47de6a042628 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Fri, 13 May 2022 18:05:29 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parameterlist/components/addModel.vue     | 25 ++++++++++++++++++-
 .../views/parameter/parameterlist/index.vue   |  4 ++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 793f400d1..2c75fad57 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -230,6 +230,7 @@
             <a-col :span="24" >
               <a-tabs>
                 <a-tab-pane v-for='(item,index) in contentList' :tab="item.textVal" :key="index + 1">
+<!--                  <a-form-model :model="formInline" class="formAdd" :rules="rulesItem" ref="ruleFormItem" key='ruleFormItem'>-->
                   <a-row :gutter="24">
                     <a-col :span="12">
                       <div class="box-title-text">
@@ -277,6 +278,7 @@
                       </div>
                     </a-col>
                   </a-row>
+<!--                  </a-form-model>-->
                 </a-tab-pane>
               </a-tabs>
             </a-col>
@@ -302,7 +304,18 @@ export default {
     uploadFile,
     PersonnelSelection
   },
-  props: ['url'],
+  props: {
+      url: {
+        type: Object,
+        default: {},
+        require: true
+      },
+    certCategoryParamsInfoEOListItem: {
+      type: Array,
+      default: [],
+      require: false
+    }
+  },
   data() {
     return {
       controlType: [ // 控件类型
@@ -457,6 +470,12 @@ export default {
       this.title = '编辑'
       this.$nextTick(() => {
         this.formInline = value
+        this.contentList = this.certCategoryParamsInfoEOListItem
+        console.log(this.contentList,'this.contentListthis.contentListthis.contentList')
+        this.contentList.map((item,index) => {
+          item.textVal = item.certCategory_dictText
+        })
+        console.log(this.contentList,'333333333333')
       })
     },
     handleCancel() {
@@ -468,6 +487,8 @@ export default {
         if (res) {
           this.$refs.ruleForm.validate(valid => {
             if (valid) {
+              // this.$refs.ruleFormItem.validate(valid => {
+              //   if (valid) {
               let url = ''
               let Action
               this.formInline.paramsTemplateId = this.$route.query.id
@@ -498,6 +519,8 @@ export default {
                   this.confirmLoading = false
                 }
               })
+             //  }
+             // })
             }
           })
         } else {
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index 377d38eab..3a2948d9f 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -97,7 +97,7 @@
         @showSizeChange="SizeChange"
       />
     </div>
-    <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
+    <addModel :url="url" ref="addModelRef" @addModelList="addModelList" :certCategoryParamsInfoEOListItem='certCategoryParamsInfoEOList'/>
   </a-card>
 </template>
 
@@ -116,6 +116,7 @@ export default {
   },
   data() {
     return {
+      certCategoryParamsInfoEOList: [],
       orderBy: '1',
       selectedRowKeysArray: '',
       token:Vue.ls.get(ACCESS_TOKEN),
@@ -296,6 +297,7 @@ export default {
       let _this = this
       getAction(_this.url.queryById, { id: item.id }).then((res) => {
         if (res.success) {
+          this.certCategoryParamsInfoEOList = res.result.certCategoryParamsInfoEOList
           this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(res.result)))
         }
       })