yinq
/
hwbm-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.38 项目计划添加项目编号、页面优化

Browse Source
dev
yinq 3 weeks ago
parent 8c20dd758b
commit 58a29f63af
4 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File

5
src/api/oa/erp/erpProjectPlan/types.ts
Unescape Escape View File

@ -74,6 +74,11 @@ export interface ErpProjectPlanVO {
*/
projectName?: string;
/**
* 项目编号
*/
projectCode?: string;
/**
* 项目经理名称
*/

46
src/views/oa/erp/erpProjectChange/index.vue
Unescape Escape View File

@ -102,54 +102,54 @@
<el-table v-loading="loading" border :data="erpProjectChangeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="50" align="center" v-if="columns[0].visible" />
<el-table-column label="项目变更编号" align="center" prop="projectChangeCode" v-if="columns[1].visible" />
<el-table-column label="项目ID" align="center" prop="projectId" v-if="columns[2].visible" />
<el-table-column label="项目编号" align="center" prop="projectCode" v-if="columns[3].visible" />
<el-table-column label="项目名称" align="center" prop="projectName" v-if="columns[4].visible" />
<el-table-column label="项目类别" align="center" prop="projectCategory" v-if="columns[5].visible">
<el-table-column label="项目变更编号" align="center" prop="projectChangeCode" width="180" v-if="columns[1].visible" />
<el-table-column label="项目ID" align="center" prop="projectId" width="120" v-if="columns[2].visible" />
<el-table-column label="项目编号" align="center" prop="projectCode" width="150" v-if="columns[3].visible" />
<el-table-column label="项目名称" align="center" prop="projectName" width="200" show-overflow-tooltip v-if="columns[4].visible" />
<el-table-column label="项目类别" align="center" prop="projectCategory" width="150" v-if="columns[5].visible">
<template #default="scope">
<dict-tag :options="project_category" :value="scope.row.projectCategory" />
</template>
</el-table-column>
<el-table-column label="变更类型" align="center" prop="changeType" v-if="columns[6].visible">
<el-table-column label="变更类型" align="center" prop="changeType" width="100" v-if="columns[6].visible">
<template #default="scope">
<dict-tag :options="change_type" :value="scope.row.changeType ? scope.row.changeType.split(',') : []" />
</template>
</el-table-column>
<el-table-column label="变更次数" align="center" prop="changeNumber" v-if="columns[7].visible" />
<el-table-column label="项目经理ID" align="center" prop="projectManagerId" v-if="columns[8].visible" />
<el-table-column label="项目经理" align="center" prop="projectManagerName" v-if="columns[9].visible" />
<el-table-column label="部门负责人ID" align="center" prop="deptHeadId" v-if="columns[10].visible" />
<el-table-column label="部门负责人" align="center" prop="deptHeadName" v-if="columns[11].visible" />
<el-table-column label="分管副总ID" align="center" prop="responsibleVpId" v-if="columns[12].visible" />
<el-table-column label="分管副总姓名" align="center" prop="responsibleVpName" v-if="columns[13].visible" />
<el-table-column label="变更次数" align="center" prop="changeNumber" width="80" v-if="columns[7].visible" />
<el-table-column label="项目经理ID" align="center" prop="projectManagerId" width="80" v-if="columns[8].visible" />
<el-table-column label="项目经理" align="center" prop="projectManagerName" width="100" show-overflow-tooltip v-if="columns[9].visible" />
<el-table-column label="部门负责人ID" align="center" prop="deptHeadId" width="140" v-if="columns[10].visible" />
<el-table-column label="部门负责人" align="center" prop="deptHeadName" width="140" show-overflow-tooltip v-if="columns[11].visible" />
<el-table-column label="分管副总ID" align="center" prop="responsibleVpId" width="140" v-if="columns[12].visible" />
<el-table-column label="分管副总姓名" align="center" prop="responsibleVpName" width="160" show-overflow-tooltip v-if="columns[13].visible" />
<el-table-column label="申请变更时间" align="center" prop="applyChangeDate" width="180" v-if="columns[14].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.applyChangeDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="项目合同额" align="center" prop="contractAmount" v-if="columns[15].visible" />
<el-table-column label="项目合同净额" align="center" prop="contractNetAmount" v-if="columns[16].visible" />
<el-table-column label="项目当前情况" align="center" prop="currentStatus" v-if="columns[17].visible" />
<el-table-column label="变更原因" align="center" prop="changeReason" v-if="columns[18].visible" />
<el-table-column label="后续工作" align="center" prop="followUpWork" v-if="columns[19].visible" />
<el-table-column label="项目变更状态" align="center" prop="projectChangeStatus" v-if="columns[20].visible">
<el-table-column label="项目合同额" align="center" prop="contractAmount" width="150" v-if="columns[15].visible" />
<el-table-column label="项目合同净额" align="center" prop="contractNetAmount" width="150" v-if="columns[16].visible" />
<el-table-column label="项目当前情况" align="center" prop="currentStatus" min-width="200" show-overflow-tooltip v-if="columns[17].visible" />
<el-table-column label="变更原因" align="center" prop="changeReason" min-width="200" show-overflow-tooltip v-if="columns[18].visible" />
<el-table-column label="后续工作" align="center" prop="followUpWork" min-width="200" show-overflow-tooltip v-if="columns[19].visible" />
<el-table-column label="项目变更状态" align="center" prop="projectChangeStatus" width="140" v-if="columns[20].visible">
<template #default="scope">
<dict-tag :options="project_change_status" :value="scope.row.projectChangeStatus" />
</template>
</el-table-column>
<el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[21].visible">
<el-table-column label="流程状态" align="center" prop="flowStatus" width="140" v-if="columns[21].visible">
<template #default="scope">
<dict-tag :options="wf_business_status" :value="scope.row.flowStatus" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[22].visible" />
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[23].visible">
<el-table-column label="备注" align="center" prop="remark" min-width="180" show-overflow-tooltip v-if="columns[22].visible" />
<el-table-column label="激活标识" align="center" prop="activeFlag" width="120" v-if="columns[23].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag" />
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createName" v-if="columns[26].visible" />
<el-table-column label="创建人" align="center" prop="createName" width="140" v-if="columns[26].visible" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[27].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>

4
src/views/oa/erp/erpProjectPlan/edit.vue
Unescape Escape View File

@ -190,12 +190,12 @@
<el-date-picker v-model="scope.row.receivableDate" type="date" value-format="YYYY-MM-DD" placeholder="自动计算" style="width: 100%" disabled/>
</template>
</el-table-column>-->
<el-table-column label="实际开始" min-width="140">
<el-table-column label="实际开始" min-width="140" align="center">
<template #default="scope">
<el-date-picker v-model="scope.row.realStartTime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="实际结束" min-width="140">
<el-table-column label="实际结束" min-width="140" align="center">
<template #default="scope">
<el-date-picker v-model="scope.row.realEndTime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" />
</template>

58
src/views/oa/erp/erpProjectPlan/index.vue
Unescape Escape View File

@ -56,33 +56,32 @@
<el-table v-loading="loading" border :data="erpProjectPlanList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="50" align="center" v-if="columns[0].visible" />
<el-table-column label="项目计划编号" align="center" prop="projectPlanCode" width="200" v-if="columns[1].visible" />
<el-table-column label="项目名称" align="center" prop="projectName" width="200" v-if="columns[2].visible" />
<el-table-column label="项目经理" align="center" prop="managerName" v-if="columns[3].visible" />
<el-table-column label="部门负责人" align="center" prop="chargeName" v-if="columns[4].visible" />
<el-table-column label="付款方式" align="center" prop="paymentMethod" v-if="columns[5].visible" />
<el-table-column label="项目计划状态" align="center" prop="projectPlanStatus" v-if="columns[6].visible">
<el-table-column label="项目计划编号" align="center" prop="projectPlanCode" width="170" v-if="columns[1].visible" />
<el-table-column label="项目编号" align="center" prop="projectCode" width="160" v-if="columns[2].visible" />
<el-table-column label="项目名称" align="center" prop="projectName" width="200" v-if="columns[3].visible" />
<el-table-column label="项目经理" align="center" prop="managerName" width="140" v-if="columns[4].visible" />
<el-table-column label="部门负责人" align="center" prop="chargeName" width="140" v-if="columns[5].visible" />
<el-table-column label="付款方式" align="center" prop="paymentMethod" width="160" v-if="columns[6].visible" />
<el-table-column label="项目计划状态" align="center" prop="projectPlanStatus" width="140" v-if="columns[7].visible">
<template #default="scope">
<el-tag :type="scope.row.projectPlanStatus === '1' ? 'info' : scope.row.projectPlanStatus === '2' ? 'warning' : 'success'" size="small">
<dict-tag :options="project_plan_status" :value="scope.row.projectPlanStatus" />
</el-tag>
<dict-tag :options="project_plan_status" :value="scope.row.projectPlanStatus" />
</template>
</el-table-column>
<el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[7].visible">
<el-table-column label="流程状态" align="center" prop="flowStatus" width="140" v-if="columns[8].visible">
<template #default="scope">
<dict-tag :options="wf_business_status" :value="scope.row.flowStatus" />
</template>
</el-table-column>
<el-table-column label="合同名称" align="center" prop="contractName" width="200" v-if="columns[8].visible" />
<el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[9].visible" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible" />
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[11].visible">
<el-table-column label="合同名称" align="center" prop="contractName" width="200" v-if="columns[9].visible" />
<el-table-column label="排序号" align="center" prop="sortOrder" width="100" v-if="columns[10].visible" />
<el-table-column label="备注" align="center" prop="remark" min-width="200" show-overflow-tooltip v-if="columns[11].visible" />
<el-table-column label="激活标识" align="center" prop="activeFlag" width="120" v-if="columns[12].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag" />
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createName" v-if="columns[12].visible" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[13].visible">
<el-table-column label="创建人" align="center" prop="createName" width="140" v-if="columns[13].visible" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[14].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
@ -247,20 +246,21 @@ const dialog = reactive<DialogOption>({
// 列显隐信息
const columns = ref<FieldOption[]>([
{ key: 0, label: `序号`, visible: true },
{ key: 0, label: `序号`, visible: false },
{ key: 1, label: `项目计划编号`, visible: true },
{ key: 2, label: `项目名称`, visible: true },
{ key: 3, label: `项目经理`, visible: true },
{ key: 4, label: `部门负责人`, visible: true },
{ key: 5, label: `付款方式`, visible: true },
{ key: 6, label: `项目计划状态`, visible: true },
{ key: 7, label: `流程状态`, visible: false },
{ key: 8, label: `合同名称`, visible: true },
{ key: 9, label: `排序号`, visible: false },
{ key: 10, label: `备注`, visible: false },
{ key: 11, label: `激活标识`, visible: false },
{ key: 12, label: `创建人`, visible: true },
{ key: 13, label: `创建时间`, visible: true }
{ key: 2, label: `项目编号`, visible: true },
{ key: 3, label: `项目名称`, visible: true },
{ key: 4, label: `项目经理`, visible: true },
{ key: 5, label: `部门负责人`, visible: true },
{ key: 6, label: `付款方式`, visible: true },
{ key: 7, label: `项目计划状态`, visible: false },
{ key: 8, label: `流程状态`, visible: false },
{ key: 9, label: `合同名称`, visible: false },
{ key: 10, label: `排序号`, visible: false },
{ key: 11, label: `备注`, visible: false },
{ key: 12, label: `激活标识`, visible: false },
{ key: 13, label: `创建人`, visible: true },
{ key: 14, label: `创建时间`, visible: true }
]);
const initFormData: ErpProjectPlanForm = {

Write Preview
Loading…
Cancel
Save