From 23ad7c7330aecb5c7089497902b7e66affc33770 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 16:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/rowDrop/index.vue              | 21 ++++++++++++++++---
 .../supplierdeliverRequestMain.data.ts        |  3 +++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue
index 8ceae3d64..2dd0fc663 100644
--- a/src/components/rowDrop/index.vue
+++ b/src/components/rowDrop/index.vue
@@ -86,7 +86,14 @@ const save = () => {
   if(props.detailAllSchemas){
     myTableColumns = [...props.allSchemas?.tableColumns,...props.detailAllSchemas?.tableMainColumns]
   }
-  saveDate.push(myTableColumns[0])
+  let actionData = myTableColumns.find(item=>item.field=='action')
+  if(actionData){
+    myTableColumns.splice(myTableColumns[actionData],1)
+    myTableColumns = [...myTableColumns,actionData]
+  }  
+  if(props.allSchemas?.tableColumns[0].fixed=='left'){
+    saveDate.push(props.allSchemas?.tableColumns[0])
+  }
   allData.value.forEach((item) => {
     const _item:any = myTableColumns.find(itemColumns => (itemColumns.label == item ))
     if(_item){
@@ -98,10 +105,18 @@ const save = () => {
     }
   })
   // 默认操作列
-  saveDate.push(myTableColumns[myTableColumns.length-1])
+  if(actionData&&!saveDate.includes(actionData)){
+    saveDate.push(actionData)
+  }
   updataTableColumns(saveDate)
   console.log(99, saveDate)
-  RedisApi.addRedis({key: routeName.value,value: JSON.stringify(saveDate)}).then(() => {
+
+  let paramsData = saveDate.map(item=>({
+    label:item.label,
+    fixed:item.fixed,
+    field:item.field
+  }))
+  RedisApi.addRedis({key: routeName.value,value: JSON.stringify(paramsData)}).then(() => {
   }).catch(err => {
     console.log(err)
   })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index acad3e1fd..c903200e0 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -53,6 +53,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:1,
     isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -650,6 +651,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:2,
     form: {
       componentProps: {
         disabled: true
@@ -787,6 +789,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:2,
     form: {
       component: 'InputNumber',
       componentProps: {