From f98e700b5b3e988379745b7909859fe2335f1ff2 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Tue, 25 Mar 2025 08:49:56 +0800
Subject: [PATCH 01/11] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliTimeWms/deliTimeWms.data.ts           |   2 +-
 .../deliverRecordMain.data.ts                 |   1 +
 .../inventoryinitRequestMain/index.vue        | 322 +++++++++++-------
 .../purchasereturnRecordMain.data.ts          |  92 ++---
 .../purchasereturnRequestMain.data.ts         | 100 +++---
 .../purchasereturnRequestMain.data.ts         | 100 +++---
 6 files changed, 352 insertions(+), 265 deletions(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts b/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts
index b86b0d6bc..8d4208106 100644
--- a/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts
@@ -19,7 +19,7 @@ export const DeliTimeWms = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '班次',
     field: 'shift',
-    dictType: DICT_TYPE.SHIFT,
+    dictType: DICT_TYPE.DELISHIF,
     dictClass: 'string',
     isTable: true,
     isDetail: true,
diff --git a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index 64e19d895..e574b9ed5 100644
--- a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -256,6 +256,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '品番',
     field: 'itemCode',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index 888329b3a..32edec6c8 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -1,23 +1,31 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...InventoryinitRequestMain.allSchemas.searchSchema,...InventoryinitRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="[
+        ...InventoryinitRequestMain.allSchemas.searchSchema,
+        ...InventoryinitRequestDetail.allSchemas.searchSchema
+      ]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="InventoryinitRequestMain.allSchemas"
-      :detailAllSchemas="InventoryinitRequestDetail.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="InventoryinitRequestMain.allSchemas"
+    :detailAllSchemas="InventoryinitRequestDetail.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -28,13 +36,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #number="{row}">
+      <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row, $index }">
+        <ButtonBaseMore
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -78,17 +89,36 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/inventoryinit-request-main/import" :importTemplateData="importTemplateData" 
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/inventoryinit-request-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
 
-  <ImportForm ref="importFormRefLine" url="/wms/inventoryinit-request-main/importLine" :importTemplateData="importTemplateData" 
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  <ImportForm
+    ref="importFormRefLine"
+    url="/wms/inventoryinit-request-main/importLine"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { InventoryinitRequestMain,InventoryinitRequestMainRules,InventoryinitRequestDetail,InventoryinitRequestDetailRules } from './inventoryinitRequestMain.data'
+import {
+  InventoryinitRequestMain,
+  InventoryinitRequestMainRules,
+  InventoryinitRequestDetail,
+  InventoryinitRequestDetailRules
+} from './inventoryinitRequestMain.data'
 import * as InventoryinitRequestMainApi from '@/api/wms/inventoryinitRequestMain'
 import * as InventoryinitRequestDetailApi from '@/api/wms/inventoryinitRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -105,7 +135,10 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...InventoryinitRequestMain.allSchemas.tableColumns,...InventoryinitRequestDetail.allSchemas.tableMainColumns])
+const tableColumns = ref([
+  ...InventoryinitRequestMain.allSchemas.tableColumns,
+  ...InventoryinitRequestDetail.allSchemas.tableMainColumns
+])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -113,21 +146,25 @@ const updataTableColumns = (val) => {
 }
 
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      if(formField=='itemCode'){
+      if (formField == 'itemCode') {
         //品番
-        let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['code']))
-        if(itemCodes.length>0){
-          itemCodes = itemCodes.map(item=>(item['code']))
+        let itemCodes = val.filter((item) =>
+          tableData.value.find((item1) => item1['itemCode'] == item['code'])
+        )
+        if (itemCodes.length > 0) {
+          itemCodes = itemCodes.map((item) => item['code'])
           message.warning(`物料${itemCodes.join(',')}已经存在`)
         }
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['code']))
-        if(val.length==0) return
-        val.forEach(item=>{
-          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+        val = val.filter(
+          (item) => !tableData.value.find((item1) => item1['itemCode'] == item['code'])
+        )
+        if (val.length == 0) return
+        val.forEach((item) => {
+          const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...item }))
           newRow[formField] = item[searchField]
           newRow['packUnit'] = item['defaultPackUnit']
           newRow['packQty'] = item['defaultPackQty']
@@ -135,22 +172,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['batch'] = formatTime(new Date(), 'yyyyMMdd')
           tableData.value.push(newRow)
         })
-        
-      }else if(formField=='packUnit'){
+      } else if (formField == 'packUnit') {
         //包装规格1
         row[formField] = val[0][searchField]
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
-      }else if(formField=='secondPackUnit'){
+      } else if (formField == 'secondPackUnit') {
         //包装规格2
         row[formField] = val[0][searchField]
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
-      }else if(formField == 'balancePackUnit'){
+      } else if (formField == 'balancePackUnit') {
         // 入库存包装规格
         row[formField] = val[0][searchField]
         row['balancePackUnit'] = val[0]['packUnit']
-      }else{
+      } else {
         row[formField] = val[0][searchField]
       }
     } else {
@@ -163,24 +199,24 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   })
 }
 // 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
-    if(formField=='itemCode'){
-        //品番
-        setV['uom'] = val[0]['uom']
-      }else if(formField=='packUnit'){
-        //包装规格1
-        setV['packUnit'] = val[0]['packUnit']
-        setV['packQty'] = val[0]['packQty']
-      }else if(formField=='secondPackUnit'){
-        //包装规格2
-        setV['secondPackUnit'] = val[0]['packUnit']
-        setV['secondPackQty'] = val[0]['packQty']
-      }else if(formField == 'balancePackUnit'){
-        // 入库存包装规格
-        setV['balancePackUnit'] = val[0]['packUnit']
-      }
+    if (formField == 'itemCode') {
+      //品番
+      setV['uom'] = val[0]['uom']
+    } else if (formField == 'packUnit') {
+      //包装规格1
+      setV['packUnit'] = val[0]['packUnit']
+      setV['packQty'] = val[0]['packQty']
+    } else if (formField == 'secondPackUnit') {
+      //包装规格2
+      setV['secondPackUnit'] = val[0]['packUnit']
+      setV['secondPackQty'] = val[0]['packQty']
+    } else if (formField == 'balancePackUnit') {
+      // 入库存包装规格
+      setV['balancePackUnit'] = val[0]['packUnit']
+    }
     setV[formField] = val[0][searchField]
     formRef.setValues(setV)
   })
