From d01030e922a294981954a8931ca46f74f5703d63 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <Jin980303>
Date: Thu, 11 Dec 2025 14:18:07 +0800
Subject: [PATCH] no message

---
 src/views/base/item/Item.data.ts            | 10 +++++-----
 src/views/base/item/components/ItemForm.vue |  7 +++++++
 src/views/base/stock/StockList.vue          |  4 ++++
 src/views/monitor/log/index.vue             |  2 +-
 src/views/monitor/log/log.data.ts           | 10 ++++++++--
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/views/base/item/Item.data.ts b/src/views/base/item/Item.data.ts
index 068c102..3636a19 100644
--- a/src/views/base/item/Item.data.ts
+++ b/src/views/base/item/Item.data.ts
@@ -11,16 +11,16 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'itemName',
   },
+  {
+    title: '单位',
+    align: 'center',
+    dataIndex: 'unit',
+  },
   {
     title: '是否启用',
     align: 'center',
     dataIndex: 'izActive',
   },
-  {
-    title: '描述',
-    align: 'center',
-    dataIndex: 'description',
-  },
   {
     title: '创建日期',
     align: 'center',
diff --git a/src/views/base/item/components/ItemForm.vue b/src/views/base/item/components/ItemForm.vue
index 093a24c..0656c07 100644
--- a/src/views/base/item/components/ItemForm.vue
+++ b/src/views/base/item/components/ItemForm.vue
@@ -14,6 +14,11 @@
                 <a-input v-model:value="formData.itemName" placeholder="请输入物料名称" allow-clear></a-input>
               </a-form-item>
             </a-col>
+            <a-col :span="24">
+              <a-form-item label="单位" v-bind="validateInfos.unit" id="ItemForm-unit" name="unit">
+                <JDictSelectTag v-model:value="formData.unit"  placeholder="请选择" dictCode="package_unit" allowClear />
+              </a-form-item>
+            </a-col>
             <a-col :span="24">
               <a-form-item label="描述" v-bind="validateInfos.description" id="AreaForm-description" name="description">
                 <a-textarea v-model:value="formData.description" :rows="4" placeholder="请输入描述" />
@@ -40,6 +45,7 @@
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JSwitch from '@/components/Form/src/jeecg/components/JSwitch.vue';
   import { getTenantId } from '@/utils/auth';
+  import { JDictSelectTag } from '@/components/Form';
 
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
@@ -55,6 +61,7 @@
     id: '',
     itemCode: '',
     itemName: '',
+    unit: '',
     delFlag: 0,
     izActive: 1,
     tenantId: tenantId,
diff --git a/src/views/base/stock/StockList.vue b/src/views/base/stock/StockList.vue
index 812a0a2..5a58792 100644
--- a/src/views/base/stock/StockList.vue
+++ b/src/views/base/stock/StockList.vue
@@ -144,6 +144,10 @@
         width: 120,
         fixed: 'right',
       },
+      defSort: {
+        column: 'stockCode',
+        order: 'asc',
+      },
       beforeFetch: async (params) => {
         for (let key in fieldPickers) {
           if (queryParam[key] && fieldPickers[key]) {
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index cf53619..66ca252 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -36,7 +36,7 @@
       <div v-if="searchInfo.logType == 4">
         <div style="margin-bottom: 5px">
           <a-badge status="success" style="vertical-align: middle" />
-          <span class="error-box" style="vertical-align: middle">异常堆栈:{{ record.requestParam }}</span>
+          <span class="error-box" style="vertical-align: middle">异常堆栈:{{ record.logContent }}</span>
         </div>
       </div>
     </template>
diff --git a/src/views/monitor/log/log.data.ts b/src/views/monitor/log/log.data.ts
index 47c438d..e4ad8ec 100644
--- a/src/views/monitor/log/log.data.ts
+++ b/src/views/monitor/log/log.data.ts
@@ -1,4 +1,5 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
+import { render } from '@/utils/common/renderUtils';
 
 export const columns: BasicColumn[] = [
   {
@@ -10,6 +11,10 @@ export const columns: BasicColumn[] = [
     title: '操作人',
     dataIndex: 'username',
     width: 30,
+    customRender: ({ text }) => {
+      const color = 'green';
+      return render.renderTag(text === '' ? 'admin' : text, color);
+    },
   },
 
   {
@@ -41,7 +46,6 @@ export const columns: BasicColumn[] = [
  * 操作日志需要操作类型
  */
 export const operationLogColumn: BasicColumn[] = [
-
   ...columns,
   /*  {
       title: '操作类型',
@@ -51,7 +55,6 @@ export const operationLogColumn: BasicColumn[] = [
 ];
 
 export const exceptionColumns: BasicColumn[] = [
-
   {
     title: 'IP',
     dataIndex: 'ip',
@@ -61,6 +64,9 @@ export const exceptionColumns: BasicColumn[] = [
     title: '操作人',
     dataIndex: 'username',
     width: 30,
+    customRender: ({ text }) => {
+      return text === null ? '管理员' : text;
+    },
   },
 
   {