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

优化

master
陈裕财 3 years ago
parent
999c7cdf19
commit
0ddd8e8065
2 changed files with 127 additions and 57 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. 98
      src/views/xm/core/xmProduct/XmProductEdit.vue
  2. 86
      src/views/xm/core/xmProject/XmProjectEdit.vue

98
src/views/xm/core/xmProduct/XmProductEdit.vue
View File

@ -101,47 +101,62 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="控制开关" name="2"> <el-tab-pane label="控制开关" name="2">
<el-form-item label="需求控制">
<el-form-item label="团队相关:小组crud、加减人、小组组长管理等">
<el-row>
<el-radio-group v-model="qxCode.groupScope" @change="editSomeFields(editForm,'groupScope',$event)">
<el-radio label="0">不限制，允许任何人</el-radio>
<el-radio label="1">同机构下的人员</el-radio>
<el-radio label="2">同产品内人员</el-radio>
<el-radio label="3">同产品下同小组内人员</el-radio>
</el-radio-group>
</el-row>
<el-row>
<el-checkbox v-model="qxCode.groupTransmit" :true-label="'1'" :false-label="'0'" @change="editSomeFields(editForm,'groupTransmit',$event)">是否检查用户的上下级关系</el-checkbox>
</el-row>
<!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组-->
</el-form-item>
<el-form-item label="测试相关：缺陷crud、用例crud、测试计划、测试执行等">
<el-row> <el-row>
<el-radio-group v-model="qxCode.menuScope" @change="editSomeFields(editForm,'menuScope',$event)">
<el-radio label="0">不限制，任何人可以互相操作</el-radio>
<el-radio label="1">同机构下的人员可以操作</el-radio>
<el-radio label="2">同一个项目组内可以互相操作</el-radio>
<el-radio label="3">同项目组下的同一个小组可以互相操作</el-radio>
<el-radio-group v-model="qxCode.testScope" @change="editSomeFields(editForm,'testScope',$event)">
<el-radio label="0">不限制，允许任何人</el-radio>
<el-radio label="1">同机构下的人员</el-radio>
<el-radio label="2">同产品内人员</el-radio>
<el-radio label="3">同产品下同小组内人员</el-radio>
</el-radio-group> </el-radio-group>
</el-row> </el-row>
<el-row> <el-row>
<el-checkbox v-model="qxCode.menuTransmit" :true-label="'1'" :false-label="'0'" @change="editSomeFields(editForm,'menuTransmit',$event)">任务指派及crud是否检查用户的上下级关系</el-checkbox>
<el-checkbox v-model="qxCode.testTransmit" :true-label="'1'" :false-label="'0'" @change="editSomeFields(editForm,'testTransmit',$event)">缺陷、用例等指派及crud是否检查用户的上下级关系</el-checkbox>
</el-row> </el-row>
<!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组--> <!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组-->
</el-form-item> </el-form-item>
<el-form-item label="迭代控制">
<el-form-item label="迭代crud、迭代负责人管理">
<el-row> <el-row>
<el-radio-group v-model="qxCode.iterationScope" @change="editSomeFields(editForm,'iterationScope',$event)"> <el-radio-group v-model="qxCode.iterationScope" @change="editSomeFields(editForm,'iterationScope',$event)">
<el-radio label="0">不限制，任何人可以互相操作</el-radio>
<el-radio label="1">同机构下的人员可以操作</el-radio>
<el-radio label="2">同一个项目组内可以互相操作</el-radio>
<el-radio label="3">同项目组下的同一个小组可以互相操作</el-radio>
<el-radio label="0">不限制，允许任何人</el-radio>
<el-radio label="1">同机构下的人员</el-radio>
<el-radio label="2">同产品内人员</el-radio>
<el-radio label="3">同产品下同小组内人员</el-radio>
</el-radio-group> </el-radio-group>
</el-row> </el-row>
<el-row> <el-row>
<el-checkbox v-model="qxCode.iterationTransmit" :true-label="'1'" :false-label="'0'" @change="editSomeFields(editForm,'iterationTransmit',$event)">任务指派及crud是否检查用户的上下级关系</el-checkbox>
<el-checkbox v-model="qxCode.iterationTransmit" :true-label="'1'" :false-label="'0'" @change="editSomeFields(editForm,'iterationTransmit',$event)">迭代指派及crud是否检查用户的上下级关系</el-checkbox>
</el-row> </el-row>
<!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组--> <!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组-->
</el-form-item> </el-form-item>
<el-form-item label="需求控制">
<el-form-item label="需求相关：史诗、特性、故事的crud">
<el-row> <el-row>
<el-radio-group v-model="qxCode.testScope" @change="editSomeFields(editForm,'testScope',$event)">
<el-radio label="0">不限制，任何人可以互相操作</el-radio>
<el-radio label="1">同机构下的人员可以操作</el-radio>
<el-radio label="2">同一个项目组内可以互相操作</el-radio>
<el-radio label="3">同项目组下的同一个小组可以互相操作</el-radio>
<el-radio-group v-model="qxCode.menuTransmit" @change="editSomeFields(editForm,'menuScope',$event)">
<el-radio label="0">不限制，允许任何人</el-radio>
<el-radio label="1">同机构下的人员</el-radio>
<el-radio label="2">同产品内人员</el-radio>
<el-radio label="3">同产品下同小组内人员</el-radio>
</el-radio-group> </el-radio-group>
</el-row> </el-row>
<el-row> <el-row>
<el-checkbox v-model="qxCode.testTransmit" :true-label="'1'" :false-label="'0'" @change="editSomeFields(editForm,'testTransmit',$event)">任务指派及crud是否检查用户的上下级关系</el-checkbox>
<el-checkbox v-model="qxCode.menuTransmit" :true-label="'1'" :false-label="'0'" @change="editSomeFields(editForm,'menuTransmit',$event)">需求指派及crud是否检查用户的上下级关系</el-checkbox>
</el-row> </el-row>
<!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组--> <!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组-->
</el-form-item> </el-form-item>
@ -326,12 +341,14 @@ export default {
第5位代表迭代指派及crud时是否检查上下级关系，同第1位 第5位代表迭代指派及crud时是否检查上下级关系，同第1位
*/ */
qxCode:{ qxCode:{
menuScope:'2',//0-代表不限制,1-同组织，2-同项目组（默认），3-同小组
menuTransmit:'0',//0-不控制，1任务指派及crud必须检查用户的上下级关系
groupScope:'2',
groupTransmit:'1',
testScope:'2',//0-代表不限制,1-同组织，2-同项目组（默认），3-同小组 testScope:'2',//0-代表不限制,1-同组织，2-同项目组（默认），3-同小组
testTransmit:'0',//0-不控制，1任务指派及crud必须检查用户的上下级关系
testTransmit:'1',//0-不控制，1任务指派及crud必须检查用户的上下级关系
menuScope:'2',//0-代表不限制,1-同组织，2-同项目组（默认），3-同小组
menuTransmit:'1',//0-不控制，1任务指派及crud必须检查用户的上下级关系
iterationScope:'2',//0-代表不限制,1-同组织，2-同项目组（默认），3-同小组 iterationScope:'2',//0-代表不限制,1-同组织，2-同项目组（默认），3-同小组
iterationTransmit:'0',//0-不控制，1任务指派及crud必须检查用户的上下级关系
iterationTransmit:'1',//0-不控制，1任务指派及crud必须检查用户的上下级关系
}, },
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/
@ -392,8 +409,8 @@ export default {
} else if (fieldName == "startTime") { } else if (fieldName == "startTime") {
params["startTime"] = row.startTime; params["startTime"] = row.startTime;
params["endTime"] = row.endTime; params["endTime"] = row.endTime;
} else if (fieldName == "menuScope"||fieldName=="menuTransmit"||fieldName == "iterationScope"||fieldName=="iterationTransmit"||fieldName == "testScope"||fieldName=="testTransmit") {
params["qxCode"] = [this.qxCode.menuScope,this.qxCode.menuTransmit,this.qxCode.iterationScope,this.qxCode.iterationTransmit,this.qxCode.testScope,this.qxCode.testTransmit].join(",")
} else if (fieldName == "groupScope"||fieldName == "groupTransmit"||fieldName == "testScope"||fieldName=="testTransmit"||fieldName == "menuScope"||fieldName=="menuTransmit"||fieldName == "iterationScope"||fieldName=="iterationTransmit") {
params["qxCode"] = [,this.qxCode.groupScope,this.qxCode.groupTransmit,this.qxCode.testScope,this.qxCode.testTransmit,this.qxCode.menuScope,this.qxCode.menuTransmit,this.qxCode.iterationScope,this.qxCode.iterationTransmit].join(",")
} else { } else {
params[fieldName] = $event; params[fieldName] = $event;
} }
@ -409,6 +426,7 @@ export default {
this.$emit("edit-fields", params); this.$emit("edit-fields", params);
} else { } else {
Object.assign(this.editForm, this.editFormBak); Object.assign(this.editForm, this.editFormBak);
this.initQxCode()
this.$notify({ this.$notify({
position: "bottom-left", position: "bottom-left",
showClose: true, showClose: true,
@ -447,28 +465,34 @@ export default {
initQxCode(){ initQxCode(){
var qxCode=this.editForm.qxCode var qxCode=this.editForm.qxCode
if(!qxCode){ if(!qxCode){
this.qxCode.groupScope="2"
this.qxCode.groupTransmit="1"
this.qxCode.testScope="2"
this.qxCode.testTransmit="1"
this.qxCode.menuScope="2" this.qxCode.menuScope="2"
this.qxCode.menuTransmit="1" this.qxCode.menuTransmit="1"
this.qxCode.iterationScope="2" this.qxCode.iterationScope="2"
this.qxCode.iterationTransmit="1" this.qxCode.iterationTransmit="1"
this.qxCode.testScope="2"
this.qxCode.testTransmit="1"
}else{ }else{
var qxCodes=qxCode.split(",") var qxCodes=qxCode.split(",")
if(qxCodes.length>=2){
this.qxCode.menuScope=qxCodes[0]
this.qxCode.menuTransmit=qxCodes[1]
this.qxCode.iterationScope=qxCodes[2]
this.qxCode.iterationTransmit=qxCodes[3]
this.qxCode.testScope=qxCodes[4]
this.qxCode.testTransmit=qxCodes[5]
if(qxCodes.length>=8){
this.qxCode.groupScope=qxCodes[0]
this.qxCode.groupTransmit=qxCodes[1]
this.qxCode.testScope=qxCodes[2]
this.qxCode.testTransmit=qxCodes[3]
this.qxCode.menuScope=qxCodes[4]
this.qxCode.menuTransmit=qxCodes[5]
this.qxCode.iterationScope=qxCodes[6]
this.qxCode.iterationTransmit=qxCodes[7]
}else{ }else{
this.qxCode.groupScope='2'
this.qxCode.groupTransmit='1'
this.qxCode.testScope="2"
this.qxCode.testTransmit="1"
this.qxCode.menuScope="2" this.qxCode.menuScope="2"
this.qxCode.menuTransmit="1" this.qxCode.menuTransmit="1"
this.qxCode.iterationScope="2" this.qxCode.iterationScope="2"
this.qxCode.iterationTransmit="1" this.qxCode.iterationTransmit="1"
this.qxCode.testScope="2"
this.qxCode.testTransmit="1"
} }
} }
}, },

86
src/views/xm/core/xmProject/XmProjectEdit.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<section class="padding border"> <section class="padding border">
<el-row> <el-row>
<el-form :model="editForm" label-width="120px" label-position="left" :rules="editFormRules" ref="editForm" class="editForm">
<el-form :model="editForm" label-width="120px" label-position="top" :rules="editFormRules" ref="editForm" class="editForm">
<el-form-item label="项目名称" prop="name" > <el-form-item label="项目名称" prop="name" >
@ -101,17 +101,50 @@
</el-row> </el-row>
<!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组--> <!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组-->
</el-form-item> </el-form-item>
<el-form-item label="任务人员范围控制" title="指派及crud时任务人员范围控制">
<el-form-item label="团队相关:小组crud、加减人、小组组长管理等">
<el-row> <el-row>
<el-radio-group v-model="qxCode.taskScope" @change="editXmProjectSomeFields(editForm,'taskScope',$event)">
<el-radio label="0">不限制，任何人可以互相操作</el-radio>
<el-radio label="1">同机构下的人员可以操作</el-radio>
<el-radio label="2">同一个项目组内可以互相操作</el-radio>
<el-radio label="3">同项目组下的同一个小组可以互相操作</el-radio>
<el-radio-group v-model="qxCode.groupScope" @change="editXmProjectSomeFields(editForm,'groupScope',$event)">
<el-radio label="0">不限制，允许任何人</el-radio>
<el-radio label="1">同机构下的人员</el-radio>
<el-radio label="2">同项目内人员</el-radio>
<el-radio label="3">同项目下同小组内人员</el-radio>
</el-radio-group> </el-radio-group>
</el-row>
</el-row>
<el-row>
<el-checkbox v-model="qxCode.groupTransmit" :true-label="'1'" :false-label="'0'" @change="editXmProjectSomeFields(editForm,'groupTransmit',$event)">是否检查用户的上下级关系</el-checkbox>
</el-row>
<!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组--> <!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组-->
</el-form-item>
</el-form-item>
<el-form-item label="测试相关：缺陷crud">
<el-row>
<el-radio-group v-model="qxCode.testScope" @change="editXmProjectSomeFields(editForm,'testScope',$event)">
<el-radio label="0">不限制，允许任何人</el-radio>
<el-radio label="1">同机构下的人员</el-radio>
<el-radio label="2">同项目内人员</el-radio>
<el-radio label="3">同项目下同小组内人员</el-radio>
</el-radio-group>
</el-row>
<el-row>
<el-checkbox v-model="qxCode.testTransmit" :true-label="'1'" :false-label="'0'" @change="editXmProjectSomeFields(editForm,'testTransmit',$event)">是否检查用户的上下级关系</el-checkbox>
</el-row>
<!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组-->
</el-form-item>
<el-form-item label="任务相关：计划crud、任务crud、任务指派、报工等">
<el-row>
<el-radio-group v-model="qxCode.taskScope" @change="editXmProjectSomeFields(editForm,'taskScope',$event)">
<el-radio label="0">不限制，允许任何人</el-radio>
<el-radio label="1">同机构下的人员</el-radio>
<el-radio label="2">同项目内人员</el-radio>
<el-radio label="3">同项目下同小组内人员</el-radio>
</el-radio-group>
</el-row>
<el-row>
<el-checkbox v-model="qxCode.taskTransmit" :true-label="'1'" :false-label="'0'" @change="editXmProjectSomeFields(editForm,'taskTransmit',$event)">是否检查用户的上下级关系</el-checkbox>
</el-row>
<!--0-代表不限制,1-同组织，2-同项目组（默认），3-同小组-->
</el-form-item>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="工期" name="3"> <el-tab-pane label="工期" name="3">
<el-row> <el-row>
@ -535,19 +568,33 @@
methods: { methods: {
//打开用户选择 //打开用户选择
//选择接收人 //选择接收人
initQxCode(){ initQxCode(){
var qxCode=this.editForm.qxCode var qxCode=this.editForm.qxCode
if(!qxCode){ if(!qxCode){
this.qxCode.groupScope="2"
this.qxCode.groupTransmit="1"
this.qxCode.testScope="2"
this.qxCode.testTransmit="1"
this.qxCode.taskScope="2" this.qxCode.taskScope="2"
this.qxCode.taskTransmit="1"
this.qxCode.taskTransmit="1"
}else{ }else{
var qxCodes=qxCode.split(",") var qxCodes=qxCode.split(",")
if(qxCodes.length>=2){
this.qxCode.taskScope=qxCodes[0]
this.qxCode.taskTransmit=qxCodes[1]
if(qxCodes.length>=6){
this.qxCode.groupScope=qxCodes[0]
this.qxCode.groupTransmit=qxCodes[1]
this.qxCode.testScope=qxCodes[2]
this.qxCode.testTransmit=qxCodes[3]
this.qxCode.taskScope=qxCodes[4]
this.qxCode.taskTransmit=qxCodes[5]
}else{ }else{
this.qxCode.groupScope='2'
this.qxCode.groupTransmit='1'
this.qxCode.testScope="2"
this.qxCode.testTransmit="1"
this.qxCode.taskScope="2" this.qxCode.taskScope="2"
this.qxCode.taskTransmit="1"
this.qxCode.taskTransmit="1"
} }
} }
}, },
@ -571,7 +618,7 @@
this.$notify({position:'bottom-left',showClose:true,message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); this.$notify({position:'bottom-left',showClose:true,message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' });
return; return;
} }
var msg=this.xmProduct&&this.xmProduct.id?'将自动关联产品【'+(this.xmProduct.productName?this.xmProduct.productName:this.xmProduct.id)+'】':'';
var msg=this.xmProduct&&this.xmProduct.id?'将自动关联项目【'+(this.xmProduct.productName?this.xmProduct.productName:this.xmProduct.id)+'】':'';
this.$refs.editForm.validate((valid) => { this.$refs.editForm.validate((valid) => {
if (valid) { if (valid) {
this.$confirm('确认提交吗？'+msg, '提示', {}).then(() => { this.$confirm('确认提交吗？'+msg, '提示', {}).then(() => {
@ -913,6 +960,7 @@
this.editFormBak=Object.assign({},row) this.editFormBak=Object.assign({},row)
}else{ }else{
Object.assign(this.editForm,this.editFormBak) Object.assign(this.editForm,this.editFormBak)
this.initQxCode();
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'}) this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
@ -930,11 +978,9 @@
} else if (fieldName == "pmUserid") { } else if (fieldName == "pmUserid") {
params["pmUserid"] = $event[0].userid; params["pmUserid"] = $event[0].userid;
params["pmUsername"] = $event[0].username; params["pmUsername"] = $event[0].username;
}else if (fieldName == "taskScope") {
params.qxCode=[this.qxCode.taskScope,this.qxCode.taskTransmit].join(",")
}else if (fieldName == "taskTransmit") {
params.qxCode=[this.qxCode.taskScope,this.qxCode.taskTransmit].join(",")
}else{
}else if (fieldName == "groupScope"||fieldName == "groupTransmit"||fieldName == "testScope"||fieldName=="testTransmit"||fieldName == "taskScope"||fieldName=="taskTransmit") {
params["qxCode"] = [this.qxCode.groupScope,this.qxCode.groupTransmit,this.qxCode.testScope,this.qxCode.testTransmit,this.qxCode.taskScope,this.qxCode.taskTransmit].join(",")
} else{
params[fieldName]=$event params[fieldName]=$event
} }
if(fieldName=='description'){ if(fieldName=='description'){

Write Preview
Loading…
Cancel
Save