@@ -188,7 +224,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
+const Echo = []
 
 const { tableObject, tableMethods } = useTable({
   getListApi: InventoryinitRequestDetailApi.getInventoryinitRequestDetailPage // 分页接口
@@ -199,8 +235,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:inventoryinit-request-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:inventoryinit-request-main:import'}), // 导入
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:inventoryinit-request-main:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:inventoryinit-request-main:import' }), // 导入
   {
     label: '线边导入',
     name: 'importLine',
@@ -210,10 +246,10 @@ const HeadButttondata = [
     color: '',
     hasPermi: ''
   },
-  defaultButtons.defaultExportBtn({hasPermi:'wms:inventoryinit-request-main:export'}), // 导出
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:inventoryinit-request-main:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -226,30 +262,36 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if(val == 'importLine'){
+  } else if (val == 'importLine') {
     handleImportLine()
-  }else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
-    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
       searchFormClick({
         filters: tableObject.params.filters
       })
     } else {
       getList()
     }
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.status) > -1) {
     return false
   } else {
@@ -258,44 +300,71 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId']
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
+  if (findIndex > -1 && findIndex < $index) {
     return []
   }
-    return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:inventoryinit-request-main:close'}), // 关闭
-    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:inventoryinit-request-main:reAdd'}), //重新添加
-    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventoryinit-request-main:submit'}), // 提交审批
-    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventoryinit-request-main:refused'}), // 驳回
-    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventoryinit-request-main:agree'}), // 审批通过
-    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventoryinit-request-main:handle'}), // 处理
-    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventoryinit-request-main:update'}), // 编辑
-  
-    ]
+  return [
+    defaultButtons.mainListCloseBtn({
+      hide: isShowMainButton(row, ['1', '2', '3', '4']),
+      hasPermi: 'wms:inventoryinit-request-main:close'
+    }), // 关闭
+    defaultButtons.mainListReAddBtn({
+      hide: isShowMainButton(row, ['5']),
+      hasPermi: 'wms:inventoryinit-request-main:reAdd'
+    }), //重新添加
+    defaultButtons.mainListSubmitBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:inventoryinit-request-main:submit'
+    }), // 提交审批
+    defaultButtons.mainListTurnDownBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:inventoryinit-request-main:refused'
+    }), // 驳回
+    defaultButtons.mainListApproveBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:inventoryinit-request-main:agree'
+    }), // 审批通过
+    defaultButtons.mainListHandleBtn({
+      hide: isShowMainButton(row, ['3']),
+      hasPermi: 'wms:inventoryinit-request-main:handle'
+    }), // 处理
+    defaultButtons.mainListEditBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:inventoryinit-request-main:update'
+    }) // 编辑
+  ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'mainClose') { // 关闭
+  if (val == 'mainClose') {
+    // 关闭
     handleClose(row.masterId)
-  } else if (val == 'mainReAdd') { // 重新添加
+  } else if (val == 'mainReAdd') {
+    // 重新添加
     handleReAdd(row.masterId)
-  } else if (val == 'mainSubmit') { // 提交审批
+  } else if (val == 'mainSubmit') {
+    // 提交审批
     handleSubmit(row.masterId)
-  } else if (val == 'mainTurnDown') { // 驳回
+  } else if (val == 'mainTurnDown') {
+    // 驳回
     handleRefused(row.masterId)
-  } else if (val == 'mainApprove') { // 审批通过
+  } else if (val == 'mainApprove') {
+    // 审批通过
     handleAgree(row.masterId)
-  } else if (val == 'mainHandle') { // 处理
+  } else if (val == 'mainHandle') {
+    // 处理
     handleHandle(row.masterId)
-  } else if (val == 'edit') { // 编辑
+  } else if (val == 'edit') {
+    // 编辑
     openForm('update', row)
   }
 }
 
