From 286619b69e4004c6bcaff4cb19a40b77b053453d Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 01:21:33 +0800
Subject: [PATCH] feat: 前端补齐排产约束、风险监测与招投标比价界面

---
 src/views/mes/dv/repair/index.vue                     |   83 +++++++++
 src/views/aftersales/ticket/data.ts                   |  106 ++---------
 src/views/bpm/model/form/modules/bpm-model-editor.vue |   16 +
 src/views/mes/pro/task/data.ts                        |   16 +
 src/views/safety/hazard/index.vue                     |    9 
 src/api/safety/risk-source.ts                         |   11 +
 src/views/mes/pro/workorder/data.ts                   |   15 +
 src/views/srm/tender/detail.vue                       |   80 ++++++++
 src/api/safety/index.ts                               |    2 
 src/views/bpm/model/form/modules/form-design.vue      |   14 
 src/views/mes/pro/task/modules/auto-schedule.vue      |    2 
 src/views/aftersales/ticket/modules/form.vue          |   27 --
 src/views/bpm/model/form/modules/process-design.vue   |    2 
 src/api/bpm/model/index.ts                            |    2 
 src/api/mes/pro/workorder/index.ts                    |    3 
 src/views/mes/pro/task/index.vue                      |   12 +
 src/views/aftersales/return/detail.vue                |   27 +-
 src/views/safety/risk-source/index.vue                |   57 ++++++
 src/views/basicData/mdm/data.ts                       |   12 +
 src/views/bpm/model/form/index.vue                    |   22 +
 src/api/mdm/item/index.ts                             |    2 
 21 files changed, 380 insertions(+), 140 deletions(-)

diff --git a/src/api/bpm/model/index.ts b/src/api/bpm/model/index.ts
index 8c83a1c..1cda40e 100644
--- a/src/api/bpm/model/index.ts
+++ b/src/api/bpm/model/index.ts
@@ -95,7 +95,7 @@
 
 /** 鍒涘缓娴佺▼妯″瀷 */
 export async function createModel(data: BpmModelApi.Model) {
-  return requestClient.post('/bpm/model/create', data);
+  return requestClient.post<string>('/bpm/model/create', data);
 }
 
 /** 鍒犻櫎娴佺▼妯″瀷 */
diff --git a/src/api/mdm/item/index.ts b/src/api/mdm/item/index.ts
index 9b0d538..19d50a7 100644
--- a/src/api/mdm/item/index.ts
+++ b/src/api/mdm/item/index.ts
@@ -28,6 +28,8 @@
     salesPrice?: number;
     costPrice?: number;
     safetyStock?: number;
+    leadTime?: number; // 閲囪喘鎻愬墠鏈燂紙澶╋級
+    outsourceLeadTime?: number; // 澶栧崗鎻愬墠鏈燂紙澶╋級
     minStock?: number;
     maxStock?: number;
     isBatchManaged: boolean;
diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts
index 011e339..f04391f 100644
--- a/src/api/mes/pro/workorder/index.ts
+++ b/src/api/mes/pro/workorder/index.ts
@@ -29,6 +29,9 @@
     vendorCode?: string; // 渚涘簲鍟嗙紪鐮�
     batchCode?: string; // 鎵规鍙�
     requestDate?: number; // 闇�姹傛棩鏈�
+    schedulePriority?: number; // 鎺掍骇浼樺厛绾э紝鏁板�艰秺澶ц秺浼樺厛
+    marketType?: 'DOMESTIC' | 'EXPORT'; // 鐢变笟鍔$‘璁ょ殑鍐呭閿�鍒嗙被
+    deliveryDeviation?: string; // 鎺掍骇椤垫寜闇�姹傛棩鏈熷拰瀹為檯瀹屾垚鏃ユ湡璁$畻鐨勮鏄�
     parentId?: number; // 鐖惰鍗曠紪鍙�
     parentCode?: string; // 鐖惰鍗曠紪鐮�
     finishDate?: number; // 瀹屾垚鏃堕棿
diff --git a/src/api/safety/index.ts b/src/api/safety/index.ts
index 0684c3d..ef07f31 100644
--- a/src/api/safety/index.ts
+++ b/src/api/safety/index.ts
@@ -423,7 +423,7 @@
 export function deleteHazard(id: number) {
   return requestClient.delete('/safety/hazard/delete', { params: { id } });
 }
