sr 4 年 前
コミット
2f0eadcce1

+ 4 - 8
ruoyi-ui/src/views/system/editing/index.vue

@@ -19,7 +19,7 @@
     <!-- 内容 -->
     <div class="eniting_nav">
       <el-collapse v-model="activeNames" @change="handleChange">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" :rules="queryData.rules" label-width="120px">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
           <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index"
             class="eitde">
             <el-row>
@@ -224,20 +224,16 @@
         console.log(index, 4)
         for (let item of this.queryData.showData) {
           for (var i = 0; i < item.hrChildren.length; i++) {
-            if (item.hrChildren[i].htmlType == 'checkbox' || item.hrChildren[i].htmlType == 'imageUpload' || item.hrChildren[
-                i].htmlType == 'fileUpload') {
+            if (item.hrChildren[i].htmlType == 'checkbox') {
               this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config
-              console.log(this.$refs[item.hrChildren[i].columnName][0].config)
+            }else if(item.hrChildren[i].htmlType == 'imageUpload' || item.hrChildren[i].htmlType == 'fileUpload'){
+              this.queryParams[item.hrChildren[i].columnName] = JSON.stringify(this.$refs[item.hrChildren[i].columnName][0].config)
             } else {
               this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[
                 item.hrChildren[i].columnName]
-              console.log(this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName])
             }
           }
         }
-        console.log(this.queryParams)
-        this.queryParams.image = JSON.stringify(this.queryParams.image)
-        this.queryParams.file = JSON.stringify(this.queryParams.file)
         if (this.queryParams.pageNum !== undefined) {
           this.queryParams.pageNum = undefined
         }

+ 4 - 5
ruoyi-ui/src/views/system/form/index.vue

@@ -10,7 +10,7 @@
     <!-- 内容 -->
     <div class="table_nav">
       <el-collapse v-model="activeNames">
-         <el-form :model="queryParams" ref="queryForm" :rules="queryData.rules" :inline="true" label-width="120px">
+         <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
         <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index" class="eitde">
             <el-row :gutter="0">
               <el-col :span="24"  :key="index">
@@ -263,16 +263,15 @@
         }
          for(let item of this.queryData.showData){
            for(var i = 0 ; i < item.hrChildren.length ; i++){
-             if(item.hrChildren[i].htmlType == 'checkbox' || item.hrChildren[i].htmlType == 'imageUpload' || item.hrChildren[i].htmlType == 'fileUpload'){
+             if(item.hrChildren[i].htmlType == 'checkbox'){
                this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config
+             }else if(item.hrChildren[i].htmlType == 'imageUpload' || item.hrChildren[i].htmlType == 'fileUpload'){
+               this.queryParams[item.hrChildren[i].columnName] = JSON.stringify(this.$refs[item.hrChildren[i].columnName][0].config)
              } else{
                this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]
              }
            }
          }
-         this.queryParams.image = JSON.stringify(this.queryParams.image)
-         this.queryParams.file = JSON.stringify(this.queryParams.file)
-         console.log(this.queryParams)
          if(index == 'D'){
            //删除
            this.handleDelete(this.deledlid)

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

@@ -10,7 +10,7 @@
     <!-- 内容 -->
     <div class="table_nav headertable_nav">
       <el-collapse v-model="activeNames" @change="handleChange">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" :rules="queryData.rules" label-width="120px">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
         <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index" >
 
             <el-row :gutter="0">
@@ -138,16 +138,17 @@
       handleQuery(index) {
          for(let item of this.queryData.showData){
            for(var i = 0 ; i < item.hrChildren.length ; i++){
-             if(item.hrChildren[i].htmlType == 'checkbox' || item.hrChildren[i].htmlType == 'imageUpload' || item.hrChildren[i].htmlType == 'fileUpload'){
+             if(item.hrChildren[i].htmlType == 'checkbox' ){
                this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config
+             }else if(item.hrChildren[i].htmlType == 'imageUpload' || item.hrChildren[i].htmlType == 'fileUpload'){
+               if(this.$refs[item.hrChildren[i].columnName][0].config.length){
+                  this.queryParams[item.hrChildren[i].columnName] = JSON.stringify(this.$refs[item.hrChildren[i].columnName][0].config)
+               }
              } else{
                this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]
              }
            }
          }
-         this.queryParams.image = JSON.stringify(this.queryParams.image)
-         this.queryParams.file = JSON.stringify(this.queryParams.file)
-         console.log(this.queryParams)
          if(this.queryParams.pageNum !== undefined){
            this.queryParams.pageNum = undefined
          }
@@ -170,7 +171,6 @@
             this.formeanti.commitData = []
             this.formy.status = 2
             this.formeanti.commitData.push(this.formy)
-            console.log(this.formeanti)
            this.antiSubmission()
          }else if(index == '保存'){
            // 修改
@@ -301,7 +301,7 @@
               this.msgSuccess("保存成功");
               this.open = false;
               console.log(this.xidugje)
-              this.$router.replace('surface')
+              this.$router.go(-1)
             });
           }
         });