页面更新

ruoyi-ui/src/views/activiti/modeler/index.vue

@@ -322,7 +322,7 @@ export default {
         }
 
         obj = Object.assign({},this.searchData)
-      }
+      } 
 
       obj.url = this.serverUrl
       this.$network.post('/p/cs/module/migrate', obj)

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

@@ -95,7 +95,7 @@
         },
         jeigneu: [],
         jeigneutwo: [],
-        imgShoew:true
+        imgShoew:false
       };
     },
     mounted() {
@@ -130,7 +130,6 @@
         this.tabledeLise.table = this.tabldie[index].tableName
         this.formeanti.table = this.tabldie[index].tableName
         this.forme.table = this.tabldie[index].tableName
-
         this.tableZbie.table = this.tabldie[index].tableName
         // this.edingelsie()
         this.init()
@@ -221,6 +220,10 @@
         geteditindeTab(this.tableZbietabg).then(response => {
           this.tabldie = response.data.ref
           if (this.tabldie.length !== 0) {
+            this.tabledeLise.table = this.tabldie[0].tableName
+            this.formeanti.table = this.tabldie[0].tableName
+            this.forme.table = this.tabldie[0].tableName
+            this.tableZbie.table = this.tabldie[0].tableName
             this.init()
           } else {
             this.msgSuccess("暂无tab数据");

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

@@ -122,14 +122,14 @@
           table:'',
           idList:[]
         },
-        imgShoew:true
+        imgShoew:false
       };
     },
     filters:{
       btnConversion(val) {
         switch(val){
           case 'A':
-          return '新增';
+          return '保存';
           case 'M':
           return '修改';
           case 'D':
@@ -204,6 +204,7 @@
           console.log(res)
           let data = res.data
           this.queryData = data
+
           // 图片的显示隐藏
           if(this.queryData.showData.length !==0){
            this.queryData.showData.filter(route => {
@@ -228,6 +229,7 @@
         geteditindeTab(this.tableZbietabg).then(response => {
           if(response.data.ref.length !==0){
             this.tabldie = response.data.ref
+            this.queryParamslist.table = this.tabldie[0].tableName
             this.tabShoes = true
             this.foremliseju()
           }else{
@@ -321,10 +323,10 @@
            //新增
            // this.forme.table = 'obj_test'
            // this.forme.objId = -1
-           this.msgInfo('暂不支持新增')
-           return
-           // this.forme.fixedData = this.queryParams
-           // this.submitForm()
+           // this.msgInfo('暂不支持新增')
+           // return
+           this.forme.fixedData = this.queryParams
+           this.submitForm()
          }
 
         console.log(this.forme)

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

@@ -23,7 +23,7 @@
         <template v-for="(item, index) in tabData">
           <el-table-column :label="item.columnComment" align="center" :prop="item.columnName" :key="index">
             <template slot-scope="scope">
-              <img class="img_icon" v-if="item.htmlType=='imageUpload'&&scope.row[scope.column.property]" @click="imgBtn(JSON.parse(scope.row[scope.column.property])[0].url)" :src="JSON.parse(scope.row[scope.column.property])[0].url" alt="">
+              <img class="img_icon" v-if="item.htmlType=='imageUpload'&&JSON.parse(scope.row[scope.column.property]).length" @click="imgBtn(JSON.parse(scope.row[scope.column.property])[0].url)" :src="JSON.parse(scope.row[scope.column.property])[0].url" alt="">
               <span v-else>{{ scope.row[scope.column.property] }}</span>
             </template>
           </el-table-column>

ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -790,7 +790,8 @@
         this.$refs["form"].validate(valid => {
           if (valid) {
             let datas = JSON.parse(JSON.stringify(this.form))
-            datas.relationParentId = this.info.tableId
+            datas.relationParentId = this.info.id
+            console.log(datas,this.info.id,9998)
             if (this.form.id != undefined) {
               setGenTable(datas).then(response => {
                 this.msgSuccess("修改成功");
@@ -848,7 +849,6 @@
         this.reset();
         this.open = true;
         console.log(this.form)
-
         this.title = "新增关联表";
       },
       handleDel_gl(row) {