From 2f50ccf7e0a909013b63e0b22662f8ca571ec844 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <Jin980303>
Date: Tue, 9 Dec 2025 19:31:02 +0800
Subject: [PATCH] no message

---
 src/views/inventory/Inventory.data.ts         | 36 ++++++++++---------
 .../inventory/components/InventoryForm.vue    |  2 +-
 src/views/inventoryLog/InventoryLog.data.ts   | 20 ++++++++++-
 src/views/monitor/log/index.vue               | 19 ++++++----
 src/views/monitor/log/log.data.ts             | 31 ++++++++--------
 src/views/receive/asn/Asn.data.ts             |  6 ----
 6 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/src/views/inventory/Inventory.data.ts b/src/views/inventory/Inventory.data.ts
index a0ec47e..0b34842 100644
--- a/src/views/inventory/Inventory.data.ts
+++ b/src/views/inventory/Inventory.data.ts
@@ -38,18 +38,30 @@ export const columns: BasicColumn[] = [
     width: 100,
 
   },
-  {
-    title: '批次号',
-    align: 'center',
-    dataIndex: 'propC1',
-    width: 100,
-  },
   {
     title: '外部仓库',
     align: 'center',
     dataIndex: 'whCode',
     width: 100,
   },
+  {
+    title: '项目号',
+    align: 'center',
+    dataIndex: 'project',
+    width: 100,
+  },
+  {
+    title: '任务号',
+    align: 'center',
+    dataIndex: 'taskNo',
+    width: 100,
+  },
+  {
+    title: '批次号',
+    align: 'center',
+    dataIndex: 'propC1',
+    width: 100,
+  },
   {
     title: '外部库存状态',
     align: 'center',
@@ -57,17 +69,7 @@ export const columns: BasicColumn[] = [
     width: 110,
   },
   {
-    title: '生产日期',
-    align: 'center',
-    dataIndex: 'propD1',
-    width: 100,
-    customRender: ({ text }) => {
-      text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
-      return text;
-    },
-  },
-  {
-    title: '描述',
+    title: '备注',
     align: 'center',
     dataIndex: 'description',
   },
diff --git a/src/views/inventory/components/InventoryForm.vue b/src/views/inventory/components/InventoryForm.vue
index 88736a3..aafcb28 100644
--- a/src/views/inventory/components/InventoryForm.vue
+++ b/src/views/inventory/components/InventoryForm.vue
@@ -121,7 +121,7 @@
     pointId: undefined,
     stockId: undefined,
     quantity: '',
-    queuedQty: '',
+    queuedQty: 0,
     whCode: '',
     propC1: '',
     propC2: '',
diff --git a/src/views/inventoryLog/InventoryLog.data.ts b/src/views/inventoryLog/InventoryLog.data.ts
index 31f7d60..b6c4973 100644
--- a/src/views/inventoryLog/InventoryLog.data.ts
+++ b/src/views/inventoryLog/InventoryLog.data.ts
@@ -61,6 +61,18 @@ export const columns: BasicColumn[] = [
     dataIndex: 'afterAllocatedQty',
     width: 120,
   },
+  {
+    title: '项目号',
+    align: 'center',
+    dataIndex: 'project',
+    width: 100,
+  },
+  {
+    title: '任务号',
+    align: 'center',
+    dataIndex: 'taskNo',
+    width: 100,
+  },
   {
     title: '批次号',
     align: 'center',
@@ -68,7 +80,13 @@ export const columns: BasicColumn[] = [
     width: 100,
   },
   {
-    title: '描述',
+    title: '外部库存状态',
+    align: 'center',
+    dataIndex: 'propC3',
+    width: 100,
+  },
+  {
+    title: '备注',
     align: 'center',
     dataIndex: 'description',
     ellipsis: true,
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index 772a14f..cf53619 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -18,13 +18,20 @@
     <template #expandedRowRender="{ record }">
       <div v-if="searchInfo.logType == 2">
         <div style="margin-bottom: 5px">
-          <a-badge status="success" style="vertical-align: middle" />
-          <span style="vertical-align: middle">请求方法:{{ record.method }}</span></div
-        >
-        <div>
+          <a-badge status="warning" style="vertical-align: middle" />
+          <span style="vertical-align: middle">请求地址:{{ record.requestUrl }}</span>
+        </div>
+
+        <div style="margin-bottom: 5px">
           <a-badge status="processing" style="vertical-align: middle" />
-          <span style="vertical-align: middle">请求参数:{{ record.requestParam }}</span></div
-        >
+          <span style="vertical-align: middle">请求参数:{{ record.requestParam }}</span>
+        </div >
+
+        <div style="margin-bottom: 5px">
+          <a-badge status="success" style="vertical-align: middle" />
+          <span style="vertical-align: middle">响应结果:{{ record.returnData }}</span>
+        </div >
+
       </div>
       <div v-if="searchInfo.logType == 4">
         <div style="margin-bottom: 5px">
diff --git a/src/views/monitor/log/log.data.ts b/src/views/monitor/log/log.data.ts
index 7dca9f3..47c438d 100644
--- a/src/views/monitor/log/log.data.ts
+++ b/src/views/monitor/log/log.data.ts
@@ -1,38 +1,39 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
 
 export const columns: BasicColumn[] = [
-  {
-    title: '操作类型',
-    dataIndex: 'operateType_dictText',
-    width: 25,
-  },
   {
     title: 'IP',
     dataIndex: 'ip',
     width: 35,
   },
-  {
-    title: '耗时(毫秒)',
-    dataIndex: 'costTime',
-    width: 30,
-  },
   {
     title: '操作人',
     dataIndex: 'username',
-    width: 25,
+    width: 30,
   },
 
+  {
+    title: '请求地址',
+    dataIndex: 'requestUrl',
+    width: 100,
+  },
+  {
+    title: '请求参数',
+    dataIndex: 'method',
+    width: 60,
+  },
   {
     title: '日志内容',
     dataIndex: 'logContent',
-    width: 200,
+    width: 100,
     align: 'left',
   },
+
   {
     title: '创建时间',
     dataIndex: 'createTime',
     sorter: true,
-    width: 40,
+    width: 60,
   },
 ];
 
@@ -40,6 +41,7 @@ export const columns: BasicColumn[] = [
  * 操作日志需要操作类型
  */
 export const operationLogColumn: BasicColumn[] = [
+
   ...columns,
   /*  {
       title: '操作类型',
@@ -49,6 +51,7 @@ export const operationLogColumn: BasicColumn[] = [
 ];
 
 export const exceptionColumns: BasicColumn[] = [
+
   {
     title: 'IP',
     dataIndex: 'ip',
@@ -57,7 +60,7 @@ export const exceptionColumns: BasicColumn[] = [
   {
     title: '操作人',
     dataIndex: 'username',
-    width: 25,
+    width: 30,
   },
 
   {
diff --git a/src/views/receive/asn/Asn.data.ts b/src/views/receive/asn/Asn.data.ts
index 05e27ff..26bd799 100644
--- a/src/views/receive/asn/Asn.data.ts
+++ b/src/views/receive/asn/Asn.data.ts
@@ -134,12 +134,6 @@ export const asnDetailColumns: JVxeColumn[] = [
     //查询状态为可用、启用、未删除的库位
     dictCode: 'base_point where area_id = 1983454124619755521 and iz_active=1 and del_flag=0,point_code,id',
     tipsContent: '请搜索库位',
-    validateRules: [
-      {
-        required: true, // 必填
-        message: '请选择${title}', // 显示的文本
-      },
-    ],
   },
   {
     title: '需求数量',