-
-
 /** 关闭按钮操作 */
 const handleClose = async (id: number) => {
   try {
@@ -304,13 +373,13 @@ const handleClose = async (id: number) => {
     await InventoryinitRequestMainApi.closeInventoryinitRequestMain(id)
     message.success(t('common.closeSuccess'))
     tableObject.loading = false
-    buttonBaseClick('refresh',null)
-  } catch {}finally{
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
 
-
 /** 重新添加按钮操作 */
 const handleReAdd = async (id: number) => {
   try {
@@ -319,13 +388,13 @@ const handleReAdd = async (id: number) => {
     await InventoryinitRequestMainApi.reAddInventoryinitRequestMain(id)
     message.success(t('common.reAddSuccess'))
     tableObject.loading = false
-    buttonBaseClick('refresh',null)
-  } catch {}finally{
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
 
-
 /** 提交按钮操作 */
 const handleSubmit = async (id: number) => {
   try {
@@ -334,13 +403,13 @@ const handleSubmit = async (id: number) => {
     await InventoryinitRequestMainApi.submitInventoryinitRequestMain(id)
     message.success(t('common.updateSuccess'))
     tableObject.loading = false
-    buttonBaseClick('refresh',null)
-  } catch {}finally{
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
 
-
 /** 审批通过按钮操作 */
 const handleAgree = async (id: number) => {
   try {
@@ -349,13 +418,13 @@ const handleAgree = async (id: number) => {
     await InventoryinitRequestMainApi.agreeInventoryinitRequestMain(id)
     message.success(t('common.agreeSuccess'))
     tableObject.loading = false
-    buttonBaseClick('refresh',null)
-  } catch {}finally{
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
 
-
 /** 处理按钮操作 */
 const handleHandle = async (id: number) => {
   try {
@@ -363,13 +432,13 @@ const handleHandle = async (id: number) => {
     tableObject.loading = true
     await InventoryinitRequestMainApi.handleInventoryinitRequestMain(id)
     message.success(t('common.handleSuccess'))
-    buttonBaseClick('refresh',null)
-  } catch {}finally{
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
 
-
 /** 审批驳回按钮操作 */
 const handleRefused = async (id: number) => {
   try {
@@ -378,19 +447,33 @@ const handleRefused = async (id: number) => {
     await InventoryinitRequestMainApi.refusedInventoryinitRequestMain(id)
     message.success(t('common.refusedSuccess'))
     tableObject.loading = false
-    buttonBaseClick('refresh',null)
-  } catch {}finally{
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm =async (type: string, row?: any) => {
+const openForm = async (type: string, row?: any) => {
   tableData.value = [] // 重置明细数据
-  const row1 = {...row}
+  const row1 = { ...row }
   if (type == 'update') {
     row1.remark = row.remark1
+    InventoryinitRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'warehouseCode') {
+        item.componentProps.isSearchList = false
+        item.componentProps.disabled = true
+      }
+    })
+  } else {
+    InventoryinitRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'warehouseCode') {
+        item.componentProps.isSearchList = true
+        item.componentProps.disabled = false
+      }
+    })
   }
   formRef.value.open(type, row1)
 }
@@ -400,9 +483,11 @@ const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-  detailRef.value.openDetail(row, titleName, titleValue,'requestInventoryinitMain')
+  detailRef.value.openDetail(row, titleName, titleValue, 'requestInventoryinitMain')
 }
 
 /** 删除按钮操作 */
@@ -426,7 +511,9 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await InventoryinitRequestMainApi.exportInventoryinitRequestMain(tableObject.params)
+    const data = await InventoryinitRequestMainApi.exportInventoryinitRequestMain(
+      tableObject.params
+    )
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
@@ -435,10 +522,10 @@ const handleExport = async () => {
 }
 
 /**
-  * tableForm方法
-*/
+ * tableForm方法
+ */
 const tableFormKeys = {}
-InventoryinitRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+InventoryinitRequestDetail.allSchemas.tableFormColumns.forEach((item) => {
   tableFormKeys[item.field] = item.default ? item.default : ''
 })
 const tableData = ref([])
@@ -450,16 +537,16 @@ const handleAddTable = () => {
 // 删除明细
 const handleDeleteTable = (item, index) => {
   let itemIndex = tableData.value.indexOf(item)
-  if(itemIndex>-1){
+  if (itemIndex > -1) {
     tableData.value.splice(itemIndex, 1)
   }
 }
 const tableSelectionDelete = (selection) => {
-  tableData.value = tableData.value.filter(item => !selection.includes(item))
+  tableData.value = tableData.value.filter((item) => !selection.includes(item))
 }
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
-  let data = {...submitData}
+  let data = { ...submitData }
   // if(data.masterId){
   //   data.id = data.masterId
   // }
@@ -477,8 +564,8 @@ const submitForm = async (formType, submitData) => {
     // 刷新当前列表
     if (formType === 'create') {
       getList()
-    }else{
-      buttonBaseClick('refresh',null)
+    } else {
+      buttonBaseClick('refresh', null)
     }
   } finally {
     formRef.value.formLoading = false
@@ -491,7 +578,6 @@ const handleImport = () => {
   importFormRef.value.open()
 }
 
-
 /** 线边导入 */
 const importFormRefLine = ref()
 const handleImportLine = () => {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index 8b3bce991..1c650bc35 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -82,52 +82,52 @@ export const PurchasereturnRecordMain = useCrudSchemas(
       },
       isTable: false
     },
-    {
-      label: 'Q2通知单号',
-      field: 'q2Number',
-      sort: 'custom',
-      isSearch: false,
-      isDetail: true,
-      sortTableDefault: 4,
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          // multiple: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
-          searchField: 'number', // 查询弹窗赋值字段
-          searchTitle: 'Q2通知单号', // 查询弹窗标题
-          searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            },
-            {
-              key: 'status',
-              value: '0',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'number',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
+    // {
+    //   label: 'Q2通知单号',
+    //   field: 'q2Number',
+    //   sort: 'custom',
+    //   isSearch: false,
+    //   isDetail: true,
+    //   sortTableDefault: 4,
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       enterSearch: true,
+    //       // multiple: true,
+    //       isSearchList: true, // 开启查询弹窗
+    //       searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
+    //       searchField: 'number', // 查询弹窗赋值字段
+    //       searchTitle: 'Q2通知单号', // 查询弹窗标题
+    //       searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
+    //       searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
+    //       searchCondition: [
+    //         {
+    //           key: 'available',
+    //           value: 'TRUE',
+    //           isMainValue: false
+    //         },
+    //         {
+    //           key: 'status',
+    //           value: '0',
+    //           isMainValue: false
+    //         }
+    //       ],
+    //       verificationParams: [
+    //         {
+    //           key: 'number',
+    //           action: '==',
+    //           value: '',
+    //           isMainValue: false,
+    //           isSearch: true,
+    //           isFormModel: true
+    //         }
+    //       ] // 失去焦点校验参数
+    //     }
+    //   }
+    // },
     {
       label: '供应商代码',
       field: 'supplierCode',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 172247e90..ba366f936 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -275,56 +275,56 @@ export const PurchasereturnRequestMain = useCrudSchemas(
       isForm: false,
       isTable: false
     },
-    {
-      label: 'Q2通知单号',
-      field: 'q2Number',
-      sort: 'custom',
-      isSearch: false,
-      isDetail: true,
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          // multiple: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
-          searchField: 'number', // 查询弹窗赋值字段
-          searchTitle: 'Q2通知单号', // 查询弹窗标题
-          searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            },
-            {
-              key: 'status',
-              value: '0',
-              isMainValue: false
-            },
-            {
-              key: 'supplierCode',
-              value: 'supplierCode',
-              isMainValue: true
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'number',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
+    // {
+    //   label: 'Q2通知单号',
+    //   field: 'q2Number',
+    //   sort: 'custom',
+    //   isSearch: false,
+    //   isDetail: true,
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       enterSearch: true,
+    //       // multiple: true,
+    //       isSearchList: true, // 开启查询弹窗
+    //       searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
+    //       searchField: 'number', // 查询弹窗赋值字段
+    //       searchTitle: 'Q2通知单号', // 查询弹窗标题
+    //       searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
+    //       searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
+    //       searchCondition: [
+    //         {
+    //           key: 'available',
+    //           value: 'TRUE',
+    //           isMainValue: false
+    //         },
+    //         {
+    //           key: 'status',
+    //           value: '0',
+    //           isMainValue: false
+    //         },
+    //         {
+    //           key: 'supplierCode',
+    //           value: 'supplierCode',
+    //           isMainValue: true
+    //         }
+    //       ],
+    //       verificationParams: [
+    //         {
+    //           key: 'number',
+    //           action: '==',
+    //           value: '',
+    //           isMainValue: false,
+    //           isSearch: true,
+    //           isFormModel: true
+    //         }
+    //       ] // 失去焦点校验参数
+    //     }
+    //   }
+    // },
     {
       label: '承运商',
       field: 'carrierCode',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
index 65389964b..38ff3acbb 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
@@ -275,56 +275,56 @@ export const PurchasereturnRequestMain = useCrudSchemas(
       isForm: false,
       isTable: false
     },
-    {
-      label: 'Q2通知单号',
-      field: 'q2Number',
-      sort: 'custom',
-      isSearch: false,
-      isDetail: true,
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          // multiple: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
-          searchField: 'number', // 查询弹窗赋值字段
-          searchTitle: 'Q2通知单号', // 查询弹窗标题
-          searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            },
-            {
-              key: 'status',
-              value: '0',
-              isMainValue: false
-            },
-            {
-              key: 'supplierCode',
-              value: 'supplierCode',
-              isMainValue: true
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'number',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
+    // {
+    //   label: 'Q2通知单号',
+    //   field: 'q2Number',
+    //   sort: 'custom',
+    //   isSearch: false,
+    //   isDetail: true,
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       enterSearch: true,
+    //       // multiple: true,
+    //       isSearchList: true, // 开启查询弹窗
+    //       searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
+    //       searchField: 'number', // 查询弹窗赋值字段
+    //       searchTitle: 'Q2通知单号', // 查询弹窗标题
+    //       searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
+    //       searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
+    //       searchCondition: [
+    //         {
+    //           key: 'available',
+    //           value: 'TRUE',
+    //           isMainValue: false
+    //         },
+    //         {
+    //           key: 'status',
+    //           value: '0',
+    //           isMainValue: false
+    //         },
+    //         {
+    //           key: 'supplierCode',
+    //           value: 'supplierCode',
+    //           isMainValue: true
+    //         }
+    //       ],
+    //       verificationParams: [
+    //         {
+    //           key: 'number',
+    //           action: '==',
+    //           value: '',
+    //           isMainValue: false,
+    //           isSearch: true,
+    //           isFormModel: true
+    //         }
+    //       ] // 失去焦点校验参数
+    //     }
+    //   }
+    // },
     {
       label: '承运商',
       field: 'carrierCode',

From 3b9e45a0949749b6e27fcffcfd29766afbd84c91 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Tue, 25 Mar 2025 08:51:00 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 928aeaf87..4db6e2269 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -429,4 +429,5 @@ export enum DICT_TYPE {
   COUNT_MODE = "count_mode",//盘点模式(1:PAD盘点,2:Excel导入)
   INVENTORY_MODE = "inventory_mode",
   INVOICE_TYPE = 'invoice_type', // 开票种类
+  DELISHIF = "deliShif",// 班次
 }

From 84a12ed7b01330433dd89ee548dc70f87f9268ee Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Tue, 25 Mar 2025 09:07:57 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E8=A1=A5=E7=BB=99=E5=93=81=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptRequestMain.data.ts         | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 0b57dccd9..75a7d5a70 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -68,6 +68,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortTableDefault:1
   },
   {
     label: '状态',
@@ -87,6 +88,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     }
+    ,sortTableDefault:6
   },
   {
     label: '生产计划单号',
@@ -97,7 +99,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     isForm: false,
-    isTable: true,
+    isTable: true
+    ,sortTableDefault:9
   },
   {
     label: '车间代码',
@@ -132,6 +135,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         }], // 失去焦点校验参数
       }
     }
+    ,sortTableDefault:10
   },
   {
     label: '生产线代码',
@@ -193,7 +197,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true,
         }], // 失去焦点校验参数
       }
-    }
+    },
+    sortTableDefault:11
   },
   {
     label: '班组',
@@ -203,7 +208,6 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable:false,
-    sortTableDefault: 1000,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -229,6 +233,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         }], // 失去焦点校验参数
       }
     }
+    ,sortTableDefault:14
   },
   {
     label: '班组',
@@ -239,7 +244,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isDetail:false,
     isForm:false,
-    sortTableDefault: 1001,
+    sortTableDefault: 14,
   },
   {
     label: '班次',
@@ -249,7 +254,6 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable:false,
-    sortTableDefault: 1001,
     form: {
       component:'Select',
       componentProps:{
@@ -268,7 +272,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           }], // 失去焦点校验参数
       }
     }
-    
+    ,sortTableDefault:15
   },
   {
     label: '班次',
@@ -279,7 +283,6 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm:false,
     isDetail:false,
-    sortTableDefault: 1001,
     isSearch: true,
     search: {
       component:'Select',
@@ -291,7 +294,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           },
       }
     }
-    
+    ,sortTableDefault:15
   },
   {
     label: '收货类型',
@@ -688,6 +691,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         }]
       }
     }
