From 4d9301728b4c9a95f2d110958d3f6a7dd55ee802 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 8 May 2024 11:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=91=E8=BF=90=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/saleShipmentDetailRecord/index.ts |  65 ++++
 src/api/wms/saleShipmentMain/index.ts         |  30 ++
 src/api/wms/saleShipmentMainRecord/index.ts   |  56 ++++
 .../deliverplan/saleMain/saleMain.data.ts     |   8 +
 .../saleShipmentMainRecord/index.vue          | 224 ++++++++++++++
 .../saleShipmentMainRecord.data.ts            | 278 ++++++++++++++++++
 .../saleShipmentMainRequest/index.vue         |  30 +-
 .../saleShipmentMain.data.ts                  |  16 +-
 8 files changed, 700 insertions(+), 7 deletions(-)
 create mode 100644 src/api/wms/saleShipmentDetailRecord/index.ts
 create mode 100644 src/api/wms/saleShipmentMainRecord/index.ts
 create mode 100644 src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts

diff --git a/src/api/wms/saleShipmentDetailRecord/index.ts b/src/api/wms/saleShipmentDetailRecord/index.ts
new file mode 100644
index 000000000..4f22239d0
--- /dev/null
+++ b/src/api/wms/saleShipmentDetailRecord/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface SaleShipmentDetailRecordVO {
+  id: number
+  soNumber: string
+  soLine: string
+  fromOwnerCode: string
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  masterId: number
+  number: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  remark: string
+  concurrencyStamp: string
+  siteId: number
+}
+
+// 查询销售发运记录子列表
+export const getSaleShipmentDetailRecordPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/sale-shipment-detail-record/senior', data })
+  } else {
+    return await request.get({ url: `/wms/sale-shipment-detail-record/page`, params })
+  }
+}
+
+// 查询销售发运记录子详情
+export const getSaleShipmentDetailRecord = async (id: number) => {
+  return await request.get({ url: `/wms/sale-shipment-detail-record/get?id=` + id })
+}
+
+// 新增销售发运记录子
+export const createSaleShipmentDetailRecord = async (data: SaleShipmentDetailRecordVO) => {
+  return await request.post({ url: `/wms/sale-shipment-detail-record/create`, data })
+}
+
+// 修改销售发运记录子
+export const updateSaleShipmentDetailRecord = async (data: SaleShipmentDetailRecordVO) => {
+  return await request.put({ url: `/wms/sale-shipment-detail-record/update`, data })
+}
+
+// 删除销售发运记录子
+export const deleteSaleShipmentDetailRecord = async (id: number) => {
+  return await request.delete({ url: `/wms/sale-shipment-detail-record/delete?id=` + id })
+}
+
+// 导出销售发运记录子 Excel
+export const exportSaleShipmentDetailRecord = async (params) => {
+  return await request.download({ url: `/wms/sale-shipment-detail-record/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/sale-shipment-detail-record/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/saleShipmentMain/index.ts b/src/api/wms/saleShipmentMain/index.ts
index e03719231..c8768bea2 100644
--- a/src/api/wms/saleShipmentMain/index.ts
+++ b/src/api/wms/saleShipmentMain/index.ts
@@ -61,4 +61,34 @@ export const exportSaleShipmentMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/sale-shipment-main-request/get-import-template' })
+}
+
+// 关闭-销售发运申请
+export const closeSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/close?id=` + id })
+}
+
+// 重新添加-销售发运申请
+export const reAddSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/reAdd?id=` + id })
+}
+
+// 提交审批-销售发运申请
+export const submitSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/submit?id=` + id })
+}
+
+// 审批驳回-销售发运申请
+export const refusedSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/refused?id=` + id })
+}
+
+// 审批通过-销售发运申请
+export const agreeSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/agree?id=` + id })
+}
+
+// 处理-销售发运申请
+export const handleSaleShipmentMain = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id })
 }
