From 1a392e62e038dd6f2ac045a8d5b0b621f28c1696 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sat, 28 Dec 2024 14:30:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?SBBJ-785=E5=BA=93=E5=AD=98=E4=BA=8B?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=BA=93=E5=AD=98=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E3=80=81=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E5=BA=94?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87=EF=BC=9B=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=BA=94=E4=B8=8E=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=EF=BC=8C=E5=BA=94=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/item/transaction/transaction.data.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/eam/item/transaction/transaction.data.ts b/src/views/eam/item/transaction/transaction.data.ts
index f75af8a..0f456d1 100644
--- a/src/views/eam/item/transaction/transaction.data.ts
+++ b/src/views/eam/item/transaction/transaction.data.ts
@@ -17,7 +17,7 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '库位编码',
+    label: '库位编号',
     field: 'locationNumber',
     sort: 'custom',
     isSearch: true,
@@ -74,6 +74,7 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计量单位',
     field: 'uom',
     sort: 'custom',
+    dictType: DICT_TYPE.UOM,
     isSearch: false,
   },
   {

From 86d3f7da7323d183e1cdf0652911a885df2818fa Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sat, 28 Dec 2024 16:26:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?SBBJ-784=E5=A4=87=E4=BB=B6=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/item/countRecord/countRecord.data.ts   |  3 +++
 src/views/eam/item/transaction/index.vue       | 15 ++++++++++-----
 .../eam/item/transaction/transaction.data.ts   | 18 +++++++++---------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/views/eam/item/countRecord/countRecord.data.ts b/src/views/eam/item/countRecord/countRecord.data.ts
index c6d5c31..5feb17a 100644
--- a/src/views/eam/item/countRecord/countRecord.data.ts
+++ b/src/views/eam/item/countRecord/countRecord.data.ts
@@ -74,6 +74,9 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
      }
    },
    isForm: false,
+   detail: {
+     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+   }
  },
   {
     label: '操作',
diff --git a/src/views/eam/item/transaction/index.vue b/src/views/eam/item/transaction/index.vue
index 27e45cc..ca18167 100644
--- a/src/views/eam/item/transaction/index.vue
+++ b/src/views/eam/item/transaction/index.vue
@@ -97,7 +97,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'item:transaction:create'}), // 新增
+  // defaultButtons.defaultAddBtn({hasPermi:'item:transaction:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'item:transaction:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'item:transaction:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
@@ -131,8 +131,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'item:transaction:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'item:transaction:delete'}), // 删除
+  // defaultButtons.mainListEditBtn({hasPermi:'item:transaction:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'item:transaction:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -151,8 +151,9 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =Transaction.allSchemas.formSchema.some(function (item) {
+const formsSuccess = async (formType, data) => {
+  try {
+    var isHave =Transaction.allSchemas.formSchema.some(function (item) {
     return item.field === 'activeTime' || item.field === 'expireTime';
   });
   if(isHave){
@@ -172,6 +173,10 @@ const formsSuccess = async (formType,data) => {
   }
   basicFormRef.value.dialogVisible = false
   getList()
+  } finally {
+     basicFormRef.value.formLoading = false
+  }
+  
 }
 
 /** 详情操作 */
diff --git a/src/views/eam/item/transaction/transaction.data.ts b/src/views/eam/item/transaction/transaction.data.ts
index 0f456d1..fe59584 100644
--- a/src/views/eam/item/transaction/transaction.data.ts
+++ b/src/views/eam/item/transaction/transaction.data.ts
@@ -83,13 +83,13 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
   },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   }
+  // }
 ]))