+    ,sortTableDefault:11
   },
   {
     label: '工位代码',
@@ -755,6 +759,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         }], // 失去焦点校验参数
       }
     }
+    ,sortTableDefault:12
   },
   {
     label: '工序代码',
@@ -835,6 +840,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         }], // 失去焦点校验参数
       }
     }
+    ,sortTableDefault:13
   },
   {
     label: '包装号',
@@ -963,7 +969,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '品番',
     field: 'itemCode',
     sort: 'custom',
-    sortTableDefault: 1003,
     table: {
       width: 150
     },
@@ -1029,6 +1034,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         }], // 失去焦点校验参数
       }
     }
+    ,sortTableDefault:2
   },
   {
     label: '背番',
@@ -1039,7 +1045,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isSearch:true,
     isForm: false,
-    sortTableDefault: 1003,
     sortSearchDefault: 5,
     tableForm: {
       disabled: true,
@@ -1050,6 +1055,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     }
+    ,sortTableDefault:3
   },
   {
     label: 'Bom版本',
@@ -1058,7 +1064,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    sortTableDefault: 1004,
     tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
@@ -1098,12 +1103,13 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         }]
       }
     },
+    sortTableDefault:16
   },
   {
     label: '批次',
     field: 'batch',
     sort: 'custom',
-    sortTableDefault: 1006,
+    sortTableDefault: 17,
     table: {
       width: 150
     },
@@ -1112,12 +1118,12 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '品名',
     field: 'itemName',
     sort: 'custom',
-    sortTableDefault: 1005,
     table: {
       width: 150
     },
     isTableForm: false,
     isForm: false
+    ,sortTableDefault:4
   },
   // {
   //   label: '背番',
@@ -1159,7 +1165,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '数量',
     field: 'qty',
     sort: 'custom',
-    sortTableDefault: 1006,
     table: {
       width: 150
     },
@@ -1177,13 +1182,13 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       max:9999,
       // precision: 6
     }
+    ,sortTableDefault:5
   },
   {
     label: '计量单位',
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    sortTableDefault: 1007,
     isTable: true,
     sort: 'custom',
     table: {
@@ -1198,7 +1203,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     }
-
+    ,sortTableDefault:7
   },
   {
     label: '生产日期',
@@ -1207,7 +1212,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
-    sortTableDefault: 1008,
     sort: 'custom',
     table: {
       width: 180
@@ -1224,7 +1228,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
-    },
+    }
+    ,sortTableDefault:8
   },
   {
     label: '过期日期',

From e5e42edace5ec7d90a809d86a5c0429f2e1531b6 Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Tue, 25 Mar 2025 09:17:00 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E8=A1=A5=E7=BB=99=E5=93=81=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E4=BB=BB=E5=8A=A1=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptJobMain.data.ts             | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index 7aa355a1d..08fd3714f 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -16,6 +16,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'left'
     },
     isSearch: true,
+    sortTableDefault:1
   },
   {
     label: '申请单号',
@@ -25,6 +26,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isSearch: true,
+    sortTableDefault:7
   },
   {
     label: '状态',
@@ -37,6 +39,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:8
   },
   {
     label: '生产计划单号',
@@ -48,6 +51,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false,
     isTable:true,
+    sortTableDefault:10
   },
   {
     label: '车间代码',
@@ -56,6 +60,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:13
   },
   {
     label: '生产线代码',
@@ -65,6 +70,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:16
   },
   {
     label: '班组',
@@ -74,6 +80,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:13
   },
   {
     label: '班组',
@@ -93,6 +100,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:14
   },
   {
     label: '班次',
@@ -716,16 +724,15 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '批次',
     field: 'batch',
-    sortTableDefault:1002,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:12
   },
   {
     label: '生产日期',
     field: 'produceDate',
-    sortTableDefault:1008,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -743,6 +750,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    sortTableDefault:9
   },
   {
     label: '过期日期',
@@ -770,7 +778,6 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库存状态',
     field: 'inventoryStatus',
-    sortTableDefault:1007,
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
@@ -778,15 +785,16 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:11
   },
   {
     label: '到库位代码',
     field: 'toLocationCode',
-    sortTableDefault:1009,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:10
   },
   {
     label: '订单号',
@@ -836,20 +844,20 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '品番',
     field: 'itemCode',
-    sortTableDefault:1000,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2
   },
   {
     label: '品名',
     field: 'itemName',
-    sortTableDefault:1001,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:4
   },
   {
     label: '背番',
@@ -861,7 +869,6 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
-    sortTableDefault: 1001,
     tableForm: {
       disabled: true
     },
@@ -869,7 +876,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true
       }
-    }
+    },
+    sortTableDefault:3
   },
   // {
   //   label: '背番',
@@ -905,13 +913,13 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '数量',
     field: 'qty',
     sort: 'custom',
-    sortTableDefault:1005,
     table: {
       width: 150
     },
     form: {
       component: 'InputNumber',
     }
+    ,sortTableDefault:5
   },
   {
     label: '计量单位',
@@ -948,11 +956,11 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
-    sortTableDefault:1011,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:6
   },
   {
     label: '创建时间',

From edc98d98c9f547ac9eb7ccf0ae2e4c6ba870992d Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Tue, 25 Mar 2025 09:32:45 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E8=A1=A5=E7=BB=99=E5=93=81=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptRecordMain.data.ts                | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index 4e8429631..4f8917191 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -15,7 +15,8 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
-    isSearch: true
+    isSearch: true,
+    sortTableDefault:1
   },
   {
     label: '申请单据号',
@@ -24,7 +25,8 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true
+    isSearch: true,
+    sortTableDefault:7
   },
   {
     label: '任务单号',
@@ -280,7 +282,8 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
           return '否'
         }
       }
-    }
+    },
+    sortTableDefault:8
   },
   {
     label: '创建者',
@@ -498,6 +501,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:2
   },
   {
     label: '品名',
@@ -506,6 +510,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:4
   },
   {
     label: '背番',
@@ -525,6 +530,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
         disabled: true
       }
     }
+    ,sortTableDefault:3
   },
   // {
   //   label: '背番',
@@ -579,6 +585,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
     }
+    ,sortTableDefault:5
   },
   {
     label: '计量单位',

From 0c749cd1851db59d48f37e613c75343a9972c1f1 Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Tue, 25 Mar 2025 09:45:49 +0800
Subject: [PATCH 06/11] =?UTF-8?q?wms=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=98=AF=E5=90=A6=E8=B6=85=E5=8F=91=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/supplieritem/supplieritem.data.ts            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index 1abe9d8fc..77c8429e1 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -202,7 +202,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Switch',
       componentProps: {
-        disabled: true,
+        disabled: false,
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
       }

From 2a8ed9b69acab027fc52b267274ee37649f1b31a Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Tue, 25 Mar 2025 10:33:33 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E5=8F=B7=E5=8F=A3=E5=93=81=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptAssembleRequestMain.data.ts          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 1c065f636..3b4ec361f 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -74,7 +74,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(
         fixed: 'left'
       },
       isForm: false,
-      isSearch: true
+      isSearch: true,
+      sortTableDefault:1
     },
     {
       label: '状态',
@@ -94,6 +95,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(
           disabled: true
         }
       }
