end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
陈裕财 4 years ago
parent
0c5029df51
commit
f96b1cc7e7
3 changed files with 195 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 115
      src/api/mdp/meta/item.js
  2. 35
      src/views/xm/core/xmMenu/XmMenuMng.vue
  3. 66
      src/views/xm/core/xmMenu/XmMenuMngBatch.vue

115
src/api/mdp/meta/item.js
View File

@ -2,17 +2,118 @@ import axios from '@/utils/request'
import config from '@/common/config' import config from '@/common/config'
let base=config.getSysBasePath();
let base = config.getSysBasePath();
/** /**
* 数据项定义 * 数据项定义
*1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， *1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
*2 查询、新增、修改的参数格式 params={id:'主键 主键',itemCode:'代码',itemName:'名称',remark:'备注',categoryId:'分类编号',itemSize:'长度',itemType:'类型',branchId:'机构编号',deptid:'部门编号'}
*2 查询、新增、修改的参数格式 params={id:'主键 主键',itemCode:'代码，小写,下横线分割，请不要用驼峰命名',itemName:'名称',remark:'备注',categoryId:'分类编号',itemSize:'长度',itemType:'类型',branchId:'机构编号',deptid:'部门编号',cmenu:'是否创建菜单',values:'默认值,如果是列表，则存储列表编号，多个逗号分割',names:'默认名称，如果是列表，则存储列表名称，多个则逗号分割',options:'item_type=4,5时的选项列表[{value:值,name:显示名称}]',inputFormat:'输入提示',required:'是否必须0否1是',seq:'排序顺序',table:'表名',show:'是否显示0否1是',qx:'权限，是否可以0-新增，1-删除，2-编辑，3-查询，多个以逗号分割'}
**/ **/
//普通查询 条件之间and关系 //普通查询 条件之间and关系
export const listItem = params => { return axios.get(`${base}/mdp/meta/item/list`, { params: params }); }; export const listItem = params => { return axios.get(`${base}/mdp/meta/item/list`, { params: params }); };
export const getDicts = params => { return axios.get(`${base}/mdp/meta/item/dicts`, { params: params }); };
/**下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex','grade']} 返回结果
{
sex: [{id:'1',name:'男'},{id:'2',name:'女'}],
grade:[{id:'1',name:'等级1'},{id:'2',name:'等级2'}]
}
**/
export const initSimpleDicts=function(categoryId,itemCodes){
if(!categoryId){
categoryId="all"
}
return new Promise((resolve, reject) => {
var keys=itemCodes
var localDicts={}
var nolocalDictsKeys=[];
var datetime=new Date().getTime();
var millSec=24*60*60*1000;//一天的毫秒数
keys.forEach(i=>{
var key=categoryId+"_@"+i;
var value= localStorage.getItem(key)
if(value!=null &&value.length>0){
var data=JSON.parse(value)
var time=data.time;
if((datetime-time)>millSec){
nolocalDictsKeys.push(i)
localStorage.removeItem(key);
}else{
localDicts[i]=data.options
}
}else{
nolocalDictsKeys.push(i)
}
})
if(nolocalDictsKeys.length==0){
var res={data:{tips:{isOk:true,msg:"成功"},data:localDicts}}
resolve(res)
}else{
getDicts({categoryId:categoryId,itemCodes:nolocalDictsKeys}).then(res=>{
if(!res.data.tips){
reject(res)
}else if(res.data.tips.isOk){
var data=res.data.data
var dicts=localDicts;
data.forEach(dict=>{
if(dict.optionList){
dict.options=JSON.parse(dict.optionList)
}else{
dict.options=[]
}
dicts[dict.itemCode]=dict.options
localStorage.setItem(categoryId+'_@'+dict.itemCode,JSON.stringify({options:dict.options,time:datetime}))
})
res.data.data=dicts;
resolve(res);
}else{
resolve(res);
}
}).catch(e=>reject(e));
}
});
};
/**下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex','grade']} 返回结果
{
sex:{id:'',itemCode:'',itemName:'',itemType:'',values:'',names:'','options':[{id:'1',name:'男'},{id:'2',name:'女'}]}
grade:{id:'',itemCode:'',itemName:'',itemType:'',values:'',names:'','options':[{id:'1',name:'等级1'},{id:'2',name:'等级2'}]}
}
***/
export const initComplexDicts=function(categoryId,itemCodes){
if(!categoryId){
categoryId="all"
}
return new Promise((resolve, reject) => {
getDicts({categoryId:categoryId,itemCodes:itemCodes}).then(res=>{
if(!res.data.tips){
reject(res)
}else if(res.data.tips.isOk){
var data=res.data.data
var dicts={};
data.forEach(dict=>{
if(dict.optionList){
dict.options=JSON.parse(dict.optionList)
}else{
dict.options=[]
}
dicts[dict.itemCode]=dict
})
res.data.data=dicts;
resolve(res);
}else{
resolve(res);
}
}).catch(e=>reject(e));
});
};
//模糊查询数据项定义 条件之间or关系 //模糊查询数据项定义 条件之间or关系
//export const listItemKey = params => { return axios.get(`${base}/mdp/meta/item/listKey`, { params: params }); }; //export const listItemKey = params => { return axios.get(`${base}/mdp/meta/item/listKey`, { params: params }); };
@ -26,4 +127,12 @@ export const batchDelItem = params => { return axios.post(`${base}/mdp/meta/item
export const editItem = params => { return axios.post(`${base}/mdp/meta/item/edit`, params); }; export const editItem = params => { return axios.post(`${base}/mdp/meta/item/edit`, params); };
//新增一条数据项定义 //新增一条数据项定义
export const addItem = params => { return axios.post(`${base}/mdp/meta/item/add`, params); };
export const addItem = params => { return axios.post(`${base}/mdp/meta/item/add`, params); };
//新增一条数据项定义
export const copyToNewCategory = params => { return axios.post(`${base}/mdp/meta/item/copyToNewCategory`, params); };
//新增或者修改
export const insertOrUpdateItem = params => { return axios.post(`${base}/mdp/meta/item/insertOrUpdate`, params); };

35
src/views/xm/core/xmMenu/XmMenuMng.vue
View File

@ -5,16 +5,16 @@
<el-row> <el-row>
<el-select v-model="filters.dtype" clearable placeholder="需求类型"> <el-select v-model="filters.dtype" clearable placeholder="需求类型">
<el-option v-for="i in this.options.demandType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
<el-select v-model="filters.source" placeholder="需求来源" clearable> <el-select v-model="filters.source" placeholder="需求来源" clearable>
<el-option v-for="i in this.options.demandSource" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
<el-select v-model="filters.dlvl" placeholder="需求层次" clearable class="hidden-md-and-down"> <el-select v-model="filters.dlvl" placeholder="需求层次" clearable class="hidden-md-and-down">
<el-option v-for="i in this.options.demandLvl" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
<el-select v-model="filters.priority" placeholder="优先级" clearable> <el-select v-model="filters.priority" placeholder="优先级" clearable>
<el-option v-for="i in options.priority" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
<el-select v-model="filters.taskFilterType" placeholder="已关联任务的需求？" clearable style="width: 160px;"> <el-select v-model="filters.taskFilterType" placeholder="已关联任务的需求？" clearable style="width: 160px;">
<el-option value="not-join-any-project" label="未关联任务"></el-option> <el-option value="not-join-any-project" label="未关联任务"></el-option>
@ -106,7 +106,7 @@
需求层次: 需求层次:
</font> </font>
<el-select v-model="filters.dlvl" placeholder="需求层次" clearable> <el-select v-model="filters.dlvl" placeholder="需求层次" clearable>
<el-option v-for="i in this.options.demandLvl" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="24" style="padding-top:5px;"> <el-col :span="24" style="padding-top:5px;">
@ -250,7 +250,7 @@
</el-row> </el-row>
<el-row v-if="batchEditVisible"> <el-row v-if="batchEditVisible">
<xm-menu-mng-batch :xm-menus="xmMenus" @no-batch-edit="noBatchEdit" :product="filters.product"></xm-menu-mng-batch>
<xm-menu-mng-batch :xm-menus="xmMenus" :options="options" @no-batch-edit="noBatchEdit" :product="filters.product"></xm-menu-mng-batch>
</el-row> </el-row>
<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"></el-pagination> <el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"></el-pagination>
@ -281,7 +281,7 @@
import util from '@/common/js/util';//全局公共库 import util from '@/common/js/util';//全局公共库
import treeTool from '@/common/js/treeTool';//全局公共库 import treeTool from '@/common/js/treeTool';//全局公共库
//import Sticky from '@/components/Sticky' // 粘性header组件 //import Sticky from '@/components/Sticky' // 粘性header组件
import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
import { listXmMenu, delXmMenu, batchDelXmMenu,batchAddXmMenu,batchEditXmMenu,listXmMenuWithState,listXmMenuWithPlan,batchChangeParentMenu } from '@/api/xm/core/xmMenu'; import { listXmMenu, delXmMenu, batchDelXmMenu,batchAddXmMenu,batchEditXmMenu,listXmMenuWithState,listXmMenuWithPlan,batchChangeParentMenu } from '@/api/xm/core/xmMenu';
import { batchRelTasksWithMenu } from '@/api/xm/core/xmTask'; import { batchRelTasksWithMenu } from '@/api/xm/core/xmTask';
import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState'; import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState';
@ -357,7 +357,21 @@
parentMenuList:[], parentMenuList:[],
status:'', status:'',
}, },
options:{},
options:{
menuStatus:[
{id:"0", name:"初始"},
{id:"1", name:"待评审"},
{id:"2", name:"待设计"},
{id:"3", name:"待开发"},
{id:"4", name:"待SIT"},
{id:"5", name:"待UAT"},
{id:"6", name:"待上线"},
{id:"7", name:"运行中"},
{id:"8", name:"已下线"},
{id:"9", name:"已删除"},
]
},
xmMenus: [],//查询结果 xmMenus: [],//查询结果
pageInfo:{//分页数据 pageInfo:{//分页数据
total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
@ -957,9 +971,8 @@
//在下面添加其它组件 //在下面添加其它组件
}, },
mounted() { mounted() {
listOption([{categoryId:'all',itemCode:'demandSource'},{categoryId:'all',itemCode:'demandLvl'},{categoryId:'all',itemCode:'demandType'},{categoryId:'all',itemCode:'priority'}]).then(res=>{
this.options=res.data.data;
initSimpleDicts("all",['menuStatus','demandSource','demandLvl','demandType','priority']).then(res=>{
this.dicts=res.data.data;
}) })
this.filters.product=this.xmProduct this.filters.product=this.xmProduct
if(this.xmProduct && this.xmProduct.id){ if(this.xmProduct && this.xmProduct.id){

66
src/views/xm/core/xmMenu/XmMenuMngBatch.vue
View File

@ -19,12 +19,37 @@
<el-input v-model="scope.row.menuName" @change="fieldChange(scope.row,'menuName')"></el-input> <el-input v-model="scope.row.menuName" @change="fieldChange(scope.row,'menuName')"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="mmUsername" label="负责人" min-width="100" >
<el-table-column prop="mmUsername" label="跟进人" min-width="100" >
<template slot="header">
<el-button type="text" icon="el-icon-user" title="批量修改跟进人" @click="showBatchMmUserSelectVisible">批量修改</el-button>
</template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.mmUserid" @click="selectUser(scope.row)" closable @close="clearPmUser(scope.row)">{{scope.row.mmUsername}}</el-tag> <el-tag v-if="scope.row.mmUserid" @click="selectUser(scope.row)" closable @close="clearPmUser(scope.row)">{{scope.row.mmUsername}}</el-tag>
<el-button v-else type="text" @click="selectUser(scope.row)">选人</el-button> <el-button v-else type="text" @click="selectUser(scope.row)">选人</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="需求属性" width="500" >
<template slot-scope="scope">
<el-select v-model="scope.row.dtype" clearable placeholder="需求类型">
<el-option v-for="i in options.demandType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
</el-select>
<el-select v-model="scope.row.source" placeholder="需求来源" clearable>
<el-option v-for="i in options.demandSource" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
</el-select>
<el-select v-model="scope.row.dlvl" placeholder="需求层次" clearable class="hidden-md-and-down">
<el-option v-for="i in options.demandLvl" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
</el-select>
<el-select v-model="scope.row.priority" placeholder="优先级" clearable>
<el-option v-for="i in options.priority" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="remark" label="描述" min-width="140" show-overflow-tooltip> <el-table-column prop="remark" label="描述" min-width="140" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
@ -36,7 +61,11 @@
</el-row> </el-row>
<el-drawer title="选择员工" :visible.sync="userSelectVisible" size="60%" append-to-body> <el-drawer title="选择员工" :visible.sync="userSelectVisible" size="60%" append-to-body>
<users-select @confirm="onUserSelected" ref="usersSelect"></users-select> <users-select @confirm="onUserSelected" ref="usersSelect"></users-select>
</el-drawer>
</el-drawer>
<el-drawer title="选择员工" :visible.sync="batchMmUserSelectVisible" size="60%" append-to-body>
<users-select @confirm="onBatchMmUserSelectConfirm" ref="batchMmUserSelect"></users-select>
</el-drawer>
</el-row> </el-row>
</section> </section>
</template> </template>
@ -44,7 +73,7 @@
<script> <script>
import util from '@/common/js/util';//全局公共库 import util from '@/common/js/util';//全局公共库
import treeTool from '@/common/js/treeTool';//全局公共库 import treeTool from '@/common/js/treeTool';//全局公共库
//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
import { batchEditXmMenu,listXmMenuWithState } from '@/api/xm/core/xmMenu'; import { batchEditXmMenu,listXmMenuWithState } from '@/api/xm/core/xmMenu';
import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@ -52,7 +81,7 @@
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
props:['product','xmMenus'],
props:['product','xmMenus','options'],
computed: { computed: {
...mapGetters([ ...mapGetters([
'userInfo','roles' 'userInfo','roles'
@ -78,7 +107,7 @@
}, },
load:{ list: false, edit: false, del: false, add: false },//查询中... load:{ list: false, edit: false, del: false, add: false },//查询中...
sels: [],//列表选中数据 sels: [],//列表选中数据
options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
options2:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
//新增xmMenu界面初始化数据 //新增xmMenu界面初始化数据
addForm: { addForm: {
@ -91,6 +120,7 @@
}, },
valueChangeRows:[], valueChangeRows:[],
userSelectVisible:false, userSelectVisible:false,
batchMmUserSelectVisible:false,
maxTableHeight:300, maxTableHeight:300,
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
@ -125,8 +155,7 @@
batchEditXmMenu(this.valueChangeRows).then(res=>{ batchEditXmMenu(this.valueChangeRows).then(res=>{
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){
this.valueChangeRows=[]
this.getXmMenus()
this.valueChangeRows=[]
} }
this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
}); });
@ -200,11 +229,34 @@
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
}, },
//查询时选择责任人
showBatchMmUserSelectVisible() {
if(!this.sels||this.sels.length==0){
this.$notify({showClose:true,message:'请先选中一条或多条数据',type:'error'})
return;
}else{
this.batchMmUserSelectVisible=true;
}
},
//查询时选择责任人
onBatchMmUserSelectConfirm(users) {
var user={};
if (users && users.length > 0) {
user=users[0]
}
this.batchMmUserSelectVisible=false;
this.sels.forEach(i=>{
i.mmUserid=user.userid;
i.mmUsername=user.username;
this.fieldChange(i,"mmUserid")
})
},
},//end methods },//end methods
components: { components: {
UsersSelect, UsersSelect,
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el); this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
}); });

Write Preview
Loading…
Cancel
Save