-export function assignHazard(data: { id: number; assigneeId: number; rectifyDeadline?: string; remark?: string }) {
+export function assignHazard(data: { id: number; assigneeId: number; notifyUserId?: number; rectifyDeadline?: string; remark?: string }) {
   return requestClient.put('/safety/hazard/assign', data);
 }
 export function rectifyHazard(data: { id: number; rectifyDesc: string; rectifyPhotoUrls?: string }) {
diff --git a/src/api/safety/risk-source.ts b/src/api/safety/risk-source.ts
new file mode 100644
index 0000000..4d2be02
--- /dev/null
+++ b/src/api/safety/risk-source.ts
@@ -0,0 +1,11 @@
+import type { PageParam, PageResult } from '@vben/request';
+import { requestClient } from '#/api/request';
+export interface SafetyRiskSource {
+  id?: number; name: string; category: 'MAJOR' | 'HIGH_VOLTAGE' | 'OTHER'; location?: string;
+  metricName: string; unit?: string; lowerLimit?: number; upperLimit?: number;
+  currentValue?: number; observedAt?: string; riskStatus?: 'NORMAL' | 'ALARM' | 'UNKNOWN'; remark?: string;
+}
+export function getRiskSourcePage(params: PageParam & { name?: string }) { return requestClient.get<PageResult<SafetyRiskSource>>('/safety/risk-source/page', { params }); }
+export function createRiskSource(data: SafetyRiskSource) { return requestClient.post<number>('/safety/risk-source/create', data); }
+export function updateRiskSource(data: SafetyRiskSource) { return requestClient.put<boolean>('/safety/risk-source/update', data); }
+export function deleteRiskSource(id: number) { return requestClient.delete<boolean>('/safety/risk-source/delete', { params: { id } }); }
diff --git a/src/views/aftersales/return/detail.vue b/src/views/aftersales/return/detail.vue
index 7dab7ef..b91cd16 100644
--- a/src/views/aftersales/return/detail.vue
+++ b/src/views/aftersales/return/detail.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import type { AftersalesReturnApi } from '#/api/aftersales/return';
 import type { AftersalesTicketApi } from '#/api/aftersales/ticket';
-import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
 import { computed, onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
@@ -9,13 +8,12 @@
 import { Page } from '@vben/common-ui';
 import { AftersaleReturnStatusEnum } from '@vben/constants';
 
-import { Button, Card, Descriptions, message, Popconfirm, Select, Tag } from 'ant-design-vue';
+import { Button, Card, Descriptions, InputNumber, message, Popconfirm, Select, Tag } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { approveReturn, 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';
 
 defineOptions({ name: 'AftersalesReturnDetail' });
 
@@ -25,7 +23,7 @@
 const submitting = ref(false);
 const returnData = ref<AftersalesReturnApi.Return>();
 const ticketData = ref<AftersalesTicketApi.Ticket>();
-const saleOrderItems = ref<ErpSaleOrderApi.SaleOrderItem[]>([]);
+const returnUnitPrices = ref<Record<number, number | undefined>>({});
 
 const returnId = computed(() => route.params.id as string);
 const ticketIdFromQuery = computed(() => Number(route.query.ticketId || 0));
@@ -121,26 +119,18 @@
   loading.value = true;
   try {
     ticketData.value = await getTicket(ticketIdFromQuery.value);
-    saleOrderItems.value = [];
-    if (ticketData.value?.saleOrderId) {
-      const order = await getSaleOrder(ticketData.value.saleOrderId);
-      saleOrderItems.value = order.items || [];
-    }
+    returnUnitPrices.value = {};
   } finally {
     loading.value = false;
   }
 }
 
 async function handleTicketChange(item: Record<string, unknown> | undefined) {
-  saleOrderItems.value = [];
+  returnUnitPrices.value = {};
   if (!item?.id) { ticketData.value = undefined; return; }
   loading.value = true;
   try {
     ticketData.value = await getTicket(item.id as number);
-    if (ticketData.value?.saleOrderId) {
-      const order = await getSaleOrder(ticketData.value.saleOrderId);
-      saleOrderItems.value = order.items || [];
-    }
   } finally {
     loading.value = false;
   }
@@ -165,6 +155,10 @@
       message.warning('璇峰厛鍦ㄥ敭鍚庡伐鍗曚腑濉啓鏈夋晥鐨勯��璐х墿鏂欏強鏁伴噺');
       return;
     }
+    if (needReturnItems.value.some((item) => item.id == null || returnUnitPrices.value[item.id] == null || !Number.isFinite(returnUnitPrices.value[item.id]) || returnUnitPrices.value[item.id]! < 0)) {
+      message.warning('璇蜂负姣忔潯閫�璐х墿鏂欏~鍐欑粡纭鐨勯潪璐熷崟浠�');
+      return;
+    }
     const newId = await createReturn({
       ticketId: ticketData.value!.id!,
       customerId: ticketData.value!.customerId!,
@@ -174,8 +168,7 @@
       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);
-        const unitPrice = orderItem?.productPrice || 0;
+        const unitPrice = returnUnitPrices.value[item.id!]!;
         const returnQuantity = item.returnQuantity || 0;
         return {
           ticketItemId: item.id,
@@ -253,6 +246,7 @@
                 <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-right">閫�璐у崟浠�</th>
               </tr>
             </thead>
             <tbody>
@@ -261,6 +255,7 @@
                 <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-right"><InputNumber v-if="item.id != null" v-model:value="returnUnitPrices[item.id]" :min="0" :precision="2" placeholder="璇疯緭鍏ュ崟浠�" /></td>
               </tr>
             </tbody>
           </table>
diff --git a/src/views/aftersales/ticket/data.ts b/src/views/aftersales/ticket/data.ts
index 15c83cc..a817877 100644
--- a/src/views/aftersales/ticket/data.ts
+++ b/src/views/aftersales/ticket/data.ts
@@ -1,7 +1,6 @@
 import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { AftersalesTicketApi } from '#/api/aftersales/ticket';
-import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
 import { h, markRaw } from 'vue';
 
@@ -12,7 +11,6 @@
 
 import { z } from '#/adapter/form';
 import CrmCustomerSelect from '#/components/crm-customer-select.vue';
-import { ErpSaleOrderSelect } from '#/views/erp/sale/order/components';
 import { MdItemSelect } from '#/views/mes/md/item/components';
 import { WmBatchSelect } from '#/views/wls/batch/components';
 import { UserSelect } from '#/views/system/user/components';
@@ -42,8 +40,6 @@
 /** 宸ュ崟琛ㄥ崟 */
 export function useTicketFormSchema(
   formType: TicketFormType,
-  formApi?: VbenFormApi,
-  onSaleOrderChange?: (order: Record<string, unknown> | undefined) => void,
 ): VbenFormSchema[] {
   const readonly = isHeaderReadonly(formType);
   return [
@@ -73,30 +69,10 @@
       rules: 'required',
     },
     {
-      fieldName: 'saleOrderId',
-      label: '閿�鍞鍗曞彿',
-      component: markRaw(ErpSaleOrderSelect),
-      componentProps: {
-        placeholder: '璇烽�夋嫨閿�鍞鍗�',
-        outStatus: 3,
-        onChange: (item: Record<string, unknown> | undefined) => {
-          if (formApi) {
-            formApi.setFieldValue('saleOrderNo', item?.no ?? '');
-            if (item?.customerId) {
-              formApi.setFieldValue('customerId', item.customerId);
-            }
-          }
-          onSaleOrderChange?.(item);
-        },
-      },
-    },
-    {
       fieldName: 'saleOrderNo',
+      label: '閿�鍞鍗曞彿',
       component: 'Input',
-      dependencies: {
-        triggerFields: [''],
-        show: () => false,
-      },
+      componentProps: { placeholder: '璇疯緭鍏ュ叧鑱旇鍗曞彿锛堥�夊~锛�' },
     },
     {
       fieldName: 'customerId',
@@ -375,38 +351,19 @@
 export function useTicketItemFormSchema(
   clientId?: number,
   salesOrderCode?: string,
-  orderItems?: ErpSaleOrderApi.SaleOrderItem[],
   formApi?: VbenFormApi,
 ): VbenFormSchema[] {
-  const hasOrderItems = orderItems && orderItems.length > 0;
   return [
     {
       fieldName: 'itemId',
       label: '鐗╂枡',
-      component: hasOrderItems ? 'Select' : markRaw(MdItemSelect),
-      componentProps: hasOrderItems
-        ? {
-            placeholder: '璇烽�夋嫨鐗╂枡',
-            options: orderItems!.map((oi) => ({
-              label: `${oi.productName || ''} (${oi.productBarCode || oi.productId})`,
-              value: oi.productId,
-            })),
-            showSearch: true,
-            onChange: (value: number) => {
-              const oi = orderItems!.find((o) => o.productId === value);
-              if (oi && formApi) {
-                formApi.setValues({
-                  itemName: oi.productName,
-                  itemCode: oi.productBarCode || '',
-                  saleQuantity: oi.count,
-                  batchCode: oi.batchCode || '',
-                });
-              }
-            },
-          }
-        : {
-            placeholder: '璇烽�夋嫨鐗╂枡',
-          },
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '璇烽�夋嫨鐗╂枡',
+        onChange: (item: { code?: string; name?: string } | undefined) => {
+          formApi?.setValues({ itemCode: item?.code || '', itemName: item?.name || '' });
+        },
+      },
       rules: 'selectRequired',
     },
     {
@@ -419,39 +376,18 @@
       component: 'Input',
       dependencies: { triggerFields: [''], show: () => false },
     },
-    ...(hasOrderItems
-      ? [
-          {
-            fieldName: 'batchCode',
-            label: '鎵规',
-            component: 'Input',
-            componentProps: {
-              disabled: true,
-              placeholder: '鑷姩浠庤鍗曞甫鍏�',
-            },
-          },
-        ]
-      : [
-          {
-            fieldName: 'batchId',
-            label: '鎵规',
-            component: markRaw(WmBatchSelect),
-            componentProps: {
-              clientId,
-              placeholder: '璇烽�夋嫨鎵规',
-              salesOrderCode,
-            },
-            dependencies: {
-              triggerFields: ['itemId'],
-              componentProps: (values: Record<string, unknown>) => ({
-                clientId,
-                itemId: values.itemId,
-                placeholder: '璇烽�夋嫨鎵规',
-                salesOrderCode,
-              }),
-            },
-          },
-        ]),
+    {
+      fieldName: 'batchId',
+      label: '鎵规',
+      component: markRaw(WmBatchSelect),
+      componentProps: { clientId, placeholder: '璇烽�夋嫨鎵规', salesOrderCode },
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values: Record<string, unknown>) => ({
+          clientId, itemId: values.itemId, placeholder: '璇烽�夋嫨鎵规', salesOrderCode,
+        }),
+      },
+    },
     {
       fieldName: 'saleQuantity',
       label: '閿�鍞暟閲�',
diff --git a/src/views/aftersales/ticket/modules/form.vue b/src/views/aftersales/ticket/modules/form.vue
index bdb3fab..1315fe4 100644
--- a/src/views/aftersales/ticket/modules/form.vue
+++ b/src/views/aftersales/ticket/modules/form.vue
@@ -2,7 +2,6 @@
 import type { TicketFormType } from '../data';
 
 import type { AftersalesTicketApi } from '#/api/aftersales/ticket';
-import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { computed, nextTick, ref } from 'vue';
@@ -24,7 +23,6 @@
   resolveTicket,
   updateTicket,
 } from '#/api/aftersales/ticket';
-import { getSaleOrder } from '#/api/erp/sale/order';
 import { $t } from '#/locales';
 
 import { useTicketFormSchema, useTicketItemFormSchema, useTicketItemGridColumns } from '../data';
@@ -75,17 +73,6 @@
   return $t('ui.actionTitle.create', ['鍞悗宸ュ崟']);
 });
 
-// 閿�鍞鍗曠墿鏂欒繃婊�
-const orderItems = ref<ErpSaleOrderApi.SaleOrderItem[]>([]);
-
-function handleSaleOrderChange(item: Record<string, unknown> | undefined) {
-  if (!item?.id) {
-    orderItems.value = [];
-    return;
-  }
-  orderItems.value = (item.items as ErpSaleOrderApi.SaleOrderItem[]) || [];
-}
-
 // 涓昏〃鍗�
 const [Form, formApi] = useVbenForm({
   commonConfig: { componentProps: { class: 'w-full' }, formItemClass: 'col-span-1', labelWidth: 110 },
@@ -131,11 +118,11 @@
 // Modal锛堝伐鍗曡〃鍗曞脊妗嗭級蹇呴』鍦� ItemModal 涔嬪墠锛岀‘淇� connectedComponent 娉ㄥ叆鍒版纭殑寮规
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
-    if (!isOpen) { formData.value = undefined; items.value = []; orderItems.value = []; showClassify.value = false; return; }
+    if (!isOpen) { formData.value = undefined; items.value = []; showClassify.value = false; return; }
     const data = modalApi.getData<{ formType: TicketFormType; id?: number }>();
     formType.value = data.formType;
     itemsGridApi.setGridOptions({ columns: useTicketItemGridColumns(isEdit.value) });
-    formApi.setState({ schema: useTicketFormSchema(formType.value, formApi, handleSaleOrderChange) });
+    formApi.setState({ schema: useTicketFormSchema(formType.value) });
     formApi.setDisabled(!isEdit.value);
     modalApi.setState({ showConfirmButton: false, showCancelButton: false });
     if (data?.id) {
@@ -152,10 +139,6 @@
             status: 'done', id: item.id,
           }));
           await formApi.setFieldValue('blobIds', blobIds);
-        }
-        if (formData.value?.saleOrderId) {
-          const order = await getSaleOrder(formData.value.saleOrderId);
-          orderItems.value = (order as Record<string, unknown>).items as ErpSaleOrderApi.SaleOrderItem[] || [];
         }
       } finally { modalApi.unlock(); }
     } else {
@@ -183,7 +166,7 @@
   onOpenChange(isOpen: boolean) {
     if (!isOpen) { editingItemIndex.value = null; return; }
     const d = itemModalApi.getData<AftersalesTicketApi.TicketItem | null>();
-    itemFormApi.setState({ schema: useTicketItemFormSchema(formData.value?.customerId, formData.value?.saleOrderNo, orderItems.value, itemFormApi) });
+    itemFormApi.setState({ schema: useTicketItemFormSchema(formData.value?.customerId, formData.value?.saleOrderNo, itemFormApi) });
     if (d) { itemFormApi.setValues(d as Record<string, unknown>); } else { itemFormApi.resetForm(); }
   },
 });
