Browse Source

优化

master
陈裕财 2 years ago
parent
commit
aab52fd39c
  1. 106
      src/views/xm/core/xmProduct/XmProductEdit.vue
  2. 108
      src/views/xm/core/xmProduct/XmProductSetting.vue
  3. 6
      src/views/xm/core/xmProject/XmProjectEdit.vue

106
src/views/xm/core/xmProduct/XmProductEdit.vue

@ -5,20 +5,20 @@
<el-form
:model="editForm"
label-width="120px"
:rules="editFormRules"
:rules="editFormRules"
label-position="top"
ref="editForm"
>
<el-form-item label="产品名称" prop="productName" v-if="opType !== 'add'">
<el-input
<el-form-item label="产品名称" prop="productName" v-if="opType !== 'add'">
<el-input
v-model="editForm.productName"
placeholder="产品名称"
@change="editSomeFields(editForm, 'productName', $event)"
></el-input>
></el-input>
<el-row class=" label-font-color">
<span >产品代号:</span>
{{ editForm.code }} <el-divider direction="vertical"></el-divider><span
{{ editForm.code }} <el-divider direction="vertical"></el-divider><span
>产品编号:</span
>
{{ editForm.id }}
@ -26,14 +26,14 @@
content="产品代号用于签订合同等甲乙方共享的场景;产品编号为内部编号,用于内部流转,编号生成规则:产品代号+四位随机码 "
><i class="el-icon-question"></i
></el-tooltip>
</el-row>
</el-form-item>
<el-form-item label="产品名称" prop="productName" v-if="opType === 'add'">
</el-row>
</el-form-item>
<el-form-item label="产品名称" prop="productName" v-if="opType === 'add'">
<el-input
v-model="editForm.productName"
placeholder="产品名称"
></el-input>
</el-form-item>
placeholder="产品名称"
></el-input>
</el-form-item>
<el-form-item label="产品代号" prop="code" v-if="opType === 'add'">
<el-input
v-model="editForm.code"
@ -46,10 +46,10 @@
content="产品代号用于签订合同等甲乙方共享的场景;产品编号为内部编号,用于内部流转,生成规则:产品代号+四位随机码 "
><i class="el-icon-question"></i
></el-tooltip>
</el-form-item>
</el-form-item>
<el-form-item label="管理成员">
<el-row class="padding padding-top">
<el-col :span="8">
<el-form-item prop="admUserid" label-width="0px">
<mdp-select-user-x
@ -58,7 +58,7 @@
username-key="admUsername"
v-model="editForm"
@change="editSomeFields(editForm, 'admUserid', $event)"
></mdp-select-user-x>
></mdp-select-user>
</el-form-item>
</el-col>
<el-col :span="8">
@ -69,7 +69,7 @@
username-key="pmUsername"
v-model="editForm"
@change="editSomeFields(editForm, 'pmUserid', $event)"
></mdp-select-user-x>
></mdp-select-user>
</el-form-item>
</el-col>
<el-col :span="8">
@ -80,12 +80,12 @@
username-key="assUsername"
v-model="editForm"
@change="editSomeFields(editForm, 'assUserid', $event)"
></mdp-select-user-x>
></mdp-select-user>
</el-form-item>
</el-col>
</el-row>
</el-form-item>
</el-row>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="editForm.remark"
@ -95,12 +95,12 @@
placeholder="备注"
@change="editSomeFields(editForm, 'remark', $event)"
></el-input>
</el-form-item>
</el-form-item>
</el-form>
<el-row v-if="opType==='add'" style="float:right;">
<el-button type="primary" @click="addSubmit">保存</el-button>
</el-row>
</el-row>
</el-row>
</section>
</template>
@ -113,7 +113,7 @@ import {
editXmProductSomeFields,
createProductCode
} from "@/api/xm/core/xmProduct";
import { mapGetters } from "vuex";
import { mapGetters } from "vuex";
import store from '@/store'
export default {
computed: {
@ -144,8 +144,8 @@ export default {
},
visible: function (visible) {
if (visible == true) {
this.initData();
this.initData();
this.initQxCode();
//
}
@ -262,12 +262,12 @@ export default {
},
userSelectVisible: false,
currTabPane:"1",
/**
/**
权限码0,1,2,3,4,5,67,8,9逗号分割
共10位,不定长暂时只启用前6个位
第0位代表需求指派及crud权限
0-代表不限制,1-同组织2-同项目组默认3-同小组
第1位代表需求指派及crud时是否检查上下级关系0-默认1
第1位代表需求指派及crud时是否检查上下级关系0-默认1
第2位代表测试相关(包括测试用例测试库测试计划测试报告)指派及crud权限同第0位
第3位代表测试相关(包括测试用例测试库测试计划测试报告)指派及crud时是否检查上下级关系同第1位
第4位代表迭代指派及crud时权限同第0位
@ -277,11 +277,11 @@ export default {
groupScope:'2',
groupTransmit:'1',
testScope:'2',//0-,1-2-3-
testTransmit:'1',//0-1crud
testTransmit:'1',//0-1crud
menuScope:'2',//0-,1-2-3-
menuTransmit:'1',//0-1crud
menuTransmit:'1',//0-1crud
iterationScope:'2',//0-,1-2-3-
iterationTransmit:'1',//0-1crud
iterationTransmit:'1',//0-1crud
},
/**begin 在下面加自定义属性,记得补上面的一个逗号**/
@ -296,14 +296,14 @@ export default {
},
//XmProduct @submit="afterAddSubmit"
addSubmit: function () {
this.$refs.editForm.validate((valid) => {
if (valid) {
var msg=this.selProject&&this.selProject.id?'将自动关联项目【'+(this.selProject.name?this.selProject.name:this.selProject.id)+'】':'';
this.$confirm('确认提交吗?'+msg, '提示', {}).then(() => {
this.$confirm('确认提交吗?'+msg, '提示', {}).then(() => {
this.load.add=true
let params = Object.assign({}, this.editForm);
let params = Object.assign({}, this.editForm);
if(this.selProject &&this.selProject.id){
params.links=[{projectId:this.selProject.id}]
}
@ -315,11 +315,11 @@ export default {
//this.$refs['addForm'].resetFields();
this.$emit('submit',res.data.data);// @submit="afterAddSubmit"
}
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' });
}).catch( err => this.load.add=false);
});
}else{
this.$notify({position:'bottom-left',showClose:true,message: "表单检查不通过", type: 'error' });
this.$notify({position:'bottom-left',showClose:true,message: "表单检查不通过", type: 'error' });
}
});
},
@ -343,7 +343,7 @@ export default {
params["startTime"] = row.startTime;
params["endTime"] = row.endTime;
} 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(",")
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 {
params[fieldName] = $event;
}
@ -370,31 +370,31 @@ export default {
})
.catch((e) => Object.assign(this.editForm, this.editFormBak));
},
createProductCode(){
createProductCode(){
createProductCode({}).then(res=>{
var tips=res.data.tips;
if(tips.isOk){
if(tips.isOk){
this.$set(this.editForm,'code',res.data.data)
}
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' });
})
},
initData(){
this.editForm=Object.assign(this.editForm,this.xmProduct)
if(this.opType==='add'){
if(this.opType==='add'){
this.editForm.pmUserid=this.userInfo.userid
this.editForm.pmUsername=this.userInfo.username
this.editForm.admUserid=this.userInfo.userid
this.editForm.admUsername=this.userInfo.username
this.editForm.assUserid=this.userInfo.userid
this.editForm.assUsername=this.userInfo.username
}
this.editForm.assUsername=this.userInfo.username
}
this.editFormBak={...this.editForm}
},
initQxCode(){
var qxCode=this.editForm.qxCode
if(!qxCode){
@ -431,9 +431,9 @@ export default {
},
/**end 在上面加自定义方法**/
}, //end method
components: {
components: {
},
mounted() {
mounted() {
initDicts(this);
this.initData();
this.initQxCode();
@ -442,6 +442,6 @@ export default {
};
</script>
<style lang="scss" scoped>
</style>
<style lang="scss" scoped>
</style>

108
src/views/xm/core/xmProduct/XmProductSetting.vue

@ -5,15 +5,15 @@
<el-form
:model="editForm"
label-width="120px"
:rules="editFormRules"
:rules="editFormRules"
label-position="top"
ref="editForm"
>
<h3>{{ editForm.productName }}</h3>
<h3>{{ editForm.productName }}</h3>
<el-row class=" label-font-color">
<span >产品代号:</span>
{{ editForm.code }} <el-divider direction="vertical"></el-divider><span
{{ editForm.code }} <el-divider direction="vertical"></el-divider><span
>产品编号:</span
>
{{ editForm.id }}
@ -21,10 +21,10 @@
content="产品代号用于签订合同等甲乙方共享的场景;产品编号为内部编号,用于内部流转,编号生成规则:产品代号+四位随机码 "
><i class="el-icon-question"></i
></el-tooltip>
</el-row>
</el-row>
<el-form-item label="管理成员">
<el-row class="padding padding-top">
<el-col :span="8">
<el-form-item prop="admUserid" label-width="0px">
<mdp-select-user-x
@ -33,7 +33,7 @@
username-key="admUsername"
v-model="editForm"
@change="editSomeFields(editForm, 'admUserid', $event)"
></mdp-select-user-x>
></mdp-select-user>
</el-form-item>
</el-col>
<el-col :span="8">
@ -44,7 +44,7 @@
username-key="pmUsername"
v-model="editForm"
@change="editSomeFields(editForm, 'pmUserid', $event)"
></mdp-select-user-x>
></mdp-select-user>
</el-form-item>
</el-col>
<el-col :span="8">
@ -55,15 +55,15 @@
username-key="assUsername"
v-model="editForm"
@change="editSomeFields(editForm, 'assUserid', $event)"
></mdp-select-user-x>
></mdp-select-user>
</el-form-item>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="团队相关:小组crud、加减人、小组组长管理等">
<el-row>
</el-row>
</el-form-item>
<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>
@ -72,13 +72,13 @@
</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-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-form-item>
<el-form-item label="测试相关:缺陷crud、用例crud、测试计划、测试执行等">
<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>
@ -87,13 +87,13 @@
</el-radio-group>
</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.testTransmit" :true-label="'1'" :false-label="'0'" @change="editSomeFields(editForm,'testTransmit',$event)">缺陷用例等指派及crud是否检查用户的上下级关系</el-checkbox>
</el-row>
<!--0-代表不限制,1-同组织2-同项目组默认3-同小组-->
</el-form-item>
<el-form-item label="迭代crud、迭代负责人管理">
<el-row>
</el-form-item>
<el-form-item label="迭代crud、迭代负责人管理">
<el-row>
<el-radio-group v-model="qxCode.iterationScope" @change="editSomeFields(editForm,'iterationScope',$event)">
<el-radio label="0">不限制允许任何人</el-radio>
<el-radio label="1">同机构下的人员</el-radio>
@ -102,13 +102,13 @@
</el-radio-group>
</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>
<!--0-代表不限制,1-同组织2-同项目组默认3-同小组-->
</el-form-item>
<el-form-item label="需求相关:史诗、特性、故事的crud">
<el-row>
</el-form-item>
<el-form-item label="需求相关:史诗、特性、故事的crud">
<el-row>
<el-radio-group v-model="qxCode.menuTransmit" @change="editSomeFields(editForm,'menuScope',$event)">
<el-radio label="0">不限制允许任何人</el-radio>
<el-radio label="1">同机构下的人员</el-radio>
@ -117,11 +117,11 @@
</el-radio-group>
</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.menuTransmit" :true-label="'1'" :false-label="'0'" @change="editSomeFields(editForm,'menuTransmit',$event)">需求指派及crud是否检查用户的上下级关系</el-checkbox>
</el-row>
<!--0-代表不限制,1-同组织2-同项目组默认3-同小组-->
</el-form-item>
</el-form>
</el-form-item>
</el-form>
</el-row>
</section>
</template>
@ -134,7 +134,7 @@ import {
editXmProductSomeFields,
createProductCode
} from "@/api/xm/core/xmProduct";
import { mapGetters } from "vuex";
import { mapGetters } from "vuex";
import store from '@/store'
export default {
computed: {
@ -151,8 +151,8 @@ export default {
},
visible: function (visible) {
if (visible == true) {
this.initData();
this.initData();
this.initQxCode();
//
}
@ -162,7 +162,7 @@ export default {
return {
dicts: { xmProductPstatus: [] }, // params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
load: { list: false, add: false, del: false, edit: false }, //...
editFormRules: {
editFormRules: {
},
//
editForm: {
@ -234,13 +234,13 @@ export default {
locked: "",
del: "",
ltime: "",
},
/**
},
/**
权限码0,1,2,3,4,5,67,8,9逗号分割
共10位,不定长暂时只启用前6个位
第0位代表需求指派及crud权限
0-代表不限制,1-同组织2-同项目组默认3-同小组
第1位代表需求指派及crud时是否检查上下级关系0-默认1
第1位代表需求指派及crud时是否检查上下级关系0-默认1
第2位代表测试相关(包括测试用例测试库测试计划测试报告)指派及crud权限同第0位
第3位代表测试相关(包括测试用例测试库测试计划测试报告)指派及crud时是否检查上下级关系同第1位
第4位代表迭代指派及crud时权限同第0位
@ -250,11 +250,11 @@ export default {
groupScope:'2',
groupTransmit:'1',
testScope:'2',//0-,1-2-3-
testTransmit:'1',//0-1crud
testTransmit:'1',//0-1crud
menuScope:'2',//0-,1-2-3-
menuTransmit:'1',//0-1crud
menuTransmit:'1',//0-1crud
iterationScope:'2',//0-,1-2-3-
iterationTransmit:'1',//0-1crud
iterationTransmit:'1',//0-1crud
},
/**begin 在下面加自定义属性,记得补上面的一个逗号**/
@ -267,7 +267,7 @@ export default {
this.$refs["editForm"].resetFields();
this.$emit("cancel");
},
editSomeFields(row, fieldName, $event) {
if(this.opType==='add'){
@ -285,7 +285,7 @@ export default {
params["pmUserid"] = $event[0].userid;
params["pmUsername"] = $event[0].username;
} 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(",")
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 {
params[fieldName] = $event;
}
@ -312,13 +312,13 @@ export default {
})
.catch((e) => Object.assign(this.editForm, this.editFormBak));
},
initData(){
this.editForm=Object.assign(this.editForm,this.xmProduct)
this.editForm=Object.assign(this.editForm,this.xmProduct)
this.editFormBak={...this.editForm}
},
initQxCode(){
var qxCode=this.editForm.qxCode
if(!qxCode){
@ -355,9 +355,9 @@ export default {
},
/**end 在上面加自定义方法**/
}, //end method
components: {
components: {
},
mounted() {
mounted() {
initDicts(this);
this.initData();
this.initQxCode();
@ -366,6 +366,6 @@ export default {
};
</script>
<style lang="scss" scoped>
</style>
<style lang="scss" scoped>
</style>

6
src/views/xm/core/xmProject/XmProjectEdit.vue

@ -38,19 +38,19 @@
<el-row class="padding">
<el-col :span="8">
<el-form-item prop="admUserid" label-width="0px">
<mdp-select-user-x label=" 项目总控" userid-key="admUserid" username-key="admUsername" v-model="editForm" @change="editXmProjectSomeFields(editForm,'admUserid',$event)"></mdp-select-user-x>
<mdp-select-user show-style="x" label=" 项目总控" userid-key="admUserid" username-key="admUsername" v-model="editForm" @change="editXmProjectSomeFields(editForm,'admUserid',$event)"></mdp-select-user>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="pmUserid" label-width="0px">
<mdp-select-user-x label=" 项目经理" userid-key="pmUserid" username-key="pmUsername" v-model="editForm" @change="editXmProjectSomeFields(editForm,'pmUserid',$event)"></mdp-select-user-x>
<mdp-select-user show-style="x" label=" 项目经理" userid-key="pmUserid" username-key="pmUsername" v-model="editForm" @change="editXmProjectSomeFields(editForm,'pmUserid',$event)"></mdp-select-user>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="assUserid" label-width="0px">
<mdp-select-user-x label=" 副经理、助理" userid-key="assUserid" username-key="assUsername" v-model="editForm" @change="editXmProjectSomeFields(editForm,'assUserid',$event)"></mdp-select-user-x>
<mdp-select-user show-style="x" label=" 副经理、助理" userid-key="assUserid" username-key="assUsername" v-model="editForm" @change="editXmProjectSomeFields(editForm,'assUserid',$event)"></mdp-select-user>
</el-form-item>
</el-col>

Loading…
Cancel
Save