yrik 4 anos atrás
pai
commit
2524b988e9

+ 11 - 5
ruoyi-ui/src/components/DynamicForm/index.vue

@@ -12,9 +12,9 @@
         </el-option>
         </el-option>
       </el-select>
       </el-select>
       <!-- 复选框 -->
       <!-- 复选框 -->
-      <el-checkbox-group v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'checkbox'">
-        <el-checkbox v-for="itemChild in formConfig.sysDictData" :key="itemChild.dictValue" :label="itemChild.dictLabel"
-          :value="itemChild.dictValue"></el-checkbox>
+      <el-checkbox-group v-model="formConfig.sysDictDatatwo" v-if="formConfig.htmlType == 'checkbox'">
+        <el-checkbox @change="handleCheckedCitiesChange" v-for="itemChild in formConfig.sysDictData" :key="itemChild.dictValue" :label="itemChild.dictLabel"
+        :value="itemChild.dictValue" ></el-checkbox>
       </el-checkbox-group>
       </el-checkbox-group>
       <!-- 单选框 -->
       <!-- 单选框 -->
       <el-radio-group v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'radio'">
       <el-radio-group v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'radio'">
@@ -70,10 +70,13 @@
       formConfig: {
       formConfig: {
         type: Object,
         type: Object,
         required: true,
         required: true,
-        default: {
+        'default': {
           sysDictData: []
           sysDictData: []
         }
         }
       },
       },
+    },
+    created() {
+    console.log(this.formConfig)
     },
     },
     mounted() {
     mounted() {
     },
     },
@@ -96,7 +99,10 @@
       },
       },
       handleQuery() {
       handleQuery() {
         this.$emit('btns')
         this.$emit('btns')
-      },
+      },
+      handleCheckedCitiesChange(value){
+        console.log(value)
+      }
     }
     }
   }
   }
 </script>
 </script>

+ 15 - 2
ruoyi-ui/src/views/system/table/index.vue

@@ -6,8 +6,8 @@
       <div class="table_headerBtun" v-if="queryData.buttonList">
       <div class="table_headerBtun" v-if="queryData.buttonList">
         <el-button type="primary" plain v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
         <el-button type="primary" plain v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
       </div>
       </div>
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-        <dynamic-form :config="queryParams" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.queryList" :key='index'/>
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+        <dynamic-form :config="queryParams" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.queryList" :key='index' />
         <el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -105,6 +105,19 @@
         }).then(res => {
         }).then(res => {
           let data = res.data
           let data = res.data
           this.queryData = data
           this.queryData = data
+          console.log( this.queryData.queryList)
+          this.queryData.queryList.filter(route => {
+            if(route.htmlType == 'checkbox'){
+              route.sysDictDatatwo = []
+              route.sysDictDatatwo.push(route.columnName)
+              // route.sysDictData.filter(router=>{
+              //  route.sysDictDatatwo.push(router.dictLabel)
+              //  console.log( route.sysDictDatatwo)
+              // })
+              console.log(route.sysDictDatatwo,846)
+            }
+          })
+          console.log(this.queryData.queryList)
         })
         })
       },
       },
       handleChange(val) {
       handleChange(val) {