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

1.1.25 合同订单代办、合同执行信息去掉部门

Browse Source
dev
yinq 2 months ago
parent dcece62410
commit 3bdbdfa883
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

12
src/views/oa/erp/contractInfo/contractOrderIndex.vue
Unescape Escape View File

@ -46,8 +46,8 @@
</transition>
<el-card shadow="never">
<!-- <template #header>-->
<!-- <el-row :gutter="10" class="mb8">-->
<template #header>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-dropdown trigger="click" @command="handleAdd">-->
<!-- <el-button type="primary" plain icon="Plus" v-hasPermi="['oa/erp:projectInfo:add']">-->
@ -78,9 +78,9 @@
<!-- <el-col :span="1.5">-->
<!-- <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:projectInfo:export']">导出 </el-button>-->
<!-- </el-col>-->
<!-- <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>-->
<!-- </el-row>-->
<!-- </template>-->
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" border :data="projectInfoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
@ -248,7 +248,7 @@ const columns = ref<FieldOption[]>([
{ key: 7, label: `备件标识`, visible: false },
{ key: 8, label: `订单类型`, visible: true },
{ key: 9, label: `付款方式`, visible: false },
{ key: 10, label: `部门`, visible: true },
{ key: 10, label: `部门`, visible: false },
{ key: 11, label: `项目经理`, visible: false },
{ key: 12, label: `部门负责人`, visible: false },
{ key: 13, label: `分管副总`, visible: false },

10
src/views/oa/erp/contractInfo/orderActivate.vue
Unescape Escape View File

@ -351,12 +351,12 @@
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="项目类型" prop="projectTypeId">
<el-form-item label="销售项目类型" prop="projectTypeId">
<el-cascader
v-model="addProjectForm.projectTypeId"
:options="projectTypeOptions"
:props="{ value: 'projectTypeId', label: 'typeName', children: 'children', emitPath: false }"
placeholder="请选择项目类型"
placeholder="请选择销售项目类型"
style="width: 100%"
/>
</el-form-item>
@ -548,7 +548,7 @@ const addProjectForm = reactive<Record<string, any>>({
const addProjectRules = {
projectCode: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
projectTypeId: [{ required: true, message: '项目类型不能为空', trigger: 'change' }],
projectTypeId: [{ required: true, message: '销售项目类型不能为空', trigger: 'change' }],
deptId: [{ required: true, message: '部门不能为空', trigger: 'change' }],
managerId: [{ required: true, message: '项目经理不能为空', trigger: 'change' }],
deputyId: [{ required: true, message: '分管副总不能为空', trigger: 'change' }],
@ -833,7 +833,7 @@ const getProjectTypeList = async () => {
projectTypeOptions.value = proxy?.handleTree<ProjectTypeVO>(res.data || [], 'projectTypeId', 'parentId') || [];
};
/** 项目类型父级ID -> 项目类别 映射 */
/** 销售项目类型父级ID -> 项目类别 映射 */
function mapProjectCategoryByParentId(parentId: string | number | undefined): string | undefined {
const parentIdStr = parentId === undefined || parentId === null ? '' : String(parentId);
const categoryMap: Record<string, string> = {
@ -844,7 +844,7 @@ function mapProjectCategoryByParentId(parentId: string | number | undefined): st
return categoryMap[parentIdStr];
}
/** 根据项目类型自动回填项目类别（parentId: 1->实施, 8->物流, 11->备件） */
/** 根据销售项目类型自动回填项目类别（parentId: 1->实施, 8->物流, 11->备件） */
function syncProjectCategoryByProjectType(projectTypeId: string | number | undefined): void {
if (projectTypeId === undefined || projectTypeId === null || projectTypeId === '') return;
const type = projectTypeList.value.find((item) => String(item.projectTypeId) === String(projectTypeId));

6
src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue
Unescape Escape View File

@ -91,9 +91,9 @@
</template>
</el-table-column>
<el-table-column label="付款方式" align="center" prop="paymentMethod" width="120" />
<el-table-column label="部门" align="center" prop="deptName" width="120" />
<el-table-column label="部门负责人" align="center" prop="chargeName" width="120" />
<el-table-column label="分管副总" align="center" prop="deputyName" width="110" />
<!-- <el-table-column label="部门" align="center" prop="deptName" width="120" />-->
<!-- <el-table-column label="部门负责人" align="center" prop="chargeName" width="120" />-->
<!-- <el-table-column label="分管副总" align="center" prop="deputyName" width="110" />-->
<el-table-column label="金额" align="center" prop="amount" width="120">
<template #default="scope">
{{ scope.row.amount != null ? formatNumber(scope.row.amount) : '-' }}

14
src/views/oa/erp/projectInfo/edit.vue
Unescape Escape View File

@ -124,12 +124,12 @@
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="项目类型" prop="projectTypeId">
<el-form-item label="销售项目类型" prop="projectTypeId">
<el-cascader
v-model="form.projectTypeId"
:options="projectTypeOptions"
:props="{ value: 'projectTypeId', label: 'typeName', children: 'children', emitPath: false }"
placeholder="请选择项目类型"
placeholder="请选择销售项目类型"
style="width: 100%"
/>
</el-form-item>
@ -346,9 +346,9 @@ const getUserSelectList = async () => {
};
const projectTypeOptions = ref<ProjectTypeVO[]>([]);
// 保存原始的项目类型列表（扁平结构），用于查找 parentId
// 保存原始的销售项目类型列表（扁平结构），用于查找 parentId
const projectTypeList = ref<ProjectTypeVO[]>([]);
/** 查询项目类型列表 */
/** 查询销售项目类型列表 */
const getProjectTypeList = async () => {
const params = { } as any;
const res = await listProjectType(params);
@ -357,7 +357,7 @@ const getProjectTypeList = async () => {
projectTypeOptions.value = proxy?.handleTree<ProjectTypeVO>(res.data, 'projectTypeId', 'parentId') || [];
};
/** 项目类型父级ID -> 项目类别 映射 */
/** 销售项目类型父级ID -> 项目类别 映射 */
function mapProjectCategoryByParentId(parentId: string | number | undefined): string | undefined {
const parentIdStr = parentId === undefined || parentId === null ? '' : String(parentId);
const categoryMap: Record<string, string> = {
@ -368,7 +368,7 @@ function mapProjectCategoryByParentId(parentId: string | number | undefined): st
return categoryMap[parentIdStr];
}
/** 根据项目类型自动回填项目类别（仅新增模式） */
/** 根据销售项目类型自动回填项目类别（仅新增模式） */
function syncProjectCategoryByProjectType(projectTypeId: string | number | undefined): void {
const mappedCategory = projectTypeId
? mapProjectCategoryByParentId(
@ -424,7 +424,7 @@ const data = reactive<{ form: ProjectInfoFormEx; rules: any }>({
projectCode: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'change' }],
projectTypeId: [{ required: true, message: '项目类型不能为空', trigger: 'change' }],
projectTypeId: [{ required: true, message: '销售项目类型不能为空', trigger: 'change' }],
deptId: [{ required: true, message: '部门不能为空', trigger: 'change' }],
managerId: [{ required: true, message: '项目经理不能为空', trigger: 'change' }],
deputyId: [{ required: true, message: '分管副总不能为空', trigger: 'change' }],

Write Preview
Loading…
Cancel
Save