1.0.37 维护合同信息按钮、优化合同信息

dev
yinq 4 weeks ago
parent 5a7cf72a68
commit 2d7d7a4225

@ -14,6 +14,11 @@ export interface ContractInfoVO {
*/
contractCode: string;
/**
*
*/
customerContractCode: string;
/**
*
*/
@ -167,6 +172,11 @@ export interface ContractInfoForm extends BaseEntity {
*/
contractCode?: string;
/**
*
*/
customerContractCode?: string;
/**
*
*/
@ -323,6 +333,11 @@ export interface ContractInfoQuery extends PageQuery {
*/
contractCode?: string;
/**
*
*/
customerContractCode?: string;
/**
*
*/

@ -90,12 +90,12 @@
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" fixed="right" width="100" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/base:printTemplate:edit']"></el-button>
</el-tooltip>
<el-tooltip content="编辑" placement="top">
<!-- <el-tooltip content="修改" placement="top">-->
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/base:printTemplate:edit']"></el-button>-->
<!-- </el-tooltip>-->
<el-tooltip content="编辑模板" placement="top">
<el-button
link
type="primary"
@ -104,9 +104,9 @@
v-hasPermi="['oa/base:printTemplate:edit']"
></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/base:printTemplate:remove']"></el-button>
</el-tooltip>
<!-- <el-tooltip content="删除" placement="top">-->
<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/base:printTemplate:remove']"></el-button>-->
<!-- </el-tooltip>-->
</template>
</el-table-column>
</el-table>

@ -1,6 +1,6 @@
<template>
<div class="p-2">
<el-card shadow="never">
<el-card shadow="never" style="margin-top: 0">
<!-- <template #header>-->
<!-- <div style="text-align: left; font-weight: bold; font-size: 24px">合同{{ form.contractId ? ' - 修改' : ' - 新增' }}</div>-->
<!-- </template>-->
@ -15,6 +15,8 @@
:pageType="routeParams.type"
:mode="false"
/>
</el-card>
<el-card shadow="never" style="margin-top: 0">
<el-form ref="contractInfoFormRef" :model="form" :loading="buttonLoading" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'" :rules="rules" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
@ -25,7 +27,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同编号" prop="contractCode" v-if="form.contractFlag === '1'">
<el-form-item label="合同编号" prop="contractCode">
<el-input v-model="form.contractCode" placeholder="请输入合同编号">
<template #append>
<el-button type="primary" @click="generateContractCode" :disabled="isCodeGenerated">生成合同编号 </el-button>
@ -40,7 +42,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="合同大类" prop="contractCategory">
<el-select v-model="form.contractCategory" placeholder="请选择合同大类">
<el-select v-model="form.contractCategory" placeholder="请选择合同大类" disabled>
<el-option v-for="dict in contract_category" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
@ -160,7 +162,7 @@
</el-card>
<!-- 合同物料管理区域 -->
<el-card shadow="never" style="margin-top: 20px">
<el-card shadow="never" style="margin-top: 0">
<template #header>
<div style="text-align: left; font-weight: bold; font-size: 18px">合同物料管理</div>
</template>
@ -533,6 +535,7 @@ const data = reactive<{ form: ContractInfoFormEx; rules: any }>({
form: { ...initFormData },
rules: {
contractFlag: [{ required: true, message: '有无合同不能为空', trigger: 'blur' }],
contractCode: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }],
contractName: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
paymentMethod: [{ required: true, message: '付款方式不能为空', trigger: 'blur' }],
}
@ -852,6 +855,7 @@ onMounted(async () => {
if (userInfoRes.data?.user?.deptId && !form.value.contractDeptId) {
form.value.contractDeptId = userInfoRes.data.user.deptId;
}
form.value.contractCategory = routeParams.value.contractCategory as string;
} catch (error) {
console.error('获取用户信息失败:', error);
}
@ -874,7 +878,7 @@ const handleApprovalRecord = () => {
//
const submitCallback = async () => {
await proxy.$tab.closePage(proxy.$route);
await proxy.$tab.closePage(route);
router.go(-1);
};

@ -3,7 +3,7 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="80px">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
<!-- <el-form-item label="有无合同" prop="contractFlag">-->
<!-- <el-select v-model="queryParams.contractFlag" placeholder="请选择有无合同" clearable>-->
<!-- <el-option v-for="dict in contract_flag" :key="dict.value" :label="dict.label" :value="dict.value" />-->
@ -12,6 +12,9 @@
<el-form-item label="合同编号" prop="contractCode">
<el-input v-model="queryParams.contractCode" placeholder="请输入合同编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="客户合同编号" prop="customerContractCode">
<el-input v-model="queryParams.customerContractCode" placeholder="请输入客户合同编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="合同名称" prop="contractName">
<el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
@ -33,11 +36,11 @@
<!-- <el-form-item label="部门" prop="contractDeptId">-->
<!-- <el-input v-model="queryParams.contractDeptId" placeholder="请输入部门" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="合同状态" prop="contractStatus">-->
<!-- <el-select v-model="queryParams.contractStatus" placeholder="请选择合同状态" clearable>-->
<!-- <el-option v-for="dict in contract_status" :key="dict.value" :label="dict.label" :value="dict.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="合同状态" prop="contractStatus">
<el-select v-model="queryParams.contractStatus" placeholder="请选择合同状态" clearable>
<el-option v-for="dict in contract_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<!-- <el-form-item label="流程状态" prop="flowStatus">-->
<!-- <el-input v-model="queryParams.flowStatus" placeholder="请输入流程状态" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
@ -54,11 +57,22 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/erp:contractInfo:add']"> </el-button>
<el-dropdown trigger="click" @command="handleAdd" v-hasPermi="['oa/erp:contractInfo:add']">
<el-button type="primary" plain icon="Plus">
新增 <el-icon class="el-icon--right"><arrow-down /></el-icon>
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item v-for="dict in contract_category" :key="dict.value" :command="dict.value">
{{ dict.label }}
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/erp:contractInfo:edit']"
>修改
<el-button type="primary" plain icon="EditPen" :disabled="single" @click="openMaintainDialog" v-hasPermi="['oa/erp:contractInfo:update']"
>维护合同信息
</el-button>
</el-col>
<el-col :span="1.5">
@ -83,7 +97,7 @@
</el-table-column>
<el-table-column label="合同编号" align="center" prop="contractCode" width="140" v-if="columns[3].visible" />
<el-table-column label="合同名称" align="center" prop="contractName" width="200" v-if="columns[4].visible" />
<el-table-column label="合同大类" align="center" prop="contractCategory" v-if="columns[5].visible">
<el-table-column label="合同大类" align="center" prop="contractCategory" width="100" v-if="columns[5].visible">
<template #default="scope">
<dict-tag :options="contract_category" :value="scope.row.contractCategory" />
</template>
@ -143,6 +157,11 @@
<span v-else style="color: #999">未上传</span>
</template>
</el-table-column>
<el-table-column label="客户合同编号" align="center" prop="customerContractCode" width="160" v-if="columns[33].visible" />
<el-table-column label="内部合同号" align="center" prop="internalContractCode" width="160" v-if="columns[34].visible" />
<el-table-column label="外部合同号" align="center" prop="externalContractCode" width="160" v-if="columns[35].visible" />
<el-table-column label="订单号" align="center" prop="orderContractCode" width="160" v-if="columns[36].visible" />
<el-table-column label="项目号" align="center" prop="projectContractCode" width="160" v-if="columns[37].visible" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[24].visible" />
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[25].visible">
<template #default="scope">
@ -163,19 +182,19 @@
</el-table-column>
<el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="查看详情" placement="top" v-if="scope.row.contractStatus !== '1'">
<el-tooltip content="查看详情" placement="top" v-if="canViewDetail(scope.row)">
<el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
</el-tooltip>
<el-tooltip content="导出合同" placement="top" v-if=" scope.row.templateId != null">
<el-button link type="info" icon="Reading" @click="contractView(scope.row)"></el-button>
</el-tooltip>
<el-tooltip content="修改" placement="top" v-if="scope.row.contractStatus === '1'">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:contractInfo:edit']"></el-button>
</el-tooltip>
<el-tooltip content="审批记录" placement="top" v-if="scope.row.contractStatus === '2' || scope.row.contractStatus === '3'">
<el-button link type="info" icon="View" @click="handleApprovalRecord(scope.row)"></el-button>
<!-- <el-tooltip content="审批记录" placement="top" v-if="scope.row.contractStatus === '2' || scope.row.contractStatus === '3'">-->
<!-- <el-button link type="info" icon="View" @click="handleApprovalRecord(scope.row)"></el-button>-->
<!-- </el-tooltip>-->
<el-tooltip content="合同模板" placement="top" v-if="scope.row.templateId != null && scope.row.contractStatus === '3'">
<el-button link type="info" icon="Download" @click="contractView(scope.row)"></el-button>
</el-tooltip>
<el-tooltip content="上传终版合同" placement="top" v-if="!scope.row.signatureAppendix">
<el-tooltip content="上传终版合同" placement="top" v-if="!scope.row.signatureAppendix && scope.row.contractStatus === '3'">
<el-button
link
type="success"
@ -204,6 +223,38 @@
</div>
</template>
</el-dialog>
<!-- 维护合同信息 -->
<el-dialog v-model="maintainDialog.visible" title="维护合同信息" width="600px" append-to-body>
<el-form ref="maintainFormRef" :model="maintainDialog.form" label-width="120px">
<el-form-item label="合同名称">
<el-input v-model="maintainDialog.form.contractName" disabled />
</el-form-item>
<el-form-item label="合同编号">
<el-input v-model="maintainDialog.form.contractCode" disabled />
</el-form-item>
<el-form-item label="客户合同编号">
<el-input v-model="maintainDialog.form.customerContractCode" placeholder="请输入客户合同编号" />
</el-form-item>
<el-form-item label="内部合同号">
<el-input v-model="maintainDialog.form.internalContractCode" placeholder="请输入内部合同号" />
</el-form-item>
<el-form-item label="外部合同号">
<el-input v-model="maintainDialog.form.externalContractCode" placeholder="请输入外部合同号" />
</el-form-item>
<el-form-item label="订单号">
<el-input v-model="maintainDialog.form.orderContractCode" placeholder="请输入订单号" />
</el-form-item>
<el-form-item label="项目号">
<el-input v-model="maintainDialog.form.projectContractCode" placeholder="请输入项目号" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" :loading="maintainDialog.loading" @click="submitMaintain"> </el-button>
<el-button @click="maintainDialog.visible = false"> </el-button>
</div>
</template>
</el-dialog>
<!-- 审批记录 -->
<ApprovalRecord ref="approvalRecordRef" />
</div>
@ -225,6 +276,7 @@ const { contract_category, business_direction, active_flag, contract_flag, contr
const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
const contractInfoList = ref<ContractInfoVO[]>([]);
const selectedRows = ref<ContractInfoVO[]>([]);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
@ -268,7 +320,12 @@ const columns = ref<FieldOption[]>([
{ key: 29, label: `创建时间`, visible: false },
{ key: 30, label: `更新人`, visible: false },
{ key: 31, label: `更新时间`, visible: false },
{ key: 32, label: `终版合同`, visible: true }
{ key: 32, label: `终版合同`, visible: true },
{ key: 33, label: `客户合同编号`, visible: true },
{ key: 34, label: `内部合同号`, visible: true },
{ key: 35, label: `外部合同号`, visible: true },
{ key: 36, label: `订单号`, visible: true },
{ key: 37, label: `项目号`, visible: true }
]);
const data = reactive<{ queryParams: ContractInfoQuery }>({
@ -277,6 +334,7 @@ const data = reactive<{ queryParams: ContractInfoQuery }>({
pageSize: 10,
contractFlag: undefined,
contractCode: undefined,
customerContractCode: undefined,
contractName: undefined,
contractCategory: undefined,
contractType: undefined,
@ -314,6 +372,22 @@ const uploadDialog = reactive({
}
});
const maintainDialog = reactive({
visible: false,
loading: false,
form: {
contractId: undefined as any,
contractName: undefined as string | undefined,
contractCode: undefined as string | undefined,
customerContractCode: undefined as string | undefined,
internalContractCode: undefined as string | undefined,
externalContractCode: undefined as string | undefined,
orderContractCode: undefined as string | undefined,
projectContractCode: undefined as string | undefined
}
});
const maintainFormRef = ref<ElFormInstance>();
/** 查询合同信息列表 */
const getList = async () => {
loading.value = true;
@ -340,15 +414,17 @@ const handleSelectionChange = (selection: ContractInfoVO[]) => {
ids.value = selection.map((item) => item.contractId);
single.value = selection.length != 1;
multiple.value = !selection.length;
selectedRows.value = selection;
};
/** 新增按钮操作 */
const handleAdd = () => {
const handleAdd = (contractCategory?: string | number) => {
proxy.$tab.closePage(route);
router.push({
path: '/contract/contractInfo/edit',
query: {
type: 'add'
type: 'add',
contractCategory: contractCategory as string
}
});
};
@ -411,6 +487,45 @@ const openUploadFinalDialog = (row?: ContractInfoVO) => {
uploadDialog.visible = true;
};
const openMaintainDialog = () => {
if (selectedRows.value.length !== 1) {
proxy?.$modal.msgWarning('请选择一条数据进行维护');
return;
}
const row = selectedRows.value[0];
Object.assign(maintainDialog.form, {
contractId: row.contractId as any,
contractName: row.contractName,
contractCode: row.contractCode,
customerContractCode: row.customerContractCode,
internalContractCode: (row as any).internalContractCode,
externalContractCode: (row as any).externalContractCode,
orderContractCode: (row as any).orderContractCode,
projectContractCode: (row as any).projectContractCode
});
maintainDialog.visible = true;
};
const submitMaintain = async () => {
if (!maintainDialog.form.contractId) return;
maintainDialog.loading = true;
try {
await updateContractInfo({
contractId: maintainDialog.form.contractId,
customerContractCode: maintainDialog.form.customerContractCode,
internalContractCode: maintainDialog.form.internalContractCode,
externalContractCode: maintainDialog.form.externalContractCode,
orderContractCode: maintainDialog.form.orderContractCode,
projectContractCode: maintainDialog.form.projectContractCode
} as any);
proxy?.$modal.msgSuccess('维护成功');
maintainDialog.visible = false;
await getList();
} finally {
maintainDialog.loading = false;
}
};
//
const confirmUploadFinal = async () => {
uploadDialog.loading = true;
@ -442,4 +557,9 @@ const contractView = (e) => {
console.log(e);
router.push({ path: '/contract/contractView', query: { templateId: e.templateId, contractId: e.contractId } });
};
/** 判断是否可以查看详情 */
const canViewDetail = (row: ContractInfoVO) => {
return row.contractStatus !== '1';
};
</script>

@ -60,10 +60,13 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item command="1">销售项目实施物流</el-dropdown-item>
<el-dropdown-item command="2">销售项目备件</el-dropdown-item>
<el-dropdown-item command="3">研发项目</el-dropdown-item>
<el-dropdown-item command="4">预投项目</el-dropdown-item>
<el-dropdown-item
v-for="dict in project_category"
:key="dict.value"
:command="dict.value"
>
{{ dict.label }}
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
@ -141,7 +144,7 @@
<el-tooltip content="修改" placement="top" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'back'">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:projectInfo:edit']"></el-button>
</el-tooltip>
<el-tooltip content="查看" placement="top" v-if="scope.row.flowStatus !== 'draft'">
<el-tooltip content="查看详情" placement="top" v-if="scope.row.flowStatus !== 'draft'">
<el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
</el-tooltip>
<!-- <el-col :span="1.5" v-if="scope.row.flowStatus === 'waiting'">-->

@ -84,8 +84,8 @@
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="160" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip v-if="!canEdit(scope.row)" content="查看" placement="top">
<el-button link type="info" icon="View" @click="handleView(scope.row)"></el-button>
<el-tooltip v-if="!canEdit(scope.row)" content="查看详情" placement="top">
<el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
</el-tooltip>
<el-tooltip v-if="canEdit(scope.row)" content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:projectPurchase:edit']"></el-button>

Loading…
Cancel
Save