master
赵玉瑞 2 years ago
parent 930a28bde6
commit 60f39207eb
  1. 66
      ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
  2. 10
      ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue

@ -123,6 +123,7 @@ import ModulexModal from './modules/ModulexModal'
import {getAction} from "@api/manage"; import {getAction} from "@api/manage";
import BugxModal from "@views/modulex/modules/BugxModal"; import BugxModal from "@views/modulex/modules/BugxModal";
import store from "@/store"; import store from "@/store";
import {filterObj} from "@/utils/util";
export default { export default {
name: 'ModulexList', name: 'ModulexList',
@ -303,6 +304,8 @@ export default {
dictOptions: {}, dictOptions: {},
superFieldList: [], superFieldList: [],
userRole1: '', //1 2 userRole1: '', //1 2
projectIdx: '',
loadRouteType:false,
} }
}, },
created() { created() {
@ -426,8 +429,67 @@ export default {
fieldList.push({type: 'int', value: 'verisonStatus', text: '版本状态', dictCode: ''}) fieldList.push({type: 'int', value: 'verisonStatus', text: '版本状态', dictCode: ''})
fieldList.push({type: 'int', value: 'verison', text: '版本号', dictCode: ''}) fieldList.push({type: 'int', value: 'verison', text: '版本号', dictCode: ''})
this.superFieldList = fieldList this.superFieldList = fieldList
} },
} loadParameter() {
if (this.loadRouteType === false) {
this.projectIdx = this.$route.query.moduleid;
// console.log('aaaaaaaaa',this.projectIdx)
// console.log("***********")
this.loadRouteType = true;
}
},
loadData(arg) {
if (!this.url.list) {
this.$message.error("请设置url.list属性!");
return
}
// 1
if (arg === 1) {
this.ipagination.current = 1;
}
this.loadParameter();
var params = this.getQueryParams();//
this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
//update-begin---author:zhangyafei Date:20201118 for------------
this.dataSource = res.result.records || res.result;
if (res.result.total) {
this.ipagination.total = res.result.total;
} else {
this.ipagination.total = 0;
}
//update-end---author:zhangyafei Date:20201118 for------------
} else {
this.$message.warning(res.message)
}
}).finally(() => {
this.loading = false
})
},
getQueryParams() {
//
let sqp = {}
if (this.superQueryParams) {
sqp['superQueryParams'] = encodeURI(this.superQueryParams)
sqp['superQueryMatchType'] = this.superQueryMatchType
}
var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
param.field = this.getQueryField();
param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize;
//param.id=this.id;
param.projectId = this.$route.query.moduleid;
// console.log('paaaaaaaaaaaaaaaaaaaaa')
return filterObj(param);
},
searchReset() {
this.queryParam=''
this.loadData();
},
},
} }
</script> </script>
<style scoped> <style scoped>

@ -80,11 +80,11 @@
class="j-table-force-nowrap" class="j-table-force-nowrap"
@change="handleTableChange"> @change="handleTableChange">
<template slot="htmlSlot" slot-scope="text"> <template slot="htmlSlot" slot-scope="text, record">
<!-- <div v-html="text"></div>--> <!-- <div v-html="text"></div>-->
<a @click="rolemanage()">角色</a> <a @click="rolemanage()">角色</a>
<a-divider type="vertical"/> <a-divider type="vertical"/>
<a @click="modulemanage()">模块</a> <a @click="modulemanage(record)">模块</a>
</template> </template>
@ -146,7 +146,7 @@ export default {
{ {
title: '项目英文名称', title: '项目英文名称',
align: "center", align: "center",
dataIndex: 'projectEnName' dataIndex: 'projectEnName',
}, },
{ {
title: '项目编码', title: '项目编码',
@ -258,10 +258,10 @@ export default {
//query: {id: '123456'} //query: {id: '123456'}
}) })
}, },
modulemanage() { modulemanage(record) {
this.$router.push({ this.$router.push({
path: '/src/views/modulex/ModulexList', path: '/src/views/modulex/ModulexList',
//query: {id: '123456'} query: {moduleid: record.id}
}) })
}, },
initDictConfig() { initDictConfig() {

Loading…
Cancel
Save