From 591e05e6e881b9b83face9d78060a9324a3b04e8 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 4 Sep 2024 14:27:14 +0800
Subject: [PATCH] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5766=20=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=A4=96=E5=85=A5=E5=BA=93=E7=94=B3=E8=AF=B7.=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1.=E8=AE=B0=E5=BD=95=E4=B8=BB=E5=AD=90=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedreceiptJobMain.data.ts                    |  6 +++---
 .../unplannedreceiptRecordMain.data.ts                 |  6 +++---
 .../unplannedreceiptRequestMain.data.ts                | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
index d6f590e93..8e2fe9647 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
@@ -351,13 +351,13 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '备注',
+    label: '单据备注',
     field: 'remarkMain',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   {
     label: '自动完成',
@@ -1026,7 +1026,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
+    label: '明细备注',
     field: 'remark',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index bc4712099..8fcf73b5e 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -358,9 +358,9 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '备注',
+    label: '单据备注',
     field: 'remarkMain',
-    isTable:false,
+    isTable:true,
     sort: 'custom',
     table: {
       width: 150
@@ -840,7 +840,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '备注',
+    label: '明细备注',
     field: 'remark',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index 53bf8f0cd..fc2f9eefd 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -538,14 +538,14 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '备注',
+    label: '单据备注',
     field: 'remarkMain',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable:false,
-    sortTableDefault: 1000,
+    isTable:true,
+    //sortTableDefault: 1000,
   },
   {
     label: '创建时间',
@@ -668,7 +668,7 @@ export const UnplannedreceiptRequestMainRules = reactive({
   directCreateRecord: [
     { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
   ],
-  remark:  [
+  remarkMain:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   usageDescription:[
@@ -1244,7 +1244,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '备注',
+    label: '明细备注',
     field: 'remark',
     sort: 'custom',
     table: {