Merge remote-tracking branch 'origin/master'

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableServiceImpl.java

@@ -557,7 +557,7 @@ public class GenTableServiceImpl implements IGenTableService {
      * @param genTable
      */
     public void isMenu(GenTable genTable, BusinessType type) {
-        String tableName = genTable.getTableName();
+        String tableName = StringUtils.trim(genTable.getTableName());
         if (type.equals(BusinessType.UPDATE)) {
             //先查询之前是否是菜单
             GenTable genTableOld = genTableMapper.selectGenTableById(genTable.getId());

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysMenuServiceImpl.java

@@ -712,7 +712,6 @@ public class SysMenuServiceImpl implements ISysMenuService {
      * 功能描述: 找到sonMenus对应的所有的父类，结果存放于result中
      *
      * @param allMenus allMenus
-     * @param sonMenus sonMenus
      * @param result   没有按照规则排序只是把父类全部存放于result中
      */
     @Override

boman-modules/boman-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -59,7 +59,7 @@
 	
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
 		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.create_by, m.update_by, m.update_time, m.remark, m.sys_table_name
-		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
+		from sys_menu m where m.menu_type in ('M', 'C') and m.status = '0'
 		order by m.parent_id, m.order_num
 	</select>
 	

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

@@ -1,7 +1,6 @@
 <template>
     <div class="InstanceManagementList">
       <Breadcrumb separator=">">
-        <!-- <BreadcrumbItem to="/InstanceManagementList" @click.native="routeClick(1)">实例管理</BreadcrumbItem> -->
         <BreadcrumbItem  v-if="tabalive==='待办流程'"  @click.native="routeClick(1)">待办流程</BreadcrumbItem>
         <BreadcrumbItem  v-if="tabalive==='历史流程'"  @click.native="routeClick(2)">历史流程</BreadcrumbItem>
     </Breadcrumb>
@@ -14,10 +13,8 @@
 <script>
 import todoProcess from '@/components/todoProcess/index';
 import HistoricalProcess from '@/components/HistoricalProcess';
-// import router from '../config/router.config'
 export default {
     name:'InstanceManagementList',
-    // todoProcess,
     components:{todoProcess,HistoricalProcess},
     data(){
         return{

ruoyi-ui/src/views/index.vue

@@ -468,7 +468,6 @@ export default {
            }
          }
        }
-       console.log(that.ary)
        return that.ary
      }
 
@@ -476,20 +475,17 @@ export default {
   methods: {
       // Tooltip 文字提示
         content (date) {
-          console.log(date,37645)
           let data = date
           let datase = date
           let content = ''
           let conert = ''
           let conertre = ''
           let nujue= 0
-          console.log(this.calendarData)
           for (var i = 0 ; i < this.calendarData.length; i++) {
             if(this.calendarData[i].schedule_content !== undefined){
            this.calendarData[i].schedule_content = this.calendarData[i].schedule_content.replace(/<\/?[^>]*>/g, '')
             }
             if(data == this.calendarData[i].remind_time){
-              console.log(content,this.calendarData[i].schedule_content)
               if(content  == this.calendarData[i].schedule_content + '、'){
                 content  = content
               }else{
@@ -500,9 +496,7 @@ 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() {
@@ -514,7 +508,6 @@ export default {
           }else {
             this.configList.push({notice_title: "暂无数据"});
           }
-          console.log(this.configList)
           this.total = response.data.total;
           this.loading = false;
         }
@@ -525,7 +518,6 @@ export default {
       this.loading = true;
       listIndex(this.queryParams).then(response => {
           this.configList = response.data.rows;
-          console.log(this.configList)
           this.total = response.data.total;
           this.loading = false;
         }
@@ -544,7 +536,6 @@ export default {
               this.tieku = '暂无数据'
               this.comg = '暂无数据'
             }
-            // console.log(this.getLisprofileone[0].info_title,98)
             this.totalprofile = response.data.total;
           }
          this.loading = false;
@@ -558,7 +549,6 @@ export default {
       listIndex(this.queryParamscalendar).then(response => {
           if(response.data !== undefined){
             this.calendarData = response.data.rows;
-            console.log(this.calendarData,9845765)
           }
           this.loading = false;
         }
@@ -578,7 +568,6 @@ export default {
               this.shower = false
               this.getmemorandum.push({memorandum_title:'暂无数据',shower:false})
             }
-            console.log(this.getmemorandum,98765)
           }
           this.loading = false;
         }
@@ -590,7 +579,6 @@ export default {
       listIndex(this.queryParamsail).then(response => {
           if(response.data !== undefined){
             this.getLisaillie = response.data.rows;
-            // console.log(this.configList)
           }
           this.totalali = response.data.total
           this.loading = false;
@@ -603,7 +591,6 @@ export default {
       listIndextwo(this.dictType).then(response => {
           this.editableTabs = response.data;
           this.queryParams.dictType = response.data[1].dictType
-          console.log(this.editableTabs)
           // this.total = response.total;
           this.loading = false;
         }
@@ -614,7 +601,6 @@ export default {
       this.loading = true;
       listIndextherr(this.dictTypetwo).then(response => {
           this.editableTabsteo = response.data;
-          console.log(this.editableTabsteo)
           // this.total = response.total;
           this.loading = false;
         }
@@ -635,8 +621,7 @@ export default {
                }
              }
            })
-           console.log(this.tableDataalid,67)
-           this.totalprofile = response.data.total;
+           this.totalali = response.data.total;
          }
          this.loading = false;
        }
@@ -649,7 +634,6 @@ export default {
      listIndextanl(this.calendaradd).then(response => {
          if(response.data !== undefined){
            this.queryData = response.data
-        // console.log(this.selectList)
 
          }
          this.loading = false;
@@ -663,7 +647,6 @@ export default {
      listIndextanl(this.calendaraddmer).then(response => {
          if(response.data !== undefined){
            this.queryData = response.data
-        // console.log(this.selectList)
          }
          this.loading = false;
        }
@@ -673,37 +656,29 @@ export default {
       window.open(href, "_blank");
     },
      handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
       },
     handleCurrentChange(val) {
       this.queryParams.pageNo = val
       this.getList()
-        console.log(`当前页: ${val}`);
       },
       // 公司概况
       handleSizeChangeprofile(val) {
-              console.log(`每页 ${val} 条`);
         },
       handleCurrentChangeprofile(val) {
         this.queryParamstabprofile.pageNo = val
         this.getLisprofile()
-          console.log(`当前页: ${val}`);
         },
      // 通讯录
      handleSizeChangeali(val) {
-             console.log(`每页 ${val} 条`);
        },
      handleCurrentChangeali(val) {
        this.queryParamsail.pageNo = val
        this.getLisail()
-         console.log(`当前页: ${val}`);
        },
     handleClick(tab, event) {
-              console.log(tab, event);
       },
       // 第一部分tab点击
     tabSbu(index){
-      console.log(index)
      this.num = index - 1
      this.queryParams.fixedData.condition.notice_type = index
      this.getList()
@@ -733,7 +708,6 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.nummer = 0
-      console.log(this.open)
       this.reset();
       this.form ={
       }
@@ -759,7 +733,6 @@ export default {
         //   this.forme.fixedData.remind_type = this.forme.fixedData.remind_type.join(',');
         // }
         //日历
-        console.log(this.forme.fixedData,this.forme)
         addConfigindex(this.forme).then(response => {
           this.msgSuccess("新增成功");
           // this.open = false;
@@ -780,7 +753,6 @@ export default {
          this.cancel();
        });
       }
-      console.log(this.form.fixedData,22311)
       // this.getList();
     },
     // 弹框
@@ -829,9 +801,7 @@ export default {
             serfgt.push(arfe[i])
             }
       }
-      console.log(serfgt.join(','))
      // const res = new Map();
-     // console.log(arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1)))
      // return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
     },
     getUser() {
@@ -839,7 +809,6 @@ export default {
         this.user = response.data;
         this.getLisalendar()
         this.getLismemorandum()
-       console.log(this.user,97653)
       });
     },
     // 通知公告弹窗

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

@@ -176,7 +176,6 @@
       this.taheus = this.$route.query.tables
       this.taheusid = this.$route.query.id
       this.deledlid.idList.push(this.$route.query.id)
-      console.log(this.deledlid)
       // tab
       this.edingelsietab()
       this.init()
@@ -188,13 +187,10 @@
         this.$set(this.queryParams,obj,cont)
       },
       handleChange(val) {
-        console.log(val);
       },
       enditTab(index) {
         this.num = index
-        console.log(index)
         if(this.num == 0){
-          console.log(34567)
           this.tabledeLise.table = this.tabldie[index].tableName
           this.formeanti.table = this.tabldie[index].tableName
           this.forme.table = this.tabldie[index].tableName
@@ -208,10 +204,6 @@
           this.inittwo()
           this.foremliseju()
         }
-        // this.tableZbie.table = this.tabldie[index].tableName
-        // this.tableZbie.fixedData.id = this.tabldie[index].id
-        // this.edingelsie()
-        // this.init()
       },
       // 按钮
       init() {
@@ -223,11 +215,7 @@
           this.jeigneutwo = []
           this.jeigneu = []
           this.jeigneu = data.buttonList.split('')
-          console.log(data.buttonList)
-          console.log(this.jeigneu)
           this.jeigneu.filter(route => {
-            // route.dept_id = route.dept_id.value
-            console.log(route)
             if (route == 'A') {
               if (this.formy.id == -1) {
                 route = '保存'
@@ -270,26 +258,20 @@
           })
           this.jeigneutwo.push('刷新')
           this.jeigneutwo.push('返回')
-          console.log(this.queryData, 567)
           // 图片的显示隐藏
           if(this.queryData.showData.length !==0){
            this.queryData.showData.filter(route => {
                if(route.cssClass !== null){
                  this.imgShoew = route.cssClass
                  if(route.cssClass == 2 || route.cssClass == 4 ){
-                   console.log(34)
-                   // || route.mask.slice(3,4) == '0'
                    route.hrChildren.filter(routers =>{
 
                      routers.isonliy = true
                    })
-                   // route.routers = true
                  }else{
-                   console.log(123)
                    route.hrChildren.filter(routers =>{
                      routers.isonliy = false
                    })
-                   // route.isonliy = false
                  }
                }
            })
@@ -305,11 +287,7 @@
           this.jeigneutwo = []
           this.jeigneu = []
           this.jeigneu = data.buttonList.split('')
-          console.log(data.buttonList)
-          console.log(this.jeigneu)
           this.jeigneu.filter(route => {
-            // route.dept_id = route.dept_id.value
-            console.log(route)
             if (route == 'A') {
                 route = '新增'
                 this.jeigneutwo.push(route)
@@ -346,55 +324,41 @@
             }
 
           })
-          // this.jeigneutwo.push('刷新')
-          // this.jeigneutwo.push('返回')
         })
       },
       // 数据信息
       edingelsie() {
-        console.log(1234)
         getQueryList(
           this.tabledeLise
         ).then(res => {
           let data = res.data
           this.taleLisst = data
-          // console.log(this.queryData.queryList)
         })
       },
       // tab数据
       edingelsietab() {
-        console.log(4566)
         geteditindeTab(this.tableZbietabg).then(response => {
           this.tabldie = [{tableComment:'主表数据',tableName:this.taheus}]
           this.tabldie =this.tabldie.concat(response.data.ref)
           if (this.tabldie.length !== 1) {
-            // this.tableZbie.table = this.tabldie[0].tableName
-            // this.tableZbie.fixedData.id = this.tabldie[0].id
-            // this.foremliseju()
+           
           } else {
             this.msgSuccess("暂无tab数据");
             this.$router.go(-1)
           }
-          // this.msgSuccess("反提交成功");
-          // this.open = false;
-          // this.getList();
+         
         });
       },
       // 列表数据
       foremliseju(){
        listIndex(this.queryParamslist).then(res => {
-         console.log(res)
          if(res.code == 200){
            let data = res.data
            this.postList = data
            this.total = res.data.total - 0
          }else{
-           console.log(876)
-           // this.postList = []
          }
           this.loading = false
-         console.log(this.total)
-         console.log(this.postList,567)
 
        })
       },
@@ -404,7 +368,6 @@
         }
       },
       handleQuery(index) {
-        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') {
@@ -435,36 +398,23 @@
           this.handleDelete(this.deledlid)
         } else if (index == '提交') {
           //提交  保存
-          // this.formeanti.table = 'obj_test'
           this.formeanti.commitData = []
           this.formy.status = 1
-          // this.formy.id = 0
           this.formeanti.commitData.push(this.formy)
-          console.log(this.formeanti)
           this.antiSubmission()
         } else if (index == '反提交') {
           //反提交  保存
-          // this.formeanti.table = 'obj_test'
           this.formeanti.commitData = []
           this.formy.status = 2
-          // this.formy.id = 0
           this.formeanti.commitData.push(this.formy)
-          console.log(this.formeanti)
           this.antiSubmission()
         } else if (index == '保存') {
           // 修改
-          // this.forme.table = 'obj_test'
-          // this.forme.objId = 1
           this.forme.fixedData = this.queryParams
           this.submitForm()
         } else if (index == '返回') {
-          // if(this.xidugje ==0){
-          //    this.$router.go(-2)
-          // }else{
           this.$router.go(-1)
-          // }
         } else if (index == '刷新') {
-          // this.xidugje = 1
           this.reload()
         }else if(index == '新增'){
             this.routerFn(-1, this.tabName)
@@ -474,16 +424,13 @@
             return
           }
           const id = this.ids.join(',')
-          console.log(12346)
           this.routerFn(id, this.tabName)
         }
 
-        console.log(this.forme)
         // this.getList();
       },
       /** 新增 修改提交按钮 */
       submitForm: function() {
-        console.log(3456)
         this.$refs["queryForm"].validate(valid => {
           if (valid) {
             addbjectSave(this.forme).then(response => {
@@ -504,7 +451,6 @@
               tableSubimt(this.formeanti).then(response => {
                 this.msgSuccess("提交成功");
                 this.$router.go(-1)
-                // this.open = false;
                 // this.getList();
               });
             } else if (this.formy.status == 2) {
@@ -512,7 +458,6 @@
               tableSubimtanit(this.formeanti).then(response => {
                 this.msgSuccess("反提交成功");
                 this.$router.go(-1)
-                // this.open = false;
                 // this.getList();
               });
             }
@@ -521,7 +466,6 @@
       },
       //删除
       handleDelete(index) {
-        console.log(index)
         if(this.num == 0){
           this.$confirm('是否确认删除', "警告", {
             confirmButtonText: "确定",
@@ -539,7 +483,7 @@
             this.msgInfo('请勾选一条信息')
             return
           }
-          console.log(this.ids)
+          // console.log(this.ids)
           var that = this
           index.idList  = this.ids
           index.table = this.tabName
@@ -559,12 +503,10 @@
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)
-        console.log(this.ids)
         this.single = selection.length != 1
         this.multiple = !selection.length
       },
       routerFn(id, tables) {
-        console.log(157)
         if (this.queryDatatwo.viewType == 'crud') {
           this.$router.push({
             path: 'table',
@@ -586,7 +528,6 @@
      // 搜索
      handleQueryiu(){
       for(let item of this.queryDatatwo.queryList){
-        // for(var i = 0 ; i < item.hrChildren.length ; i++){
           if(item.htmlType == 'checkbox'){
             this.queryParamstwoi[item.columnName] = this.$refs[item.columnName][0].config
           }else if(item.htmlType == 'imageUpload' || item.htmlType == 'fileUpload'){
@@ -594,7 +535,6 @@
           } else{
             this.queryParamstwoi[item.columnName] = this.$refs[item.columnName][0].config[item.columnName]
           }
-        // }
 
       }
       for(var items in this.queryParamstwoi){
@@ -604,7 +544,6 @@
       }
       this.queryParamslist.fixedData.condition = this.queryParamstwoi
       this.foremliseju()
-       console.log(this.queryParamstwoi)
      },
      resetQuery(){
       this.resetForm("queryParamstwoi");

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

@@ -54,7 +54,6 @@
                 <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="">
-                  <!-- :style="scope.row.list_class" scope.row[scope.column.property] -->
                   <span  :style="scope.row.list_class" v-else-if="item.columnName == 'status' " >{{ scope.row[scope.column.property] }}</span>
                   <span  v-else>{{ scope.row[scope.column.property] }}</span>
                 </template>
@@ -69,10 +68,6 @@
               :limit.sync="queryParamslist.pageSize"
               @pagination="foremliseju"
             />
-           <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage3"
-              :page-size="queryParamslist.pageSize" layout="prev, pager, next, jumper" v-show="total>0"
-      :total="total" @pagination="foremliseju">
-            </el-pagination> -->
           </div>
         </el-collapse-item>
       </el-collapse>
@@ -259,17 +254,13 @@
                if(route.cssClass !== null){
                  this.imgShoew = route.cssClass
                  if(route.cssClass == 2 || route.cssClass == 4){
-                   console.log(34)
                    route.hrChildren.filter(routers =>{
                      routers.isonliy = true
                    })
-                   // route.routers = true
                  }else{
-                   console.log(123)
                    route.hrChildren.filter(routers =>{
                      routers.isonliy = false
                    })
-                   // route.isonliy = false
                  }
                }
            })
@@ -295,28 +286,21 @@
           }else{
             this.tabShoes = false
           }
-          // this.msgSuccess("反提交成功");
-          // this.open = false;
-          // this.getList();
         });
       },
       // 列表数据
       foremliseju(){
        listIndex(this.queryParamslist).then(res => {
-         console.log(res)
          let data = res.data
          this.postList = data
          this.loading = false
          this.total = res.data.total - 0
-         console.log(this.total)
-         console.log(this.postList,567)
 
        })
       },
       // 列表查询接口
       foremlisejuque(){
        getObjectqure(this.objParamstue).then(res => {
-         console.log(res)
           let data = res.data
          this.queryDatatao = res.data
          this.jeigneutwo = []
@@ -324,7 +308,6 @@
          this.jeigneu = data.buttonList.split('')
          this.jeigneu.filter(route => {
            // route.dept_id = route.dept_id.value
-           console.log(route)
            if (route == 'A') {
 
                route = '新增'
@@ -359,9 +342,6 @@
            }
 
          })
-         console.log(this.jeigneutwo)
-         // let data = res.data
-         // this.queryData = data
          // 图片的显示隐藏
        })
       },
@@ -417,45 +397,30 @@
            this.handleDelete(this.deledlid)
          }else if(index == 'S'){
            //提交  保存
-            // this.formeanti.table = 'obj_test'
             this.formeanti.commitData = []
             this.formy.status = 1
-            // this.formy.id = 0
             this.formeanti.commitData.push(this.formy)
-            console.log(this.formeanti)
            this.antiSubmission()
          }else if(index == 'U'){
            //反提交  保存
-            // this.formeanti.table = 'obj_test'
             this.formeanti.commitData = []
             this.formy.status = 2
-            // this.formy.id = 0
             this.formeanti.commitData.push(this.formy)
-            console.log(this.formeanti)
            this.antiSubmission()
          }else if(index == 'M'){
            // 修改
-           // this.forme.table = 'obj_test'
-           // this.forme.objId = 1
            this.forme.fixedData = this.queryParams
            this.submitForm()
          }else if(index == 'A'){
-           //新增
-           // this.forme.table = 'obj_test'
-           // this.forme.objId = -1
-           // this.msgInfo('暂不支持新增')
-           // return
            this.forme.fixedData = this.queryParams
            this.submitForm()
          }
 
-        console.log(this.forme)
         // this.getList();
       },
       // 搜索列表
       handleQueryiu(){
        for(let item of this.queryDatatao.queryList){
-         // for(var i = 0 ; i < item.hrChildren.length ; i++){
            if(item.htmlType == 'checkbox'){
              this.queryParamstwoi[item.columnName] = this.$refs[item.columnName][0].config
            }else if(item.htmlType == 'imageUpload' || item.htmlType == 'fileUpload'){
@@ -463,7 +428,6 @@
            } else{
              this.queryParamstwoi[item.columnName] = this.$refs[item.columnName][0].config[item.columnName]
            }
-         // }
 
        }
        for(var items in this.queryParamstwoi){
@@ -473,7 +437,6 @@
        }
        this.queryParamslist.fixedData.condition = this.queryParamstwoi
        this.foremliseju()
-        console.log(this.queryParamstwoi)
 
       },
      /** 新增 修改提交按钮 */
@@ -498,7 +461,6 @@
          tableSubimt(this.formeanti).then(response => {
            this.msgSuccess("提交成功");
            this.$router.go(-1)
-           // this.open = false;
            // this.getList();
          });
        } else if(this.formy.status == 2){
@@ -506,7 +468,6 @@
          tableSubimtanit(this.formeanti).then(response => {
            this.msgSuccess("反提交成功");
            this.$router.go(-1)
-           // this.open = false;
            // this.getList();
          });
        }
@@ -546,12 +507,11 @@
      // 多选框选中数据
      handleSelectionChange(selection) {
        this.ids = selection.map(item => item.id)
-       console.log(this.ids)
+       // console.log(this.ids)
        this.single = selection.length != 1
        this.multiple = !selection.length
      },
      handleQueryju(index){
-       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') {
@@ -583,12 +543,10 @@
            return
          }
          const id = this.ids.join(',')
-         console.log(12346)
          this.routerFn(id, this.tabName)
        }
      },
      routerFn(id, tables) {
-       console.log(157)
        if (this.queryDatatao.viewType == 'crud') {
          this.$router.push({
            path: 'table',

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

@@ -207,7 +207,6 @@
         this.statusOptions = response.data;
         this.relationType = response.data
         this.getDeptTreeselect()
-        console.log(this.relationType)
       });
       this.getList();
 
@@ -216,8 +215,6 @@
       relationTypeFn(data) {
         var _this = this
         let is = ''
-        console.log(data)
-        console.log(_this.cloumns)
         for (let item of that.relationType) {
           if (item.dictValue == data) {
             is = item.dictLabel
@@ -228,7 +225,6 @@
     },
     methods: {
       handleNodeClick() {
-        console.log(221)
       },
       /** 查询角色列表 */
       getList() {
@@ -257,14 +253,11 @@
       /** 查询列表数据*/
       getDeptTreeselect() {
         listPostporen(this.queryParamstr).then(response => {
-          console.log(response.rows)
           this.cloumns = response.rows;
           this.total = response.total
           // this.cloumns.
           this.cloumns.filter(route => {
-            console.log(route)
               for(var item in route){
-                console.log(item,78)
                 if(item == 'dataScope'){
                   console.log(route[item])
                   console.log(this.relationType)
@@ -273,8 +266,6 @@
                     if(router.dictValue == route[item]){
                       route[item] = router.dictLabel
                     }
-                    console.log(route[item])
-
                   })
                 }
               }
@@ -465,20 +456,13 @@
       },
       // 点击角色id
       jieese(id,index){
-        console.log(id)
-        console.log(index)
         this.indexdw = index
         this.ijeudid = id
         this.queryParamstr.roleId = id
         this.getDeptTreeselect()
-       console.log(this.form.roleId)
       },
       handleCheckAllChange(val) {
-              // this.checkedCities = val ? cityOptions : [];
-              console.log(val)
               if(val == true){
-                // cloumns.isUse
-                // this.cloumns.fill()
                 this.cloumns.filter(router =>{
                   router.isUse = 'Y'
                 })
@@ -490,11 +474,6 @@
               this.isIndeterminate = false;
       },
        handleCheckedCitiesChange(value) {
-              // let checkedCount = value.length;
-              console.log(value)
-             // this.kiejfur.push(value)
-              // this.checkAll = checkedCount === this.cities.length;
-              // this.isIndeterminate = checkedCount > 0 && checkedCount < this.cities.length;
        }
     }
   };

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

@@ -91,28 +91,6 @@
         imgShoew:0
       };
     },
-    // filters:{
-    //   btnConversion(val) {
-    //     switch(val){
-    //       case 'A':
-    //       return '保存';
-    //       case 'M':
-    //       return '保存';
-    //       case 'D':
-    //       return '删除';
-    //       case 'Q':
-    //       return '查询';
-    //       case 'S':
-    //       return '提交';
-    //       case 'U':
-    //       return '反提交';
-    //       case 'I':
-    //       return '导入';
-    //       case 'E':
-    //       return '导出';
-    //     }
-    //   }
-    // },
     mounted() {
       // this.tableZbie.fixedData.id = 0
       this.deledlid.idList = []
@@ -171,7 +149,6 @@
 
         if (index == '删除') {
           //删除
-          console.log(this.formy.id)
           this.handleDelete(this.deledlid)
         } else if (index == '提交') {
           //提交  保存
@@ -187,38 +164,20 @@
           this.antiSubmission()
         } else if (index == '保存') {
           // 修改
-          // this.xidugje = '保存'
           this.forme.fixedData = this.queryParams
           this.submitForm()
         } else if (index == '新增') {
           //新增
-          this.$router.push({
-            path: '/business/table',
-            query: {
-              id: -1,
-              tables: this.forme.table
-            },
-          })
-          // // this.forme.objId = "-1"
-          //  this.queryParams = {}
           this.xidugje = 0
-          // this.tableZbie.fixedData.id = -1
-          // this.formy.id = '-1'
-          // this.init()
           this.reload()
         } else if (index == '返回') {
-          // if (this.xidugje == 0) {
-          //   this.$router.go(-2)
-          // } else {
             this.$router.go(-1)
-          // }
         } else if (index == '刷新') {
           this.xidugje = 1
           this.reload()
         }
 
 
-        console.log(this.forme)
         // this.getList();
       },
       getList() {
@@ -229,18 +188,14 @@
           this.tableZbie
         ).then(res => {
           let data = res.data
-          console.log(res.data)
           this.queryData = {}
           this.queryData = data
           // imgShoew
           this.jeigneutwo = []
           this.jeigneu = []
           this.jeigneu = data.buttonList.split('')
-          console.log(data.buttonList)
-          console.log(this.jeigneu)
+          // console.log(data.buttonList)
           this.jeigneu.filter(route => {
-            // route.dept_id = route.dept_id.value
-            console.log(route)
             if(route == 'A'){
               if(this.formy.id == -1){
                 route = '保存'
@@ -284,8 +239,6 @@
 
           this.jeigneutwo.push('刷新')
           this.jeigneutwo.push('返回')
-          // console.log(this.jeigneutwo,567)
-          // console.log(this.xidugje)
           if(this.xidugje == '刷新'){
             if(res.code == 200){
               this.msgSuccess("操作成功");
@@ -297,17 +250,13 @@
             if(route.cssClass !== null){
               this.imgShoew = route.cssClass
               if(route.cssClass == 2 || route.cssClass == 4){
-                console.log(34)
                 route.hrChildren.filter(routers =>{
                   routers.isonliy = true
                 })
-                // route.routers = true
               }else{
-                console.log(123)
                 route.hrChildren.filter(routers =>{
                   routers.isonliy = false
                 })
-                // route.isonliy = false
               }
             }
           })
@@ -315,21 +264,17 @@
         })
       },
       tablsie() {
-        console.log(1234)
         getQueryList(
           this.tabledeLise
         ).then(res => {
           let data = res.data
           this.taleLisst = data
-          // console.log(this.queryData.queryList)
         })
       },
       handleChange(val) {
-        console.log(val);
       },
       // 按钮点击
       delet(index) {
-        console.log(index)
         if (index == 'D') {
           this.handleDelete(this.formy.id)
         }
@@ -341,7 +286,6 @@
             addbjectSave(this.forme).then(response => {
               this.msgSuccess("保存成功");
               this.open = false;
-              console.log(this.xidugje)
               this.$router.go(-1)
             });
           }
@@ -356,7 +300,6 @@
               tableSubimt(this.formeanti).then(response => {
                 this.msgSuccess("提交成功");
                 this.$router.go(-1)
-                // this.open = false;
                 // this.getList();
               });
             } else if (this.formy.status == 2) {
@@ -364,7 +307,6 @@
               tableSubimtanit(this.formeanti).then(response => {
                 this.msgSuccess("反提交成功");
                 this.$router.go(-1)
-                // this.open = false;
                 // this.getList();
               });
             }