+      ,sortTableDefault:6
     },
     {
       label: '生产计划单号',
@@ -1010,7 +1012,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(
       label: '品番',
       field: 'itemCode',
       sort: 'custom',
-      sortTableDefault: 1003,
       table: {
         width: 150
       },
@@ -1086,6 +1087,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(
           ] // 失去焦点校验参数
         }
       }
+      ,sortTableDefault:2
     },
     {
       label: '背番',
@@ -1096,7 +1098,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(
       },
       isForm: false,
       isSearch: true,
-      sortTableDefault: 1003,
       tableForm: {
         disabled: true,
         isPlaceholder:false
@@ -1106,6 +1107,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(
           disabled: true
         }
       }
+      ,sortTableDefault:3
     },
     {
       label: 'Bom版本',
@@ -1221,7 +1223,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(
       label: '数量',
       field: 'qty',
       sort: 'custom',
-      sortTableDefault: 1006,
       table: {
         width: 150
       },
@@ -1239,6 +1240,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(
         max: 9999
         // precision: 6
       }
+      ,sortTableDefault:4
     },
     {
       label: '计量单位',

From baf49688171db83ef9662f6a21e25a22a2274c4c Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Tue, 25 Mar 2025 11:04:01 +0800
Subject: [PATCH 08/11] =?UTF-8?q?YT-2222SCP=E3=80=8A=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E3=80=8B=E4=B8=AD?=
 =?UTF-8?q?=E3=80=90=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E3=80=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E8=BF=87=E3=80=90=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E3=80=91?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=97=B6=EF=BC=8C=E6=8C=89=E9=92=AE=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E6=98=AF=E8=93=9D=E8=89=B2=EF=BC=9B=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E7=82=B9=E5=87=BB=E8=BF=87=E3=80=90=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=A0=87=E7=AD=BE=E3=80=91=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2=E5=8F=98=E6=88=90=E6=A9=99?=
 =?UTF-8?q?=E8=89=B2=E3=80=82=EF=BC=88=E5=8F=AA=E5=9C=A8=E4=B8=8D=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E7=8E=B0=E8=BF=99=E4=B8=AA=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=8D=B3=E5=8F=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index c47f6a07c..6be11035a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -560,7 +560,7 @@ const butttondata = (row, $index) => {
     },
     defaultButtons.mainListPointBtn({
       hide: isShowMainButton(row, ['3', '8']),
-      type: row.isShowSuccess ? 'success' : 'primary',
+      type: row.isShowSuccess ? 'warning' : 'primary',
       hasPermi: 'wms:supplierdeliver-request-main:printLabel'
     }), // 标签打印
     //defaultButtons.mainListDocumentPrintBtn({ hide: isShowMainButton(row, ['3','8']) }), // 单据打印

From 6312d9115e640f8c3f76e4acb517ff6d3005a8e4 Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Tue, 25 Mar 2025 11:30:11 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=8F=B7=E5=8F=A3=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptAssembleJobMain.data.ts                | 9 +++++----
 .../productreceiptAssembleRecordMain.data.ts             | 8 ++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
index 38da4828e..c7c26e996 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -16,6 +16,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'left'
     },
     isSearch: true,
+    sortTableDefault:1
   },
   {
     label: '申请单号',
@@ -837,20 +838,20 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '品番',
     field: 'itemCode',
-    sortTableDefault:1000,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2
   },
   {
     label: '品名',
     field: 'itemName',
-    sortTableDefault:1001,
     sort: 'custom',
     table: {
       width: 150
-    },
+    }
+    ,sortTableDefault:4
   },
   {
     label: '背番',
@@ -862,7 +863,6 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
-    sortTableDefault: 1001,
     tableForm: {
       disabled: true
     },
@@ -871,6 +871,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     }
+    ,sortTableDefault:3
   },
   // {
   //   label: '背番',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
index 6557b14f6..ad83d834c 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@@ -15,7 +15,8 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
-    isSearch: true
+    isSearch: true,
+    sortTableDefault:1
   },
   {
     label: '申请单号',
@@ -502,6 +503,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:2
   },
   {
     label: '品名',
@@ -510,6 +512,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:4
   },
   {
     label: '背番',
@@ -528,7 +531,8 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         disabled: true
       }
-    }
+    },
+    sortTableDefault:3
   },
   // {
   //   label: '背番',

From 78080640e7972c7b90ab25c82623f5ccfc867853 Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Tue, 25 Mar 2025 11:44:16 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productredressJobMain/productredressJobMain.data.ts   | 6 +++++-
 .../productredressRecordMain.data.ts                      | 8 ++++++--
 .../productredressRequestMain.data.ts                     | 6 +++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index 6cd35701a..273fc66d0 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -16,6 +16,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortTableDefault:1
   },
   {
     label: '申请单号',
@@ -496,6 +497,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:2
   },
   {
     label: '品名',
@@ -504,6 +506,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:5
   },
   {
     label: '背番',
@@ -522,7 +525,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true
       }
-    }
+    },
+    sortTableDefault:3
   },
   {
     label: '批次',
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
index c022f1914..e4ae7f244 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -25,6 +25,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortTableDefault:1
   },
   {
     label: '申请单号',
@@ -379,7 +380,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sort: 'custom',
     table: {
       width: 150
-    }
+    },
+    sortTableDefault:2
   },
   {
     label: '品名',
@@ -388,6 +390,7 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:4
   },
   {
     label: '背番',
@@ -406,7 +409,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         disabled: true
       }
-    }
+    },
+    sortTableDefault:3
   },
   {
     label: '批次',
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index 42fb60f8b..6e7cdfb9a 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -46,6 +46,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortTableDefault:1
   },
   // {
   //   label: '生产计划单号',
@@ -597,6 +598,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
 
       ]
     },
+    sortTableDefault:2
   },
   {
     label: '品名',
@@ -610,6 +612,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     tableForm: {
       disabled: true
     },
+    sortTableDefault:4
   },
   {
     label: '背番',
@@ -627,7 +630,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       componentProps: {
         disabled: true
       }
-    }
+    },
+    sortTableDefault:3
   },
   // {
   //   label: '背番',

From 3791d4d6f8c42deffd74291566d1fd80fa3cf5aa Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Tue, 25 Mar 2025 13:12:02 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=EF=BC=9A=E5=88=9B=E5=BB=BA=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8E=EF=BC=8C=E9=80=89=E6=8B=A9=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E5=8F=B7=EF=BC=8C=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=90=8E=E5=86=8D=E6=AC=A1=E5=88=9B=E5=BB=BA=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=20=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedreceiptRequestMain/index.vue     |  133 +-
 .../unplannedreceiptRequestMain.data.ts       |   24 +-
 .../repleinshRequestMain.data.ts              | 1774 ++++++++---------
 .../supplierinvoiceRecordMain/index.vue       |    2 +-
 4 files changed, 976 insertions(+), 957 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index a9af640d4..a1e5bc641 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -92,6 +92,9 @@
   <Detail
     ref="detailRef"
     :isBasic="false"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
     :allSchemas="UnplannedreceiptRequestMain.allSchemas"
     :detailAllSchemas="UnplannedreceiptRequestDetail.allSchemas"
     :detailAllSchemasRules="UnplannedreceiptRequestDetailRules"
@@ -281,7 +284,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           tfk['itemCode'] = item['code']
           tfk['uom'] = item['uom']
           tfk['validityDays'] = item['validityDays']