\ No newline at end of file
diff --git a/src/api/wms/saleShipmentMainRecord/index.ts b/src/api/wms/saleShipmentMainRecord/index.ts
new file mode 100644
index 000000000..60a87d971
--- /dev/null
+++ b/src/api/wms/saleShipmentMainRecord/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface SaleShipmentMainRecordVO {
+  id: number
+  requestNumber: string
+  customerCode: string
+  invoiceTime: Date
+  executeTime: Date
+  available: string
+  departmentCode: string
+  number: string
+  businessType: string
+  extraProperties: string
+  siteId: string
+}
+
+// 查询销售发运记录主列表
+export const getSaleShipmentMainRecordPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/sale-shipment-main-record/senior', data })
+  } else {
+    return await request.get({ url: `/wms/sale-shipment-main-record/page`, params })
+  }
+}
+
+// 查询销售发运记录主详情
+export const getSaleShipmentMainRecord = async (id: number) => {
+  return await request.get({ url: `/wms/sale-shipment-main-record/get?id=` + id })
+}
+
+// 新增销售发运记录主
+export const createSaleShipmentMainRecord = async (data: SaleShipmentMainRecordVO) => {
+  return await request.post({ url: `/wms/sale-shipment-main-record/create`, data })
+}
+
+// 修改销售发运记录主
+export const updateSaleShipmentMainRecord = async (data: SaleShipmentMainRecordVO) => {
+  return await request.put({ url: `/wms/sale-shipment-main-record/update`, data })
+}
+
+// 删除销售发运记录主
+export const deleteSaleShipmentMainRecord = async (id: number) => {
+  return await request.delete({ url: `/wms/sale-shipment-main-record/delete?id=` + id })
+}
+
+// 导出销售发运记录主 Excel
+export const exportSaleShipmentMainRecord = async (params) => {
+  return await request.download({ url: `/wms/sale-shipment-main-record/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/sale-shipment-main-record/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
index 623f4d311..28c996130 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
@@ -364,6 +364,14 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装规格代码',
+      searchField: 'code',
+      searchTitle: '包装规格信息',
+      searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+      searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+    },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
new file mode 100644
index 000000000..97a295c57
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@@ -0,0 +1,224 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SaleShipmentMainRecord.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SaleShipmentMainRecord.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      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>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="SaleShipmentMainRecordRules"
+    :formAllSchemas="SaleShipmentMainRecord.allSchemas"
+    :apiUpdate="SaleShipmentMainRecordApi.updateSaleShipmentMainRecord"
+    :apiCreate="SaleShipmentMainRecordApi.createSaleShipmentMainRecord"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="SaleShipmentMainRecord.allSchemas" />
+
+  <!-- 导入 -->
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SaleShipmentMainRecord,SaleShipmentMainRecordRules } from './saleShipmentMainRecord.data'
+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' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SaleShipmentMainRecord.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SaleShipmentMainRecordApi.getSaleShipmentMainRecordPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:saleShipmentMainRecord:create'}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:'wms:saleShipmentMainRecord:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:saleShipmentMainRecord:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:saleShipmentMainRecord:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =SaleShipmentMainRecord.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await SaleShipmentMainRecordApi.createSaleShipmentMainRecord(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await SaleShipmentMainRecordApi.updateSaleShipmentMainRecord(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSaleShipmentMainRecord')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SaleShipmentMainRecordApi.deleteSaleShipmentMainRecord(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SaleShipmentMainRecordApi.exportSaleShipmentMainRecord(tableObject.params)
+    download.excel(data, '销售发运记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
new file mode 100644
index 000000000..ba4ba4a2b
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
@@ -0,0 +1,278 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const SaleShipmentMainRecordRules = reactive({
+})
+
+export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '发票时间',
+    field: 'invoiceTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const SaleShipmentDetailRecordRules = reactive({
+})
+
+export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '销售订单号',
+    field: 'soNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '销售订单行',
+    field: 'soLine',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index cb188aa14..9821f5356 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -77,7 +77,7 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/sale-shipment-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/sale-shipment-main-request/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -194,12 +194,34 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
+    return [
   defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-request:update'}), // 编辑
+  defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),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'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:update'}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // 删除
-]
-
+  ]
+}
 const tableData = ref([])
 
 
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
index 8f9dbb872..86764a943 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -27,6 +27,9 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'customerCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -51,6 +54,9 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false,
+    table: {
+      width: 150
+    },
   },
   {
     label: '业务类型',
@@ -71,6 +77,9 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '发票时间',
     field: 'invoiceTime',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     formatter: dateFormatter,
     search: {
       component: 'DatePicker',
@@ -251,6 +260,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
     tableForm: {
       type: 'Select',
       disabled: true
@@ -356,11 +366,11 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '从库位代码',
+    label: '客户库位',
     field: 'fromLocationCode',
     sort: 'custom',
     isSearch: true,
-    isTableForm: false
+    isTableForm: true
   },
 
   {
@@ -402,7 +412,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true,
   },
   {
-    label: '数量',
+    label: '开票数量',
     field: 'qty',
     sort: 'custom',
     isSearch: true,