- {{ 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
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 () => {
>
保存
-
+
+ 提交
+
+
+ 签约审批表打印
+
+
+ 合同文本打印
+
+
提交