- {{ item.module }} {{ item.title }}
+ {{ item.moduleName }} {{ item.title }}
{
});
todoItems.value = data.rows.map((item) => {
- let module =
+ let moduleName =
getDictObj(DICT_TYPE.contract_todo_type, item.module)?.label || '';
- if (module) {
- module = `[${module}]`;
+ if (moduleName) {
+ moduleName = `[${moduleName}]`;
}
return {
- module,
+ ...item,
+ moduleName,
avatar: '',
date: item.createTime,
isRead: true,
diff --git a/apps/web-office/src/layouts/basic.vue b/apps/web-office/src/layouts/basic.vue
index f2016600..8ee59043 100644
--- a/apps/web-office/src/layouts/basic.vue
+++ b/apps/web-office/src/layouts/basic.vue
@@ -150,13 +150,13 @@ function handleMenuClick(e) {
{{ value ? `代理${value}` : '代理切换' }}
-
+ /> -->
Date: Fri, 18 Oct 2024 16:34:20 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E9=80=89=E5=95=86?=
=?UTF-8?q?=E8=8A=82=E7=82=B9=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/utils/dict/static.data.js | 14 ++++-------
.../views/contract/approval/edit/index.vue | 20 ++++++++--------
.../business/edit/basic-info-card.vue | 10 +-------
.../contract/business/edit/business-card.vue | 9 +------
.../src/views/contract/business/edit/curd.tsx | 3 +--
.../views/contract/business/edit/index.vue | 24 ++++++-------------
6 files changed, 24 insertions(+), 56 deletions(-)
diff --git a/apps/web-contract/src/utils/dict/static.data.js b/apps/web-contract/src/utils/dict/static.data.js
index 851538c2..4148eb7e 100644
--- a/apps/web-contract/src/utils/dict/static.data.js
+++ b/apps/web-contract/src/utils/dict/static.data.js
@@ -71,17 +71,11 @@ export default {
contract_approval_flow_node: createEntry('合同立项节点流程', [
{ label: '开始节点', value: 'paStart' },
- { label: '待编制', value: 'paEdit' },
- { label: '待部门自审', value: 'paDepartmentAudit' },
-
+ { label: '立项编制', value: 'paEdit' },
+ { label: '立项审批中', value: 'paApproval' },
{ label: '选商编制', value: 'smEdit' },
- { label: '待部门自审', value: 'smDepartmentAudit' },
- { label: '待计划规划部审查', value: 'smPlanningDepartment' },
- { label: '待财务资产部审查', value: 'smFinancialDepartment' },
- { label: '待合规审查（企管法规部）', value: 'smRegulationDepartment' },
- { label: '待主管领导审批', value: 'smManager' },
- { label: '待公司领导审核', value: 'smLeaders' },
- { label: '选商结果填报', value: 'smrEdit' },
+ { label: '选商审批中', value: 'smApproval' },
+ { label: '选商结果编制', value: 'smrEdit' },
]),
contract_business_flow_node: createEntry('合同选商节点流程', [
diff --git a/apps/web-contract/src/views/contract/approval/edit/index.vue b/apps/web-contract/src/views/contract/approval/edit/index.vue
index 917a1365..3460656c 100644
--- a/apps/web-contract/src/views/contract/approval/edit/index.vue
+++ b/apps/web-contract/src/views/contract/approval/edit/index.vue
@@ -14,12 +14,12 @@ import temporaryFormModal from '#/components/temporary-form-modal/temporary-form
import { useVxeTable } from '#/hooks/vxeTable';
import { DICT_TYPE, getDictObj } from '#/utils/dict';
import { FileUploader } from '#/utils/file';
+import AuditNodeTable from '#/views/contract/components/audit-node-table/audit-node-table.vue';
import chooseUserModal from '#/views/system/user/choose-user-modal.vue';
import chooseSigningBasisModal from '../signing-basis/choose-signing-basis-modal.vue';
import { getColumns } from '../signing-basis/columns';
import { getFormSchema } from './curd';
-import AuditNodeTable from '#/views/contract/components/audit-node-table/audit-node-table.vue';
const { xGridRef, gridProps } = useVxeTable({ ref: 'xGridRef' });
@@ -156,7 +156,7 @@ const currAuditType = ref<'abolish' | 'audit'>('audit');
const userListByAbolish = ref([]);
-async function handleAbolish(type: 'openModal' | 'confirm') {
+async function handleAbolish(type: 'confirm' | 'openModal') {
userModalOpenType.value = 'abolish';
if (type === 'openModal') {
Modal.confirm({
@@ -177,7 +177,7 @@ async function handleAbolish(type: 'openModal' | 'confirm') {
try {
await Apis.contractBaseInfo.post_abolishFlowStart({
data: {
- guid: currData.value['guid'],
+ guid: currData.value.guid,
assigneeList: userListByAbolish.value.map((item) => item.ACCOUNT_ID),
},
});
@@ -233,7 +233,7 @@ async function handleAbolishAudit(
},
data: {
// appId: id.value,
- taskId: taskId,
+ taskId,
nodeId: '',
comment: '通过',
},
@@ -285,7 +285,7 @@ async function handleAbolishAudit(
},
data: {
appId: id.value,
- taskId: taskId,
+ taskId,
nodeId: '',
comment,
},
@@ -462,7 +462,7 @@ let auditType = ref('');
const isTemporaryFormModalLoading = ref(false);
async function handleAudit(
- type: 'openAccessModal' | 'openRejectModal' | 'confirm',
+ type: 'confirm' | 'openAccessModal' | 'openRejectModal',
data?: any,
) {
console.log(type);
@@ -502,7 +502,7 @@ async function handleAudit(
},
data: {
appId: id.value,
- taskId: taskId,
+ taskId,
nodeId: '',
comment: comment || '',
},
@@ -554,7 +554,7 @@ async function handleAudit(
},
data: {
appId: id.value,
- taskId: taskId,
+ taskId,
nodeId: '',
comment,
},
@@ -687,7 +687,7 @@ onMounted(async () => {
{
通过
{
- return [
- 'smDepartmentAudit',
- 'smFinancialDepartment',
- 'smLeaders',
- 'smManager',
- 'smPlanningDepartment',
- 'smRegulationDepartment',
- ].includes(form.businessStep);
+ return ['smApproval'].includes(form.businessStep);
});
watch(
@@ -73,7 +66,6 @@ watch(
() => form,
(newForm) => {
emit('update:form', newForm);
- emit('field-change', newForm);
},
{ deep: true },
);
diff --git a/apps/web-contract/src/views/contract/business/edit/business-card.vue b/apps/web-contract/src/views/contract/business/edit/business-card.vue
index fbae1597..7f84c79a 100644
--- a/apps/web-contract/src/views/contract/business/edit/business-card.vue
+++ b/apps/web-contract/src/views/contract/business/edit/business-card.vue
@@ -45,14 +45,7 @@ const formRef = ref();
const form = reactive({ ...props.form });
const readOnly = computed(() => {
- return [
- 'smDepartmentAudit',
- 'smFinancialDepartment',
- 'smLeaders',
- 'smManager',
- 'smPlanningDepartment',
- 'smRegulationDepartment',
- ].includes(form.step);
+ return ['smApproval'].includes(form.step);
});
const rules = {
diff --git a/apps/web-contract/src/views/contract/business/edit/curd.tsx b/apps/web-contract/src/views/contract/business/edit/curd.tsx
index 078a6fdf..5bc32033 100644
--- a/apps/web-contract/src/views/contract/business/edit/curd.tsx
+++ b/apps/web-contract/src/views/contract/business/edit/curd.tsx
@@ -3,7 +3,6 @@ import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { dict } from '@fast-crud/fast-crud';
-import { VxeGrid } from 'vxe-table';
import { DICT_TYPE } from '#/utils/dict';
@@ -18,7 +17,7 @@ const xGridRefs = ref>(new Map());
const gridRefs = ref>(new Map());
export function getFormSchema(params: any = {}) {
- let { formRef, dictMap = {}, bidList = [], showBid = true } = params;
+ const { formRef, dictMap = {}, bidList = [], showBid = true } = params;
/** Hooks - 表格 */
const gridOptions = {
diff --git a/apps/web-contract/src/views/contract/business/edit/index.vue b/apps/web-contract/src/views/contract/business/edit/index.vue
index 405a439e..fbf73498 100644
--- a/apps/web-contract/src/views/contract/business/edit/index.vue
+++ b/apps/web-contract/src/views/contract/business/edit/index.vue
@@ -12,25 +12,22 @@ import {
type UploadChangeParam,
type UploadFile,
} from 'ant-design-vue';
+import { cloneDeep } from 'lodash-es';
import Apis from '#/api';
import temporaryFormModal from '#/components/temporary-form-modal/temporary-form-modal.vue';
import { useVxeTable } from '#/hooks/vxeTable';
-import { DICT_TYPE, getDictDatasAsync, getDictObj } from '#/utils/dict';
import { FileUploader } from '#/utils/file';
import { logger } from '#/utils/logger';
+import AuditNodeTable from '#/views/contract/components/audit-node-table/audit-node-table.vue';
import chooseUserModal from '#/views/system/user/choose-user-modal.vue';
import { getColumns } from '../../approval/signing-basis/columns';
import chooseCompanyModal from '../../company/list/choose-company-modal.vue';
-import { getBidColumns, getProviderColumns } from './bid-columns';
-import { getFormSchema } from './curd';
import BasicInfoCard from './basic-info-card.vue';
-import { cloneDeep } from 'lodash-es';
+import { getBidColumns, getProviderColumns } from './bid-columns';
import BusinessCard from './business-card.vue';
-import AuditNodeTable from '#/views/contract/components/audit-node-table/audit-node-table.vue';
-
const [ChooseCompanyModal, chooseCompanyModalApi] = useVbenModal({
connectedComponent: chooseCompanyModal,
});
@@ -71,14 +68,7 @@ const bidGridRefs = ref>(new Map());
const providerGridRefs = ref>(new Map());
const readOnly = computed(() => {
- return [
- 'smDepartmentAudit',
- 'smPlanningDepartment',
- 'smFinancialDepartment',
- 'smRegulationDepartment',
- 'smManager',
- 'smLeaders',
- ].includes(businessData.value.step);
+ return ['smApproval'].includes(businessData.value.step);
});
watch(
@@ -395,8 +385,8 @@ async function handleSave() {
try {
await contractCardRef.value.validate();
await businessCardRef.value.validate();
- } catch (e) {
- console.log(e);
+ } catch (error) {
+ console.log(error);
message.error('请完成必填项的填写');
return;
}
@@ -752,11 +742,11 @@ onMounted(async () => {
From f7ff06e1ac31f27b0a44f1211345a8b1d74ccca1 Mon Sep 17 00:00:00 2001
From: z9130 <984661593@qq.com>
Date: Fri, 18 Oct 2024 16:45:11 +0800
Subject: [PATCH 4/8] smApproval
---
.../src/views/contract/business/edit/index.vue | 18 ++----------------
apps/web-contract/vite.config.mts | 12 ++++++++----
2 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/apps/web-contract/src/views/contract/business/edit/index.vue b/apps/web-contract/src/views/contract/business/edit/index.vue
index fbf73498..c6f000a1 100644
--- a/apps/web-contract/src/views/contract/business/edit/index.vue
+++ b/apps/web-contract/src/views/contract/business/edit/index.vue
@@ -649,14 +649,7 @@ onMounted(async () => {
{
{
},
'/api/flowCenter': {
changeOrigin: true,
- rewrite: (path) => path.replace(/^\/api\/flowCenter/, '/flowCenter'),
+ rewrite: (path) =>
+ path.replace(/^\/api\/flowCenter/, '/flowCenter'),
// target: `http://10.71.220.24:8083/rl`,
target: `http://192.168.147.164:19007`,
ws: true,
},
'/api/czg/flowCenter': {
changeOrigin: true,
- rewrite: (path) => path.replace(/^\/api\/flowCenter/, '/flowCenter'),
+ rewrite: (path) =>
+ path.replace(/^\/api\/flowCenter/, '/czg/flowCenter'),
// target: `http://10.71.220.24:8083/rl`,
target: `http://192.168.147.164:19007`,
ws: true,
},
'/api/zp/flowCenter': {
changeOrigin: true,
- rewrite: (path) => path.replace(/^\/api\/flowCenter/, '/flowCenter'),
+ rewrite: (path) =>
+ path.replace(/^\/api\/flowCenter/, '/zp/flowCenter'),
// target: `http://10.71.220.24:8083/rl`,
target: `http://192.168.147.164:19007`,
ws: true,
},
'/api/zzz/flowCenter': {
changeOrigin: true,
- rewrite: (path) => path.replace(/^\/api\/flowCenter/, '/flowCenter'),
+ rewrite: (path) =>
+ path.replace(/^\/api\/flowCenter/, '/zzz/flowCenter'),
// target: `http://10.71.220.24:8083/rl`,
target: `http://192.168.147.164:19007`,
ws: true,
From daec624df2e78a0368b06d7a8a86910dd3c5d696 Mon Sep 17 00:00:00 2001
From: z9130 <984661593@qq.com>
Date: Fri, 18 Oct 2024 16:51:46 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0keepAlive?=
=?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/router/routes/modules/contract.ts | 35 +++++++++++++++++++
.../views/contract/business/result/index.vue | 16 ---------
2 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/apps/web-contract/src/router/routes/modules/contract.ts b/apps/web-contract/src/router/routes/modules/contract.ts
index 0bb65c4d..48576044 100644
--- a/apps/web-contract/src/router/routes/modules/contract.ts
+++ b/apps/web-contract/src/router/routes/modules/contract.ts
@@ -17,6 +17,7 @@ const routes: RouteRecordRaw[] = [
path: '/contract/config',
component: () => import('#/views/contract/config/index.vue'),
meta: {
+ keepAlive: true,
hideInMenu: true,
icon: 'lucide:area-chart',
title: '合同配置',
@@ -45,6 +46,7 @@ const routes: RouteRecordRaw[] = [
},
component: () => import('#/views/contract/approval/edit/index.vue'),
meta: {
+ keepAlive: true,
icon: 'lucide:area-chart',
title: '立项申报',
activePath: '/contract/approval/edit/:id?',
@@ -55,6 +57,7 @@ const routes: RouteRecordRaw[] = [
path: '/contract/approval/list',
component: () => import('#/views/contract/approval/list/index.vue'),
meta: {
+ keepAlive: true,
icon: 'lucide:area-chart',
title: '立项编制',
},
@@ -64,6 +67,7 @@ const routes: RouteRecordRaw[] = [
path: '/contract/approval/todo',
component: () => import('#/views/contract/approval/todo/index.vue'),
meta: {
+ keepAlive: true,
icon: 'lucide:area-chart',
title: '立项提示',
},
@@ -75,6 +79,7 @@ const routes: RouteRecordRaw[] = [
component: () =>
import('#/views/contract/approval/signing-basis/index.vue'),
meta: {
+ keepAlive: true,
icon: 'lucide:area-chart',
title: '签约依据维护',
},
@@ -97,6 +102,7 @@ const routes: RouteRecordRaw[] = [
meta: {
hideInMenu: true,
hideInTab: true,
+ keepAlive: true,
icon: 'lucide:area-chart',
title: '选商填报',
activePath: '/contract/business/todo',
@@ -109,6 +115,7 @@ const routes: RouteRecordRaw[] = [
meta: {
hideInMenu: true,
hideInTab: true,
+ keepAlive: true,
icon: 'lucide:area-chart',
title: '选商结果填报',
activePath: '/contract/business/todo',
@@ -122,6 +129,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '选商编制',
+ keepAlive: true,
},
},
{
@@ -132,6 +140,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '选商结果编制',
+ keepAlive: true,
},
},
{
@@ -141,6 +150,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '选商提示',
+ keepAlive: true,
},
},
],
@@ -167,6 +177,7 @@ const routes: RouteRecordRaw[] = [
meta: {
hideInMenu: true,
hideInTab: true,
+ keepAlive: true,
icon: 'lucide:area-chart',
title: '申报填报',
activePath: '/contract/declaration/todo',
@@ -179,6 +190,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '申报编制',
+ keepAlive: true,
},
},
{
@@ -188,6 +200,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '申报提示',
+ keepAlive: true,
},
},
@@ -198,6 +211,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '合同打印',
+ keepAlive: true,
},
},
],
@@ -238,6 +252,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '合同签订',
+ keepAlive: true,
},
children: [
{
@@ -256,6 +271,7 @@ const routes: RouteRecordRaw[] = [
icon: 'lucide:area-chart',
title: '签订填报',
activePath: '/contract/sign/todo',
+ keepAlive: true,
},
},
{
@@ -265,6 +281,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '签订编制',
+ keepAlive: true,
},
},
{
@@ -274,6 +291,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '签订提示',
+ keepAlive: true,
},
},
],
@@ -285,6 +303,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '合同履行',
+ keepAlive: true,
},
children: [
{
@@ -303,6 +322,7 @@ const routes: RouteRecordRaw[] = [
icon: 'lucide:area-chart',
title: '履行填报',
activePath: '/contract/perform/todo',
+ keepAlive: true,
},
},
{
@@ -312,6 +332,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '履行编制',
+ keepAlive: true,
},
},
{
@@ -321,6 +342,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '履行提示',
+ keepAlive: true,
},
},
{
@@ -330,6 +352,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '履行结果填报',
+ keepAlive: true,
},
},
{
@@ -340,6 +363,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '履行结果编制',
+ keepAlive: true,
},
},
{
@@ -350,6 +374,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '临时归档',
+ keepAlive: true,
},
},
],
@@ -361,6 +386,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '合同归档',
+ keepAlive: true,
},
children: [
{
@@ -371,6 +397,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '合同归档',
+ keepAlive: true,
},
},
{
@@ -381,6 +408,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '合同回档',
+ keepAlive: true,
},
},
{
@@ -390,6 +418,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '归档查询',
+ keepAlive: true,
},
},
],
@@ -401,6 +430,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '签约授权管理',
+ keepAlive: true,
},
children: [
{
@@ -418,6 +448,7 @@ const routes: RouteRecordRaw[] = [
icon: 'lucide:area-chart',
title: '签约授权申报',
activePath: '/contract/sign-authorization/edit/:id?',
+ keepAlive: true,
},
},
{
@@ -428,6 +459,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '签约授权查询',
+ keepAlive: true,
},
},
],
@@ -439,6 +471,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '合同相对人',
+ keepAlive: true,
},
children: [
{
@@ -455,6 +488,7 @@ const routes: RouteRecordRaw[] = [
icon: 'lucide:area-chart',
title: '相对人录入维护',
activePath: '/contract/company/edit/:id?',
+ keepAlive: true,
},
},
{
@@ -464,6 +498,7 @@ const routes: RouteRecordRaw[] = [
meta: {
icon: 'lucide:area-chart',
title: '相对人查询',
+ keepAlive: true,
},
},
],
diff --git a/apps/web-contract/src/views/contract/business/result/index.vue b/apps/web-contract/src/views/contract/business/result/index.vue
index 96b7c8dc..246229ea 100644
--- a/apps/web-contract/src/views/contract/business/result/index.vue
+++ b/apps/web-contract/src/views/contract/business/result/index.vue
@@ -142,11 +142,6 @@ async function handleSubmit(type: 'openModal' | 'submit') {
onMounted(async () => {
isLoading.value = true;
try {
- const contractReferTypeData = await Apis.contractReferType.get_list({
- params: {},
- });
- contractTypeData.value = contractReferTypeData.rows || [];
-
if (id.value) {
const contract: any = await Apis.contractBaseInfo.get_getOne({
params: { contractId: id.value },
@@ -157,17 +152,6 @@ onMounted(async () => {
params: { contractId: contract.contractId },
});
businseeData.value = business;
-
- // 获取供应商信息
- const providerData = await Apis.contractRecommendProvider.get_list({
- params: {
- contractId: business.contractId,
- },
- });
-
- providerList = providerData.rows || [];
-
- // xGridRef.value!.reloadColumn(getColumns());
}
} catch (error) {
logger.error('获取合同信息出错', error);
From 40e5205ccb631edf84906f91bea74fe49b51f450 Mon Sep 17 00:00:00 2001
From: z9130 <984661593@qq.com>
Date: Tue, 22 Oct 2024 19:59:41 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E9=80=89=E5=95=86=E7=BB=93=E6=9E=9C?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/web-contract/src/api/index.ts | 36 +++-
.../views/contract/business/edit/index.vue | 5 +-
.../business/result/fill-result-card.vue | 182 ++++++++++++++++--
.../views/contract/business/result/index.vue | 134 +++++++++++--
.../company/list/choose-company-modal.vue | 3 +
.../components/basis-table/basis-table.vue | 12 +-
.../components/file-card/file-card.vue | 3 +-
.../views/contract/declaration/edit/curd.tsx | 8 +-
.../views/contract/declaration/edit/index.vue | 22 ++-
.../info-approval/approval-card.vue | 5 +-
.../info-approval/info-approval.vue | 11 +-
.../info-business/business-card.vue | 75 ++++----
.../info-business/info-business.vue | 30 +--
.../src/views/contract/iframe-info/index.vue | 8 +-
apps/web-contract/vite.config.mts | 6 +-
packages/preferences/src/index.ts | 4 +-
resource/apiDefinitions.ts | 39 +++-
17 files changed, 446 insertions(+), 137 deletions(-)
diff --git a/apps/web-contract/src/api/index.ts b/apps/web-contract/src/api/index.ts
index 0e6a53b7..bf5bb49d 100644
--- a/apps/web-contract/src/api/index.ts
+++ b/apps/web-contract/src/api/index.ts
@@ -547,6 +547,15 @@ export default {
/** 合同系统/履行/履行提示/合同变更 获取合同变更信息 */
get_getContractChangeInfo: (data?: QueryOptions) =>
http.get('/app/lvxChange/getContractChangeInfo', data),
+ /** 合同系统/履行/履行提示/合同变更 查询流程未配置人员节点 */
+ get_getFlowNodeUserConfig: (data?: QueryOptions) =>
+ http.get('/app/lvxChange/getFlowNodeUserConfig', data),
+ /** 合同系统/履行/履行提示/合同变更 流程启动 */
+ post_startWorkFlow: (data?: BodyOptions) =>
+ http.post('/app/lvxChange/startWorkFlow', data),
+ /** 合同系统/履行/履行提示/合同变更 审核通过 */
+ post_submit: (data?: BodyOptions) =>
+ http.post('/app/lvxChange/submit', data),
},
contractRelieve: {
/** 合同系统/履行/履行提示/合同解除 获取合同解除信息 */
@@ -579,6 +588,11 @@ export default {
lvxResult: {
/** 合同系统/履行/履行结果 履行结果保存 */
post_save: (data?: BodyOptions) => http.post('/app/lvxResult/save', data),
+ /** 合同系统/履行/履行结果 分页履行结果查询 */
+ get_page: (data?: QueryOptions) => http.get('/app/lvxResult/page', data),
+ /** 合同系统/履行/履行结果 已办 */
+ get_pageDone: (data?: QueryOptions) =>
+ http.get('/app/lvxResult/pageDone', data),
},
contractFiling: {
/** 合同系统/履行/履行提示/临时归档 保存临时归档信息 */
@@ -641,7 +655,7 @@ export default {
/** 合同系统/签订 获取合同签订信息 */
get_getContractSignInfo: (data?: QueryOptions) =>
http.get('/app/qdSign/getContractSignInfo', data),
- /** 合同系统/签订 打印签订审批表 */
+ /** 合同系统/打印 选商打印 */
get_printApprove: (data?: QueryOptions) =>
http.get('/app/qdSign/printApprove', data),
/** 合同系统/签订 打印文本 */
@@ -806,6 +820,15 @@ export default {
/** 合同系统/选商/选商结果 待审核 */
get_toDoPage: (data?: QueryOptions) =>
http.get('/app/biddingResult/toDoPage', data),
+ /** 合同系统/选商/选商结果 查询合同信息 */
+ get_getContractInfo: (data?: QueryOptions) =>
+ http.get('/app/biddingResult/getContractInfo', data),
+ /** 合同系统/选商/选商结果 查询供应商列表 */
+ get_getProviderInfo: (data?: QueryOptions) =>
+ http.get('/app/biddingResult/getProviderInfo', data),
+ /** 合同系统/选商/选商结果 选商专家列表 */
+ get_queryBiddingExpert: (data?: QueryOptions) =>
+ http.get('/app/biddingResult/queryBiddingExpert', data),
},
home: {
/** 合同系统/首页待办/已办 首页待办 */
@@ -859,8 +882,8 @@ export default {
/** 设备管理/设备静态库管理/设备调拨 调拨信息保存 */
post_save: (data?: BodyOptions) => http.post('/app/equAllot/save', data),
/** 设备管理/设备静态库管理/设备调拨 调拨信息删除 */
- post_delete: (data?: BodyOptions) =>
- http.post('/app/equAllot/delete', data),
+ post_deletes: (data?: BodyOptions) =>
+ http.post('/app/equAllot/deletes', data),
},
bidding: {
/** 合同系统/标段信息 标段查询 */
@@ -870,6 +893,9 @@ export default {
/** 合同系统/标段信息 标段信息删除 */
post_deletes: (data?: BodyOptions) =>
http.post('/app/bidding/deletes', data),
+ /** 合同系统/选商/选商结果 查询标段列表 */
+ get_getBuddingPtInfoList: (data?: QueryOptions) =>
+ http.get('/app/bidding/getBuddingPtInfoList', data),
},
equAccident: {
/** 设备管理/设备使用管理/事故处理 事故处理(查询/获取) */
@@ -915,8 +941,8 @@ export default {
post_save: (data?: BodyOptions) =>
http.post('/app/equDayRepair/save', data),
/** 设备管理/设备使用管理/日常维修 删除 */
- get_deletes: (data?: QueryOptions) =>
- http.get('/app/equDayRepair/deletes', data),
+ post_deletes: (data?: BodyOptions) =>
+ http.post('/app/equDayRepair/deletes', data),
/** 设备管理/查询管理/日常维修查询 查询 */
get_query: (data?: QueryOptions) =>
http.get('/app/equDayRepair/query', data),
diff --git a/apps/web-contract/src/views/contract/business/edit/index.vue b/apps/web-contract/src/views/contract/business/edit/index.vue
index c6f000a1..62650c2b 100644
--- a/apps/web-contract/src/views/contract/business/edit/index.vue
+++ b/apps/web-contract/src/views/contract/business/edit/index.vue
@@ -636,7 +636,10 @@ onMounted(async () => {
保存
-import { onMounted, ref } from 'vue';
+import { nextTick, onMounted, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
@@ -12,12 +12,14 @@ import chooseCompanyModal from '../../company/list/choose-company-modal.vue';
const props = withDefaults(
defineProps<{
+ businseeData: any;
contractId: string;
projectId: string;
}>(),
{
contractId: '',
projectId: '',
+ businseeData: () => ({}),
},
);
@@ -33,12 +35,10 @@ const companyChooseType = ref<'biddingProvider' | 'providerPt'>('providerPt');
/** 必填字段校验 */
const requiredFieldRules: any = {
- // contractName: { required: true, message: "合同名称不得为空" },
- // ctrType: { required: true, message: "合同类别不得为空" },
- // ctrTwoType: { required: true, message: "合同二级类别不得为空" },
- // fundAllocation: { required: true, message: "资金流向不得为空" },
- // fundDitch: { required: true, message: "资金渠道不得为空" },
- // organiza: { required: true, message: "组织形式不得为空" },
+ openDate: { required: true, message: '开标时间不得为空' },
+ openPlace: { required: true, message: '开标地点不得为空' },
+ participant: { required: true, message: '参加人不得为空' },
+ processDesc: { required: true, message: '过程描述不得为空' },
};
/** 必填字段校验,如果是必填字段则返回对应message */
@@ -51,6 +51,7 @@ function isRequired(field: string): string {
}
const biddingExpertRef = ref();
+const bidList = ref([]);
const biddingExpertList = ref([]);
@@ -71,14 +72,17 @@ function onAddProviderPt(type: string, data?: any) {
chooseCompanyModalApi.setData({
title: '选择单位',
limitMultipleNum: 5,
- guids: tableFullData.map((item) => item.guid) || [],
+ guids: tableFullData.map((item) => item._guid) || [],
});
chooseCompanyModalApi.open();
}
if (type === 'confirm') {
console.log(data);
- data.map((item) => (item.guid = undefined));
+ data.map((item) => {
+ item._guid = item.guid;
+ item.guid = undefined;
+ });
providerPtRef1.value.insert(data);
providerPtRef2.value.insert(data);
}
@@ -87,19 +91,22 @@ function onAddProviderPt(type: string, data?: any) {
function onAddBiddingProvider(type: string, data?: any) {
companyChooseType.value = 'biddingProvider';
const tableFullData = biddingProviderRef.value.getTableData()?.fullData || [];
-
+ console.log(tableFullData);
if (type === 'openModal') {
chooseCompanyModalApi.setData({
title: '选择单位',
limitMultipleNum: 1,
- guids: tableFullData.map((item) => item.guid) || [],
+ guids: [],
});
chooseCompanyModalApi.open();
}
if (type === 'confirm') {
console.log(data);
- data.map((item) => (item.guid = undefined));
+ data.map((item) => {
+ item._guid = item.guid;
+ item.guid = undefined;
+ });
biddingProviderRef.value.loadData(data);
}
}
@@ -125,10 +132,10 @@ function onRemoveProviderPtRow(row) {
}
function handleChooseCompanyConfirm(e) {
- if (companyChooseType.value == 'providerPt') {
+ if (companyChooseType.value === 'providerPt') {
onAddProviderPt('confirm', e);
}
- if (companyChooseType.value == 'biddingProvider') {
+ if (companyChooseType.value === 'biddingProvider') {
onAddBiddingProvider('confirm', e);
}
}
@@ -139,12 +146,17 @@ async function verify() {
for (const field of Object.keys(requiredFieldRules)) {
if (!biddingResult.value[field]) {
message.error(isRequired(field));
- return;
+ return false;
}
}
+ return true;
}
-function getFormData() {
+async function getFormData() {
+ if (!(await verify())) {
+ return;
+ }
+
const _fullData1 = providerPtRef1.value.getTableData().fullData;
const _fullData2 = providerPtRef2.value.getTableData().fullData;
const _fullData3 = biddingExpertRef.value.getTableData().fullData;
@@ -152,6 +164,64 @@ function getFormData() {
console.log(_fullData1, _fullData2, _fullData3, _fullData4);
+ if (_fullData1.length === 0) {
+ message.error('请添加标段信息');
+ return;
+ }
+
+ for (const item of _fullData1) {
+ if (!item.bidPlace) {
+ message.error('请补全标段信息中的投标地点');
+ return;
+ }
+ if (!item.bidMoney) {
+ message.error('请补全标段信息中的投标保证金');
+ return;
+ }
+ }
+
+ if (_fullData3.length === 0) {
+ message.error('请添加专家信息');
+ return;
+ }
+ for (const item of _fullData3) {
+ if (!item.expertName) {
+ message.error('请补全专家信息中的评委姓名');
+ return;
+ }
+ if (!item.expertSex) {
+ message.error('请补全专家信息中的性别');
+ return;
+ }
+ // if (!item.expertAge) {
+ // message.error('请补全专家信息中的年龄');
+ // return;
+ // }
+ // if (!item.expertDepartName) {
+ // message.error('请补全专家信息中的部门');
+ // return;
+ // }
+ // if (!item.professionTypeName) {
+ // message.error('请补全专家信息中的专业');
+ // return;
+ // }
+ // if (!item.titleTypeName) {
+ // message.error('请补全专家信息中的职称');
+ // return;
+ // }
+ // if (!item.positionName) {
+ // message.error('请补全专家信息中的职务');
+ // return;
+ // }
+ }
+
+ for (const item of _fullData2) {
+ if (!item.offerMoney) {
+ message.error('请补全单位报价及评标信息中的报价');
+ return;
+ }
+ }
+
const data1: any[] = [];
for (const item1 of _fullData1) {
@@ -159,6 +229,7 @@ function getFormData() {
if (item1.providerId === item2.providerId) {
data1.push({
...item1,
+ phasePtId: '99999',
offerMoney: item2.offerMoney,
bidScore: item2.bidScore,
bidDesc: item2.bidDesc,
@@ -172,6 +243,7 @@ function getFormData() {
tempBiddingResult.projectId = props.projectId;
const tempBiddingPtInfo = JSON.parse(JSON.stringify(biddingPtInfo.value));
tempBiddingPtInfo.projectId = props.projectId;
+ tempBiddingPtInfo.phasePtId = '99999';
_fullData3.map((item) => (item.projectId = props.projectId));
const form = {
@@ -186,6 +258,53 @@ function getFormData() {
onMounted(async () => {
try {
+ // 查询供应商信息;
+ let providerData = await Apis.contractRecommendProvider.get_list({
+ params: {
+ contractId: props.contractId,
+ },
+ });
+ providerData = providerData.rows || [];
+
+ // 查询
+ nextTick(() => {
+ providerPtRef1.value.loadData(providerData);
+ providerPtRef2.value.loadData(providerData);
+ });
+
+ // if (props.businseeData.frameProtocol === '1') {
+ // for (const item of bidList.value) {
+ // const rows = [];
+ // for (const provider of providerData) {
+ // if (item.phaseSeq == provider.phaseSeq) {
+ // rows.push(provider);
+ // }
+ // }
+ // item.providerList = rows;
+ // // nextTick(() => {
+ // // providerGridRefs.value.get(`${item.phaseSeq}`).insert(rows);
+ // // });
+ // }
+ // } else {
+ // nextTick(() => {
+ // providerPtRef1.value.loadData(providerData);
+ // providerPtRef2.value.loadData(providerData);
+ // // providerGridRefs2.value.insert(providerData);
+ // });
+ // }
+
+ // 查询专家信息
+ const expertData = await Apis.biddingResult.get_queryBiddingExpert({
+ params: {
+ projectId: props.projectId,
+ contractId: props.contractId,
+ },
+ });
+ console.log('专家信息', expertData);
+ nextTick(() => {
+ biddingExpertRef.value.loadData(expertData.rows);
+ });
+
// 查询选商结果填报信息
const data = await Apis.biddingResult.get_page({
params: {
@@ -242,7 +361,11 @@ defineExpose({
-
+
@@ -330,24 +453,40 @@ defineExpose({
-
+
+
+ *
+ 开标时间
+
-
+
+
+ *
+ 开标地点
+
-
+
+
+ *
+ 参加人
+
-
+
+
+ *
+ 过程描述
+
diff --git a/apps/web-contract/src/views/contract/business/result/index.vue b/apps/web-contract/src/views/contract/business/result/index.vue
index 246229ea..0a0d477e 100644
--- a/apps/web-contract/src/views/contract/business/result/index.vue
+++ b/apps/web-contract/src/views/contract/business/result/index.vue
@@ -1,13 +1,14 @@
{
{{ `${info.budgetSum || ''} ${info.priceTypeName || ''}` }}
@@ -101,7 +108,7 @@ onMounted(async () => {
- {{ row.qualification }}
+ {{ row.aptitudeName }}
@@ -124,26 +131,19 @@ onMounted(async () => {
-
+
- {{ row.bidName }}
+ {{ row.phaseName }}
-
- {{ row.phaseMoney }}
-
-
-
-
- {{ row.phaseDesc }}
-
+ {{ row.phaseMoney }} 元
@@ -160,7 +160,7 @@ onMounted(async () => {
- {{ row.qualification }}
+ {{ row.aptitudeName }}
@@ -202,4 +202,5 @@ onMounted(async () => {
{{ info.stockPlanMx || '无' }}
+
diff --git a/apps/web-contract/src/views/contract/iframe-info/components/info-business/info-business.vue b/apps/web-contract/src/views/contract/iframe-info/components/info-business/info-business.vue
index 0b80948c..8c552d0d 100644
--- a/apps/web-contract/src/views/contract/iframe-info/components/info-business/info-business.vue
+++ b/apps/web-contract/src/views/contract/iframe-info/components/info-business/info-business.vue
@@ -1,29 +1,22 @@
@@ -120,7 +125,11 @@ const searchForm = ref({
-
+
-
- {{ row.ctrName }}
+
+ {{ row.CTR_NAME }}
diff --git a/apps/web-contract/src/views/contract/declaration/print/index.vue b/apps/web-contract/src/views/contract/declaration/print/index.vue
index bfeb981b..f78c099d 100644
--- a/apps/web-contract/src/views/contract/declaration/print/index.vue
+++ b/apps/web-contract/src/views/contract/declaration/print/index.vue
@@ -99,12 +99,49 @@ function toDetail(row) {
async function handlePrint(row, type: string) {
const hideLoading = message.loading('加载中', 0);
+ console.log(row);
try {
- const form: any = {};
- await Apis.qdSign.get_printApprove({
- params: form,
- });
+ if (type === 'xs') {
+ await Apis.qdSign.get_printApprove({
+ params: {
+ modelId: '1',
+ caseId: row.ctrBaseId,
+ },
+ config: {
+ meta: {
+ responseType: 'blob',
+ },
+ },
+ });
+ }
+ if (type === 'qy') {
+ await Apis.qdSign.get_printApprove({
+ params: {
+ modelId: '2',
+ caseId: row.ctrBaseId,
+ },
+ config: {
+ meta: {
+ responseType: 'blob',
+ },
+ },
+ });
+ }
+ if (type === 'wb') {
+ await Apis.qdSign.get_textPrint({
+ params: {
+ ctrBaseId: row.ctrBaseId,
+ },
+ config: {
+ meta: {
+ responseType: 'blob',
+ },
+ },
+ });
+ }
+ message.success('文件已下载');
} catch (error) {
+ message.error('文件下载失败');
logger.error('打印失败', error);
} finally {
hideLoading();
diff --git a/apps/web-contract/src/views/contract/iframe-info/components/info-approval/approval-card.vue b/apps/web-contract/src/views/contract/iframe-info/components/info-approval/approval-card.vue
index 7ad9364c..e014fc92 100644
--- a/apps/web-contract/src/views/contract/iframe-info/components/info-approval/approval-card.vue
+++ b/apps/web-contract/src/views/contract/iframe-info/components/info-approval/approval-card.vue
@@ -1,15 +1,35 @@
@@ -23,10 +43,10 @@ withDefaults(
{{ info.contractName }}
- {{ info.contractName }}
+ {{ info.ctrTypeName }}
- {{ info.contractName }}
+ {{ info.ctrTwoTypeName }}
{{ getDictObj(DICT_TYPE.common_whether, info.frameProtocol)?.label }}
diff --git a/apps/web-contract/src/views/contract/iframe-info/components/info-approval/info-approval.vue b/apps/web-contract/src/views/contract/iframe-info/components/info-approval/info-approval.vue
index 0c9634b9..71e2a7ce 100644
--- a/apps/web-contract/src/views/contract/iframe-info/components/info-approval/info-approval.vue
+++ b/apps/web-contract/src/views/contract/iframe-info/components/info-approval/info-approval.vue
@@ -5,7 +5,6 @@ import { message } from 'ant-design-vue';
import { logger } from 'common-utils';
import Apis from '#/api';
-import { useVxeTable } from '#/hooks/vxeTable';
import AuditNodeTable from '#/views/contract/components/audit-node-table/audit-node-table.vue';
import BasisTable from '#/views/contract/components/basis-table/basis-table.vue';
import ApprovalCard from '#/views/contract/iframe-info/components/info-approval/approval-card.vue';
@@ -24,11 +23,6 @@ const props = withDefaults(
},
);
-const { xGridRef, gridProps } = useVxeTable({ ref: 'xGridRef' });
-const { xGridRef: xGridRefByAuditInfo } = useVxeTable({
- ref: 'xGridRefByAuditInfo',
-});
-
const currData = ref({});
const isLoading = ref(false);
@@ -72,8 +66,13 @@ onMounted(async () => {
-
-
+
+
diff --git a/apps/web-contract/src/views/contract/iframe-info/components/info-business/info-business.vue b/apps/web-contract/src/views/contract/iframe-info/components/info-business/info-business.vue
index 8c552d0d..a51fec70 100644
--- a/apps/web-contract/src/views/contract/iframe-info/components/info-business/info-business.vue
+++ b/apps/web-contract/src/views/contract/iframe-info/components/info-business/info-business.vue
@@ -100,7 +100,12 @@ onMounted(async () => {
-
+
diff --git a/apps/web-contract/src/views/contract/schema.ts b/apps/web-contract/src/views/contract/schema.ts
index 5ddd6e5f..535bc6d1 100644
--- a/apps/web-contract/src/views/contract/schema.ts
+++ b/apps/web-contract/src/views/contract/schema.ts
@@ -4,9 +4,6 @@ import { h } from 'vue';
import { Tooltip } from 'ant-design-vue';
-import { DICT_TYPE, getDictObj } from '#/utils/dict';
-import { useRender } from '#/hooks/useRender';
-
export const PrimaryKey = 'guid';
/** 获取待办/已办列表的列 */
@@ -104,7 +101,12 @@ export function getAuditInfoColumns(
title: '任务名称',
minWidth: 200,
},
- { field: 'assigneeId', title: '审批人', width: 150 },
+ {
+ field: 'assigneeId',
+ title: '审批人',
+ width: 150,
+ slots: { default: ({ row }) => row.userName || row.assigneeId },
+ },
{ field: 'startTime', title: '送审时间', width: 150 },
{ field: 'endTime', title: '审批时间', width: 150 },
{ field: 'type', title: '审批状态', width: 100 },
diff --git a/apps/web-contract/src/views/contract/sign/edit/index.vue b/apps/web-contract/src/views/contract/sign/edit/index.vue
index b6f68b69..5fd5d614 100644
--- a/apps/web-contract/src/views/contract/sign/edit/index.vue
+++ b/apps/web-contract/src/views/contract/sign/edit/index.vue
@@ -372,11 +372,16 @@ onMounted(async () => {
>
保存
-
+
+ 提交
+
+
+ 签约审批表打印
+
+
+ 合同文本打印
+
+
提交