From 4b7f75cc838a32a5bf6b0e350938fa3c2ce88bc9 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Fri, 18 Oct 2024 16:34:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E9=80=89=E5=95=86=E8=8A=82?= =?UTF-8?q?=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 () => {