From 0124d319ae10b39c6fdafba653578ac6facb404f Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 24 十月 2026 22:08:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_新高电力' into dev_新疆_新高电力

---
 src/views/crm/receivable/detail/index.vue               |    3 
 src/api/aftersales/return.ts                            |   11 ++
 src/views/aftersales/return/detail.vue                  |  139 ++++++++++++++++++++++++++++++----
 src/api/crm/receivable/index.ts                         |   10 +-
 src/views/crm/backlog/modules/receivable-audit-list.vue |   26 ++----
 src/views/aftersales/return/index.vue                   |    2 
 src/views/crm/receivable/index.vue                      |   35 +++-----
 src/views/mes/workbench/components/TaskListPanel.vue    |    4 
 8 files changed, 165 insertions(+), 65 deletions(-)

diff --git a/src/api/aftersales/return.ts b/src/api/aftersales/return.ts
index c37a93b..a0d5afe 100644
--- a/src/api/aftersales/return.ts
+++ b/src/api/aftersales/return.ts
@@ -33,6 +33,7 @@
     defectCategory?: string;
     totalReturnPrice?: number;
     actualRefundPrice?: number;
+    refundVoucherNo?: string;
     status?: number;
     auditUserId?: number;
     auditTime?: string;
@@ -63,6 +64,16 @@
   });
 }
 