-          tfk['isEnableBuy'] =  val[0]['enableBuy']
+          tfk['isEnableBuy'] = val[0]['enableBuy']
           tableData.value.push(tfk)
         })
       } else if (formField === 'costcentreCode') {
@@ -554,7 +557,7 @@ const buttonTableClick = async (val, row) => {
     // 判断 是否已创建标签
     tableObject.loading = true
     try {
-       let isCreateLabel = false
+      let isCreateLabel = false
       await PackageApi.getPackagePage({
         requestNumber: row.number
       }).then((res) => {
@@ -564,7 +567,7 @@ const buttonTableClick = async (val, row) => {
       })
       if (isCreateLabel) {
         message.warning('已创建过标签！！！')
-      tableObject.loading = false
+        tableObject.loading = false
         return
       }
       console.log('列表-操作按钮事件-创建标签')
@@ -579,7 +582,7 @@ const buttonTableClick = async (val, row) => {
       }
       // 打开创建标签页面
       // dialogVisible.value = true
-     tableObject.loading = false
+      tableObject.loading = false
       formLabelRef.value.open('create', row)
       console.log(detailListTableColumns.tableFormColumns)
       detatableData.tableList.map((item) => {
@@ -631,11 +634,10 @@ const buttonTableClick = async (val, row) => {
             }
           })
       })
-    }finally {
+    } finally {
       tableObject.loading = false
     }
   }
-   
 }
 
 /** 关闭按钮操作 */
@@ -866,7 +868,7 @@ const submitForm = async (formType, submitData) => {
   try {
     let newVal = data.subList.some((item) => item.isEnableBuy == 'TRUE')
     let newVal1 = data.subList.some((item) => item.isEnableBuy == 'FALSE')
-    console.log(newVal,newVal1)
+    console.log(newVal, newVal1)
     if (newVal && newVal1) {
       message.warning('不能同时选择可制造和可采购的物料')
       return
@@ -955,25 +957,29 @@ const submitFormLabel = async (formType, data) => {
   try {
     formLabelRef.value.formLoading = true
     detatableData.tableList.forEach(async (item) => {
-      const unitConversion = await UnitConversionApi.getUnitConversionByCode(item.itemCode);
-      let convertRate = 1//转换率
-      let purchaseUom = item.uom//采购计量单位
-      let purchaseStdQty//采购标包数量
-      if(unitConversion!=null){
-        if(unitConversion.convertRate!=null&&unitConversion.convertRate!='' && unitConversion.convertRate!=0){
-        convertRate = unitConversion.convertRate;
+      const unitConversion = await UnitConversionApi.getUnitConversionByCode(item.itemCode)
+      let convertRate = 1 //转换率
+      let purchaseUom = item.uom //采购计量单位
+      let purchaseStdQty //采购标包数量
+      if (unitConversion != null) {
+        if (
+          unitConversion.convertRate != null &&
+          unitConversion.convertRate != '' &&
+          unitConversion.convertRate != 0
+        ) {
+          convertRate = unitConversion.convertRate
         }
-        if(unitConversion.purchaseUom!=null&&unitConversion.purchaseUom!='' ){
-          purchaseUom = unitConversion.purchaseUom;
+        if (unitConversion.purchaseUom != null && unitConversion.purchaseUom != '') {
+          purchaseUom = unitConversion.purchaseUom
         }
       }
-      let purchaseQty = (item.qty / convertRate).toFixed(5);//采购每包中实际的数量
-      purchaseStdQty = (item.packQty / convertRate).toFixed(5);//采购每包中实际的数量
-      item.purchaseQty = purchaseQty;//采购实际每包数量
-      item.convertRate = convertRate;//转换率
-      item.purchaseStdQty = purchaseStdQty;//采购标包数量
-      item.purchaseUom = purchaseUom;//采购计量单位
-      console.log('item======================',item)
+      let purchaseQty = (item.qty / convertRate).toFixed(5) //采购每包中实际的数量
+      purchaseStdQty = (item.packQty / convertRate).toFixed(5) //采购每包中实际的数量
+      item.purchaseQty = purchaseQty //采购实际每包数量
+      item.convertRate = convertRate //转换率
+      item.purchaseStdQty = purchaseStdQty //采购标包数量
+      item.purchaseUom = purchaseUom //采购计量单位
+      console.log('item======================', item)
       await PackageApi.createPackageLabel(item)
         .then((res) => {
           isCreateLabel.value = true
@@ -1067,49 +1073,68 @@ const labelPrint = async (row) => {
   try {
     await PackageApi.getPackagePage({
       requestNumber: row.number
-    }).then((res) => {
-      if (res.list.length > 0) {
-        isCreateLabel.value = true
-      } else {
-        isCreateLabel.value = false
-      }
-    }).catch((err) => {
-      isCreateLabel.value = false
-      console.log(err)
     })
+      .then((res) => {
+        if (res.list.length > 0) {
+          isCreateLabel.value = true
+        } else {
+          isCreateLabel.value = false
+        }
+      })
+      .catch((err) => {
+        isCreateLabel.value = false
+        console.log(err)
+      })
     // 判断是采购还是制造
     if (isCreateLabel.value) {
       // labelPrint(row)
       await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then(async (res) => {
         if (res.length > 0) {
-          const itemType = res.some((item) => item.itemType == '可采购' && item.itemBasicType =='TOOL')//跳转协定品标签
-          const itemType2 = res.some((item) => item.itemType == '可采购' && item.itemBasicType !='TOOL')
+          const itemType = res.some(
+            (item) => item.itemType == '可采购' && item.itemBasicType == 'TOOL'
+          ) //跳转协定品标签
+          const itemType2 = res.some(
+            (item) => item.itemType == '可采购' && item.itemBasicType != 'TOOL'
+          )
           const itemType1 = res.some((item) => item.itemType == '可制造')
           if (itemType) {
-            window.open( BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken() + '&request_number=' + row.number )
+            window.open(
+              BASE_URL +
+                '/jmreport/view/1028102732077142016?token=' +
+                getAccessToken() +
+                '&request_number=' +
+                row.number
+            )
           }
           if (itemType2) {
-            window.open( BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken() + '&request_number=' + row.number )
+            window.open(
+              BASE_URL +
+                '/jmreport/view/1016234988731322368?token=' +
+                getAccessToken() +
+                '&request_number=' +
+                row.number
+            )
+          }
+          if (itemType1) {
+            // window.open(src.value + '&request_number=' + row.number)
+            await PackageApi.batchPrintingLableForYT(row.number)
+              .then((res) => {
+                console.log(res)
+                const src = ref(
+                  BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()
+                )
+                window.open(src.value + '&asn_number=' + res)
+              })
+              .catch((err) => {
+                console.log(err)
+                message.error('创建标签失败')
+              })
           }
-        if (itemType1) {
-          // window.open(src.value + '&request_number=' + row.number)
-          await PackageApi.batchPrintingLableForYT(row.number).then((res) => {
-              console.log(res)
-              const src = ref(
-                BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()
-              )
-              window.open(src.value + '&asn_number=' + res)
-            })
-            .catch((err) => {
-              console.log(err)
-              message.error('创建标签失败')
-            })
         }
-      }
-    })
-  } else {
-    message.warning('请先创建标签')
-  }
+      })
+    } else {
+      message.warning('请先创建标签')
+    }
   } finally {
     tableObject.loading = false
   }
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index 08e7cc0c4..2bb8dac07 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -1423,18 +1423,18 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    hiddenInMain:true,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:false,
-  }
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   hiddenInMain:true,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:false,
+  // }
 ]))
 function validateQty(rule, value, callback) {
   if (value>0) {
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 9f1e3b0de..dafff9d9e 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -1,11 +1,11 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
-import * as ItembasicApi  from '@/api/wms/itembasic'
+import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 
-import * as LocationApi  from '@/api/wms/location'
+import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
 import * as WarehouseApi from '@/api/wms/warehouse'
@@ -15,144 +15,86 @@ const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'RepleinmentRequest',
+  pageSize: 10,
+  pageNo: 1,
+  code: 'RepleinmentRequest',
   businessTypeCode: 'Repleinment'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
- // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
-import {getLocationPageRepleinsh} from "@/api/wms/location";
- const userStore = useUserStore()
- const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
- const userDeptArray:any = [userDept]
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+import { getLocationPageRepleinsh } from '@/api/wms/location'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 
 /**
  * @returns {Array} 补料申请主表
  */
-export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-    sortSearchDefault:1,
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isForm:false,
-    isTable: true,
-    isSearch: true,
-    sort: 'custom',
-    sortTableDefault:1,
-    table: {
-      width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    // isTableForm: false,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch:true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位信息', // 查询弹窗标题
-        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+export const RepleinshRequestMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isForm: false,
+      isSearch: true,
+      sortSearchDefault: 1
+    },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isForm: false,
+      isTable: true,
+      isSearch: true,
+      sort: 'custom',
+      sortTableDefault: 1,
+      table: {
+        width: 150
+      },
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '库位信息', // 查询弹窗标题
-      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-      searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-  },
-  {
-    label: '来源',
-    field: 'sourceType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTable: true,
-    isDetail: true
-  },
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTable: true,
-    isDetail: true
-  },
-  {
-    label: '生产线区分',
-    field: 'productionLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTable: true,
-    isDetail: true
-  },
-{
+    {
+      label: '生产线代码',
+      field: 'productionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: true,
+      isDetail: true
+    },
+    {
+      label: '生产线区分',
+      field: 'productionLine',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: true,
+      isDetail: true
+    },
+    {
       label: '日期',
-      sortTableDefault:5,
+      sortTableDefault: 5,
       field: 'day',
       sort: 'custom',
       isDetail: true,
@@ -182,9 +124,75 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         width: 150
       },
       detail: {
-        dateFormat:'YYYY-MM-DD'
+        dateFormat: 'YYYY-MM-DD'
       }
     },
+    {
+      label: '到库位代码',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      // isTableForm: false,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '库位信息', // 查询弹窗标题
+          searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+          searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      },
+      tableForm: {
+        isInpuFocusShow: true,
+        searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      }
+    },
+    {
+      label: '来源',
+      field: 'sourceType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: true,
+      isDetail: true
+    },
+   
     {
       label: '便次',
       field: 'deliNo',
@@ -193,806 +201,796 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       table: {
         width: 150
       },
-      isTable:true,
+      isTable: true,
       form: {
         component: 'InputNumber',
         componentProps: {
-          min: 1,
-        },
+          min: 1
+        }
       }
     },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false,
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false,
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
     },
-    isForm: false,
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
     },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 150
-    },
-    isTable: false,
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id == cellValue)?.name
-    },
-    form: {
-      value: userDept.id,
-      component: 'Select',
-      api: () => userDeptArray,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
         }
       }
