From 3949f78e79c380d67b75b96ded713043d1cf11ff Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 16 May 2024 13:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverRequestMain.data.ts                  |  1 -
 .../deliver/deliverRequestMain/index.vue        |  3 ---
 .../saleShipmentMainRecord/index.vue            | 17 ++++++++---------
 .../saleShipmentMainRecord.data.ts              |  3 +++
 .../saleShipmentMainRequest/index.vue           |  2 +-
 .../saleShipmentMain.data.ts                    |  6 ++----
 .../containerMainRequest.data.ts                |  5 +----
 7 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index caf69fc42..54715ea57 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -786,7 +786,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 3a6f4ac74..8e0e37a1e 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -567,9 +567,6 @@ const resetShow = async () => {
       item.tableForm.isInpuFocusShow = true
       item.tableForm.disabled = false
     }
-    if(item.field == 'uom') {
-      item.tableForm.disabled = false
-    }
     if(item.field == 'available') {
       item.tableForm.disabled = false
     }
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
index df789bd3d..e00bd5819 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -62,7 +62,6 @@ import { SaleShipmentMainRecord,SaleShipmentMainRecordRules } from './saleShipme
 import * as SaleShipmentMainRecordApi from '@/api/wms/saleShipmentMainRecord'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 
 defineOptions({ name: 'SaleShipmentMainRecord' })
@@ -98,8 +97,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:saleShipmentMainRecord:create'}), // 新增
-  defaultButtons.defaultExportBtn({hasPermi:'wms:saleShipmentMainRecord:export'}), // 导出
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:sale-shipment-main-record:create'}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:'wms:sale-shipment-main-record:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -129,8 +128,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:saleShipmentMainRecord:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:saleShipmentMainRecord:delete'}), // 删除
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -189,7 +188,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SaleShipmentMainRecordApi.exportSaleShipmentMainRecord(tableObject.params)
-    download.excel(data, '销售发运记录主.xlsx')
+    download.excel(data, '销售发运记录.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
index ba4ba4a2b..f950af5b6 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
@@ -73,6 +73,7 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     sort: 'custom',
     isSearch: true,
+    isTable:false
   },
   {
     label: '部门',
@@ -102,12 +103,14 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    isTable:false
   },
   {
     label: '地点ID',
     field: 'siteId',
     sort: 'custom',
     isSearch: true,
+    isTable:false
   },
   {
     label: '操作',
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index c2bce7085..0302e1661 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -214,7 +214,7 @@ const butttondata = (row,$index) => {
   }
     return [
   defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:update'}), // 编辑
-  defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:sale-shipment-main-request:close'}), // 关闭
+  defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:sale-shipment-main-request:close'}), // 关闭
   defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:sale-shipment-main-request:reAdd'}), //重新添加
   defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:submit'}), // 提交审批
   defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
index 94c56b794..b996f56fe 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -499,9 +499,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isDetail: false,
     isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
+    hiddenInMain:true,
+    isTableForm:false,
   }
 ]))
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
index 122339949..c2cf324bd 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
@@ -493,10 +493,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     hiddenInMain:true,
     isTableForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
+    isTable: false
   }
 ]))