ZF/xm-ui-web
1
0
Fork 0
mirror of https://gitee.com/maimengcloud/xm-ui-web.git synced 2025-12-30 10:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

通用变更

Browse Source
This commit is contained in:
陈裕财
2025-04-13 17:40:14 +08:00
parent 09f2524de8
commit 62c803d5cd
5 changed files with 140 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/components/mdp-ui-ext/mdp-ext-infos/Index.vue
View File

@@ -87,6 +87,26 @@
<el-button @click.prevent="removeExtInfosItem(item,index)" icon="delete"/><el-button @click="addExtInfosItem(item,index)" icon="plus"/>
</el-space>
</el-form-item>
<el-form-item v-else-if="item.type=='16'" :label-width="labelWidth"> <el-space>
<el-select v-model="item.type" style="width:120px;">
<el-option v-for="(it,indexx) in itemTypes" :key="indexx" :label="it.name" :value="it.id">{{it.name}} </el-option>
</el-select>
<el-input style="width:10%;" v-model="item.id" placeholder="代码"/>:
<el-input style="width:10%;" v-model="item.name" placeholder="名称"/>:
<mdp-select-user width="100%" v-model="item.value" />
<el-button @click.prevent="removeExtInfosItem(item,index)" icon="delete"/><el-button @click="addExtInfosItem(item,index)" icon="plus"/>
</el-space>
</el-form-item>
<el-form-item v-else-if="item.type=='17'" :label-width="labelWidth"> <el-space>
<el-select v-model="item.type" style="width:120px;">
<el-option v-for="(it,indexx) in itemTypes" :key="indexx" :label="it.name" :value="it.id">{{it.name}} </el-option>
</el-select>
<el-input style="width:10%;" v-model="item.id" placeholder="代码"/>:
<el-input style="width:10%;" v-model="item.name" placeholder="名称"/>:
<mdp-select-dept width="100%" v-model="item.value" />
<el-button @click.prevent="removeExtInfosItem(item,index)" icon="delete"/><el-button @click="addExtInfosItem(item,index)" icon="plus"/>
</el-space>
</el-form-item>
</div>
<el-form-item :label-width="labelWidth">
@@ -129,6 +149,12 @@
<el-radio v-model="item.value" :label="'1'" placeholder="">是</el-radio>
<el-radio v-model="item.value" :label="'0'" placeholder="">否</el-radio>
</el-form-item>
<el-form-item v-else-if="item.type=='16'" :label="item.name">
<mdp-select-user width="100%" v-model="item.value" showStyle="tag" />
</el-form-item>
<el-form-item v-else-if="item.type=='17'" :label="item.name">
<mdp-select-dept width="100%" v-model="item.value" showStyle="tag" />
</el-form-item>
</el-col>
</el-row>
@@ -200,7 +226,7 @@
data() {
return{
configVisible:false,
itemTypes:[//支持简单的1-普通文本2-数字，3-日期，8-富文本，9单图文，15-是否'
itemTypes:[//支持简单的1-普通文本2-数字，3-日期，8-富文本，9单图文，15-是否'，16-用户，17-部门
{id:'1',name:'普通文本'},
{id:'2',name:'数字'},
{id:'3',name:'日期'},
@@ -208,6 +234,8 @@
{id:'8',name:'富文本'},
{id:'9',name:'单图文'},
{id:'15',name:'是否'},
{id:'16',name:'用户'},
{id:'17',name:'部门'},
],
extInfosList:[],//[{name:'中文名称',id:'编号',value:'值',link:'超链接',remark:'备注',type:'支持简单的1-普通文本2-数字，3-日期，8-富文本，9单图文，15-是否'}]

36
src/router/modules/xm_core.ts
View File

@@ -376,7 +376,7 @@ const RoutesXmCore: AppRouteRecordRaw[] = [
{
path: 'setup',
props:{bizKey:'xm_project_start_approva'},
component: () => import('@/views/xm/core/xmProject/XmProjectSetup.vue'),
component: () => import('@/views/xm/core/xmProject/XmProjectDetail.vue'),
name: 'projectSetup',
meta: {
title: '项目-立项申请',
@@ -398,41 +398,17 @@ const RoutesXmCore: AppRouteRecordRaw[] = [
}
},
{
path: 'budget/change',
props:{bizKey:'xm_project_budget_change_approva'},
component: () => import('@/views/xm/core/xmProject/XmProjectDetail.vue'),
name: 'projectBudgetChange',
path: 'comm/change',
props:{bizKey:'xm_project_comm_change_approva'},
component: () => import('@/views/xm/core/xmProject/XmProjectCommChange.vue'),
name: 'projectCommChange',
meta: {
title: '项目-预算变更申请',
icon: 'project',
menu: false,
hidden: true
}
},
{
path: 'duration/change',
props:{bizKey:'xm_project_delay_approva'},
component: () => import('@/views/xm/core/xmProject/XmProjectDetail.vue'),
name: 'projectDurationChange',
meta: {
title: '项目-工期变更申请',
title: '项目-项目变更申请',
icon: 'project',
menu: false,
hidden: true
}
},
{
path: 'comm/change',
props:{bizKey:'xm_project_comm_approva'},
component: () => import('@/views/xm/core/xmProject/XmProjectDetail.vue'),
name: 'projectCommChange',
meta: {
title: '项目-项目整体变更申请',
icon: 'project',
menu: false,
hidden: true
}
},
{
path: 'currFlow',
component: () => import('@/views/xm/core/xmProject/XmProjectCurrFlow.vue'),

170
src/views/xm/core/xmProject/XmProjectSetup.vue → src/views/xm/core/xmProject/XmProjectCommChange.vue
View File

@@ -1,116 +1,38 @@
<template>
<mdp-lr-box :lspan="24" :gutter="20">
<template #left>
<el-scrollbar v-adaptive>
<el-form :model="editForm" label-width="120px" label-position="left" :rules="editFormRules" ref="editForm" class="padding">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="项目名称" prop="name">
<el-space>
<el-text type="info">编号：{{editForm.id}}</el-text> &nbsp;<el-text type="info">代号：{{editForm.code}}</el-text>
<el-text type="info">审核状态：<mdp-select itemCode="bizFlowState" v-model="editForm.bizFlowState" showStyle="tag" :disabled="true"/>
</el-text>
</el-space>
<el-input v-model="editForm.name" placeholder="项目名称" @change="editSomeFields(editForm,'name',$event)"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目类型" prop="xmType">
<mdp-select :clearable="false" width="100%" itemCode="projectType" v-model="editForm.xmType" @change="editSomeFields(editForm,'xmType',$event)"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目总控" prop="admUserid">
<mdp-select-user width="100%" v-model="editForm.admUserid" @change2="editSomeFields(editForm,'admUserid',$event)" :init-name="editForm.admUsername"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目经理" prop="pmUserid">
<mdp-select-user width="100%" v-model="editForm.pmUserid" @change2="editSomeFields(editForm,'pmUserid',$event)" :init-name="editForm.pmUsername"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门" prop="deptid">
<mdp-select-dept width="100%" v-model="editForm.deptid" @change2="editSomeFields(editForm,'deptid',$event)" :displayLoad="true"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起止日期" prop="startTime">
<mdp-date-range width="100%" v-model="editForm" startKey="startTime" endKey="endTime" @change2="editSomeFields(editForm,'startTime',$event)"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工期(小时)" prop="planWorkingHours">
<mdp-input width="100%" type="number" v-model="editForm.planWorkingHours" @change="editSomeFields(editForm,'planWorkingHours',$event)"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技术来源" prop="tsrc">
<mdp-select :clearable="false" width="100%" itemCode="tsrc" v-model="editForm.tsrc" @change="editSomeFields(editForm,'tsrc',$event)"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="研发成果" prop="gain">
<mdp-select :clearable="false" width="100%" itemCode="gain" v-model="editForm.gain" @change="editSomeFields(editForm,'gain',$event)"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="预算金额" prop="planTotalCost">
<el-input type="number" v-model="editForm.planTotalCost" @change="editSomeFields(editForm,'planTotalCost',$event)"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="税率" prop="taxRate">
<el-input type="number" v-model="editForm.taxRate" @change="editSomeFields(editForm,'taxRate',$event)"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="预估毛利率" prop="budgetMarginRate">
<el-input type="number" v-model="editForm.budgetMarginRate" @change="editSomeFields(editForm,'budgetMarginRate',$event)"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同总金额" prop="contractAmt">
<el-input type="number" v-model="editForm.contractAmt" @change="editSomeFields(editForm,'contractAmt',$event)"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="研发目标" prop="target">
<el-input type="textarea" :rows="4" v-model="editForm.target" @change="editSomeFields(editForm,'target',$event)"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="立项说明" prop="setupRemark">
<el-input type="textarea" :rows="4" v-model="editForm.setupRemark" @change="editSomeFields(editForm,'setupRemark',$event)"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="项目描述" prop="description">
<el-input type="textarea" :rows="4" v-model="editForm.description" @change="editSomeFields(editForm,'description',$event)"/>
</el-form-item>
</el-col>
</el-row>
<!-- <el-form-item label="附件">
<mdp-select-att subOpType="select" simple v-if="editForm.id" crelyType="xm-project" :crelyId="editForm.id" :biz-id="editForm.id"/>
</el-form-item> -->
<div class="footer">
<el-button @click="sendToProcessApprova()" type="primary" icon="Finished">发起审核</el-button>
</div>
</el-form>
</el-scrollbar>
</template>
</mdp-lr-box>
<el-table :data="tableDatas">
<el-table-column type="index"/>
<el-table-column prop="name" label="名称" width="200px"/>
<el-table-column prop="ovalue" label="原值" min-width="120px">
<template #default="{row}">
<mdp-input width="100%" v-if="row.item_type=='1'" v-model="row.ovalue" disabled/>
<mdp-input width="100%" v-else-if="row.item_type=='2'" type="number" v-model="row.ovalue" disabled/>
<mdp-date width="100%" v-else-if="row.item_type=='3'" v-model="row.ovalue" disabled/>
<mdp-select width="100%" v-else-if="row.item_type=='4'" :itemCode="row.itemCode" v-model="row.ovalue" disabled/>
<mdp-input width="100%" v-else-if="row.item_type=='8'" type="textarea" rows="4" v-model="row.ovalue" disabled/>
<mdp-select-user width="100%" v-else-if="row.item_type=='16'" v-model="row.ovalue" disabled/>
<mdp-select-dept width="100%" v-else-if="row.item_type=='17'" v-model="row.ovalue" disabled/>
<mdp-input width="100%" v-else v-model="row.ovalue" disabled/>
</template>
</el-table-column>
<el-table-column prop="nvalue" label="新值" min-width="120px">
<template #default="{row}">
<mdp-input width="100%" v-if="row.item_type=='1'" v-model="row.nvalue"/>
<mdp-input width="100%" v-else-if="row.item_type=='2'" type="number" v-model="row.nvalue"/>
<mdp-date width="100%" v-else-if="row.item_type=='3'" v-model="row.nvalue"/>
<mdp-select width="100%" v-else-if="row.item_type=='4'" :itemCode="row.itemCode" v-model="row.nvalue"/>
<mdp-input width="100%" v-else-if="row.item_type=='8'" type="textarea" rows="4" v-model="row.nvalue"/>
<mdp-select-user width="100%" v-else-if="row.item_type=='16'" v-model="row.nvalue"/>
<mdp-select-dept width="100%" v-else-if="row.item_type=='17'" v-model="row.nvalue"/>
<mdp-input width="100%" v-else v-model="row.nvalue"/>
</template>
</el-table-column>
<el-table-column prop="remark" label="填写说明" min-width="120px">
<template #default="{row}">
{{ row.fremark }}
</template>
</el-table-column>
</el-table>
</template>
@@ -206,10 +128,25 @@ export default {
add: addXmProject,
edit: editXmProject,
editSomeFields: editXmProjectSomeFields
}
} ,
xmProjectFields:[],
tableDatas:[],
}//end return
},//end data
methods: {
initTalbeDatas(){
debugger
let tds=[]
this.xmProjectFields.forEach((k)=>{
let extVals=JSON.parse(k.extVals?.length>0?k.extVals:'[]')
let row={id:k.id,name:k.name,ovalue:this.editForm[k.id],nvalue:null}
extVals.forEach(k=>{
row[k.id]=k.value
})
tds.push(row)
})
this.tableDatas=tds
},
sendToProcessApprova: function () {
let row=this.editForm
let bizKey="xm_project_start_approva"
@@ -337,10 +274,17 @@ export default {
},
initCurrData(){
this.editForm={...this.projectInfo}
this.$mdp.getDictOptions('xm_project_fields').then(res=>
{
this.xmProjectFields=res
this.initTalbeDatas()
})
}
/**end 在上面加自定义方法**/
},//end method
components: {
},
}

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

@@ -10,6 +10,7 @@
<el-tooltip content="项目代号用于签订合同等甲乙方共享的场景;项目编号为内部编号，用于内部流转,编号生成规则:项目代号+四位随机码">
<icon icon="ep:info-filled" />
</el-tooltip>
<el-text type="info">&nbsp;&nbsp;流程状态：<mdp-select itemCode="bizFlowState" v-model="editForm.bizFlowState" showStyle="tag" disabled/></el-text>
</el-col>
<el-col :span="24">
@@ -219,7 +220,7 @@
</el-form-item>
</el-tab-pane>
<el-tab-pane label="概算" name="budget">
<el-row :gutter="30">
<el-row :gutter="30" style="height:10px;">
<el-col :span="3">类型</el-col>
<el-col :span="4">人数</el-col>
<el-col :span="6">工作量</el-col>
@@ -228,7 +229,7 @@
</el-row>
<el-divider />
<el-row :gutter="30">
<el-row :gutter="30" style="height:10px;">
<el-col :span="3">内购</el-col>
<el-col :span="4"><el-input style="width:100%;" type="number" v-model="editForm.planIuserCnt" :precision="0"
:step="1" :min="0" placeholder="内购人数" />
@@ -240,7 +241,7 @@
万元</el-text></el-col>
</el-row>
<el-divider />
<el-row :gutter="30">
<el-row :gutter="30" style="height:10px;">
<el-col :span="3">外购</el-col>
<el-col :span="4"><el-input style="width:100%;" type="number" v-model="editForm.planOuserCnt" :precision="0"
:step="1" :min="0" placeholder="外购人数" />
@@ -252,7 +253,7 @@
</el-row>
<el-divider />
<el-row :gutter="30">
<el-row :gutter="30" style="height:10px;">
<el-col :span="3">小计</el-col>
<el-col :span="4"> {{ autoParams.planOuserCnt + autoParams.planIuserCnt }}人
</el-col>
@@ -322,15 +323,11 @@
<el-row class="footer">
<el-space wrap>
<span v-if="currOpType !== 'add'">
<el-button v-if="currTabPane == 'budget' && editForm.status<='5' && editForm.status >'2'" icon="Edit" type="warning"
@click="handleCommand({ type: 'sendToProcessApprova', data: editForm, bizKey: 'xm_project_budget_change_approva' })">预算变更申请</el-button>
<el-button v-if="(currTabPane == 'cost' || currTabPane == 'totalAmount') && editForm.status<='5' && editForm.status >'2'" icon="Edit" type="warning"
@click="handleCommand({ type: 'sendToProcessApprova', data: editForm, bizKey: 'xm_project_budget_change_approva' })">项目金额变更申请</el-button>
<el-button v-if="currTabPane == 'time' && editForm.status<'5' && editForm.status >'2'" icon="watch" type="warning"
@click="handleCommand({ type: 'sendToProcessApprova', data: editForm, bizKey: 'xm_project_delay_approva' })">工期变更申请</el-button>
<el-button icon="finished" type="success" :disabled="editForm.status > '5'" v-if="editForm.status<='5' && editForm.status >'2'"
<el-button icon="finished" type="warning" v-if="bizKey=='xm_project_comm_change_approva'"
@click="handleCommand({ type: 'sendToProcessApprova', data: editForm, bizKey: 'xm_project_comm_change_approva' })">变更申请</el-button>
<el-button icon="finished" type="warning" :disabled="editForm.status > '2'" v-if="bizKey=='xm_project_start_approva'"
@click="handleCommand({ type: 'sendToProcessApprova', data: editForm, bizKey: 'xm_project_start_approva' })">立项申请</el-button>
<el-button icon="finished" type="warning" :disabled="editForm.status > '5'" v-if="bizKey=='xm_project_over_approva'"
@click="handleCommand({ type: 'sendToProcessApprova', data: editForm, bizKey: 'xm_project_over_approva' })">结项申请</el-button>
</span>
<el-button v-if="currOpType === 'add'" v-loading="load.edit" type="primary" @click="editSubmit"
@@ -468,7 +465,7 @@ export default {
}
},
},
props: ['selProject', 'visible', 'xmProduct', 'subOpType'/**add、edit */],
props: ['selProject', 'visible', 'xmProduct', 'subOpType'/**add、edit */,'bizKey'],
watch: {
'visible': function (visible) {
if (visible == true) {
@@ -640,7 +637,8 @@ export default {
add: addXmProject,
edit: editXmProject,
editSomeFields: editXmProjectSomeFields
}
},
xmProjectfields:[],
/**end 在上面加自定义属性**/
}//end return
},//end data
@@ -1013,12 +1011,30 @@ export default {
params.flowVars.data = row
//this.html2canvas(document.querySelector(".editForm"),row,params);
this.$router.push({ name: 'bizStartProc', query: { paramsId: this.$mdp.setCacheParams(params) } });
}else if(bizKey=='xm_project_start_approva'){//立项审核
params.mainTitle = '关于项目【' + row.name + "】立项的审批申请";
params.mainContext = `<p><ol>
<li>项目名称:${row.name}</li>
<li>项目编号:${row.id}</li>
<li>开始日期:${row.startTime} 结束日期:${row.endTime}</li>
<li>总工期:${row.planWorkingHours}小时</li>
<li>需要人员:${row.planIuserCnt+row.planOuserCnt}人</li>
<li>项目目标:${row.target||''}</li>
<li>项目总控:${row.admUsername}</li>
<li>项目经理:${row.pmUsername}</li>
<li>项目预算:${row.planTotalCost||'0'}元</li>
<li>合同金额:${row.contractAmt||'0'}元</li>
<li>预计毛利率:${row.budgetMarginRate||'-'}%</li>
<li>立项说明:${row.setupRemark||''}</li>
<li>项目说明:${row.description||''}</li>
</ol></p>`;
params.restUrl = "/"+config.getXmCtx() + "/xm/core/xmProject/processApprova";
params.flowVars.data = row
this.$router.push({ name: 'bizStartProc', query: { paramsId: this.$mdp.setCacheParams(params) } });
} else {
this.$notify.error("不支持的审批事项");
return;
}
//this.$useXmStore.addVisitedViews( {path:'/mdp/workflow/re/procdef/bizStartProc',query:{params:jsonParmas}})
}
},
handleCommand(command) {
if (command.type == 'sendToProcessApprova') {
@@ -1086,6 +1102,7 @@ export default {
})
},
initCurrData() {
this.editForm = Object.assign(this.editForm, this.selProject)
if (this.currOpType === 'add') {
this.editForm.pmUserid = this.userInfo.userid
@@ -1121,6 +1138,17 @@ export default {
editSomeFieldsCheck(row, fieldName, $event, params) {
let field=this.xmProjectfields.find(k=>k.id==fieldName)
if(field?.id){
setTimeout(() => {
this.editForm={...this.dataBak}
this.$notify.error( field.name+"的修改需要审核，请发起项目变更流程" )
}, 1);
return false;
}
if (fieldName == "admUserid") {
params["admUserid"] = $event.userid;
params["admUsername"] = $event.username;
@@ -1167,6 +1195,8 @@ export default {
},
mounted() {
this.$mdp.getDictOptions('projectStatus').then(res => this.dicts.projectStatus = res)
this.$mdp.getDictOptions('xm_project_fields').then(res => this.xmProjectfields = res)
}

6
src/views/xm/core/xmProject/top-nav.vue
View File

@@ -125,12 +125,6 @@
<el-menu-item :index="'/xm/project/view/accept?projectId='+projectInfo.id">
<template #title><icon icon="ep:finished"/>结项提审</template>
</el-menu-item>
<el-menu-item :index="'/xm/project/view/budget/change?projectId='+projectInfo.id">
<template #title><icon icon="ep:coin"/>预算变更提审</template>
</el-menu-item>
<el-menu-item :index="'/xm/project/view/duration/change?projectId='+projectInfo.id">
<template #title><icon icon="ep:timer"/>工期变更提审</template>
</el-menu-item>
<el-menu-item :index="'/xm/project/view/comm/change?projectId='+projectInfo.id">
<template #title><icon icon="ep:switch"/>通用变更提审</template>
</el-menu-item>