-    }
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    form: {
-      value: 'Repleinment',
-      componentProps: {
-        disabled: true
+    },
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      isForm: false,
+      table: {
+        width: 150
+      },
+      isTable: false,
+      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+        return userDeptArray.find((account) => account.id == cellValue)?.name
+      },
+      form: {
+        value: userDept.id,
+        component: 'Select',
+        api: () => userDeptArray,
+        componentProps: {
+          disabled: true,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'id'
+          }
+        }
       }
     },
-    isForm: false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTable: true,
-    isDetail: true
-  },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        value: 'Repleinment',
+        componentProps: {
+          disabled: true
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: true,
+      isDetail: true
+    },
 
-  // {
-  //   label: '从仓库代码',
-  //   field: 'fromWarehouseCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: false,
-  //   form: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '仓库信息', // 查询弹窗标题
-  //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
-  //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
-  //       searchCondition: [{
-  //         key: 'available',
-  //         value: 'TRUE',
-  //         isMainValue: false
-  //       }]
-  //     }
-  //   }
-  // },
-  // {
-  //   label: '到仓库代码',
-  //   field: 'toWarehouseCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: false,
-  //   form: {
-  //     componentProps: {
-  //       disabled: true
-  //     }
-  //   }
-  // },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm:false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    // {
+    //   label: '从仓库代码',
+    //   field: 'fromWarehouseCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false,
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       isSearchList: true, // 开启查询弹窗
+    //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+    //       searchField: 'code', // 查询弹窗赋值字段
+    //       searchTitle: '仓库信息', // 查询弹窗标题
+    //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+    //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+    //       searchCondition: [{
+    //         key: 'available',
+    //         value: 'TRUE',
+    //         isMainValue: false
+    //       }]
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '到仓库代码',
+    //   field: 'toWarehouseCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false,
+    //   form: {
+    //     componentProps: {
+    //       disabled: true
+    //     }
+    //   }
+    // },
+    {
+      label: '自动提交',
+      field: 'autoCommit',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoCommit,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm:false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    },
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoAgree,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    },
+    {
+      label: '自动执行',
+      field: 'autoExecute',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoExecute,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
     },
-    isForm: false,
-    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')]
-      },
-    },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: true,
-    isForm: false,
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isDetail: true,
-    hiddenInMain:true,
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    // {
+    //   label: '直接生成记录',
+    //   field: 'directCreateRecord',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   isTable: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'Switch',
+    //     value: requestsettingData.directCreateRecord,
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE',
+    //       disabled: true
+    //     }
+    //   }
+    // },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false,
+      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: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTable: false,
-    isDetail: true,
-    isForm: false,
-  },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 300,
-  //     fixed: 'right'
-  //   },
-  // },
-  // {
-  //   label: '包装规格',
-  //   field: 'packUnit',
-  //   sort: 'custom',
-  //   isForm:false,
-  //   table: {
-  //     width: 150
-  //   },
-  //   sortTableDefault:7,
-  // },
-  // {
-  //   label: '包装数量',
-  //   field: 'packQty',
-  //   sort: 'custom',
-  //   isForm:false,
-  //   table: {
-  //     width: 150
-  //   },
-  //   sortTableDefault:8,
-  // },
-]))
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: true,
+      isForm: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isDetail: true,
+      hiddenInMain: true,
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTable: false,
+      isDetail: true,
+      isForm: false
+    }
+    // {
+    //   label: '操作',
+    //   field: 'action',
+    //   isDetail: false,
+    //   isForm: false,
+    //   table: {
+    //     width: 300,
+    //     fixed: 'right'
+    //   },
+    // },
+    // {
+    //   label: '包装规格',
+    //   field: 'packUnit',
+    //   sort: 'custom',
+    //   isForm:false,
+    //   table: {
+    //     width: 150
+    //   },
+    //   sortTableDefault:7,
+    // },
+    // {
+    //   label: '包装数量',
+    //   field: 'packQty',
+    //   sort: 'custom',
+    //   isForm:false,
+    //   table: {
+    //     width: 150
+    //   },
+    //   sortTableDefault:8,
+    // },
+  ])
+)
 
 //表单校验
 export const RepleinshRequestMainRules = reactive({
-  fromWarehouseCode: [
-    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
-  ],
-  fromAreaTypes: [
-    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
-  ],
-  toWarehouseCode: [
-    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
-  ],
-  toAreaTypes: [
-    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
-  ],
-  departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
-  ],
-  autoCommit: [
-    { required: true, message: '请选择是否自动提交', trigger: 'change' }
-  ],
-  autoAgree: [
-    { required: true, message: '请选择是否自动通过', trigger: 'change' }
-  ],
-  autoExecute: [
-    { required: true, message: '请选择是否自动执行', trigger: 'change' }
-  ],
-  toLocationCode: [
-    { required: true, message: '请输入到库位代码', trigger: ['change', 'blur']}
-  ],
+  fromWarehouseCode: [{ required: true, message: '请输入从仓库代码', trigger: 'blur' }],
+  fromAreaTypes: [{ required: true, message: '请选择从库区类型范围', trigger: 'change' }],
+  toWarehouseCode: [{ required: true, message: '请输入到仓库代码', trigger: 'blur' }],
+  toAreaTypes: [{ required: true, message: '请选择到库区类型范围', trigger: 'change' }],
+  departmentCode: [{ required: true, message: '请输入部门', trigger: 'blur' }],
+  autoCommit: [{ required: true, message: '请选择是否自动提交', trigger: 'change' }],
+  autoAgree: [{ required: true, message: '请选择是否自动通过', trigger: 'change' }],
+  autoExecute: [{ required: true, message: '请选择是否自动执行', trigger: 'change' }],
+  toLocationCode: [{ required: true, message: '请输入到库位代码', trigger: ['change', 'blur'] }],
   directCreateRecord: [
     { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
   ],
-  businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
-  ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
 })
 
 /**
  * @returns {Array} 补料申请子表
  */
