From f48ad02bb9f634a0927585d2c61f94e50fc88718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 29 Jan 2024 18:13:33 +0800 Subject: [PATCH] =?UTF-8?q?2.0-=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86xm?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=201=E4=BA=A7=E5=93=81=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E5=90=8E=E7=AB=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=83=A8=E9=97=A8=E8=87=AA=E5=8A=A8=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=97=A0=E6=9D=83=E9=99=90=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=202=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=AE=BE=E7=BD=AE=E3=80=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=88=86=E5=88=AB=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=A8=8B=E5=BA=A6=E9=80=89=E9=A1=B9=203?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E4=BA=A7=E5=93=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E3=80=81=E9=A1=B9=E7=9B=AE=E7=BC=96=E8=BE=91=E5=88=86?= =?UTF-8?q?=E5=88=AB=E5=A2=9E=E5=8A=A0=E5=BD=92=E5=B1=9E=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=204=E8=A1=A8xm=5Fproduct=E3=80=81xm=5Fprojec?= =?UTF-8?q?t=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5show=5Fout=E3=80=81deptid?= =?UTF-8?q?=5Fpath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmProduct/XmProductEdit.vue | 12 ++++++++++- .../xm/core/xmProduct/XmProductSetting.vue | 18 +++++++++++++++++ src/views/xm/core/xmProject/XmProjectEdit.vue | 16 +++++++++++++-- .../xm/core/xmProject/XmProjectSetting.vue | 20 +++++++++++++++++-- 4 files changed, 61 insertions(+), 5 deletions(-) diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue index 6a0ebb77..23fe4ca4 100644 --- a/src/views/xm/core/xmProduct/XmProductEdit.vue +++ b/src/views/xm/core/xmProduct/XmProductEdit.vue @@ -46,7 +46,14 @@ content="产品代号用于签订合同等甲乙方共享的场景;产品编号为内部编号，用于内部流转，生成规则:产品代号+四位随机码 " > - + + + + @@ -341,6 +348,9 @@ export default { 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(",") + }else if(fieldName=='deptid'){ + params["deptid"] = $event.deptid; + params["deptidPath"] = $event.idPath; } else { params[fieldName] = $event; } diff --git a/src/views/xm/core/xmProduct/XmProductSetting.vue b/src/views/xm/core/xmProduct/XmProductSetting.vue index 88e08402..e14c3dff 100644 --- a/src/views/xm/core/xmProduct/XmProductSetting.vue +++ b/src/views/xm/core/xmProduct/XmProductSetting.vue @@ -59,6 +59,22 @@ + + + + + + + 完全不可见 + 仅本司人员可见 + 关联人员可见（众包-外包-招投标） + 本部门、上级部门、下属部门可见 + 本部门、上级部门可见 + 本部门、下级部门可见、上级不可见 + 任何人可见 + + + @@ -196,6 +212,7 @@ export default { locked: "", del: "", ltime: "", + showOut:'1' }, editFormBak: { id: "", @@ -231,6 +248,7 @@ export default { locked: "", del: "", ltime: "", + showOut:'1' }, /** 权限码0,1,2,3,4,5,67,8,9，逗号分割 diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue index 0df25498..63767e31 100644 --- a/src/views/xm/core/xmProject/XmProjectEdit.vue +++ b/src/views/xm/core/xmProject/XmProjectEdit.vue @@ -17,6 +17,14 @@ 自动生成 + + + + @@ -863,6 +871,7 @@ editXmProjectSomeFields(row,fieldName,$event){ + debugger; if(this.opType=='add'){ return; } @@ -886,7 +895,7 @@ } var params={ids:[row.id]}; - + debugger; if (fieldName == "admUserid") { params["admUserid"] = $event.userid; @@ -897,7 +906,10 @@ } else if (fieldName == "pmUserid") { params["pmUserid"] = $event.userid; params["pmUsername"] = $event.username; - } else{ + }else if(fieldName=='deptid'){ + params["deptid"] = $event.deptid; + params["deptidPath"] = $event.idPath; + } else{ params[fieldName]=$event } if(fieldName=='description'){ diff --git a/src/views/xm/core/xmProject/XmProjectSetting.vue b/src/views/xm/core/xmProject/XmProjectSetting.vue index a0febeaa..6c42f0cc 100644 --- a/src/views/xm/core/xmProject/XmProjectSetting.vue +++ b/src/views/xm/core/xmProject/XmProjectSetting.vue @@ -35,6 +35,22 @@ + + + + + + + 完全不可见 + 仅本司人员可见 + 关联人员可见（众包-外包-招投标） + 本部门、上级部门、下属部门可见 + 本部门、上级部门可见 + 本部门、下级部门可见、上级不可见 + 任何人可见 + + + @@ -129,10 +145,10 @@ }, //编辑界面数据 XmProject xm_project editForm: { - id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'0',totalReceivables:'0',budgetMarginRate:13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:0,planIuserCnt:0,planWorkingHours:0,taxRate:3,planIuserWorkload:0,planOuserWorkload:0,fromTplId:'',budgetCtrl:'0',deptid:'',showOut:'0',isTpl:'0',pmUserid:'',pmUsername:'',assUserid:'',assUsername:'',admUserid:'',admUsername:'',budgetEarly:'',phaseActCtrl:'',del:'0',ltime:'',ostatus:'0',workType:'',wtype:'',earlyAmt:0,maxTaskAmt:0,menuLink:'0',phaseLink:'0',tplType:'',qxCode:'' + id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'0',totalReceivables:'0',budgetMarginRate:13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:0,planIuserCnt:0,planWorkingHours:0,taxRate:3,planIuserWorkload:0,planOuserWorkload:0,fromTplId:'',budgetCtrl:'0',deptid:'',showOut:'1',isTpl:'0',pmUserid:'',pmUsername:'',assUserid:'',assUsername:'',admUserid:'',admUsername:'',budgetEarly:'',phaseActCtrl:'',del:'0',ltime:'',ostatus:'0',workType:'',wtype:'',earlyAmt:0,maxTaskAmt:0,menuLink:'0',phaseLink:'0',tplType:'',qxCode:'' }, editFormBak: { - id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'0',totalReceivables:'0',budgetMarginRate:13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:0,planIuserCnt:0,planWorkingHours:0,taxRate:3,planIuserWorkload:0,planOuserWorkload:0,fromTplId:'',budgetCtrl:'0',deptid:'',showOut:'0',isTpl:'0',pmUserid:'',pmUsername:'',assUserid:'',assUsername:'',admUserid:'',admUsername:'',budgetEarly:'',phaseActCtrl:'',del:'0',ltime:'',ostatus:'0',workType:'',wtype:'',earlyAmt:0,maxTaskAmt:0,menuLink:'0',phaseLink:'0',tplType:'',qxCode:'' + id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'0',totalReceivables:'0',budgetMarginRate:13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:0,planIuserCnt:0,planWorkingHours:0,taxRate:3,planIuserWorkload:0,planOuserWorkload:0,fromTplId:'',budgetCtrl:'0',deptid:'',showOut:'1',isTpl:'0',pmUserid:'',pmUsername:'',assUserid:'',assUsername:'',admUserid:'',admUsername:'',budgetEarly:'',phaseActCtrl:'',del:'0',ltime:'',ostatus:'0',workType:'',wtype:'',earlyAmt:0,maxTaskAmt:0,menuLink:'0',phaseLink:'0',tplType:'',qxCode:'' }, /**begin 在下面加自定义属性,记得补上面的一个逗号**/ maxTableHeight:300,