diff --git a/src/api/system/business-process.js b/src/api/system/business-process.js index 0818de1..5d0f502 100644 --- a/src/api/system/business-process.js +++ b/src/api/system/business-process.js @@ -6,8 +6,9 @@ import request from '@/axios'; * @param {string} data.templateCode 模板编码 * @param {string} data.submitIdentity 提交人（手机号） * @param {string} data.loginName 登录账号（手机号） - * @param {string} data.formInstanceId 业务表单实例 id + * @param {string} data.bizId 业务主键（后端生成/复用 formInstanceId） * @param {string} [data.subject] 流程标题 + * @param {string} [data.bizType] 业务类型 */ export const processSubmit = data => { return request({ @@ -20,7 +21,7 @@ export const processSubmit = data => { /** * 调用 MK processDelete 删除审核流（驳回后重新提交前使用） * @param {Object} data - * @param {string} data.formInstanceId 业务表单实例 id + * @param {string} data.bizId 业务主键 */ export const processDelete = data => { return request({ @@ -33,7 +34,7 @@ export const processDelete = data => { /** * 查询 MK 流程实例是否仍存在（有数据则无需删除/重新提交） * @param {Object} params - * @param {string} params.bizId 业务 id（formInstanceId） + * @param {string} params.bizId 业务主键 */ export const hasMkProcessInstance = params => { return request({ diff --git a/src/option/business/project-apply.js b/src/option/business/project-apply.js index ad46f63..0c6ed41 100644 --- a/src/option/business/project-apply.js +++ b/src/option/business/project-apply.js @@ -57,16 +57,24 @@ export const config = { action: 'submitApproval', label: '提交', statusProp: 'approvalStatus', - status: ['draft'], + status: ['draft', 'rejected', 'withdrawn'], permission: 'project_apply_submit', }, { action: 'withdraw', label: '撤回', statusProp: 'approvalStatus', - status: ['reviewing'], + status: ['draft', 'reviewing'], permission: 'project_apply_withdraw', }, + { + action: 'mkAudit', + label: '流程', + statusProp: 'approvalStatus', + status: ['reviewing', 'change_reviewing'], + permission: 'project_apply_approve', + mkOnly: true, + }, { action: 'approve', label: '通过', @@ -74,6 +82,7 @@ export const config = { statusProp: 'approvalStatus', status: ['reviewing', 'change_reviewing'], permission: 'project_apply_approve', + localOnly: true, }, { action: 'reject', @@ -82,6 +91,7 @@ export const config = { statusProp: 'approvalStatus', status: ['reviewing', 'change_reviewing'], permission: 'project_apply_reject', + localOnly: true, }, { action: 'startChange', diff --git a/src/router/page/index.js b/src/router/page/index.js index ab93bb9..e2a8ab1 100644 --- a/src/router/page/index.js +++ b/src/router/page/index.js @@ -106,17 +106,6 @@ export default [ bizType: 'contract-manage', }, }, - { - path: '/business/waybill-manage/public-view', - name: '查看运单信息', - component: () => import('@/views/business/waybill-manage-public-view.vue'), - meta: { - keepAlive: false, - isTab: false, - isAuth: false, - bizType: 'waybill-manage', - }, - }, { path: '/settlement/pre-settlement/public-view', name: '查看预结算信息', @@ -150,6 +139,39 @@ export default [ bizType: 'payment-application', }, }, + { + path: '/payment/invoice-application/public-view', + name: '查看开票申请信息', + component: () => import('@/views/payment/invoice-application-public-view.vue'), + meta: { + keepAlive: false, + isTab: false, + isAuth: false, + bizType: 'invoice-application', + }, + }, + { + path: '/payment/invoice-receipt/public-view', + name: '查看收票登记信息', + component: () => import('@/views/payment/invoice-receipt-public-view.vue'), + meta: { + keepAlive: false, + isTab: false, + isAuth: false, + bizType: 'invoice-receipt', + }, + }, + { + path: '/payment/bill-payment/public-view', + name: '查看汇票付款信息', + component: () => import('@/views/payment/bill-payment-public-view.vue'), + meta: { + keepAlive: false, + isTab: false, + isAuth: false, + bizType: 'bill-payment', + }, + }, { path: '/', name: '主页', diff --git a/src/utils/mk-approval.js b/src/utils/mk-approval.js index 9bbb524..a9071d2 100644 --- a/src/utils/mk-approval.js +++ b/src/utils/mk-approval.js @@ -18,11 +18,6 @@ export const MK_BIZ = { subjectPrefix: '合同审批', rejected: ['rejected', 'change_rejected', 'withdrawn'], }, - 'waybill-manage': { - dictName: '提交运单审核流', - subjectPrefix: '运单审批', - rejected: ['rejected', 'returned'], - }, 'pre-settlement': { dictName: '提交预结算审核流', subjectPrefix: '预结算审批', @@ -38,6 +33,21 @@ export const MK_BIZ = { subjectPrefix: '付款审批', rejected: ['returned'], }, + 'invoice-application': { + dictName: '提交开票审核流', + subjectPrefix: '开票审批', + rejected: ['returned'], + }, + 'invoice-receipt': { + dictName: '提交收票审核流', + subjectPrefix: '收票审批', + rejected: ['returned'], + }, + 'bill-payment': { + dictName: '提交汇票付款审核流', + subjectPrefix: '汇票付款审批', + rejected: ['returned'], + }, }; const MK_SWITCH_NAME = '开启MK'; @@ -70,9 +80,17 @@ export async function resolveMkTemplateCode(dictName, list) { return String(templateCode); } +/** + * 提交 MK 审核流 + * @param {Object} options + * @param {string} options.bizType 业务类型 + * @param {string|number} options.bizId 业务主键（后端据此生成/复用 formInstanceId） + * @param {string} [options.subjectName] 标题后缀 + * @param {string} [options.approvalStatus] 当前审批状态（驳回态会先 delete） + */ export async function submitMkApprovalFlow({ bizType, - formInstanceId, + bizId, subjectName = '', approvalStatus = '', }) { @@ -80,25 +98,29 @@ export async function submitMkApprovalFlow({ if (!conf) { return Promise.reject(new Error(`不支持的MK业务类型：${bizType}`)); } + if (bizId == null || bizId === '') { + return Promise.reject(new Error('业务id不能为空')); + } const list = await loadMkTemplateList(); if (!isMkEnabled(list)) { return; } + const bizIdText = String(bizId); // 先查 MK 流程实例：已有数据则不删除、不重新提交 - const existsRes = await hasMkProcessInstance({ bizId: String(formInstanceId) }); + const existsRes = await hasMkProcessInstance({ bizId: bizIdText }); if (existsRes?.data?.data) { return; } if ((conf.rejected || []).includes(approvalStatus)) { - await processDelete({ formInstanceId: String(formInstanceId) }); + await processDelete({ bizId: bizIdText }); } const templateCode = await resolveMkTemplateCode(conf.dictName, list); const subject = subjectName ? `${conf.subjectPrefix}：${subjectName}` - : `${conf.subjectPrefix}：${formInstanceId}`; + : `${conf.subjectPrefix}：${bizIdText}`; return processSubmit({ templateCode, - formInstanceId: String(formInstanceId), + bizId: bizIdText, subject, bizType, }); diff --git a/src/views/business/common-cargo.vue b/src/views/business/common-cargo.vue index 6b060f7..fe173a1 100644 --- a/src/views/business/common-cargo.vue +++ b/src/views/business/common-cargo.vue @@ -275,7 +275,12 @@ export default { return (data && data.records) || []; }, defaultDeptId() { - return (this.userInfo && (this.userInfo.deptId || this.userInfo.dept_id)) || ''; + // 用户可能绑定多个组织（逗号分隔），搜索下拉是单选，只取当前会话第一个组织 ID。 + const raw = (this.userInfo && (this.userInfo.deptId || this.userInfo.dept_id)) || ''; + return String(raw) + .split(',') + .map(item => item.trim()) + .filter(Boolean)[0] || ''; }, applyDefaultDeptSearch() { const deptId = this.defaultDeptId(); @@ -296,6 +301,18 @@ export default { if (deptColumn) { deptColumn.dicData = this.deptOptions; } + // dicData 异步到位后再回填，避免下拉选项为空时清空已选组织，导致请求丢失 deptId。 + const deptId = String(this.query.deptId || this.defaultDeptId() || ''); + if (!deptId) return; + if (deptColumn) { + deptColumn.searchValue = deptId; + } + this.query = { ...this.query, deptId }; + this.$nextTick(() => { + if (this.$refs.crud?.searchForm) { + this.$refs.crud.searchForm.searchDeptId = deptId; + } + }); }); }, loadPriceUnitOptions() { @@ -323,9 +340,13 @@ export default { flattenDept(tree, level = 0) { const result = []; tree.forEach(item => { + // 雪花 ID 必须保持字符串，避免 JS Number 精度丢失导致筛错组织。 + const id = + item.id === undefined || item.id === null || item.id === '' ? '' : String(item.id); + if (!id) return; result.push({ label: `${'　'.repeat(level)}${item.title || item.deptName || item.name}`, - value: item.id, + value: id, }); if (item.children && item.children.length) { result.push(...this.flattenDept(item.children, level + 1)); @@ -333,6 +354,18 @@ export default { }); return result; }, + normalizeListQuery(params = {}) { + const query = { ...params, ...this.query }; + const rawDeptId = query.deptId ?? query.searchDeptId; + delete query.searchDeptId; + if (rawDeptId !== undefined && rawDeptId !== null && String(rawDeptId).trim() !== '') { + query.deptId = String(rawDeptId).split(',')[0].trim(); + } else { + delete query.deptId; + } + query.allDept = this.isAdmin ? 1 : 0; + return query; + }, normalizeCargoTypeOptions(list = []) { return list .map(item => ({ @@ -640,9 +673,9 @@ export default { this.onLoad(this.page, this.query); }, searchChange(params, done) { - this.query = params; + this.query = this.normalizeListQuery(params); this.page.currentPage = 1; - this.onLoad(this.page, params); + this.onLoad(this.page, this.query); done(); }, selectionChange(list) { @@ -665,12 +698,10 @@ export default { }, onLoad(page, params = {}) { this.loading = true; + const query = this.normalizeListQuery(params); + this.query = query; api - .getList(page.currentPage, page.pageSize, { - ...params, - ...this.query, - allDept: this.isAdmin ? 1 : 0, - }) + .getList(page.currentPage, page.pageSize, query) .then(res => { const result = res.data.data; this.page.total = result.total; @@ -683,8 +714,7 @@ export default { }, buildExportParams() { return { - ...this.query, - allDept: this.isAdmin ? 1 : 0, + ...this.normalizeListQuery(this.query), ids: this.ids, [this.website.tokenHeader]: getToken(), }; diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue index ed1bd0e..b070975 100644 --- a/src/views/business/components/waybill-manage-page.vue +++ b/src/views/business/components/waybill-manage-page.vue @@ -2348,7 +2348,7 @@ -
+
关闭
@@ -244,6 +216,8 @@ import * as api from '@/api/payment/invoiceApplication'; import * as formalSettlementApi from '@/api/settlement/formalSettlement'; import { invoiceApplicationTableColumns } from '@/option/payment/invoiceApplication'; import organizationSearch from '@/mixins/organization-search'; +import { getMKApprovalUrl } from '@/api/system/business-process'; +import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval'; const emptyQuery = () => ({ applicationNo: '', @@ -271,7 +245,7 @@ export default { selection: [], loading: false, page: { current: 1, size: 10, total: 0 }, - flowDialog: { visible: false, loading: false, row: {}, records: [] }, + mkEnabled: false, }; }, computed: { @@ -280,6 +254,13 @@ export default { mounted() { this.loadOrganizationOptions(); this.loadTable(); + loadMkEnabled() + .then(enabled => { + this.mkEnabled = !!enabled; + }) + .catch(() => { + this.mkEnabled = false; + }); }, methods: { hasPermission(code) { @@ -356,19 +337,6 @@ export default { this.$message.error('正式结算单详情加载失败'); } }, - async openFlow(row) { - this.flowDialog.row = { ...row }; - this.flowDialog.records = []; - this.flowDialog.visible = true; - this.flowDialog.loading = true; - try { - const detail = this.unwrapData(await api.getDetail(row.id)); - this.flowDialog.row = { ...row, ...detail }; - this.flowDialog.records = detail.records || []; - } finally { - this.flowDialog.loading = false; - } - }, async handleDelete(row) { await this.$confirm('确认删除该开票申请？', '提示', { type: 'warning' }); await api.remove(row.id); @@ -377,9 +345,33 @@ export default { }, async handleSubmit(row) { await api.submit({ id: row.id }); + await submitMkApprovalFlow({ + bizType: 'invoice-application', + bizId: row.id, + subjectName: row.applicationNo || '', + approvalStatus: row.approvalStatus || '', + }); this.$message.success('提交成功'); this.loadTable(); }, + handleMkAudit(row) { + if (!row?.id) { + this.$message.warning('开票申请ID为空，无法打开审核页'); + return; + } + getMKApprovalUrl({ bizId: String(row.id) }) + .then(res => { + const url = res?.data?.data; + if (!url) { + this.$message.error('获取审核跳转地址失败'); + return; + } + window.open(url, '_blank'); + }) + .catch(() => { + this.$message.error('获取审核跳转地址失败'); + }); + }, async handleApprove(row) { await this.$confirm('确认审批通过该开票申请？', '提示', { type: 'warning' }); await api.approve({ id: row.id }); @@ -436,19 +428,6 @@ export default { '' ); }, - statusName(status) { - return ( - { - draft: '草稿', - reviewing: '审批中', - approved: '审批通过', - returned: '已驳回', - voided: '已作废', - }[status] || - status || - '-' - ); - }, displayValue(value) { return value === null || value === undefined || value === '' ? '-' : value; }, diff --git a/src/views/payment/invoice-receipt-form.vue b/src/views/payment/invoice-receipt-form.vue index 965a168..57cbbe7 100644 --- a/src/views/payment/invoice-receipt-form.vue +++ b/src/views/payment/invoice-receipt-form.vue @@ -134,7 +134,7 @@ -
+
取消 同步 + + + + + + diff --git a/src/views/payment/invoice-receipt.vue b/src/views/payment/invoice-receipt.vue index 55f4acf..da8b05a 100644 --- a/src/views/payment/invoice-receipt.vue +++ b/src/views/payment/invoice-receipt.vue @@ -146,14 +146,20 @@ >提交 流程
- - - - - {{ flowDialog.row.invoiceNo || '-' }} - - - {{ flowDialog.row.approvalStatusName || '-' }} - - - {{ flowDialog.row.currentNode || '-' }} - - - {{ flowDialog.row.currentProcessor || '-' }} - - - - - - - - - - - - - - - - - @@ -236,6 +208,8 @@ import * as XLSX from 'xlsx'; import * as api from '@/api/payment/invoiceReceipt'; import { invoiceReceiptTableColumns } from '@/option/payment/invoiceReceipt'; import organizationSearch from '@/mixins/organization-search'; +import { getMKApprovalUrl } from '@/api/system/business-process'; +import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval'; const emptyQuery = () => ({ invoiceNo: '', @@ -264,7 +238,7 @@ export default { selection: [], loading: false, page: { current: 1, size: 10, total: 0 }, - flowDialog: { visible: false, loading: false, row: {}, records: [] }, + mkEnabled: false, }; }, computed: { @@ -273,6 +247,13 @@ export default { mounted() { this.loadOrganizationOptions(); this.loadTable(); + loadMkEnabled() + .then(enabled => { + this.mkEnabled = !!enabled; + }) + .catch(() => { + this.mkEnabled = false; + }); }, methods: { hasPermission(code) { @@ -321,19 +302,6 @@ export default { query: { mode: 'view', id: row.id }, }); }, - async openFlow(row) { - this.flowDialog.row = { ...row }; - this.flowDialog.records = []; - this.flowDialog.visible = true; - this.flowDialog.loading = true; - try { - const detail = this.unwrapData(await api.getDetail(row.id)); - this.flowDialog.row = { ...row, ...detail }; - this.flowDialog.records = detail.records || []; - } finally { - this.flowDialog.loading = false; - } - }, async handleDelete(row) { await this.$confirm('确认删除该收票登记？', '提示', { type: 'warning' }); await api.remove(row.id); @@ -342,9 +310,33 @@ export default { }, async handleSubmit(row) { await api.submit({ id: row.id }); + await submitMkApprovalFlow({ + bizType: 'invoice-receipt', + bizId: row.id, + subjectName: row.invoiceNo || '', + approvalStatus: row.approvalStatus || '', + }); this.$message.success('提交成功'); this.loadTable(); }, + handleMkAudit(row) { + if (!row?.id) { + this.$message.warning('收票登记ID为空，无法打开审核页'); + return; + } + getMKApprovalUrl({ bizId: String(row.id) }) + .then(res => { + const url = res?.data?.data; + if (!url) { + this.$message.error('获取审核跳转地址失败'); + return; + } + window.open(url, '_blank'); + }) + .catch(() => { + this.$message.error('获取审核跳转地址失败'); + }); + }, async handleApprove(row) { await this.$confirm('确认审批通过该收票登记？', '提示', { type: 'warning' }); await api.approve({ id: row.id }); @@ -401,19 +393,6 @@ export default { '' ); }, - statusName(status) { - return ( - { - draft: '草稿', - reviewing: '审批中', - approved: '审批通过', - returned: '已驳回', - voided: '已作废', - }[status] || - status || - '-' - ); - }, displayValue(value) { return value === null || value === undefined || value === '' ? '-' : value; }, diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue index 1c06624..9e7e278 100644 --- a/src/views/payment/payment-application-form.vue +++ b/src/views/payment/payment-application-form.vue @@ -2635,7 +2635,7 @@ export default { await api.submit({ id: this.form.id }); await submitMkApprovalFlow({ bizType: 'payment-application', - formInstanceId: this.form.id, + bizId: this.form.id, subjectName: this.form.paymentNo || '', approvalStatus: this.form.approvalStatus || '', }); diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue index 3013b4e..1d4042e 100644 --- a/src/views/payment/payment-application.vue +++ b/src/views/payment/payment-application.vue @@ -151,14 +151,29 @@ >编辑 提交 流程 + 驳回 - 流程 - - - {{ flowDialog.row.paymentNo || '-' }} - - - {{ flowDialog.row.approvalStatusName || '-' }} - - - {{ flowDialog.row.currentNode || '-' }} - - - {{ flowDialog.row.currentProcessor || '-' }} - - - @@ -233,7 +228,8 @@ import { mapGetters } from 'vuex'; import * as api from '@/api/payment/paymentApplication'; import { paymentApplicationTableColumns } from '@/option/payment/paymentApplication'; import organizationSearch from '@/mixins/organization-search'; -import { submitMkApprovalFlow } from '@/utils/mk-approval'; +import { getMKApprovalUrl } from '@/api/system/business-process'; +import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval'; const emptyQuery = () => ({ paymentNo: '', @@ -265,7 +261,7 @@ export default { selection: [], loading: false, page: { current: 1, size: 10, total: 0 }, - flowDialog: { visible: false, row: {} }, + mkEnabled: false, }; }, computed: { @@ -277,6 +273,13 @@ export default { mounted() { this.loadOrganizationOptions(); this.loadTable(); + loadMkEnabled() + .then(enabled => { + this.mkEnabled = !!enabled; + }) + .catch(() => { + this.mkEnabled = false; + }); }, methods: { hasPermission(code) { @@ -364,7 +367,7 @@ export default { await api.submit({ id: row.id }); await submitMkApprovalFlow({ bizType: 'payment-application', - formInstanceId: row.id, + bizId: row.id, subjectName: row.paymentNo || '', approvalStatus: row.approvalStatus || '', }); @@ -376,16 +379,30 @@ export default { this.$message.success('审批通过'); this.loadTable(); }, + handleMkAudit(row) { + if (!row?.id) { + this.$message.warning('付款申请ID为空，无法打开审核页'); + return; + } + getMKApprovalUrl({ bizId: String(row.id) }) + .then(res => { + const url = res?.data?.data; + if (!url) { + this.$message.error('获取审核跳转地址失败'); + return; + } + window.open(url, '_blank'); + }) + .catch(() => { + this.$message.error('获取审核跳转地址失败'); + }); + }, async handleReturn(row) { const { value } = await this.$prompt('请输入驳回原因', '审批驳回'); await api.returnBill({ id: row.id, reason: value }); this.$message.success('已驳回'); this.loadTable(); }, - openFlow(row) { - this.flowDialog.row = row; - this.flowDialog.visible = true; - }, async handleVoid(row) { const { value } = await this.$prompt('请输入作废原因', '作废付款申请'); await api.voidBill({ id: row.id, reason: value }); diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue index 63a5859..9807c44 100644 --- a/src/views/settlement/components/formal-settlement-table-panel.vue +++ b/src/views/settlement/components/formal-settlement-table-panel.vue @@ -134,6 +134,7 @@ export default { loading: { type: Boolean, default: false }, page: { type: Object, required: true }, hasPermission: { type: Function, required: true }, + mkEnabled: { type: Boolean, default: false }, }, emits: [ 'create', @@ -193,7 +194,10 @@ export default { actions.push({ type: 'delete', label: '删除', danger: true }); if (this.hasPermission('formal_settlement_submit') && this.isEditable(row)) actions.push({ type: 'submit', label: '提交' }); - if (this.hasPermission('formal_settlement_approve') && row.approvalStatus === 'reviewing') { + if (this.mkEnabled && this.hasPermission('formal_settlement_approve') && row.approvalStatus === 'reviewing') { + actions.push({ type: 'mkAudit', label: '流程' }); + } + if (!this.mkEnabled && this.hasPermission('formal_settlement_approve') && row.approvalStatus === 'reviewing') { actions.push({ type: 'approve', label: '通过' }); actions.push({ type: 'return', label: '驳回', danger: true }); } diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue index 9c7cb11..1c5f134 100644 --- a/src/views/settlement/components/pre-settlement-editor.vue +++ b/src/views/settlement/components/pre-settlement-editor.vue @@ -1604,7 +1604,7 @@ export default { await submit({ id: this.form.id }); await submitMkApprovalFlow({ bizType: 'pre-settlement', - formInstanceId: this.form.id, + bizId: this.form.id, subjectName: this.form.preSettlementNo || this.form.contractName || '', approvalStatus: this.form.approvalStatus || '', }); diff --git a/src/views/settlement/formal-settlement.vue b/src/views/settlement/formal-settlement.vue index 985e1a0..a5aca35 100644 --- a/src/views/settlement/formal-settlement.vue +++ b/src/views/settlement/formal-settlement.vue @@ -64,6 +64,7 @@ :loading="loading" :page="page" :has-permission="hasPermissionFn" + :mk-enabled="mkEnabled" @create="openCreate" @payment="openPaymentDialog" @sync="handleSync" @@ -82,6 +83,7 @@ :loading="loading" :page="page" :has-permission="hasPermissionFn" + :mk-enabled="mkEnabled" @create="openCreate" @payment="openPaymentDialog" @sync="handleSync" @@ -182,7 +184,8 @@ import organizationSearch from '@/mixins/organization-search'; import { formalSettlementTableColumns } from '@/option/settlement/formalSettlementTable'; import FormalSettlementEditor from './components/formal-settlement-editor.vue'; import FormalSettlementTablePanel from './components/formal-settlement-table-panel.vue'; -import { submitMkApprovalFlow } from '@/utils/mk-approval'; +import { submitMkApprovalFlow, loadMkEnabled } from '@/utils/mk-approval'; +import { getMKApprovalUrl } from '@/api/system/business-process'; const emptyQuery = () => ({ formalSettlementNo: '', @@ -224,6 +227,7 @@ export default { rows: [], form: { appliedAmount: 0, remark: '' }, }, + mkEnabled: false, }; }, computed: { @@ -247,6 +251,13 @@ export default { this.loadOrganizationOptions(); this.loadTable(); this.openRouteDetail(); + loadMkEnabled() + .then(enabled => { + this.mkEnabled = !!enabled; + }) + .catch(() => { + this.mkEnabled = false; + }); }, methods: { hasPermission(code) { @@ -290,6 +301,7 @@ export default { edit: () => this.openEdit(row), delete: () => this.handleDelete(row), submit: () => this.handleSubmit(row), + mkAudit: () => this.handleMkAudit(row), approve: () => this.handleApprove(row), return: () => this.handleReturn(row), void: () => this.handleVoid(row), @@ -340,13 +352,31 @@ export default { await api.submit({ id: row.id }); await submitMkApprovalFlow({ bizType: 'formal-settlement', - formInstanceId: row.id, + bizId: row.id, subjectName: row.formalSettlementNo || '', approvalStatus: row.approvalStatus || '', }); this.$message.success('提交成功'); this.loadTable(); }, + handleMkAudit(row) { + if (!row?.id) { + this.$message.warning('正式结算单ID为空，无法打开审核页'); + return; + } + getMKApprovalUrl({ bizId: String(row.id) }) + .then(res => { + const url = res?.data?.data; + if (!url) { + this.$message.error('获取审核跳转地址失败'); + return; + } + window.open(url, '_blank'); + }) + .catch(() => { + this.$message.error('获取审核跳转地址失败'); + }); + }, async handleApprove(row) { await this.$confirm( '审核通过后正式结算生效，金额只能通过结算调整单处理，确认通过？', diff --git a/src/views/settlement/pre-settlement.vue b/src/views/settlement/pre-settlement.vue index f393a14..2a7e1b6 100644 --- a/src/views/settlement/pre-settlement.vue +++ b/src/views/settlement/pre-settlement.vue @@ -172,21 +172,43 @@ 删除 + 提交 + + 流程 通过 @@ -259,23 +281,6 @@ - - - - - {{ flowDialog.row.preSettlementNo || '-' }} - - - {{ flowDialog.row.approvalStatusName || '-' }} - - - {{ flowDialog.row.currentNode || '-' }} - - - {{ flowDialog.row.currentProcessor || '-' }} - - - @@ -290,6 +295,7 @@ import { getPrintTemplates, remove, returnBill, + submit, voidBill, } from '@/api/settlement/preSettlement'; import { preSettlementSearchFields } from '@/option/settlement/preSettlementSearch'; @@ -297,6 +303,8 @@ import organizationSearch from '@/mixins/organization-search'; import { preSettlementTableColumns } from '@/option/settlement/preSettlementTable'; import { createSettlementTransfer } from '@/utils/settlement-transfer'; import { downloadFile } from '@/utils/util'; +import { getMKApprovalUrl } from '@/api/system/business-process'; +import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval'; import PreSettlementEditor from './components/pre-settlement-editor.vue'; const emptyQuery = () => ({ @@ -345,10 +353,7 @@ export default { templates: [], template: '', }, - flowDialog: { - visible: false, - row: {}, - }, + mkEnabled: false, }; }, computed: { @@ -372,6 +377,13 @@ export default { this.loadOrganizationOptions(); this.loadTable(); this.openRouteDetail(); + loadMkEnabled() + .then(enabled => { + this.mkEnabled = !!enabled; + }) + .catch(() => { + this.mkEnabled = false; + }); }, methods: { hasPermission(code) { @@ -628,9 +640,34 @@ export default { const { data } = await exportList(params); downloadFile(data, `预结算单${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`); }, - openFlow(row) { - this.flowDialog.row = row; - this.flowDialog.visible = true; + async handleSubmit(row) { + await submit({ id: row.id }); + await submitMkApprovalFlow({ + bizType: 'pre-settlement', + bizId: row.id, + subjectName: row.preSettlementNo || '', + approvalStatus: row.approvalStatus || '', + }); + this.$message.success('提交成功'); + this.loadTable(); + }, + handleMkAudit(row) { + if (!row?.id) { + this.$message.warning('预结算单ID为空，无法打开审核页'); + return; + } + getMKApprovalUrl({ bizId: String(row.id) }) + .then(res => { + const url = res?.data?.data; + if (!url) { + this.$message.error('获取审核跳转地址失败'); + return; + } + window.open(url, '_blank'); + }) + .catch(() => { + this.$message.error('获取审核跳转地址失败'); + }); }, async handleApprove(row) { await this.$confirm('确认审批通过该预结算单？', '提示', { type: 'warning' }); diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue index 55575dd..1c99992 100644 --- a/src/views/vehicle/customer-archive.vue +++ b/src/views/vehicle/customer-archive.vue @@ -4288,7 +4288,7 @@ export default { submitCustomerApproval(id, fullName = '', approvalStatus = '') { return submitMkApprovalFlow({ bizType: 'customer-archive', - formInstanceId: id, + bizId: id, subjectName: fullName, approvalStatus, }).then(() => submitApproval(id));