+/** 纭绾夸笅閫�娆炬垨鎹㈣揣宸茬粡瀹為檯瀹屾垚锛岄檮鍑瘉鍙枫�� */
+export function completeRefund(data: { id: number; actualRefundPrice: number; voucherNo: string }) {
+  return requestClient.put<boolean>('/aftersales/return/complete-refund', data);
+}
+
+/** 鍙栨秷灏氭湭鍏ュ簱鐨勫敭鍚庨��璐х敵璇凤紝骞跺悓姝ュ彇娑堝叧鑱� MES 鍗曟嵁銆� */
+export function cancelReturn(id: number) {
+  return requestClient.put<boolean>('/aftersales/return/cancel', null, { params: { id } });
+}
+
 /** 鑾峰彇閫�璐х敵璇疯鎯� */
 export function getReturn(id: number) {
   return requestClient.get<AftersalesReturnApi.Return>(
diff --git a/src/api/crm/receivable/index.ts b/src/api/crm/receivable/index.ts
index 974be6e..363bd87 100644
--- a/src/api/crm/receivable/index.ts
+++ b/src/api/crm/receivable/index.ts
@@ -17,7 +17,7 @@
     invoiceId?: number;
     invoice?: InvoiceInfo;
     auditStatus: number;
-    processInstanceId: number;
+    processInstanceId?: string;
     returnTime: Date;
     returnType: number;
     price: number;
@@ -98,10 +98,10 @@
   return requestClient.download('/crm/receivable/export-excel', { params });
 }
 
-/** 鏇存柊鍥炴鐨勭姸鎬侊紙瀹℃牳/鍙嶅鏍革級 */
-export function updateReceivableStatus(id: number, status: number) {
-  return requestClient.put('/crm/receivable/update-status', null, {
-    params: { id, status },
+/** 鎻愪氦鍥炴 BPM 瀹℃壒 */
+export function submitReceivable(id: number) {
+  return requestClient.put('/crm/receivable/submit', null, {
+    params: { id },
   });
 }
 
diff --git a/src/views/aftersales/return/detail.vue b/src/views/aftersales/return/detail.vue
index b069656..2679118 100644
--- a/src/views/aftersales/return/detail.vue
+++ b/src/views/aftersales/return/detail.vue
@@ -7,31 +7,76 @@
 import { useRoute, useRouter } from 'vue-router';
 
 import { Page } from '@vben/common-ui';
+import { useAccess } from '@vben/access';
 import { AftersaleReturnStatusEnum } from '@vben/constants';
 
-import { Button, Card, Descriptions, message, Popconfirm, Select, Tag } from 'ant-design-vue';
+import { Button, Card, Descriptions, Input, InputNumber, message, Modal, Popconfirm, Select, Tag } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
-import { approveReturn, createReturn, getReturn } from '#/api/aftersales/return';
+import { approveReturn, cancelReturn, completeRefund, createReturn, getReturn } from '#/api/aftersales/return';
 import { getTicket } from '#/api/aftersales/ticket';
 import { AftersalesTicketSelect } from '#/views/aftersales/ticket/components';
-import { getSaleOrder } from '#/api/erp/sale/order';
+import { getSaleOrderItemListByOrderId } from '#/api/erp/sale/order';
 
 defineOptions({ name: 'AftersalesReturnDetail' });
 
 const route = useRoute();
 const router = useRouter();
+const { hasAccessByCodes } = useAccess();
 const loading = ref(false);
 const submitting = ref(false);
 const returnData = ref<AftersalesReturnApi.Return>();
 const ticketData = ref<AftersalesTicketApi.Ticket>();
 const saleOrderItems = ref<ErpSaleOrderApi.SaleOrderItem[]>([]);
+const requestedQuantities = ref<Record<number, number>>({});
+
+function initializeRequestedQuantities() {
+  requestedQuantities.value = Object.fromEntries(
+    (ticketData.value?.items || []).filter((item) => item.id).map((item) => [item.id!, item.returnQuantity || 0]),
+  );
+}
 
 const returnId = computed(() => route.params.id as string);
 const ticketIdFromQuery = computed(() => Number(route.query.ticketId || 0));
 const isCreate = computed(() => returnId.value === 'new');
 
 const isDraft = computed(() => returnData.value?.status === AftersaleReturnStatusEnum.DRAFT);
+const canConfirmRefund = computed(() => returnData.value?.status === AftersaleReturnStatusEnum.INBOUND
+  || (returnData.value?.returnType === 3 && returnData.value?.status === AftersaleReturnStatusEnum.SYNCED_MES));
+const canCancelReturn = computed(() => returnData.value?.status === AftersaleReturnStatusEnum.DRAFT
+  || returnData.value?.status === AftersaleReturnStatusEnum.SYNCED_MES
+  || returnData.value?.status === AftersaleReturnStatusEnum.QC_CHECKING
+  || returnData.value?.status === AftersaleReturnStatusEnum.QC_DONE);
+const refundModalOpen = ref(false);
+const refundSubmitting = ref(false);
+const actualRefundPrice = ref<number>(0);
+const refundVoucherNo = ref('');
+
+function openRefundModal() {
+  actualRefundPrice.value = returnData.value?.returnType === 2 ? 0 : (returnData.value?.totalReturnPrice || 0);
+  refundVoucherNo.value = '';
+  refundModalOpen.value = true;
+}
+
+async function handleConfirmRefund() {
+  if (!returnData.value?.id || !refundVoucherNo.value.trim()) {
+    message.warning('璇峰~鍐欓��娆炬祦姘村彿鎴栨崲璐у崟鍙�');
+    return;
+  }
+  refundSubmitting.value = true;
+  try {
+    await completeRefund({
+      id: returnData.value.id,
+      actualRefundPrice: actualRefundPrice.value || 0,
+      voucherNo: refundVoucherNo.value.trim(),
+    });
+    refundModalOpen.value = false;
+    message.success('閫�娆�/鎹㈣揣瀹屾垚锛屽伐鍗曞凡瀹岀粨');
+    await loadReturn();
+  } finally {
+    refundSubmitting.value = false;
+  }
+}
 
 const statusMap: Record<number, { color: string; label: string }> = {
   [AftersaleReturnStatusEnum.DRAFT]: { color: 'default', label: '鑽夌' },
@@ -121,9 +166,9 @@
   loading.value = true;
   try {
     ticketData.value = await getTicket(ticketIdFromQuery.value);
+    initializeRequestedQuantities();
     if (ticketData.value?.saleOrderId) {
-      const order = await getSaleOrder(ticketData.value.saleOrderId);
-      saleOrderItems.value = (order as Record<string, unknown>).items as ErpSaleOrderApi.SaleOrderItem[] || [];
+      saleOrderItems.value = await getSaleOrderItemListByOrderId(ticketData.value.saleOrderId);
     }
   } finally {
     loading.value = false;
@@ -135,9 +180,9 @@
   loading.value = true;
   try {
     ticketData.value = await getTicket(item.id as number);
+    initializeRequestedQuantities();
     if (ticketData.value?.saleOrderId) {
-      const order = await getSaleOrder(ticketData.value.saleOrderId);
-      saleOrderItems.value = (order as Record<string, unknown>).items as ErpSaleOrderApi.SaleOrderItem[] || [];
+      saleOrderItems.value = await getSaleOrderItemListByOrderId(ticketData.value.saleOrderId);
     }
   } finally {
     loading.value = false;
@@ -147,6 +192,11 @@
 const needReturnItems = computed(() =>
   (ticketData.value?.items || []).filter((item) => item.needReturn),
 );
+
+function findSaleOrderItem(item: AftersalesTicketApi.TicketItem) {
+  return saleOrderItems.value.find((orderItem) => orderItem.id === item.saleOrderItemId)
+    || saleOrderItems.value.find((orderItem) => orderItem.productId === item.itemId);
+}
 
 async function handleCreateReturn() {
   const { valid } = await createFormApi.validate();
@@ -160,6 +210,20 @@
   submitting.value = true;
   try {
     const formValues = await createFormApi.getValues();
+    const sourceItems = formValues.returnType === 3 ? (ticketData.value?.items || []) : needReturnItems.value;
+    const selectedItems = sourceItems.filter((item) => (requestedQuantities.value[item.id!] || 0) > 0);
+    if (!selectedItems.length) {
+      message.warning('璇蜂负鏈鐢宠濉啓鑷冲皯涓�椤规鏁版暟閲忥紱鏅�氶��璐у彧鑳介�夋嫨宸ュ崟鏍囪涓洪渶閫�璐х殑鐗╂枡');
+      return;
+    }
+    if (selectedItems.some((item) => (requestedQuantities.value[item.id!] || 0) > (item.saleQuantity || 0))) {
+      message.warning('鐢宠鏁伴噺涓嶈兘瓒呰繃宸ュ崟閿�鍞暟閲�');
+      return;
+    }
+    if (selectedItems.some((item) => !findSaleOrderItem(item))) {
+      message.warning('閿�鍞鍗曟槑缁嗕笌宸ュ崟鐗╂枡涓嶅尮閰嶏紝璇峰厛鏍稿宸ュ崟鍏宠仈鐨勯攢鍞鍗�');
+      return;
+    }
     const newId = await createReturn({
       ticketId: ticketData.value!.id!,
       customerId: ticketData.value!.customerId!,
@@ -168,10 +232,10 @@
       returnReason: formValues.returnReason as string,
       defectCategory: formValues.defectCategory as string | undefined,
       remark: formValues.remark as string | undefined,
-      items: needReturnItems.value.map((item) => {
-        const orderItem = saleOrderItems.value.find((oi) => oi.productId === item.itemId);
+      items: selectedItems.map((item) => {
+        const orderItem = findSaleOrderItem(item);
         const unitPrice = orderItem?.productPrice || 0;
-        const returnQuantity = item.returnQuantity || 0;
+        const returnQuantity = requestedQuantities.value[item.id!] || 0;
         return {
           ticketItemId: item.id,
           itemId: item.itemId,
@@ -196,7 +260,14 @@
 
 async function handleApprove() {
   await approveReturn(returnData.value!.id!);
-  message.success('瀹℃牳閫氳繃锛屽凡鍚屾MES鍒涘缓閫�璐у崟');
+  message.success(returnData.value?.returnType === 3 ? '瀹℃牳閫氳繃锛岀瓑寰呴��娆剧‘璁�' : '瀹℃牳閫氳繃锛屽凡鍚屾MES鍒涘缓閫�璐у崟');
+  await loadReturn();
+}
+
+async function handleCancel() {
+  if (!returnData.value?.id) return;
+  await cancelReturn(returnData.value.id);
+  message.success('閫�璐х敵璇峰凡鍙栨秷锛屽敭鍚庡伐鍗曞凡鎭㈠澶勭悊涓�');
   await loadReturn();
 }
 
@@ -215,6 +286,15 @@
 
 <template>
   <Page auto-content-height :loading="loading">
+    <Modal v-model:open="refundModalOpen" title="纭澶栭儴閫�娆�/鎹㈣揣宸插畬鎴�" :confirm-loading="refundSubmitting" @ok="handleConfirmRefund">
+      <div class="flex flex-col gap-3">
+        <p>浠呭湪璐㈠姟閫�娆惧埌璐︽垨鎹㈣揣瀹為檯瀹屾垚鍚庣‘璁ゃ�傜‘璁ゅ悗宸ュ崟灏嗚嚜鍔ㄥ畬缁撱��</p>
+        <div>瀹為檯閫�娆鹃噾棰濓紙鎹㈣揣鍙~ 0锛�</div>
+        <InputNumber v-model:value="actualRefundPrice" :min="0" :max="returnData?.totalReturnPrice" class="w-full" />
+        <div>閫�娆炬祦姘村彿鎴栨崲璐у崟鍙�</div>
+        <Input v-model:value="refundVoucherNo" :maxlength="100" placeholder="濉啓鍙拷婧殑鍑瘉鍙�" />
+      </div>
+    </Modal>
     <template #title>
       <div class="flex items-center gap-3">
         <Button @click="goBack">杩斿洖</Button>
@@ -235,7 +315,8 @@
         </Descriptions>
       </Card>
 
-      <Card v-if="needReturnItems.length" title="閫�璐ф槑缁�" class="mb-4">
+      <Card v-if="ticketData.items?.length" title="宸ュ崟鐗╂枡鏄庣粏" class="mb-4">
+        <p class="mb-2 text-sm text-gray-500">濉啓鏈鐢宠鏁伴噺銆傛櫘閫氶��璐т粎鎻愪氦鏍囪涓衡�滈渶閫�璐р�濈殑鐗╂枡锛涗粎閫�娆惧彲閫夋嫨浠绘剰宸ュ崟鐗╂枡銆�</p>
         <div class="overflow-x-auto">
           <table class="w-full border text-sm">
             <thead class="bg-gray-50">
@@ -243,15 +324,19 @@
                 <th class="border p-2 text-left">鐗╂枡缂栫爜</th>
                 <th class="border p-2 text-left">鐗╂枡鍚嶇О</th>
                 <th class="border p-2 text-left">鎵规鍙�</th>
-                <th class="border p-2 text-right">閫�璐ф暟閲�</th>
+                <th class="border p-2 text-center">闇�閫�璐�</th>
+                <th class="border p-2 text-right">鏈鐢宠鏁伴噺</th>
               </tr>
             </thead>
             <tbody>
-              <tr v-for="item in needReturnItems" :key="item.id">
+              <tr v-for="item in ticketData.items" :key="item.id">
                 <td class="border p-2">{{ item.itemCode }}</td>
                 <td class="border p-2">{{ item.itemName }}</td>
                 <td class="border p-2">{{ item.batchCode || '-' }}</td>
-                <td class="border p-2 text-right">{{ item.returnQuantity || '-' }}</td>
+                <td class="border p-2 text-center">{{ item.needReturn ? '鏄�' : '鍚�' }}</td>
+                <td class="border p-2 text-right">
+                  <InputNumber v-model:value="requestedQuantities[item.id!]" :min="0" :max="item.returnQuantity && item.returnQuantity > 0 ? Math.min(item.returnQuantity, item.saleQuantity || 0) : (item.saleQuantity || 0)" class="w-28" />
+                </td>
               </tr>
             </tbody>
           </table>
@@ -285,7 +370,8 @@
           <Descriptions.Item label="閫�璐у崟鍙�">{{ returnData.no }}</Descriptions.Item>
           <Descriptions.Item label="鐘舵��">
             <Tag :color="statusMap[returnData.status!]?.color">
-              {{ statusMap[returnData.status!]?.label }}
+              {{ returnData.returnType === 3 && returnData.status === AftersaleReturnStatusEnum.SYNCED_MES
+                ? '寰呴��娆剧‘璁�' : statusMap[returnData.status!]?.label }}
             </Tag>
           </Descriptions.Item>
           <Descriptions.Item label="瀹㈡埛">{{ returnData.customerName || '-' }}</Descriptions.Item>
@@ -301,6 +387,13 @@
           <Descriptions.Item label="MES閫�璐у崟鍙�">
             {{ returnData.mesReturnCode || '-' }}
           </Descriptions.Item>
+          <Descriptions.Item v-if="returnData.status === AftersaleReturnStatusEnum.SYNCED_MES
+            || returnData.status === AftersaleReturnStatusEnum.QC_DONE
+            || returnData.status === AftersaleReturnStatusEnum.INBOUND" label="涓嬩竴姝�" :span="3">
+            {{ returnData.status === AftersaleReturnStatusEnum.INBOUND ? '绛夊緟澶栭儴閫�娆炬垨鎹㈣揣瀹屾垚锛屽啀褰曞叆閲戦涓庡嚟璇佸彿'
+              : returnData.status === AftersaleReturnStatusEnum.QC_DONE ? '鍦� MES 閿�鍞��璐у崟瀹屾垚鎵ц涓庝笂鏋�'
+                : returnData.returnType === 3 ? '绛夊緟澶栭儴閫�娆惧畬鎴愬苟褰曞叆鍑瘉' : '鍦� MES 閿�鍞��璐у崟涓彁浜ゃ�佹楠屻�佷笂鏋讹紱鍏ュ簱鍚庡啀纭閫�娆炬垨鎹㈣揣' }}
+          </Descriptions.Item>
           <Descriptions.Item label="閫�璐у師鍥�" :span="3">
             {{ returnData.returnReason || '-' }}
           </Descriptions.Item>
@@ -311,6 +404,7 @@
           <Descriptions.Item label="瀹為��閲戦">
             {{ returnData.actualRefundPrice ? `楼${returnData.actualRefundPrice}` : '-' }}
           </Descriptions.Item>
+          <Descriptions.Item label="閫�娆�/鎹㈣揣鍑瘉">{{ returnData.refundVoucherNo || '-' }}</Descriptions.Item>
           <Descriptions.Item label="璐ㄦ缁撹">{{ returnData.qualityResult || '-' }}</Descriptions.Item>
           <Descriptions.Item label="鍏ュ簱鏃堕棿">{{ returnData.returnInboundTime || '-' }}</Descriptions.Item>
           <Descriptions.Item label="閫�娆炬椂闂�">{{ returnData.refundTime || '-' }}</Descriptions.Item>
@@ -349,13 +443,24 @@
     </template>
 
     <template #extra>
-      <div v-if="!isCreate && isDraft" class="flex gap-2">
+      <div v-if="!isCreate" class="flex gap-2">
         <Popconfirm
+          v-if="isDraft && hasAccessByCodes(['aftersales:return:approve'])"
           title="纭瀹℃牳閫氳繃璇ラ��璐х敵璇凤紵瀹℃牳鍚庡皢鑷姩鍚屾MES鍒涘缓閫�璐у崟銆�"
           @confirm="handleApprove"
         >
           <Button type="primary">瀹℃牳閫氳繃</Button>
         </Popconfirm>
+        <Popconfirm
+          v-if="canCancelReturn && hasAccessByCodes(['aftersales:return:cancel'])"
+          title="纭鍙栨秷閫�璐х敵璇凤紵鏈叆搴撶殑 MES 鍗曟嵁浼氬悓姝ュ彇娑堬紝宸ュ崟鎭㈠澶勭悊涓��"
+          @confirm="handleCancel"
+        >
+          <Button danger>鍙栨秷鐢宠</Button>
+        </Popconfirm>
+        <Button v-if="canConfirmRefund && hasAccessByCodes(['aftersales:return:refund'])" type="primary" @click="openRefundModal">
+          纭澶栭儴閫�娆�/鎹㈣揣瀹屾垚
+        </Button>
       </div>
     </template>
   </Page>
diff --git a/src/views/aftersales/return/index.vue b/src/views/aftersales/return/index.vue
index b2ed5b7..a56e723 100644
--- a/src/views/aftersales/return/index.vue
+++ b/src/views/aftersales/return/index.vue
@@ -117,7 +117,7 @@
       <template #status="{ row }">
         <Tag v-if="row.status === 0">鑽夌</Tag>
         <Tag v-else-if="row.status === 10" color="processing">閿�鍞鏍镐腑</Tag>
-        <Tag v-else-if="row.status === 20" color="processing">宸插悓姝ES</Tag>
+        <Tag v-else-if="row.status === 20" color="processing">{{ row.returnType === 3 ? '寰呴��娆剧‘璁�' : '宸插悓姝ES' }}</Tag>
         <Tag v-else-if="row.status === 30" color="warning">妫�楠屼腑</Tag>
         <Tag v-else-if="row.status === 40" color="warning">妫�楠屽畬鎴�</Tag>
         <Tag v-else-if="row.status === 50" color="success">宸插叆搴�</Tag>
diff --git a/src/views/crm/backlog/modules/receivable-audit-list.vue b/src/views/crm/backlog/modules/receivable-audit-list.vue
index a2a80be..400a738 100644
--- a/src/views/crm/backlog/modules/receivable-audit-list.vue
+++ b/src/views/crm/backlog/modules/receivable-audit-list.vue
@@ -5,28 +5,20 @@
 
 import { useRouter } from 'vue-router';
 
-import { Button, message } from 'ant-design-vue';
+import { Button } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { getReceivablePage, updateReceivableStatus } from '#/api/crm/receivable';
+import { getReceivablePage } from '#/api/crm/receivable';
 import { useGridColumns } from '#/views/crm/receivable/data';
 
 import { AUDIT_STATUS } from '../data';
 
 const { push } = useRouter();
 
-/** 瀹℃牳 */
-async function handleAudit(row: CrmReceivableApi.Receivable) {
-  const hideLoading = message.loading({
-    content: '瀹℃牳涓�...',
-    duration: 0,
-  });
-  try {
-    await updateReceivableStatus(row.id!, 20);
-    message.success('瀹℃牳鎴愬姛');
-    gridApi.query();
-  } finally {
-    hideLoading();
+/** 瀹℃壒鎿嶄綔鍦� BPM 娴佺▼璇︽儏涓姙鐞嗐�� */
+function handleAudit(row: CrmReceivableApi.Receivable) {
+  if (row.processInstanceId) {
+    push({ name: 'BpmProcessInstanceDetail', query: { id: row.processInstanceId } });
   }
 }
 
@@ -50,7 +42,7 @@
     schema: [
       {
         fieldName: 'auditStatus',
-        label: '鍚堝悓鐘舵��',
+        label: '鍥炴鐘舵��',
         component: 'Select',
         componentProps: {
           allowClear: true,
@@ -106,11 +98,11 @@
     </template>
     <template #actions="{ row }">
       <Button
-        v-if="row.auditStatus === 10"
+        v-if="row.auditStatus === 10 && row.processInstanceId"
         type="link"
         @click="handleAudit(row)"
       >
-        瀹℃牳
+        鏌ョ湅瀹℃壒
       </Button>
     </template>
   </Grid>
diff --git a/src/views/crm/receivable/detail/index.vue b/src/views/crm/receivable/detail/index.vue
index 39c84b9..9757fcd 100644
--- a/src/views/crm/receivable/detail/index.vue
+++ b/src/views/crm/receivable/detail/index.vue
@@ -99,7 +99,8 @@
             type: 'primary',
             icon: ACTION_ICON.EDIT,
             auth: ['crm:receivable:update'],
-            ifShow: permissionListRef?.validateWrite,
+            ifShow: permissionListRef?.validateWrite &&
+              (receivable.auditStatus === 0 || receivable.auditStatus === 30),
             onClick: handleEdit,
           },
         ]"
diff --git a/src/views/crm/receivable/index.vue b/src/views/crm/receivable/index.vue
index 289a143..9a2db52 100644
--- a/src/views/crm/receivable/index.vue
+++ b/src/views/crm/receivable/index.vue
@@ -15,7 +15,7 @@
   deleteReceivable,
   exportReceivable,
   getReceivablePage,
-  updateReceivableStatus,
+  submitReceivable,
 } from '#/api/crm/receivable';
 import { $t } from '#/locales';
 
@@ -76,18 +76,15 @@
   }
 }
 
-/** 鏇存柊鍥炴鐘舵�侊紙瀹℃牳/鍙嶅鏍革級 */
-async function handleUpdateStatus(
-  row: CrmReceivableApi.Receivable,
-  status: number,
-) {
+/** 鎻愪氦鍥炴瀹℃壒 */
+async function handleSubmit(row: CrmReceivableApi.Receivable) {
   const hideLoading = message.loading({
-    content: '鏇存柊鐘舵�佷腑...',
+    content: '姝e湪鎻愪氦瀹℃壒...',
     duration: 0,
   });
   try {
-    await updateReceivableStatus(row.id!, status);
-    message.success('鏇存柊鐘舵�佹垚鍔�');
+    await submitReceivable(row.id!);
+    message.success('鎻愪氦瀹℃壒鎴愬姛');
     handleRefresh();
   } finally {
     hideLoading();
@@ -216,24 +213,18 @@
               type: 'link',
               icon: ACTION_ICON.EDIT,
               auth: ['crm:receivable:update'],
-              ifShow: row.auditStatus === 10,
+              ifShow: row.auditStatus === 0 || row.auditStatus === 30,
               onClick: handleEdit.bind(null, row),
             },
             {
-              label: '瀹℃牳',
+              label: '鎻愪氦瀹℃壒',
               type: 'link',
-              icon: ACTION_ICON.AUDIT,
               auth: ['crm:receivable:update'],
-              ifShow: row.auditStatus === 10,
-              onClick: handleUpdateStatus.bind(null, row, 20),
-            },
-            {
-              label: '鍙嶅鏍�',
-              type: 'link',
-              icon: ACTION_ICON.VIEW,
-              auth: ['crm:receivable:update'],
-              ifShow: row.auditStatus === 20,
-              onClick: handleUpdateStatus.bind(null, row, 10),
+              ifShow: row.auditStatus === 0 || row.auditStatus === 30,
+              popConfirm: {
+                title: '纭鎻愪氦鍥炴瀹℃壒锛熸彁浜ゅ悗闇�鐢辨祦绋嬪鎵逛汉澶勭悊銆�',
+                confirm: handleSubmit.bind(null, row),
+              },
             },
             {
               label: $t('common.delete'),
diff --git a/src/views/mes/workbench/components/TaskListPanel.vue b/src/views/mes/workbench/components/TaskListPanel.vue
index 90141ef..bce994b 100644
--- a/src/views/mes/workbench/components/TaskListPanel.vue
+++ b/src/views/mes/workbench/components/TaskListPanel.vue
@@ -55,7 +55,7 @@
 const pauseLoading = ref(false);
 
 const pauseRules = {
-  reason: [{ required: true, message: '璇疯緭鍏ュ仠宸ュ師鍥�', trigger: 'blur' }],
+  reason: [{ required: true, message: '璇疯緭鍏ュ仠宸ュ師鍥�', trigger: 'blur' as const }],
 };
 
 function handlePause(item: PendingTask, event: Event) {
@@ -160,7 +160,7 @@
                 澶嶅伐
               </Button>
               <Button
-                v-else
+                v-else-if="item.status === 1 || item.status === 2"
                 type="primary"
                 danger
                 size="small"

--
Gitblit v1.9.3