页面更新

ruoyi-ui/src/api/system/table.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取表单数据
 export function getQueryList(data) {
   return request({
-    url: '/boman-system/p/cs/queryList',
+    url: '/boman-web-core/p/cs/queryList',
     method: 'POST',
     data
   })
@@ -11,7 +11,7 @@ export function getQueryList(data) {
 // 获取表单查询字段、按钮、表头
 export function getTableQuery(data) {
   return request({
-    url: '/boman-system/p/cs/getTableQuery',
+    url: '/boman-web-core/p/cs/getTableQuery',
     method: 'POST',
     data
   })

ruoyi-ui/src/components/DynamicForm/index.vue

@@ -19,13 +19,13 @@
       </el-checkbox-group>
       <!-- 单选框 -->
       <el-radio-group v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'radio'">
-        <el-radio v-for="itemChild in formConfig.sysDictData" :key="itemChild.dictValue" :label="itemChild.dictLabel" :value="itemChild.dictValue"></el-radio>
+        <el-radio v-for="itemChild in formConfig.sysDictData" :key="itemChild.dictValue" :label="itemChild.dictValue">{{itemChild.dictLabel}}</el-radio>
       </el-radio-group>
       <!-- 时间控件 -->
-      <el-date-picker v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'datetime'" type="date" :placeholder="'请输入'+formConfig.columnComment">
+      <el-date-picker value-format="yyyy-MM-dda" v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'datetime'" type="date" :placeholder="'请输入'+formConfig.columnComment">
       </el-date-picker>
       <!-- 上传图片 -->
-      <el-upload v-if="formConfig.htmlType == 'imageUpload'" :headers="{Authorization: 'Bearer ' + getToken()}" :action="process + '/boman-file/upload'" list-type="picture-card"
+      <el-upload v-if="formConfig.htmlType == 'imageUpload'" :headers="{Authorization: 'Bearer ' + getToken()}" :action="process + '/boman-file/upload'" :file-list="config" list-type="picture-card"
         :on-preview="handlePictureCardPreview" :on-remove="handleRemove">
         <i class="el-icon-plus"></i>
       </el-upload>
@@ -39,7 +39,7 @@
         v-if="formConfig.htmlType == 'fileUpload'"
         :action="process + '/boman-file/upload'"
         :on-change="handleChange"
-        :file-list="fileList">
+        :file-list="config">
         <el-button size="small" type="primary">点击上传</el-button>
         <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
       </el-upload>
@@ -83,7 +83,7 @@
     },
     methods: {
       init() {
-        if(this.formConfig.htmlType == 'checkbox'){
+        if(this.formConfig.htmlType == 'checkbox' || this.formConfig.htmlType == 'imageUpload' || this.formConfig.htmlType == 'fileUpload'){
           this.config = []
         }
         console.log(this.config,99888)

ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
   title: '博曼办公协作',
   // urls: `http://192.168.101.11:8090`,
-  urls: `http://192.168.101.110:8090`,
+  urls: `http://192.168.101.110:8080`,
   // urls: `http://192.168.101.49:8080`,
 
   // urls: `http://192.168.101.10:8080`,

ruoyi-ui/src/views/system/surface/index.vue

@@ -7,7 +7,7 @@
         <el-button type="primary" plain v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
       </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' />
+        <dynamic-form :ref="item.columnName" :config="queryParams" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.queryList" :key='index' />
         <el-form-item>
           <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>
@@ -94,6 +94,16 @@
       },
       /** 搜索按钮操作 */
       handleQuery() {
+        for(let item of this.queryData.queryList){
+          if(item.htmlType == 'checkbox'){
+            this.queryParams[item.columnName] = this.$refs[item.columnName][0].config
+          }else if(item.htmlType == 'imageUpload'){
+            console.log(this.$refs[item.columnName][0].config,7777)
+          } else{
+            this.queryParams[item.columnName] = this.$refs[item.columnName][0].config[item.columnName]
+          }
+        }
+        console.log(this.queryParams,22311)
         this.getList();
       },
       getList() {
@@ -105,19 +115,13 @@
         }).then(res => {
           let data = res.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)
+          // this.queryData.queryList.filter(route => {
+          //   if(route.htmlType == 'checkbox'){
+          //     route.sysDictDatatwo = []
+          //     route.sysDictDatatwo.push(route.columnName)
+          //     console.log(route.sysDictDatatwo,846)
+          //   }
+          // })
         })
       },
       handleChange(val) {