@@ -199,6 +182,10 @@
   submitting.value = true;
   try {
     const data = (await formApi.getValues()) as Record<string, unknown>;
+    if (formData.value?.saleOrderId && data.saleOrderNo !== formData.value.saleOrderNo) {
+      message.warning('姝ゅ伐鍗曞凡鍏宠仈鍘嗗彶璁㈠崟锛屼笉鑳界洿鎺ヤ慨鏀硅鍗曞彿');
+      return;
+    }
     if (formData.value?.id) {
       await updateTicket({ ...formData.value, ...data, items: items.value } as AftersalesTicketApi.Ticket);
     } else {
diff --git a/src/views/basicData/mdm/data.ts b/src/views/basicData/mdm/data.ts
index 051a99c..b351a85 100644
--- a/src/views/basicData/mdm/data.ts
+++ b/src/views/basicData/mdm/data.ts
@@ -289,6 +289,18 @@
       },
     },
     {
+      component: 'InputNumber',
+      fieldName: 'leadTime',
+      label: '閲囪喘鎻愬墠鏈燂紙澶╋級',
+      componentProps: { class: '!w-full', min: 0, precision: 0, placeholder: '璇疯緭鍏ラ噰璐彁鍓嶆湡' },
+    },
+    {
+      component: 'InputNumber',
+      fieldName: 'outsourceLeadTime',
+      label: '澶栧崗鎻愬墠鏈燂紙澶╋級',
+      componentProps: { class: '!w-full', min: 0, precision: 0, placeholder: '璇疯緭鍏ュ鍗忔彁鍓嶆湡' },
+    },
+    {
       component: "InputNumber",
       fieldName: "minStock",
       label: "鏈�浣庡簱瀛�",
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index e0b46ba..e4cedac 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -59,6 +59,10 @@
 
 const actionType = route.params.type as string; // 鎿嶄綔绫诲瀷锛歝reate銆乧opy銆乽pdate
 const currentStep = ref(-1); // 姝ラ鎺у埗銆�-1 鐢ㄤ簬锛屼竴寮�濮嬪叏閮ㄤ笉灞曠ず绛夊綋鍓嶉〉闈㈡暟鎹垵濮嬪寲瀹屾垚
+const processVisited = ref(false);
+watch(currentStep, (step) => {
+  if (step === 2) processVisited.value = true;
+}, { flush: 'sync' });
 const steps = [
   { title: '鍩烘湰淇℃伅', validator: validateBasic },
   { title: '琛ㄥ崟璁捐', validator: validateForm },
@@ -251,6 +255,11 @@
 
   // 娴佺▼璁捐鏍¢獙
   try {
+    if (!processDesignRef.value) {
+      currentStep.value = 2;
+      message.warning('璇峰厛妫�鏌ユ祦绋嬭璁�');
+      return false;
+    }
     await validateProcess();
   } catch {
     currentStep.value = 2;
@@ -335,7 +344,7 @@
     }
     deployLoading.value = true;
     // 1.2 鏍¢獙鎵�鏈夋楠�
-    await validateAllSteps();
+    if (!(await validateAllSteps())) return;
 
     // 2.1 鏇存柊琛ㄥ崟鏁版嵁
     const modelData = {
@@ -345,8 +354,7 @@
     if (formData.value.id) {
       await updateModel(modelData);
     } else {
-      const result = await createModel(modelData);
-      formData.value.id = result.id;
+      formData.value.id = await createModel(modelData);
     }
     // 2.3 鍙戝竷
     await deployModel(formData.value.id);
@@ -480,7 +488,7 @@
       <Card :body-style="{ padding: '10px' }" class="mb-4">
         <div class="mt-12">
           <!-- 绗竴姝ワ細鍩烘湰淇℃伅 -->
-          <div v-if="currentStep === 0" class="mx-auto w-4/6">
+          <div v-if="currentStep >= 0" v-show="currentStep === 0" class="mx-auto w-4/6">
             <BasicInfo
               v-model="formData"
               :category-list="categoryList"
@@ -490,7 +498,7 @@
             />
           </div>
           <!-- 绗簩姝ワ細琛ㄥ崟璁捐  -->
-          <div v-if="currentStep === 1" class="mx-auto w-4/6">
+          <div v-if="currentStep >= 0" v-show="currentStep === 1" class="mx-auto w-4/6">
             <FormDesign
               v-model="formData"
               :form-list="formList"
@@ -500,7 +508,9 @@
 
           <!-- 绗笁姝ワ細娴佺▼璁捐 -->
           <ProcessDesign
-            v-if="currentStep === 2"
+            v-if="processVisited"
+            v-show="currentStep === 2"
+            :active="currentStep === 2"
             v-model="formData"
             ref="processDesignRef"
           />
diff --git a/src/views/bpm/model/form/modules/bpm-model-editor.vue b/src/views/bpm/model/form/modules/bpm-model-editor.vue
index de34e03..1194b19 100644
--- a/src/views/bpm/model/form/modules/bpm-model-editor.vue
+++ b/src/views/bpm/model/form/modules/bpm-model-editor.vue
@@ -3,7 +3,7 @@
 
 import type { BpmModelApi } from '#/api/bpm/model';
 
-import { inject, onBeforeUnmount, provide, ref, shallowRef, watch } from 'vue';
+import { inject, nextTick, onBeforeUnmount, provide, ref, shallowRef, watch } from 'vue';
 
 import { ContentWrap } from '@vben/common-ui';
 import { BpmModelFormType } from '@vben/constants';
@@ -22,7 +22,8 @@
 
 defineOptions({ name: 'BpmModelEditor' });
 
-defineProps<{
+const props = defineProps<{
+  active: boolean;
   modelId?: string;
   modelKey: string;
   modelName: string;
@@ -40,6 +41,17 @@
 const modelData = inject('modelData') as Ref; // 娉ㄥ叆妯″瀷鏁版嵁
 
 const modeler = shallowRef(); // BPMN Modeler
+let fitted = false;
+watch(() => [props.active, modeler.value] as const, async ([active, instance]) => {
+  if (!active || !instance) return;
+  await nextTick();
+  const canvas = instance.get('canvas');
+  canvas.resized();
+  if (!fitted) {
+    canvas.zoom('fit-viewport', 'auto');
+    fitted = true;
+  }
+});
 const controlForm = ref({
   simulation: true,
   labelEditing: false,
diff --git a/src/views/bpm/model/form/modules/form-design.vue b/src/views/bpm/model/form/modules/form-design.vue
index 3e6d6dd..0a226af 100644
--- a/src/views/bpm/model/form/modules/form-design.vue
+++ b/src/views/bpm/model/form/modules/form-design.vue
@@ -57,19 +57,21 @@
   ],
 };
 
-/** 鐩戝惉琛ㄥ崟 ID 鍙樺寲锛屽姞杞借〃鍗曟暟鎹� */
+/** 琛ㄥ崟绫诲瀷鎴� ID 鍙樺寲鏃跺悓姝ラ瑙堬紝閬垮厤寮傛璇锋眰瑕嗙洊鏂扮殑閫夋嫨銆� */
+let formRequest = 0;
 watch(
-  () => modelData.value.formId,
-  async (newFormId) => {
-    if (newFormId && modelData.value.formType === BpmModelFormType.NORMAL) {
+  () => [modelData.value.formId, modelData.value.formType] as const,
+  async ([newFormId, newFormType]) => {
+    const request = ++formRequest;
+    formPreview.value.rule = [];
+    if (newFormId && newFormType === BpmModelFormType.NORMAL) {
       const data = await getForm(newFormId);
+      if (request !== formRequest) return;
       setConfAndFields2(formPreview.value, data.conf, data.fields);
       // 璁剧疆鍙
       formPreview.value.rule.forEach((item) => {
         item.props = { ...item.props, disabled: true };
       });
-    } else {
-      formPreview.value.rule = [];
     }
   },
   { immediate: true },
diff --git a/src/views/bpm/model/form/modules/process-design.vue b/src/views/bpm/model/form/modules/process-design.vue
index 8f2495b..72e57b1 100644
--- a/src/views/bpm/model/form/modules/process-design.vue
+++ b/src/views/bpm/model/form/modules/process-design.vue
@@ -9,6 +9,7 @@
 import SimpleModelDesign from './simple-model-design.vue';
 
 const modelData = defineModel<any>(); // 鍒涘缓鏈湴鏁版嵁鍓湰
+defineProps<{ active: boolean }>();
 const processData = inject('processData') as Ref;
 
 const simpleDesign = ref();
@@ -61,6 +62,7 @@
         :model-id="modelData.id"
         :model-key="modelData.key"
         :model-name="modelData.name"
+        :active="active"
         @success="handleDesignSuccess"
       />
     </template>
diff --git a/src/views/mes/dv/repair/index.vue b/src/views/mes/dv/repair/index.vue
index 8d9995d..8ebe49b 100644
--- a/src/views/mes/dv/repair/index.vue
+++ b/src/views/mes/dv/repair/index.vue
@@ -1,19 +1,76 @@
 锘�<script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvRepairApi } from '#/api/mes/dv/repair';
+import type { MesCollectApi } from '#/api/mes/dv/collect';
+
+import { onBeforeUnmount, ref } from 'vue';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 import { MesDvRepairStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
-import { Button, message } from 'ant-design-vue';
+import { Alert, Button, Descriptions, message, Modal, Table } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteRepair, exportRepair, getRepairPage } from '#/api/mes/dv/repair';
+import { getCollectAlarmPage, getCollectDeviceList } from '#/api/mes/dv/collect';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
+
+const diagnosisOpen = ref(false);
+const diagnosisLoading = ref(false);
+const diagnosisError = ref('');
+const diagnosisRow = ref<MesDvRepairApi.Repair>();
+const diagnosisDevice = ref<MesCollectApi.CollectDevice>();
+const diagnosisAlarms = ref<MesCollectApi.CollectAlarm[]>([]);
+let diagnosisSequence = 0;
+let diagnosisTimer: ReturnType<typeof setInterval> | undefined;
+
+async function refreshDiagnosis() {
+  const row = diagnosisRow.value;
+  if (!diagnosisOpen.value || !row?.machineryId || diagnosisLoading.value) return;
+  const sequence = ++diagnosisSequence;
+  diagnosisLoading.value = true;
+  diagnosisError.value = '';
+  try {
+    const devices = await getCollectDeviceList();
+    const device = devices.find((item) => item.machineryId === row.machineryId);
+    const alarms = device?.collectDeviceCode
+      ? await getCollectAlarmPage({ pageNo: 1, pageSize: 20, deviceCode: device.collectDeviceCode } as any)
+      : undefined;
+    if (sequence !== diagnosisSequence) return;
+    diagnosisDevice.value = device;
+    diagnosisAlarms.value = alarms?.list || [];
+  } catch {
+    if (sequence === diagnosisSequence) {
+      diagnosisDevice.value = undefined;
+      diagnosisAlarms.value = [];
+      diagnosisError.value = '璁惧鏁伴噰鎴栧憡璀︽暟鎹姞杞藉け璐ワ紝璇锋鏌ユ潈闄愬拰鏁伴噰鏈嶅姟銆�';
+    }
+  } finally {
+    if (sequence === diagnosisSequence) diagnosisLoading.value = false;
+  }
+}
+function openDiagnosis(row: MesDvRepairApi.Repair) {
+  diagnosisSequence++;
+  diagnosisLoading.value = false;
+  diagnosisRow.value = row;
+  diagnosisDevice.value = undefined;
+  diagnosisAlarms.value = [];
+  diagnosisOpen.value = true;
+  void refreshDiagnosis();
+  if (diagnosisTimer) clearInterval(diagnosisTimer);
+  diagnosisTimer = setInterval(() => void refreshDiagnosis(), 30000);
+}
+function closeDiagnosis() {
+  diagnosisSequence++;
+  diagnosisLoading.value = false;
+  if (diagnosisTimer) clearInterval(diagnosisTimer);
+  diagnosisTimer = undefined;
+}
+onBeforeUnmount(closeDiagnosis);
 
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: Form,
@@ -170,9 +227,33 @@
               auth: ['mes:dv-repair:query'],
               onClick: handleDetail.bind(null, row),
             },
+            {
+              label: '鏁伴噰璇婃柇',
+              type: 'link',
+              auth: ['mes:collect:query'],
+              onClick: openDiagnosis.bind(null, row),
+            },
           ]"
         />
       </template>
     </Grid>
+    <Modal v-model:open="diagnosisOpen" title="璁惧鏁伴噰璇婃柇" :footer="null" width="800px" @cancel="closeDiagnosis">
+      <Alert class="mb-4" type="info" show-icon message="鏄剧ず鏈�杩戦噰闆嗘暟鎹拰鍛婅锛�30 绉掑埛鏂颁竴娆★紱閫氫俊绂荤嚎涓嶇瓑鍚屼簬鏈烘鏁呴殰銆�" />
+      <Alert v-if="diagnosisError" class="mb-4" type="error" show-icon :message="diagnosisError" />
+      <template v-else-if="diagnosisDevice">
+        <Descriptions bordered size="small" :column="2">
+          <Descriptions.Item label="璁惧">{{ diagnosisDevice.machineryName || diagnosisRow?.machineryName || '-' }}</Descriptions.Item>
+          <Descriptions.Item label="鍦ㄧ嚎鐘舵��">{{ diagnosisDevice.online == null ? '鏈煡' : diagnosisDevice.online ? '鍦ㄧ嚎' : '绂荤嚎' }}</Descriptions.Item>
+          <Descriptions.Item label="杩愯鐘舵��">{{ diagnosisDevice.stsName || '鏈笂鎶�' }}</Descriptions.Item>
+          <Descriptions.Item label="鏈�杩戦噰闆�">{{ diagnosisDevice.lastCollectTime || '鏆傛棤鏁版嵁' }}</Descriptions.Item>
+          <Descriptions.Item label="鏈秷闄ゅ憡璀�">{{ diagnosisDevice.activeAlarmCount ?? '鏈煡' }}</Descriptions.Item>
+          <Descriptions.Item label="缃戝叧鍘熷鍊�">{{ diagnosisDevice.dataJson || '鏆傛棤鏁版嵁' }}</Descriptions.Item>
+        </Descriptions>
+        <Table class="mt-4" :loading="diagnosisLoading" :data-source="diagnosisAlarms" :pagination="false" row-key="id" size="small"
+          :columns="[{ title: '鍛婅鏃堕棿', dataIndex: 'wmTime' }, { title: '鍛婅鍐呭', dataIndex: 'wmMsg' }, { title: '鐘舵��', dataIndex: 'status' }]" />
+      </template>
+      <Alert v-else-if="!diagnosisLoading" type="warning" show-icon message="璁惧鏈叧鑱旀暟閲囨垨娌℃湁瀵瑰簲閲囬泦鏁版嵁锛屾棤娉曡繘琛岃繙绋嬫暟鎹瘖鏂��" />
+      <Button class="mt-4" :loading="diagnosisLoading" @click="refreshDiagnosis">鍒锋柊</Button>
+    </Modal>
   </Page>
 </template>
diff --git a/src/views/mes/pro/task/data.ts b/src/views/mes/pro/task/data.ts
index d6cc4ab..6190120 100644
--- a/src/views/mes/pro/task/data.ts
+++ b/src/views/mes/pro/task/data.ts
@@ -159,6 +159,22 @@
       width: 100,
     },
     {
+      field: 'schedulePriority',
+      title: '鎺掍骇浼樺厛绾�',
+      width: 100,
+    },
+    {
+      field: 'marketType',
+      title: '鍐呭閿�',
+      width: 90,
+      formatter: ({ cellValue }) => cellValue === 'DOMESTIC' ? '鍐呴攢' : cellValue === 'EXPORT' ? '澶栭攢' : '鏈缃�',
+    },
+    {
+      field: 'deliveryDeviation',
+      title: '浜ゆ湡鍋忓樊',
+      width: 130,
+    },
+    {
       field: 'progressPercent',
       title: '鐘舵�佽繘搴�',
       width: 150,
diff --git a/src/views/mes/pro/task/index.vue b/src/views/mes/pro/task/index.vue
index f6877ba..8321c5b 100644
--- a/src/views/mes/pro/task/index.vue
+++ b/src/views/mes/pro/task/index.vue
@@ -12,6 +12,7 @@
 } from '@vben/constants';
 
 import { Button, Card, Progress, Tabs, message } from 'ant-design-vue';
+import dayjs from 'dayjs';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getGanttTaskList } from '#/api/mes/pro/task';
@@ -106,6 +107,17 @@
   const quantity = row.quantity ?? 0;
   const produced = row.quantityProduced ?? 0;
   Object.assign(row, { completionProgressQuantity: isCompletedWorkOrder(row) ? Math.max(produced, quantity) : produced });
+  if (row.status === MesProWorkOrderStatusEnum.CANCELED) {
+    row.deliveryDeviation = '宸插彇娑�';
+  } else if (!row.requestDate || !dayjs(row.requestDate).isValid()) {
+    row.deliveryDeviation = '鏈缃氦鏈�';
+  } else if (isCompletedWorkOrder(row) && (!row.finishDate || !dayjs(row.finishDate).isValid())) {
+    row.deliveryDeviation = '缂哄皯瀹為檯瀹屾垚鏃堕棿';
+  } else {
+    const measured = isCompletedWorkOrder(row) ? dayjs(row.finishDate) : dayjs();
+    const days = measured.startOf('day').diff(dayjs(row.requestDate).startOf('day'), 'day');
+    row.deliveryDeviation = days > 0 ? `${isCompletedWorkOrder(row) ? '寤舵湡' : '宸查�炬湡'} ${days} 澶ー : isCompletedWorkOrder(row) ? '鎸夋湡瀹屾垚' : '鏈�炬湡';
+  }
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/src/views/mes/pro/task/modules/auto-schedule.vue b/src/views/mes/pro/task/modules/auto-schedule.vue
index 69d81dd..3b2bfc9 100644
--- a/src/views/mes/pro/task/modules/auto-schedule.vue
+++ b/src/views/mes/pro/task/modules/auto-schedule.vue
@@ -126,7 +126,7 @@
   <Modal title="涓�閿帓浜�" class="w-[min(96vw,1200px)]">
     <div class="space-y-5 px-1">
       <Alert type="info" show-icon message="鍏堟牎楠屼笌棰勮锛屽啀纭鎺掍骇"
-        description="鎸変氦鏈熶紭鍏堝強宸ュ簭椤哄簭瀹夋帓宸ヤ綔绔欎笌璁惧锛涙瘡澶�09:00鈥�18:00锛屾帓闄ゅ懆鏈拰宸查厤缃妭鍋囨棩锛岄潪宸ヤ綔鏃堕棿鑷姩椤哄欢銆傚凡閮ㄥ垎鎺掍骇鐨勫伐鍗曞彧琛ラ綈鍓╀綑鏁伴噺锛屾渶澶�30涓伐鍗曘��200涓柊浠诲姟銆�" />
+        description="鎸夊伐鍗� BOM 鍜屽綋鍓嶅彲鐢ㄥ簱瀛樻鏌ラ綈濂楋紝鎵i櫎鍐荤粨銆佸崰鐢ㄥ強鍚敤鐨勫畨鍏ㄥ簱瀛橈紝涓嶅惈铏氭嫙绾胯竟搴擄紱鍏堟寜鎺掍骇浼樺厛绾с�佸啀鎸変氦鏈熷畨鎺掕澶囥�傛彁浜ゆ椂閲嶆柊妫�鏌ワ紝鎺掍骇涓嶄細棰勫崰搴撳瓨锛涚埗瀛愬伐鍗曠殑鏈潵浜у嚭涓嶈浣滅幇鏈夊簱瀛樸��" />
       <div class="flex flex-wrap items-end gap-3">
         <label class="flex flex-col gap-2">
           <span class="font-medium">鏈�鏃╁紑宸ユ椂闂�</span>
diff --git a/src/views/mes/pro/workorder/data.ts b/src/views/mes/pro/workorder/data.ts
index cdc4573..7dc34c3 100644
--- a/src/views/mes/pro/workorder/data.ts
+++ b/src/views/mes/pro/workorder/data.ts
@@ -251,6 +251,21 @@
       help: '棰勮浜や粯/瀹屾垚鏃ユ湡锛岀敤浜庢帓浜с�佽繘搴﹁窡韪笌浜ゆ湡棰勮銆�',
       rules: 'required',
     },
+    {
+      fieldName: 'schedulePriority',
+      label: '鎺掍骇浼樺厛绾�',
+      component: 'InputNumber',
+      componentProps: { min: 0, max: 100, precision: 0, disabled: headerReadonly, class: '!w-full' },
+      defaultValue: 0,
+      help: '鏁板瓧瓒婂ぇ瓒婂厛鎺掞紱鐩稿悓浼樺厛绾ф寜浜ゆ湡鎺掑簭锛岀埗宸ュ崟浠嶉渶绛夊緟瀛愬伐鍗曘��',
+    },
+    {
+      fieldName: 'marketType',
+      label: '甯傚満绫诲瀷',
+      component: 'Select',
+      componentProps: { disabled: headerReadonly, allowClear: true, options: [{ label: '鍐呴攢', value: 'DOMESTIC' }, { label: '澶栭攢', value: 'EXPORT' }] },
+      help: '鎸変笟鍔″疄闄呴�夋嫨锛涙帓浜т紭鍏堢骇鐢变笂鏂瑰瓧娈靛崟鐙淮鎶ゃ��',
+    },
     // {
     //   fieldName: 'feedbackRole',
     //   label: '鎶ュ伐瑙掕壊',
diff --git a/src/views/safety/hazard/index.vue b/src/views/safety/hazard/index.vue
index 57e481e..e3da5fe 100644
--- a/src/views/safety/hazard/index.vue
+++ b/src/views/safety/hazard/index.vue
@@ -38,6 +38,7 @@
   uploadSafetyFiles,
 } from '#/api/safety';
 import EmployeeSelect from '#/views/hrm/employee/components/select-dropdown.vue';
+import { UserSelect } from '#/views/system/user/components';
 
 import {
   HAZARD_LEVEL_COLOR,
@@ -99,7 +100,7 @@
 };
 
 const assignOpen = ref(false);
-const assignModel = reactive<{ id: number; assigneeId?: number; rectifyDeadline?: string; remark?: string }>({
+const assignModel = reactive<{ id: number; assigneeId?: number; notifyUserId?: number; rectifyDeadline?: string; remark?: string }>({
   id: 0,
   assigneeId: undefined,
 });
@@ -215,6 +216,7 @@
 function openAssign(row: SafetyApi.Hazard) {
   assignModel.id = row.id!;
   assignModel.assigneeId = row.assigneeId;
+  assignModel.notifyUserId = undefined;
   assignModel.rectifyDeadline = row.rectifyDeadline;
   assignModel.remark = '';
   assignOpen.value = true;
@@ -230,6 +232,7 @@
     await assignHazard({
       id: assignModel.id,
       assigneeId: assignModel.assigneeId,
+      notifyUserId: assignModel.notifyUserId,
       rectifyDeadline: assignModel.rectifyDeadline,
       remark: assignModel.remark,
     });
@@ -498,6 +501,10 @@
         <FormItem label="鏁存敼璐d换浜�" required>
           <EmployeeSelect v-model="assignModel.assigneeId" placeholder="杈撳叆濮撳悕鎴栧伐鍙锋悳绱㈡暣鏀硅矗浠讳汉" />
         </FormItem>
+        <FormItem label="閫氱煡鎺ユ敹璐﹀彿">
+          <UserSelect v-model="assignModel.notifyUserId" placeholder="鍛樺伐鏈粦瀹氳处鍙锋椂锛岃鏄庣‘閫夋嫨閫氱煡鎺ユ敹浜�" />
+          <div class="text-xs text-gray-500">鍛樺伐宸茬粦瀹氳处鍙锋椂鑷姩閫氱煡鏈汉锛涙湭缁戝畾鏃跺彲鎸囧畾浠f敹浜猴紝闇�鑷纭閫氱煡閫佽揪銆�</div>
+        </FormItem>
         <FormItem label="鏁存敼鏈熼檺">
           <DatePicker v-model:value="assignModel.rectifyDeadline" value-format="YYYY-MM-DD" class="w-full" />
         </FormItem>
diff --git a/src/views/safety/risk-source/index.vue b/src/views/safety/risk-source/index.vue
new file mode 100644
index 0000000..13c0419
--- /dev/null
+++ b/src/views/safety/risk-source/index.vue
@@ -0,0 +1,57 @@
+<script setup lang="ts">
+import type { SafetyRiskSource } from '#/api/safety/risk-source';
+import { onMounted, reactive, ref } from 'vue';
+import { Page } from '@vben/common-ui';
+import { Alert, Button, Card, Form, FormItem, Input, InputNumber, message, Modal, Popconfirm, Select, Space, Table, Tag } from 'ant-design-vue';
+import { createRiskSource, deleteRiskSource, getRiskSourcePage, updateRiskSource } from '#/api/safety/risk-source';
+
+defineOptions({ name: 'SafetyRiskSource' });
+const rows=ref<SafetyRiskSource[]>([]); const loading=ref(false); const saving=ref(false); const open=ref(false);
+const filters=reactive<{name?:string}>({}); const paging=reactive({current:1,pageSize:10,total:0});
+const blank=():SafetyRiskSource=>({name:'',category:'MAJOR',location:'',metricName:'',unit:'',lowerLimit:undefined,upperLimit:undefined,currentValue:undefined,remark:''});
+const model=reactive<SafetyRiskSource>(blank());
+const categories:Record<string,string>={MAJOR:'閲嶅ぇ鍗遍櫓婧�',HIGH_VOLTAGE:'楂樺帇璇曢獙鍖哄煙',OTHER:'鍏朵粬'};
+const states:Record<string,string>={NORMAL:'姝e父',ALARM:'瓒呴檺',UNKNOWN:'鏈煡'};
+const columns=[{title:'鍗遍櫓婧愬悕绉�',dataIndex:'name'},{title:'绫诲埆',key:'category'},{title:'浣嶇疆',dataIndex:'location'},
+ {title:'鐩戞祴鎸囨爣',dataIndex:'metricName'},{title:'褰撳墠鍊�',key:'value'},{title:'闃堝��',key:'limits'},
+ {title:'鏁板�煎彉鏇存椂闂�',dataIndex:'observedAt'},{title:'鐘舵��',key:'status'},{title:'鎿嶄綔',key:'action',width:150}];
+async function load(reset=false){if(reset)paging.current=1;loading.value=true;try{const r=await getRiskSourcePage({pageNo:paging.current,pageSize:paging.pageSize,...filters});rows.value=r.list;paging.total=r.total;}finally{loading.value=false;}}
+function edit(row?:SafetyRiskSource){Object.assign(model,blank(),{id:undefined},row||{});open.value=true;}
+async function save(){
+ if(!model.name.trim()||!model.metricName.trim()){message.warning('璇峰~鍐欏嵄闄╂簮鍚嶇О鍜岀洃娴嬫寚鏍�');return;}
+ if(model.lowerLimit!=null&&model.upperLimit!=null&&model.lowerLimit>model.upperLimit){message.warning('涓嬮檺涓嶈兘澶т簬涓婇檺');return;}
+ saving.value=true;try{if(model.id)await updateRiskSource(model);else await createRiskSource(model);message.success('淇濆瓨鎴愬姛');open.value=false;await load();}finally{saving.value=false;}
+}
+async function remove(id:number){await deleteRiskSource(id);message.success('宸插垹闄�');await load();}
+onMounted(()=>load());
+</script>
+<template>
+ <Page auto-content-height>
+  <Card title="鍗遍櫓婧愬彴璐�">
+   <Alert class="mb-4" type="info" show-icon message="浜哄伐缁存姢褰撳墠鐩戞祴鍊煎拰闃堝�硷紱姝ら〉闈笉浠h〃鐜板満鑷姩閲囬泦锛屼害涓嶄繚瀛樺巻鍙茶娴嬪簭鍒椼��" />
+   <Space class="mb-3"><Input v-model:value="filters.name" placeholder="鍗遍櫓婧愬悕绉�" allow-clear /><Button @click="load(true)">鏌ヨ</Button><Button v-access:code="['safety:risk:create']" type="primary" @click="edit()">鏂板鍗遍櫓婧�</Button></Space>
+   <Table :columns="columns" :data-source="rows" :loading="loading" :pagination="paging" row-key="id" :scroll="{x:1100}" @change="p=>{paging.current=p.current||1;paging.pageSize=p.pageSize||10;load();}">
+    <template #bodyCell="{column,record}">
+     <template v-if="column.key==='category'">{{categories[record.category]||record.category}}</template>
+     <template v-else-if="column.key==='value'">{{record.currentValue??'鏈綍鍏�'}} {{record.unit||''}}</template>
+     <template v-else-if="column.key==='limits'">{{record.lowerLimit??'涓嶉檺'}} 锝� {{record.upperLimit??'涓嶉檺'}} {{record.unit||''}}</template>
+     <Tag v-else-if="column.key==='status'" :color="record.riskStatus==='ALARM'?'red':record.riskStatus==='NORMAL'?'green':'default'">{{states[record.riskStatus]||'鏈煡'}}</Tag>
+     <Space v-else-if="column.key==='action'"><Button v-access:code="['safety:risk:update']" type="link" @click="edit(record as SafetyRiskSource)">缂栬緫</Button><Popconfirm title="纭鍒犻櫎璇ュ嵄闄╂簮锛�" @confirm="remove(record.id)"><Button v-access:code="['safety:risk:delete']" type="link" danger>鍒犻櫎</Button></Popconfirm></Space>
+    </template>
+   </Table>
+  </Card>
+  <Modal v-model:open="open" :title="model.id?'缂栬緫鍗遍櫓婧�':'鏂板鍗遍櫓婧�'" :confirm-loading="saving" @ok="save">
+   <Form layout="vertical">
+    <FormItem label="鍚嶇О" required><Input v-model:value="model.name" :maxlength="120" /></FormItem>
+    <FormItem label="绫诲埆" required><Select v-model:value="model.category" :options="Object.entries(categories).map(([value,label])=>({value,label}))" /></FormItem>
+    <FormItem label="浣嶇疆"><Input v-model:value="model.location" :maxlength="160" /></FormItem>
+    <FormItem label="鐩戞祴鎸囨爣" required><Input v-model:value="model.metricName" :maxlength="80" /></FormItem>
+    <FormItem label="鍗曚綅"><Input v-model:value="model.unit" :maxlength="32" /></FormItem>
+    <FormItem label="涓嬮檺锛堝彲绌猴級"><InputNumber v-model:value="model.lowerLimit" class="w-full" /></FormItem>
+    <FormItem label="涓婇檺锛堝彲绌猴級"><InputNumber v-model:value="model.upperLimit" class="w-full" /></FormItem>
+    <FormItem label="褰撳墠鍊硷紙浜哄伐褰曞叆锛�"><InputNumber v-model:value="model.currentValue" class="w-full" /></FormItem>
+    <FormItem label="澶囨敞"><Input.TextArea v-model:value="model.remark" :maxlength="500" /></FormItem>
+   </Form>
+  </Modal>
+ </Page>
+</template>
diff --git a/src/views/srm/tender/detail.vue b/src/views/srm/tender/detail.vue
index 3fb5fbb..f6ad010 100644
--- a/src/views/srm/tender/detail.vue
+++ b/src/views/srm/tender/detail.vue
@@ -142,6 +142,9 @@
 // ========== 鎶ヤ环绠$悊 ==========
 const quoteList = ref<SrmTenderApi.QuoteVO[]>([]);
 const quoteLoading = ref(false);
+const compareLoading = ref(false);
+const compareQuotes = ref<Record<number, SrmTenderApi.QuoteVO[]>>({});
+const compareLoaded = ref(false);
 const quoteFormVisible = ref(false);
 const quoteForm = ref<SrmTenderApi.QuoteVO>({ bidId: undefined!, tenderMaterialId: undefined! });
 const selectedBidId = ref<number>();
@@ -176,8 +179,50 @@
     else await createQuote(quoteForm.value);
     quoteFormVisible.value = false;
     await loadQuotes(selectedBidId.value);
+    compareLoaded.value = false;
   } catch { /* 璇锋眰灞傚凡鎻愮ず閿欒锛屼繚鐣欒〃鍗� */ }
 }
+
+/** 鎸夋姇鏍囧垎鍒鍙栨姤浠凤紝缂烘姤鐗╂枡涓嶅弬涓庡畬鏁存姤浠锋瘮杈冦�� */
+async function loadComparison() {
+  compareLoading.value = true;
+  compareLoaded.value = false;
+  try {
+    await Promise.all([loadBids(), loadMaterials()]);
+    const bids = bidList.value.filter((bid) => bid.id != null && bid.bidStatus !== BID_STATUS.WITHDRAWN);
+    const entries = await Promise.all(bids.map(async (bid) => [bid.id!, await getQuoteList(bid.id!)] as const));
+    compareQuotes.value = Object.fromEntries(entries);
+    compareLoaded.value = true;
+  } catch {
+    compareQuotes.value = {};
+    message.error('姣斾环鏁版嵁鍔犺浇澶辫触锛岃閲嶈瘯');
+  } finally {
+    compareLoading.value = false;
+  }
+}
+
+const comparisonRows = computed(() => bidList.value
+  .filter((bid) => bid.id != null && bid.bidStatus !== BID_STATUS.WITHDRAWN)
+  .map((bid) => {
+    const quotes = compareQuotes.value[bid.id!] || [];
+    const byMaterial = new Map(quotes.map((quote) => [quote.tenderMaterialId, quote]));
+    const valid = materialList.value.every((material) => material.id != null && byMaterial.get(material.id)?.quotePrice != null);
+    return { bid, quotes: byMaterial, complete: materialList.value.length > 0 && valid };
+  }));
+
+const comparableLowestPrices = computed(() => {
+  const result = new Map<number, number>();
+  for (const material of materialList.value) {
+    if (material.id == null) continue;
+    const quotes = comparisonRows.value.map((row) => row.quotes.get(material.id!))
+      .filter((quote): quote is SrmTenderApi.QuoteVO => quote?.quotePrice != null);
+    if (quotes.length < 2 || quotes.some((quote) => quote.taxRate == null)
+      || new Set(quotes.map((quote) => quote.taxRate)).size !== 1) continue;
+    const prices = quotes.map((quote) => Number(quote.quotePrice)).filter(Number.isFinite);
+    if (prices.length === quotes.length) result.set(material.id, Math.min(...prices));
+  }
+  return result;
+});
 function handleAddQuote() {
   quoteForm.value = { bidId: selectedBidId.value!, tenderMaterialId: undefined! };
   quoteFormVisible.value = true;
@@ -752,6 +797,41 @@
               </a-empty>
             </a-tab-pane>
 
+            <a-tab-pane v-if="isSimpleMode" key="comparison">
+              <template #tab>
+                <a-space :size="4"><IconifyIcon icon="ant-design:table-outlined" />渚涘簲鍟嗘瘮浠�</a-space>
+              </template>
+              <div class="mb-3 flex items-center gap-3">
+                <a-button :loading="compareLoading" @click="loadComparison">{{ compareLoaded ? '鍒锋柊姣斾环' : '鍔犺浇姣斾环' }}</a-button>
+                <span class="text-gray-500">鎸夌墿鏂欏睍绀烘姤浠凤紱鑷冲皯涓ゅ绋庣巼涓�鑷存椂鏍囪鏈�浣庡崟浠凤紝缂烘姤鎴栫◣鐜囦笉鍚岄渶浜哄伐鏍稿锛屽畾鏍囪繕闇�鑰冭檻鍟嗗姟鏉′欢銆�</span>
+              </div>
+              <div v-if="compareLoaded" class="overflow-x-auto">
+                <table class="w-full border-collapse text-sm">
+                  <thead><tr>
+                    <th class="border p-2 text-left">渚涘簲鍟� / 鎶曟爣缂栧彿</th>
+                    <th v-for="material in materialList" :key="material.id" class="border p-2 text-left">
+                      {{ material.productName }}锛坽{ material.productCode }}锛� / {{ material.quantity }} {{ material.unit }}
+                    </th>
+                    <th class="border p-2 text-left">瀹屾暣鎬� / 鎶曟爣鎬婚</th>
+                  </tr></thead>
+                  <tbody><tr v-for="row in comparisonRows" :key="row.bid.id">
+                    <td class="border p-2">{{ row.bid.supplierName }}<br />{{ row.bid.bidNo }}</td>
+                    <td v-for="material in materialList" :key="material.id" class="border p-2">
+                      <template v-if="material.id != null && row.quotes.get(material.id)?.quotePrice != null">
+                        鍗曚环 {{ row.quotes.get(material.id)?.quotePrice }}<br />
+                        <a-tag v-if="comparableLowestPrices.has(material.id) && Number(row.quotes.get(material.id)?.quotePrice) === comparableLowestPrices.get(material.id)" color="green">鏈�浣庡崟浠�</a-tag>
+                        绋庣巼 {{ row.quotes.get(material.id)?.taxRate != null ? `${row.quotes.get(material.id)?.taxRate}%` : '鏈~' }}<br />
+                        浜ゆ湡 {{ row.quotes.get(material.id)?.deliveryCycle != null ? `${row.quotes.get(material.id)?.deliveryCycle} 澶ー : '鏈~' }}
+                      </template>
+                      <span v-else class="text-orange-600">鏈姤浠�</span>
+                    </td>
+                    <td class="border p-2">{{ row.complete ? '宸叉姤鍏ㄩ儴鐗╂枡' : '鎶ヤ环涓嶅畬鏁�' }}<br />鎬婚 {{ row.bid.bidTotalAmount ?? '鏈淮鎶�' }}</td>
+                  </tr></tbody>
+                </table>
+                <a-empty v-if="!comparisonRows.length" description="鏆傛棤鏈夋晥鎶曟爣" />
+              </div>
+            </a-tab-pane>
+
             <!-- Tab4: 寮�鏍� -->
             <a-tab-pane v-if="!isSimpleMode" key="bidOpen">
               <template #tab>

--
Gitblit v1.9.3