Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/index.vue

@@ -228,10 +228,10 @@
     <!-- <el-divider /> -->
   <!-- 添加或修改公告对话框 -->
   <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="980px" append-to-body>
-            <el-form ref="form" :model="form" :rules="rules" label-width="160px" class="from_index">
+            <el-form ref="form" :model="form" :rules="queryData.rules" label-width="160px" class="from_index">
               <el-row>
                 <el-col :span="24" >
-                 <dynamic-forms   :ref="item.columnName" :config="form.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.showData" :key='index' />
+                 <dynamic-forms @modelFn="modelFn"   :ref="item.columnName" :config="form.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.showData" :key='index' />
                 </el-col>
               </el-row>
             </el-form>
@@ -494,6 +494,11 @@ export default {
           }
          return content
         },
+      modelFn(obj, cont) {
+        // console.log(obj, cont)
+        this.$set(this.form,obj,cont)
+        // console.log(this.$set(this.queryParams,obj,cont))
+      },
     //数据  第一部分列表
     getList() {
       this.loading = true;