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

1.0.45 供应商、采购页面优化

Browse Source
dev
yinq 2 weeks ago
parent 24e741e870
commit c802f5f033
3 changed files with 622 additions and 601 deletions
Show Stats Download Patch File Download Diff File

15
src/api/oa/erp/projectPurchase/types.ts
Unescape Escape View File

@ -56,6 +56,11 @@ export interface ProjectPurchaseVO {
*/ */
deputyName?: string; deputyName?: string;
/**
* 版本
*/
version?: number;
/** /**
* 提报人 * 提报人
*/ */
@ -164,6 +169,11 @@ export interface ProjectPurchaseForm extends BaseEntity {
*/ */
deputyId?: string | number; deputyId?: string | number;
/**
* 版本
*/
version?: number;
/** /**
* 部门ID * 部门ID
*/ */
@ -332,6 +342,11 @@ export interface ProjectPurchaseQuery extends PageQuery {
* 日期范围参数 * 日期范围参数
*/ */
params?: any; params?: any;
/**
* 项目经理名称
*/
managerName?: string;
} }

157
src/views/oa/crm/crmSupplierInfo/index.vue
Unescape Escape View File

@ -3,7 +3,7 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]"> <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
<el-form-item label="供应商名称" prop="supplierName"> <el-form-item label="供应商名称" prop="supplierName">
<el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
@ -99,10 +99,14 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/crm:crmSupplierInfo:add']"> 新增 </el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/crm:crmSupplierInfo:add']"> 新增 </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/crm:crmSupplierInfo:edit']">修改</el-button> <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/crm:crmSupplierInfo:edit']"
>修改
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/crm:crmSupplierInfo:remove']">删除</el-button> <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/crm:crmSupplierInfo:remove']"
>删除
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/crm:crmSupplierInfo:export']">导出 </el-button> <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/crm:crmSupplierInfo:export']">导出 </el-button>
@ -163,7 +167,13 @@
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/crm:crmSupplierInfo:edit']"></el-button> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/crm:crmSupplierInfo:edit']"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="删除" placement="top"> <el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/crm:crmSupplierInfo:remove']"></el-button> <el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['oa/crm:crmSupplierInfo:remove']"
></el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
@ -193,24 +203,13 @@
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="供应商类型" prop="supplierType"> <el-form-item label="供应商类型" prop="supplierType">
<el-select v-model="form.supplierType" placeholder="请选择供应商类型"> <el-select v-model="form.supplierType" placeholder="请选择供应商类型">
<el-option <el-option v-for="dict in supplier_type" :key="dict.value" :label="dict.label" :value="dict.value" />
v-for="dict in supplier_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="成立日期" prop="establishmentDate"> <el-form-item label="成立日期" prop="establishmentDate">
<el-date-picker <el-date-picker v-model="form.establishmentDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择成立日期" clearable />
v-model="form.establishmentDate"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择成立日期"
clearable
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
@ -324,32 +323,39 @@
<span class="section-title">附件与其他</span> <span class="section-title">附件与其他</span>
</template> </template>
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :md="12" :sm="24"> <!-- <el-col :md="12" :sm="24">-->
<el-form-item label="附件" prop="ossId"> <el-form-item label="附件" prop="ossId">
<FileUpload v-model="form.ossId" :limit="1" :is-show-tip="true" :file-size="10" /> <FileUpload v-model="form.ossId" :limit="1" :is-show-tip="true" :file-size="10" />
<span class="upload-tip">仅支持单文件上传，大小不超过10MB</span> <!-- <span class="upload-tip">仅支持单文件上传，大小不超过10MB</span>-->
<div v-if="form.attachmentList?.length" class="mt-2"> <!-- <div v-if="form.attachmentList?.length" class="mt-2">-->
<el-tag <!-- <el-tag-->
v-for="item in form.attachmentList" <!-- v-for="item in form.attachmentList"-->
:key="item.ossId" <!-- :key="item.ossId"-->
size="small" <!-- size="small"-->
class="mr-2 mb-2" <!-- class="mr-2 mb-2"-->
> <!-- >-->
<el-link :href="item.url" target="_blank" type="primary"> <!-- <el-link :href="item.url" target="_blank" type="primary">-->
{{ item.originalName || item.name }} <!-- {{ item.originalName || item.name }}-->
</el-link> <!-- </el-link>-->
</el-tag> <!-- </el-tag>-->
</div> <!-- </div>-->
</el-form-item> </el-form-item>
</el-col> <!-- </el-col>-->
<el-col :md="12" :sm="24"> <!-- <el-col :md="12" :sm="24">-->
<!-- <el-form-item label="激活标识" prop="activeFlag">-->
<!-- <el-radio-group v-model="form.activeFlag">-->
<!-- <el-radio-->
<!-- v-for="dict in active_flag"-->
<!-- :key="dict.value"-->
<!-- :value="dict.value"-->
<!-- >{{ dict.label }}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :md="24">
<el-form-item label="激活标识" prop="activeFlag"> <el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag"> <el-radio-group v-model="form.activeFlag">
<el-radio <el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
v-for="dict in active_flag"
:key="dict.value"
:value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -429,7 +435,7 @@
{ key: 25, label: `备注`, visible: true }, { key: 25, label: `备注`, visible: true },
{ key: 26, label: `激活标识`, visible: true }, { key: 26, label: `激活标识`, visible: true },
{ key: 27, label: `创建时间`, visible: true }, { key: 27, label: `创建时间`, visible: true },
{ key: 28, label: `创建人`, visible: true }, { key: 28, label: `创建人`, visible: true }
]); ]);
const initFormData: CrmSupplierInfoForm = { const initFormData: CrmSupplierInfoForm = {
@ -460,8 +466,8 @@
remark: undefined, remark: undefined,
activeFlag: undefined, activeFlag: undefined,
ownerName: undefined, ownerName: undefined,
createName: undefined, createName: undefined
} };
const data = reactive<PageData<CrmSupplierInfoForm, CrmSupplierInfoQuery>>({ const data = reactive<PageData<CrmSupplierInfoForm, CrmSupplierInfoQuery>>({
form: { ...initFormData }, form: { ...initFormData },
queryParams: { queryParams: {
@ -493,22 +499,13 @@
activeFlag: undefined, activeFlag: undefined,
ownerName: undefined, ownerName: undefined,
createName: undefined, createName: undefined,
params: { params: {}
}
}, },
rules: { rules: {
supplierName: [ supplierName: [{ required: true, message: '供应商名称不能为空', trigger: 'blur' }],
{ required: true, message: "供应商名称不能为空", trigger: "blur" } mnemonicName: [{ required: true, message: '助记名称不能为空', trigger: 'blur' }],
], supplierType: [{ required: true, message: '供应商类型不能为空', trigger: 'change' }],
mnemonicName: [ mainIndustry: [{ required: true, message: '主营行业不能为空', trigger: 'blur' }]
{ required: true, message: "助记名称不能为空", trigger: "blur" }
],
supplierType: [
{ required: true, message: "供应商类型不能为空", trigger: "change" }
],
mainIndustry: [
{ required: true, message: "主营行业不能为空", trigger: "blur" }
]
} }
}); });
@ -521,62 +518,62 @@
crmSupplierInfoList.value = res.rows; crmSupplierInfoList.value = res.rows;
total.value = res.total; total.value = res.total;
loading.value = false; loading.value = false;
} };
/** 获取用户列表 */ /** 获取用户列表 */
const getUserList = async () => { const getUserList = async () => {
const res = await listUser({ pageNum: 1, pageSize: 1000 }); const res = await listUser({ pageNum: 1, pageSize: 1000 });
userList.value = res.rows; userList.value = res.rows;
} };
/** 取消按钮 */ /** 取消按钮 */
const cancel = () => { const cancel = () => {
reset(); reset();
dialog.visible = false; dialog.visible = false;
} };
/** 表单重置 */ /** 表单重置 */
const reset = () => { const reset = () => {
form.value = { ...initFormData }; form.value = { ...initFormData };
crmSupplierInfoFormRef.value?.resetFields(); crmSupplierInfoFormRef.value?.resetFields();
} };
/** 搜索按钮操作 */ /** 搜索按钮操作 */
const handleQuery = () => { const handleQuery = () => {
queryParams.value.pageNum = 1; queryParams.value.pageNum = 1;
getList(); getList();
} };
/** 重置按钮操作 */ /** 重置按钮操作 */
const resetQuery = () => { const resetQuery = () => {
queryFormRef.value?.resetFields(); queryFormRef.value?.resetFields();
handleQuery(); handleQuery();
} };
/** 多选框选中数据 */ /** 多选框选中数据 */
const handleSelectionChange = (selection: CrmSupplierInfoVO[]) => { const handleSelectionChange = (selection: CrmSupplierInfoVO[]) => {
ids.value = selection.map(item => item.supplierId); ids.value = selection.map((item) => item.supplierId);
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
} };
/** 新增按钮操作 */ /** 新增按钮操作 */
const handleAdd = () => { const handleAdd = () => {
reset(); reset();
form.value.activeFlag = '1'; form.value.activeFlag = '1';
dialog.visible = true; dialog.visible = true;
dialog.title = "添加供应商信息"; dialog.title = '添加供应商信息';
} };
/** 修改按钮操作 */ /** 修改按钮操作 */
const handleUpdate = async (row?: CrmSupplierInfoVO) => { const handleUpdate = async (row?: CrmSupplierInfoVO) => {
reset(); reset();
const _supplierId = row?.supplierId || ids.value[0] const _supplierId = row?.supplierId || ids.value[0];
const res = await getCrmSupplierInfo(_supplierId); const res = await getCrmSupplierInfo(_supplierId);
Object.assign(form.value, res.data); Object.assign(form.value, res.data);
dialog.visible = true; dialog.visible = true;
dialog.title = "修改供应商信息"; dialog.title = '修改供应商信息';
} };
/** 提交按钮 */ /** 提交按钮 */
const submitForm = () => { const submitForm = () => {
@ -584,32 +581,36 @@
if (valid) { if (valid) {
buttonLoading.value = true; buttonLoading.value = true;
if (form.value.supplierId) { if (form.value.supplierId) {
await updateCrmSupplierInfo(form.value).finally(() => buttonLoading.value = false); await updateCrmSupplierInfo(form.value).finally(() => (buttonLoading.value = false));
} else { } else {
await addCrmSupplierInfo(form.value).finally(() => buttonLoading.value = false); await addCrmSupplierInfo(form.value).finally(() => (buttonLoading.value = false));
} }
proxy?.$modal.msgSuccess("操作成功"); proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false; dialog.visible = false;
await getList(); await getList();
} }
}); });
} };
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (row?: CrmSupplierInfoVO) => { const handleDelete = async (row?: CrmSupplierInfoVO) => {
const _supplierIds = row?.supplierId || ids.value; const _supplierIds = row?.supplierId || ids.value;
await proxy?.$modal.confirm('是否确认删除供应商信息编号为"' + _supplierIds + '"的数据项？').finally(() => loading.value = false); await proxy?.$modal.confirm('是否确认删除供应商信息编号为"' + _supplierIds + '"的数据项？').finally(() => (loading.value = false));
await delCrmSupplierInfo(_supplierIds); await delCrmSupplierInfo(_supplierIds);
proxy?.$modal.msgSuccess("删除成功"); proxy?.$modal.msgSuccess('删除成功');
await getList(); await getList();
} };
/** 导出按钮操作 */ /** 导出按钮操作 */
const handleExport = () => { const handleExport = () => {
proxy?.download('oa/crm/crmSupplierInfo/export', { proxy?.download(
'oa/crm/crmSupplierInfo/export',
{
...queryParams.value ...queryParams.value
}, `crmSupplierInfo_${new Date().getTime()}.xlsx`) },
} `crmSupplierInfo_${new Date().getTime()}.xlsx`
);
};
onMounted(() => { onMounted(() => {
getList(); getList();

15
src/views/oa/erp/projectPurchase/index.vue
Unescape Escape View File

@ -4,17 +4,17 @@
<div v-show="showSearch" class="mb-[10px]"> <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
<el-form-item label="项目号" prop="projectCode">
<el-input v-model="queryParams.projectCode" placeholder="请输入项目号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="采购编号" prop="purchaseCode"> <el-form-item label="采购编号" prop="purchaseCode">
<el-input v-model="queryParams.purchaseCode" placeholder="请输入采购编号" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.purchaseCode" placeholder="请输入采购编号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="项目号" prop="projectCode">
<el-input v-model="queryParams.projectCode" placeholder="请输入项目号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="项目名称" prop="projectName"> <el-form-item label="项目名称" prop="projectName">
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="项目经理" prop="managerId"> <el-form-item label="项目经理" prop="managerName">
<el-input v-model="queryParams.managerId" placeholder="请输入项目经理" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.managerName" placeholder="请输入项目经理" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="项目采购状态" prop="projectPurchaseStatus"> <el-form-item label="项目采购状态" prop="projectPurchaseStatus">
<el-select v-model="queryParams.projectPurchaseStatus" placeholder="请选择项目采购状态" clearable> <el-select v-model="queryParams.projectPurchaseStatus" placeholder="请选择项目采购状态" clearable>
@ -59,6 +59,11 @@
<el-table-column label="项目经理" align="center" prop="managerName" width="120" v-if="columns[5].visible" /> <el-table-column label="项目经理" align="center" prop="managerName" width="120" v-if="columns[5].visible" />
<el-table-column label="部门负责人" align="center" prop="chargeName" width="120" v-if="columns[6].visible" /> <el-table-column label="部门负责人" align="center" prop="chargeName" width="120" v-if="columns[6].visible" />
<el-table-column label="分管副总" align="center" prop="deputyName" width="120" v-if="columns[7].visible" /> <el-table-column label="分管副总" align="center" prop="deputyName" width="120" v-if="columns[7].visible" />
<el-table-column label="版本" align="center" prop="version" width="100" v-if="columns[8].visible">
<template #default="scope">
<span>v{{ scope.row.version }}.0</span>
</template>
</el-table-column>
<el-table-column label="提报人" align="center" prop="reporterName" width="120" v-if="columns[9].visible" /> <el-table-column label="提报人" align="center" prop="reporterName" width="120" v-if="columns[9].visible" />
<el-table-column label="收货人" align="center" prop="consigneeUser" width="120" v-if="columns[10].visible" /> <el-table-column label="收货人" align="center" prop="consigneeUser" width="120" v-if="columns[10].visible" />
<el-table-column label="收货地址" align="center" prop="consigneeAddress" width="200" show-overflow-tooltip v-if="columns[11].visible" /> <el-table-column label="收货地址" align="center" prop="consigneeAddress" width="200" show-overflow-tooltip v-if="columns[11].visible" />

Write Preview
Loading…
Cancel
Save