-export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '品番',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    sortSearchDefault:2,
-    sortTableDefault:3,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
+export const RepleinshRequestDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '品番',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      sortSearchDefault: 2,
+      sortTableDefault: 3,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '物料基础信息', // 查询弹窗标题
+          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+          searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      tableForm: {
+        multiple: true,
+        disabled: true,
+        // isInpuFocusShow: true,
         searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },
+          {
+            key: 'businessTypeCode',
+            value: queryParams.businessTypeCode
+          }
+        ],
+        verificationPage: ItembasicApi.getItemListByCodes, // 校验数去焦点输入是否正确的方法
+        isShowTableFormSearch: true,
+        verificationParams: [
+          {
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
       }
     },
-    tableForm:{
-      multiple:true,
-      disabled:true,
-      // isInpuFocusShow: true,
-      searchListPlaceholder: '请选择品番', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '物料基础信息', // 查询弹窗标题
-      searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-      searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key : 'businessTypeCode',
-        value: queryParams.businessTypeCode
-        }],
-      verificationPage: ItembasicApi.getItemListByCodes, // 校验数去焦点输入是否正确的方法
-      isShowTableFormSearch: true,
-      verificationParams: [{
-        key: 'code',
-        action: '==',
-        value: '',
-        isMainValue: false,
-        isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
-    },
-  },
-  {
-    label: '品名',
-    field: 'itemName',
-    sort: 'custom',
-    sortTableDefault:4,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '背番',
-    field: 'backNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTable: true,
-    isDetail: true
-  },
-  {
-    label: '描述',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '数量',
-    field: 'unexecutedQty',
-    sort: 'custom',
-    sortTableDefault:4,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:9,
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
+    {
+      label: '品名',
+      field: 'itemName',
+      sort: 'custom',
+      sortTableDefault: 4,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '背番',
+      field: 'backNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: true,
+      isDetail: true
+    },
+    {
+      label: '描述',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '数量',
+      field: 'unexecutedQty',
+      sort: 'custom',
+      sortTableDefault: 4,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 9,
+      tableForm: {
+        type: 'Select',
         disabled: true
-      }
-    }
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortSearchDefault:1000,
-    // isSearch: true,
-    sortTableDefault:1100,
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disabled:true,
-      }
-    }
-  },
- 
-  // {
-  //   label: '包装号',
-  //   field: 'packingNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: false,
-  //   isForm: false,
-  //   sortTableDefault:6,
-  //   sortSearchDefault:4,
-  // },
-  // {
-  //   label: '批次',
-  //   field: 'batch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: false,
-  //   sortTableDefault:5,
-  //   sortSearchDefault:3,
-  // },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTableForm: false,
-    isTable:false,
-    sort: 'custom',
-    form: {
-      value: 'OK',
-      componentProps: {
-        disabled: true,
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    table: {
-      width: 150
+    {
+      label: '到库位代码',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      sortSearchDefault: 1000,
+      // isSearch: true,
+      sortTableDefault: 1100,
+      isTableForm: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
     },
-    tableForm: {
-      type: 'Select',
-      default: 'OK',
-      disabled: true
-    }
-  },
 
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isTable:false,
-    form: {
-      componentProps: {
+    // {
+    //   label: '包装号',
+    //   field: 'packingNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTableForm: false,
+    //   isForm: false,
+    //   sortTableDefault:6,
+    //   sortSearchDefault:4,
+    // },
+    // {
+    //   label: '批次',
+    //   field: 'batch',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTableForm: false,
+    //   sortTableDefault:5,
+    //   sortSearchDefault:3,
+    // },
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      isTableForm: false,
+      isTable: false,
+      sort: 'custom',
+      form: {
+        value: 'OK',
+        componentProps: {
+          disabled: true,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select',
+        default: 'OK',
         disabled: true
       }
-    }
-  },
- 
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isTableForm:false,
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain:true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    },
+
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isTable: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
 
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isTable:false,
-    isForm: false,
-  },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      isTableForm: false,
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      hiddenInMain: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
 
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    sortTableDefault:1,
-    isTable:false,
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    sortTableDefault:2,
-    isTable:false,
-  },
- 
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-    hiddenInMain:true,
-    isTable:false,
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-    hiddenInMain:true,
-    isTable:false, 
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+    {
+      label: '项目代码',
+      field: 'projectCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isTable: false,
+      isForm: false
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    hiddenInMain:true,
-    isTable:false,
-    isForm: false
-  },
-  // {
-  //   label: '未执行任务数量',
-  //   field: 'unexecutedQty',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'InputNumber',
-  //   },
-  //   isTableForm:false,
-  //   hiddenInMain:true,
-  // },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   hiddenInMain:true,
-  //   isDetail: false,
-  //   isForm: false ,
-  //   table: {
-  //     width: 150,
-  //     fixed: 'right'
-  //   },
-  //   isTableForm:false,
-  // }
-]))
+
+    {
+      label: '采购订单号',
+      field: 'poNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      sortTableDefault: 1,
+      isTable: false
+    },
+    {
+      label: '订单行',
+      field: 'poLine',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      sortTableDefault: 2,
+      isTable: false
+    },
+
+    {
+      label: '从货主代码',
+      field: 'fromOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false,
+      hiddenInMain: true,
+      isTable: false
+    },
+    {
+      label: '到货主代码',
+      field: 'toOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false,
+      hiddenInMain: true,
+      isTable: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      hiddenInMain: true,
+      isTable: false,
+      isForm: false
+    }
+    // {
+    //   label: '未执行任务数量',
+    //   field: 'unexecutedQty',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   },
+    //   isTableForm:false,
+    //   hiddenInMain:true,
+    // },
+    // {
+    //   label: '操作',
+    //   field: 'action',
+    //   hiddenInMain:true,
+    //   isDetail: false,
+    //   isForm: false ,
+    //   table: {
+    //     width: 150,
+    //     fixed: 'right'
+    //   },
+    //   isTableForm:false,
+    // }
+  ])
+)
 
 //表单校验
 export const RepleinshRequestDetailRules = reactive({
@@ -1002,10 +1000,6 @@ export const RepleinshRequestDetailRules = reactive({
   // toLocationCode: [
   //   { required: true, message: '请输入到库位代码', trigger: 'blur' }
   // ],
-  itemCode: [
-    { required: true, message: '请输入品番', trigger: 'blur' }
-  ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  itemCode: [{ required: true, message: '请输入品番', trigger: 'blur' }],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
 })
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index cf8c8e0a3..2c2eedec0 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -212,7 +212,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出
-  defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印
+  // defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置