Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

# Conflicts:
#	src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue

.env.wyf

@@ -3,16 +3,16 @@ NODE_ENV=test
 
 VITE_DEV=false
 
-# # # # 请求路径
-# VITE_BASE_URL='http://192.168.0.108:12080'
-# # 上传路径
-# VITE_UPLOAD_URL='http://192.168.0.108:12080/admin-api/infra/file/upload'
-
 # 请求路径
-VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
-
+VITE_BASE_URL='http://192.168.0.108:12080'
 # 上传路径
-VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://192.168.0.108:12080/admin-api/infra/file/upload'
+
+# # 请求路径
+# VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
+
+# # 上传路径
+# VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CustomerreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CustomerreceiptRecordMain.allSchemas.searchSchema,...CustomerreceiptRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CustomerreceiptRecordMain.allSchemas"
+      :detailAllSchemas="CustomerreceiptRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CustomerreceiptRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...CustomerreceiptRecordMain.allSchemas.tableColumns,...CustomerreceiptRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -125,7 +126,11 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
   return []
 }
 

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CustomerreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CustomerreceiptRequestMain.allSchemas.searchSchema,...CustomerreceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CustomerreceiptRequestMain.allSchemas"
+      :detailAllSchemas="CustomerreceiptRequestDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -95,7 +96,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CustomerreceiptRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...CustomerreceiptRequestMain.allSchemas.tableColumns,...CustomerreceiptRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -189,7 +190,11 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
     return [
         defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customerreceipt-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customerreceipt-request-main:reAdd'}), //重新添加
@@ -208,7 +213,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    CustomerreceiptRequestMainApi.close(row.id).then(() => {
+    CustomerreceiptRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -219,7 +224,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    CustomerreceiptRequestMainApi.reAdd(row.id).then(() => {
+    CustomerreceiptRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -230,7 +235,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    CustomerreceiptRequestMainApi.submit(row.id).then(() => {
+    CustomerreceiptRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -241,7 +246,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    CustomerreceiptRequestMainApi.refused(row.id).then(() => {
+    CustomerreceiptRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -252,7 +257,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    CustomerreceiptRequestMainApi.agree(row.id).then(() => {
+    CustomerreceiptRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -263,7 +268,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    CustomerreceiptRequestMainApi.handle(row.id).then(() => {
+    CustomerreceiptRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -274,7 +279,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 
@@ -376,6 +381,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await CustomerreceiptRequestMainApi.importTemplate()
+  // importTemplateData.templateUrl = await CustomerreceiptRequestMainApi.importTemplate()
 })
 </script>

src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CustomerreturnJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CustomerreturnJobMain.allSchemas.searchSchema,...CustomerreturnJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CustomerreturnJobMain.allSchemas"
+      :detailAllSchemas="CustomerreturnJobDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CustomerreturnJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...CustomerreturnJobMain.allSchemas.tableColumns,...CustomerreturnJobDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -178,7 +179,11 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
   return [
     // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
@@ -301,7 +306,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     await message.confirm('确认要放弃吗？')
     console.log('列表-操作按钮事件-放弃')
-    CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.id).then(() => {
+    CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       getList()
     }).catch(err => {
@@ -310,7 +315,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobClo') { // 关闭
     await message.confirm('确认要关闭吗？')
     console.log('列表-操作按钮事件-关闭')
-    CustomerreturnJobMainApi.closeCustomerreturnJobMain(row.id).then(() => {
+    CustomerreturnJobMainApi.closeCustomerreturnJobMain(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       getList()
     }).catch(err => {
@@ -319,7 +324,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAcc') { // 承接
     await message.confirm('确认要承接吗？')
     console.log('列表-操作按钮事件-承接')
-    CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.id).then(() => {
+    CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       getList()
     }).catch(err => {

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CustomerreturnRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CustomerreturnRecordMain.allSchemas.searchSchema,...CustomerreturnRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CustomerreturnRecordMain.allSchemas"
+      :detailAllSchemas="CustomerreturnRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -77,7 +78,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CustomerreturnRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...CustomerreturnRecordMain.allSchemas.tableColumns,...CustomerreturnRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -126,11 +127,13 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
-  return [
-      defaultButtons.mainListDocumentPrintBtn(null), // 标签打印
-  ]
-}
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
+  defaultButtons.mainListDocumentPrintBtn(null), // 标签打印
+]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
@@ -177,7 +180,7 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/929216638195793920?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
-  window.open(src.value+'&id='+row.id)
+  window.open(src.value+'&id='+row.masterId)
 }
 
 /** 初始化 **/

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CustomerreturnRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CustomerreturnRequestMain.allSchemas.searchSchema,...CustomerreturnRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CustomerreturnRequestMain.allSchemas"
+      :detailAllSchemas="CustomerreturnRequestDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -98,7 +99,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 const customerCode = ref()
 routeName.value = route.name
-const tableColumns = ref(CustomerreturnRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...CustomerreturnRequestMain.allSchemas.tableColumns,...CustomerreturnRequestDetail.allSchemas.tableMainColumns])
 
 const isShowButton = ref(true)
 
@@ -251,7 +252,11 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
     return [
         defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customerreturn-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customerreturn-request-main:reAdd'}), // 重新添加
@@ -271,7 +276,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    CustomerreturnRequestMainApi.close(row.id).then(() => {
+    CustomerreturnRequestMainApi.close(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -281,7 +286,7 @@ const buttonTableClick = async (val, row) => {
     })  } else if (val == 'mainReAdd') { // 重新添加
       await message.confirm('确认要重新添加吗？')
       tableObject.loading = true
-      CustomerreturnRequestMainApi.reAdd(row.id).then(() => {
+      CustomerreturnRequestMainApi.reAdd(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -292,7 +297,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    CustomerreturnRequestMainApi.submit(row.id).then(() => {
+    CustomerreturnRequestMainApi.submit(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -303,7 +308,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回审批吗？')
     tableObject.loading = true
-    CustomerreturnRequestMainApi.refused(row.id).then(() => {
+    CustomerreturnRequestMainApi.refused(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -314,7 +319,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    CustomerreturnRequestMainApi.agree(row.id).then(() => {
+    CustomerreturnRequestMainApi.agree(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -325,7 +330,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    CustomerreturnRequestMainApi.handle(row.id).then(() => {
+    CustomerreturnRequestMainApi.handle(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -336,7 +341,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 

src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="DeliverJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...DeliverJobMain.allSchemas.searchSchema,...DeliverJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="DeliverJobMain.allSchemas"
+      :detailAllSchemas="DeliverJobDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(DeliverJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...DeliverJobMain.allSchemas.tableColumns,...DeliverJobDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -178,7 +179,11 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
   return [
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
@@ -286,11 +291,11 @@ const buttonTableClick = async (val, row) => {
     handleHandle(aaa)
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
-    DeliverJobMainApi.abandonDeliverJobMain(row.id)
+    DeliverJobMainApi.abandonDeliverJobMain(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    DeliverJobMainApi.closeDeliverJobMain(row.id)
+    DeliverJobMainApi.closeDeliverJobMain(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
-    DeliverJobMainApi.acceptDeliverJobMain(row.id)
+    DeliverJobMainApi.acceptDeliverJobMain(row.masterId)
   }
 }
 // 获取部门 用于详情 部门回显

src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="DeliverRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...DeliverRecordMain.allSchemas.searchSchema,...DeliverRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="DeliverRecordMain.allSchemas"
+      :detailAllSchemas="DeliverRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -77,7 +78,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(DeliverRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...DeliverRecordMain.allSchemas.tableColumns,...DeliverRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -126,7 +127,11 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => [
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
   defaultButtons.mainListDocumentPrintBtn(null), // 标签打印
 ]
 
@@ -166,7 +171,7 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/929209659733770240?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
-  window.open(src.value+'&id='+row.id)
+  window.open(src.value+'&id='+row.masterId)
 }
 
 // 筛选提交

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="DeliverRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...DeliverRequestMain.allSchemas.searchSchema,...DeliverRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="DeliverRequestMain.allSchemas"
+      :detailAllSchemas="DeliverRequestDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -33,8 +34,8 @@
         </el-button>
         
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -101,7 +102,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const customerCode = ref()
-const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns])
 
 const isShowButton = ref(true)
 
@@ -259,7 +260,11 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
     return [
     defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:deliver-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:deliver-request-main:reAdd'}), //重新添加
@@ -279,7 +284,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    DeliverRequestMainApi.close(row.id).then(() => {
+    DeliverRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -290,7 +295,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    DeliverRequestMainApi.reAdd(row.id).then(() => {
+    DeliverRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -301,7 +306,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    DeliverRequestMainApi.submit(row.id).then(() => {
+    DeliverRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -312,7 +317,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    DeliverRequestMainApi.refused(row.id).then(() => {
+    DeliverRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -323,7 +328,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    DeliverRequestMainApi.agree(row.id).then(() => {
+    DeliverRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -334,7 +339,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要 处理吗？')
     tableObject.loading = true
-    DeliverRequestMainApi.handle(row.id).then(() => {
+    DeliverRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -345,7 +350,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="DeliverPlanMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...DeliverPlanMain.allSchemas.searchSchema,...DeliverPlanDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="DeliverPlanMain.allSchemas"
+      :detailAllSchemas="DeliverPlanDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -92,7 +93,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const customerCode = ref()
-const tableColumns = ref(DeliverPlanMain.allSchemas.tableColumns)
+const tableColumns = ref([...DeliverPlanMain.allSchemas.tableColumns,...DeliverPlanDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -209,7 +210,11 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
   return [
    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:deliver-plan-main:open'}), // 打开
     defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:deliver-plan-main:close'}), // 关闭
@@ -226,7 +231,7 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainPlanOpe') { // 打开
     tableObject.loading = true
-    DeliverPlanMainApi.open(row.id).then(() => {
+    DeliverPlanMainApi.open(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -237,7 +242,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanClo') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    DeliverPlanMainApi.close(row.id).then(() => {
+    DeliverPlanMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -248,7 +253,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanSub') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    DeliverPlanMainApi.submit(row.id).then(() => {
+    DeliverPlanMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -259,7 +264,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanTur') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    DeliverPlanMainApi.reject(row.id).then(() => {
+    DeliverPlanMainApi.reject(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -270,7 +275,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanApp') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    DeliverPlanMainApi.agree(row.id).then(() => {
+    DeliverPlanMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -281,7 +286,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanPub') { // 发布
     await message.confirm('确认要发布吗？')
     tableObject.loading = true
-    DeliverPlanMainApi.publish(row.id).then(() => {
+    DeliverPlanMainApi.publish(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -292,7 +297,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanRes') { // 重置
     await message.confirm('确认要重置吗？')
     tableObject.loading = true
-    DeliverPlanMainApi.resetting(row.id).then(() => {
+    DeliverPlanMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -303,7 +308,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -608,7 +608,29 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120,
       fixed: 'right'
     },
-  }
+  },
+  {
+    label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面
+    field: 'toPackingNumber',
+    sort: 'custom',
+    isForm:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    sortTableDefault:1001,
+  },
+  {
+    label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面
+    field: 'toBatch',
+    sort: 'custom',
+    isForm:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    sortTableDefault:1001,
+  },
 ]))
 
 //表单校验
@@ -675,6 +697,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch:true,
+    hiddenInMain:true,
     sortTableDefault:1001,
     sortSearchDefault:1002
   },
@@ -696,7 +719,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:1000,
     sortSearchDefault:1000,
-    isSearch:true
+    isSearch:true,
+    hiddenInMain:true,
   },
   {
     label: '替代批次',
@@ -1025,7 +1049,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     },
     isTableForm:true,
-  }
+  },
+  
 ]))
 
 //表单校验

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { t } from '@wangeditor/editor'
 
 
 
@@ -16,6 +17,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'left'
     },
     isSearch: true,
+    sortSearchDefault:1
   },
   {
     label: '申请单号',
@@ -24,7 +26,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true,
   },
   {
     label: '任务单号',
@@ -41,6 +42,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isSearch: true
   },
   {
     label: 'ERP单据号(无用)',
@@ -67,6 +69,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false
   },
   {
     label: '供应商代码',
@@ -76,6 +79,8 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
+    sortSearchDefault:2,
+    isTable:false
   },
   {
     label: '到月台代码',
@@ -84,6 +89,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '承运商',
@@ -92,6 +98,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '运输方式',
@@ -100,6 +107,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '数据来源',
@@ -115,6 +123,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isSearch: false,
+    isTable:false
   },
   {
     label: '车牌号',
@@ -123,6 +132,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '从仓库代码',
@@ -131,6 +141,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '到仓库代码',
@@ -139,13 +150,14 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -156,7 +168,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -169,6 +181,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '到库区代码范围',
@@ -177,6 +190,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '出库事务类型',
@@ -185,6 +199,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '入库事务类型',
@@ -193,6 +208,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '执行时间',
@@ -205,6 +221,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -225,6 +242,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -246,6 +264,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -266,6 +285,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -282,6 +302,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   // {
   //   label: '代码',
@@ -296,7 +317,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -309,6 +330,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '备注',
@@ -317,6 +339,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '创建者',
@@ -325,6 +348,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '创建时间',
@@ -337,6 +361,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -352,7 +377,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -375,7 +400,27 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 300,
       fixed: 'right'
     },
-  }
+  },
+  {
+    label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
+    field: 'fromBatch',
+    sort: 'custom',
+    isForm:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    sortTableDefault:1000
+  },
+  {
+    label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1001
+  },
 ]))
 
 // 表单校验
@@ -439,14 +484,24 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 180,
       fixed: 'left'
     },
+    hiddenInMain:true
   },
   {
-    label: '订单号',
+    label: '检验申请单号',
+    field: 'inspectNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '采购订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true
   },
   {
     label: '订单行',
@@ -463,6 +518,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isSearch: true
   },
   {
     label: '物料名称',
@@ -479,6 +535,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '物料描述2',
@@ -487,6 +544,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '从批次',
@@ -495,6 +553,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '到批次',
@@ -503,6 +562,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '替代批次',
@@ -511,6 +571,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '从包装号',
@@ -519,6 +580,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '到包装号',
@@ -527,6 +589,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '从器具号',
@@ -535,6 +598,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '到器具号',
@@ -543,6 +607,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '数量',
@@ -553,7 +618,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    sortTableDefault:1000
   },
   {
     label: '计量单位',
@@ -565,29 +631,32 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:1000
   },
-  
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
+    sortTableDefault:1001
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:1001
   },
+  
 
   {
     label: '供应商计量数量',
@@ -598,7 +667,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    hiddenInMain:true
   },
   {
     label: '供应商计量单位',
@@ -610,6 +680,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   
   {
@@ -622,6 +693,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '从库位代码',
@@ -630,6 +702,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:1100
+
   },
   {
     label: '到库位代码',
@@ -638,6 +712,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:1101
   },
   {
     label: '从库位组代码',
@@ -646,6 +721,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '到库位组代码',
@@ -654,6 +730,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '从库区代码',
@@ -662,6 +739,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库区代码',
@@ -670,6 +748,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '从货主代码',
@@ -678,6 +757,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '到货主代码',
@@ -686,6 +766,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '到货日期',
@@ -707,6 +788,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    hiddenInMain:true
   },
   {
     label: '生产日期',
@@ -728,6 +810,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    hiddenInMain:true
   },
   {
     label: '过期日期',
@@ -749,6 +832,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    hiddenInMain:true
   },
   {
     label: '转换率',
@@ -759,7 +843,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    hiddenInMain:true
   },
   {
     label: '目检结果',
@@ -768,6 +853,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '目检照片',
@@ -776,6 +862,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '不合格原因',
@@ -787,6 +874,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '单价',
@@ -797,7 +885,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    hiddenInMain:true
   },
   {
     label: '金额',
@@ -808,7 +897,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    hiddenInMain:true
   },
   // {
   //   label: '任务明细ID',
@@ -826,6 +916,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   // {
   //   label: '代码',
@@ -845,6 +936,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '备注',
@@ -853,6 +945,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '创建时间',
@@ -865,6 +958,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -881,6 +975,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '操作',
@@ -964,6 +1059,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
       width: 180,
       fixed: 'left'
     },
+    hiddenInMain:true,
     form: {
       componentProps: {
       disabled:true