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

.env.wyf

@@ -6,7 +6,7 @@ VITE_DEV=false
 # 请求路径
 VITE_BASE_URL='http://192.168.0.108:12080'
 # 上传路径
-VITE_UPLOAD_URL='http://192.168.0.108:12080/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'
@@ -40,3 +40,9 @@ VITE_INTERFACE_URL='http://192.168.0.108:12080/magic/web/index.html'
 
 # 积木报表请求路径
 VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080'
+
+# # 自定义接口路径
+# VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
+
+# # 积木报表请求路径
+# VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'

src/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage.ts

@@ -0,0 +1,13 @@
+import request from '@/config/axios'
+export interface InspectionRequestPackageVO {
+  number: string
+  packageCode: string
+  packageSpecificationCode: string
+  amount: string
+  measuringUnit: string
+}
+
+//查询包装列表
+export const getInspectionJobPackageList = async (id: number) => {
+  return await request.get({ url: `/qms/inspection-job-package/list?masterId=` + id })
+}

src/api/qms/inspectionJob/inspectionJobMain/index.ts

@@ -55,8 +55,5 @@ export const exportInspectionJobMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/qms/inspection-job-main/get-import-template' })
 }
-//查询包装列表
-export const getInspectionJobPackageList = async (id: number) => {
-    return await request.get({ url: `/qms/inspection-job-package/list?masterId=` + id })
-}
+
   

src/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage.ts

@@ -0,0 +1,13 @@
+import request from '@/config/axios'
+export interface InspectionRequestPackageVO {
+  number: string
+  packageCode: string
+  packageSpecificationCode: string
+  amount: string
+  measuringUnit: string
+}
+
+//查询包装列表
+export const getInspectionRecordPackageList = async (id: number) => {
+  return await request.get({ url: `/qms/inspection-record-package/list?masterId=` + id })
+}

src/api/qms/inspectionRecord/inspectionRecordMain/index.ts

@@ -67,7 +67,3 @@ export const importTemplate = () => {
 export const publishInspectionRecordMain = async (id) => {
   return await request.put({ url: `/qms/inspection-record-main/publish?id=`+id })
 }
-//查询包装列表
-export const getInspectionRecordPackageList = async (id: number) => {
-  return await request.get({ url: `/qms/inspection-record-package/list?masterId=` + id })
-}

src/api/qms/inspectionTemplate/index.ts

@@ -2,7 +2,7 @@ import request from '@/config/axios'
 
 
 
-// 查询采样过程列表
+// 列表
 export const getListByTempleteCode = async (code) => {
   return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=`+code})
 }

src/api/wms/demandforecastingMain/index.ts

@@ -48,6 +48,24 @@ export const deleteDemandforecastingMain = async (id: number) => {
   return await request.delete({ url: `/wms/demandforecasting-main/delete?id=` + id })
 }
 
+
+// 关闭要货预测
+export const closePurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/demandforecasting-main/close?id=` + id })
+}
+// 打开要货预测
+export const openPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/demandforecasting-main/open?id=` + id })
+}
+// 发布要货预测
+export const publishPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/demandforecasting-main/publish?id=` + id })
+}
+// 下架要货预测
+export const witPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/demandforecasting-main/wit?id=` + id })
+}
+
 // 导出要货预测主 Excel
 export const exportDemandforecastingMain = async (params) => {
   if (params.isSearch) {

src/api/wms/productputawayJobMain/index.ts

@@ -42,6 +42,7 @@ export interface ProductputawayJobMainVO {
 
 // 查询制品上架任务主列表
 export const getProductputawayJobMainPage = async (params) => {
+  params.type = 'predict'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -51,6 +52,17 @@ export const getProductputawayJobMainPage = async (params) => {
   }
 }
 
+// 查询制品上架任务主列表
+export const getProductputawayJobMainAssemblePage = async (params) => {
+  params.type = 'assemble'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-job-main/page`, params })
+  }
+}
 // 查询制品上架任务主详情
 export const getProductputawayJobMain = async (id: number) => {
   return await request.get({ url: `/wms/productputaway-job-main/get?id=` + id })
@@ -73,6 +85,19 @@ export const deleteProductputawayJobMain = async (id: number) => {
 
 // 导出制品上架任务主 Excel
 export const exportProductputawayJobMain = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productputaway-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productputaway-job-main/export-excel`, params })
+  }
+} 
+
+
+// 导出制品上架任务主 Excel
+export const exportProductputawayJobMainAssemble = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     const data = {...params}
     return await request.downloadPost({ url: `/wms/productputaway-job-main/export-excel-senior`, data })

src/api/wms/productputawayRecordMain/index.ts

@@ -30,6 +30,19 @@ export interface ProductputawayRecordMainVO {
 
 // 查询制品上架记录主列表
 export const getProductputawayRecordMainPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-record-main/page`, params })
+  }
+}
+
+// 查询制品上架记录主列表
+export const getProductputawayRecordMainAssemblePage = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -61,6 +74,19 @@ export const deleteProductputawayRecordMain = async (id: number) => {
 
 // 导出制品上架记录主 Excel
 export const exportProductputawayRecordMain = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
+  }
+}
+
+// 导出制品上架记录主 Excel
+export const exportProductputawayRecordMainAssemble = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}

src/api/wms/productputawayRequestMain/index.ts

@@ -28,6 +28,19 @@ export interface ProductputawayRequestMainVO {
 
 // 查询制品上架申请主列表
 export const getProductputawayRequestMainPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-request-main/page`, params })
+  }
+}
+
+// 查询制品上架申请主列表
+export const getProductputawayRequestMainAssemblePage = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -59,6 +72,18 @@ export const deleteProductputawayRequestMain = async (id: number) => {
 
 // 导出制品上架申请主 Excel
 export const exportProductputawayRequestMain = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productputaway-request-main/export-excel`, params })
+  }
+}
+
+// 导出制品上架申请主 Excel
+export const exportProductputawayRequestMainAssemble = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     const data = {...params}
     return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data })

src/api/wms/purchasereceiptRecordDetail/index.ts

@@ -60,6 +60,15 @@ export const getPurchasereceiptRecordDetailPage = async (params) => {
     return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params })
   }
 }
+export const getPurchasereceiptRecordDetailPageSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorSCP', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-record-detail/pageSCP`, params })
+  }
+}
 
 // 查询采购收货记录子列表
 export const getPurchasereceiptRecordDetailPageBySupplierCode = async (params) => {

src/api/wms/purchasereturnRecordDetail/index.ts

@@ -48,6 +48,15 @@ export const getPurchasereturnRecordDetailPage = async (params) => {
     return await request.get({ url: `/wms/purchasereturn-record-detail/page`, params })
   }
 }
+export const getPurchasereturnRecordDetailPageSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereturn-record-detail/seniorSCP', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereturn-record-detail/pageSCP`, params })
+  }
+}
 
 // 查询采购退货记录子详情
 export const getPurchasereturnRecordDetail = async (id: number) => {

src/api/wms/supplierinvoiceRequestMain/index.ts

@@ -101,6 +101,11 @@ export const printSupplierRecord = async (asnBillNum:string) => {
   return await request.post({ url: `/wms/supplierinvoice-request-main/querySupplierRecord?asnBillNum=`+asnBillNum })
 }
 
+// 打印单挑供应商发货记录
+export const printSupplierRecordByMasterId = async (masterId:number) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/querySupplierRecordByMasterId?masterId=`+masterId })
+}
+
 // 导出供应商发票申请主 Excel
 export const exportSupplierinvoiceRequestMain = async (params) => {
   if(params.isSearch){

src/api/wms/unplannedissueRequestMain/index.ts

@@ -40,26 +40,6 @@ export const getUnplannedissueRequestMainPage = async (params) => {
   }
 }
 
-
-// 查询计划外出库申请主列表
-export const getUnplannedissueRequestMainPageSpare = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    const dataTypeCondition = {
-      'column':'dataType',
-      'action':'==',
-      'value':'2'
-    }
-    data.filters.push(dataTypeCondition)
-    return await request.post({ url: '/wms/unplannedissue-request-main/senior', data })
-  } else {
-    params.dataType='2'
-    return await request.get({ url: `/wms/unplannedissue-request-main/page`, params })
-  }
-}
-
-
 // 查询计划外出库申请主详情
 export const getUnplannedissueRequestMain = async (id: number) => {
   return await request.get({ url: `/wms/unplannedissue-request-main/get?id=` + id })
@@ -95,6 +75,8 @@ export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedissue-request-main/get-import-template' })
 }
 
+
+
 // 关闭-计划外出库申请
 export const closeUnplannedissueRequestMain = async (id) => {
   return await request.put({ url: `/wms/unplannedissue-request-main/close?id=` + id })
@@ -124,3 +106,28 @@ export const agreeUnplannedissueRequestMain = async (id) => {
 export const handleUnplannedissueRequestMain = async (id) => {
   return await request.put({ url: `/wms/unplannedissue-request-main/handle?id=` + id })
 }
+
+
+// 查询备件领用主列表
+export const getUnplannedissueRequestMainPageSpare = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    const dataTypeCondition = {
+      'column':'dataType',
+      'action':'==',
+      'value':'2'
+    }
+    data.filters.push(dataTypeCondition)
+    return await request.post({ url: '/wms/unplannedissue-request-main/senior', data })
+  } else {
+    params.dataType='2'
+    return await request.get({ url: `/wms/unplannedissue-request-main/page`, params })
+  }
+}
+
+
+// 备件领用下载用户导入模板
+export const spareImportTemplate = () => {
+  return request.download({ url: '/wms/unplannedissue-request-main/get-import-template-spare' })
+}

src/components/Annex/src/Annex.vue

@@ -16,7 +16,8 @@
               <div>{{ item.size }}KB</div>
               <div>来自 {{ item.nickname }}</div>
             </div>
-            <Icon icon="ep:delete" class="cursor-pointer" size="18" @click="deleteAnnex(item.id)" />
+            <Icon icon="ep:download" v-if="showDownload" class="cursor-pointer mr-2" size="18" @click="downFile(item)" />
+            <Icon icon="ep:delete" class="cursor-pointer" v-if="!hiddenDelete" size="18" @click="deleteAnnex(item.id)" />
           </div>
           <div class="time mt-6px ">{{ formatDate(item.createTime) }}</div>
         </div>
@@ -44,6 +45,14 @@ const props = defineProps({
     type: Object,
     required: true
   },
+  showDownload: {
+    type: Boolean,
+    required: false
+  },
+  hiddenDelete: {
+    type: Boolean,
+    required: false
+  },
 })
 // 子传父的时候需要先定义好emit这个方法
 const emit = defineEmits(['handleAnnexSuccess', 'deleteAnnexSuccess'])

src/components/BasicForm/src/BasicForm.vue

@@ -15,6 +15,7 @@
       :schema="formSchema"
       :is-col="true"
       @opensearchTable="opensearchTable"
+      @clearSearchInput="clearSearchInput"
       @onChange="onChange"
       @onBlur="onBlur"
       @onEnter="onEnter"
@@ -376,6 +377,9 @@ const opensearchTable = (
           message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
           return
         }
+      }else if(searchCondition[i].isTableRowValue){
+        //查询当前table表数据的值
+        _searchCondition[searchCondition[i].key] = row[searchCondition[i].value]
       } else {
         // 扩展 转换为筛选条件进行查询
         if (searchCondition[i].isSearch) {
@@ -410,7 +414,9 @@ const opensearchTable = (
   )
 }
 
-
+const clearSearchInput = (field)=>{
+  emit('clearSearchInput',field)
+}
 const sumFormDataByTable = () => {
   if(props.sumFormDataField){
     const sumObject = {}
@@ -600,7 +606,8 @@ const emit = defineEmits([
   'onEnter',
   'inputNumberChange',
   'formFormDateChange',
-  'footButtonClick'
+  'footButtonClick',
+  'clearSearchInput'
 ])
 //普通下拉改变事件
 const formSelectChange = (field, val, row) => {

src/components/Detail/src/Detail.vue

@@ -27,7 +27,7 @@
       </ContentWrap>
       <div class="flex">
         <!-- 详情 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label!=annexAliasLabel&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'&&tabsList[current].label!='主数据'&&!annexTableData.some(item=>item.label==tabsList[current].label)">          <!-- 列表头部 -->
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label!=annexAlias.label&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'&&tabsList[current].label!='主数据'&&!annexTableData.some(item=>item.label==tabsList[current].label)">          <!-- 列表头部 -->
           <TableHead
             v-if="!isBasic"
             :HeadButttondata="HeadButttondata"
@@ -101,8 +101,10 @@
         <div  v-for="(annexItem ,index) in annexTableData" :key="index" v-show="annexItem.label==tabsList[current].label"  class="w-[100%]" :style="{height:annexItem.hasSubDetail?'100%':remarkHeight+'px'}">
           <ContentWrap  class="w-[100%]">
             <ElScrollbar ref="scrollbar" :style="{height:annexItem.hasSubDetail?'100%':(remarkHeight-40)+'px'}">
-                <Annex v-show="tabsList[current].label==annexItem.label"
+              <Annex v-show="tabsList[current].label==annexItem.label"
                   :annexData="annexItem"
+                  :showDownload = "annexItem.showDownload"
+                  :hiddenDelete = "annexItem.hiddenDelete"
                   @handleAnnexSuccess="updateAnnexTableHandle"
                   @deleteAnnexSuccess="updateAnnexTableHandle"
                   :upData="{...remarksData.data,tableName:annexItem.tableName}"
@@ -125,11 +127,13 @@
 
         </div>
         <!-- 附件/备注/变更记录 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label==annexAliasLabel||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label==annexAlias.label||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
           <!-- 附件组件 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
-            <Annex v-show="tabsList[current].label==annexAliasLabel"
+            <Annex v-show="tabsList[current].label==annexAlias.label"
                 :annexData="annexData"
+                :showDownload = "annexAlias.showDownload"
+                :hiddenDelete = "annexAlias.hiddenDelete"
                 @handleAnnexSuccess="handleAnnexSuccess"
                 @deleteAnnexSuccess="deleteAnnexSuccess"
                 :upData="remarksData.data" 
@@ -211,13 +215,18 @@ const props = defineProps({
     type: Array,
     required: false,
     default: ()=>[]
-  },
+  },  
   //展示附件组件的tab标签
-  annexAliasLabel: {
-    type: String,
+  annexAlias: {
+    type: Object,
     required: false,
-    default: '附件'
+    default: ()=>({
+      label: '附件',
+      showDownload:false,
+      hiddenDelete:false
+    })
   },
+  
   // 是否是基础数据 展现详情顶部表单
   isBasic: {
     type: Boolean,
@@ -383,7 +392,7 @@ if (props.isBasic == true) {
 }
 
 const otherList = [...props.annexTable,{
-    label:props.annexAliasLabel,
+    label:props.annexAlias.label,
     prop:'Annex'
   },{
     label:'备注',
@@ -400,10 +409,13 @@ if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.leng
       prop: 'Detail'
   })
 }
-tabsList.value.unshift({
+if(!props.isBasic){
+  tabsList.value.unshift({
     label: '主数据',
     prop: 'Descriptions'
-})
+  })
+}
+
 
 //  Tabs 
 const tabRef = ref()
@@ -463,7 +475,9 @@ const getAnnexFileList =  async (row:id) => {
         tableName: item?.tableName || '',
         annexList,
         hasSubDetail:item.hasSubDetail||false,
-        subDetailTableData:item.subDetailTableData
+        subDetailTableData:item.subDetailTableData,
+        showDownload:item.showDownload||false, // 是否展示下载按钮
+        hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮
       })
       if(item?.subDetailTableData){
         const { tableObject:subTableObject, tableMethods:subTableMethods } = useTable({

src/components/Form/src/Form.vue

@@ -54,7 +54,7 @@ export default defineComponent({
     vLoading: propTypes.bool.def(false),
     labelPosition: propTypes.string.def('left'),
   },
-  emits: ['register','opensearchTable', 'onChange', 'onBlur','onEnter'],
+  emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter'],
   setup(props, { slots, expose, emit }) {
     // element form 实例
     const elFormRef = ref<ComponentRef<typeof ElForm>>()
@@ -124,6 +124,9 @@ export default defineComponent({
       emit('opensearchTable',field, searchField, searchTitle, searchAllSchemas, searchPage, searchCondition,multiple)
     }
 
+    const clearSearchInput = (field) => {
+      emit('clearSearchInput')
+    }
     expose({
       setValues,
       formModel,
@@ -258,6 +261,7 @@ export default defineComponent({
                       }else{
                         formModel.value[item.field] = ''
                       }
+                      clearSearchInput(item.field)
                     }}>
                     </ElButton>
                   )
@@ -292,6 +296,7 @@ export default defineComponent({
                       }else{
                         formModel.value[item.field] = ''
                       }
+                      clearSearchInput(item.field)
                     }}>
                     </ElButton>
                   )

src/components/Search/src/Search.vue

@@ -66,8 +66,23 @@ const newSchema = computed(() => {
       }
     ])
   }
+  updateSort(schema)
   return schema
 })
+const updateSort= (val)=>{
+  val.forEach(item=>{
+    if(!item.sortSearchDefault){
+      if(item.field=="action"){
+        item.sortSearchDefault = 9999 // 查询重置等操作按钮
+      }else{
+        item.sortSearchDefault = 999 // 默认999
+      }
+    }
+  })
+  val.sort((column1,column2)=>{
+    return column1.sortSearchDefault - column2.sortSearchDefault
+  })
+}
 
 const { register, elFormRef, methods } = useForm({
   model: props.model || {}

src/components/Table/src/Table.vue

@@ -250,18 +250,18 @@ export default defineComponent({
     // 默认排序
     const updateSort= (val)=>{
       val.forEach(item=>{
-        if(!item.sortDefault){
+        if(!item.sortTableDefault){
           if(item.fixed=='left'){
-            item.sortDefault = 0
+            item.sortTableDefault = 0
           }else if(item.fixed=='right'){
-            item.sortDefault = 9999
+            item.sortTableDefault = 9999
           }else{
-            item.sortDefault = 999 // 默认999
+            item.sortTableDefault = 999 // 默认999
           }
         }
       })
       val.sort((column1,column2)=>{
-        return column1.sortDefault - column2.sortDefault
+        return column1.sortTableDefault - column2.sortTableDefault
       })
     }
 

src/components/TableForm/src/TableForm.vue

@@ -65,7 +65,7 @@
               :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
               :disabled="headerItem?.tableForm?.disabled ? true: headerItem?.tableForm?.isInpuFocusShow ? true : false" 
               style="flex:1" 
-              @blur="inputStringBlur(headerItem.field, $event, row)"
+              @blur="inputStringBlur(headerItem.field, row[headerItem.field], row)"
             />
             <el-button  :key="headerItem.field+$index+'button'" v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
           </el-form-item>

src/components/rowDrop/index.vue

@@ -202,18 +202,18 @@ const initSelectSta = () => {
 }
 const updateSort= (val)=>{
   val.forEach(item=>{
-    if(!item.sortDefault){
+    if(!item.sortTableDefault){
       if(item.fixed=='left'){
-        item.sortDefault = 0
+        item.sortTableDefault = 0
       }else if(item.fixed=='right'){
-        item.sortDefault = 9999
+        item.sortTableDefault = 9999
       }else{
-        item.sortDefault = 999 // 默认999
+        item.sortTableDefault = 999 // 默认999
       }
     }
   })
   val.sort((column1,column2)=>{
-    return column1.sortDefault - column2.sortDefault
+    return column1.sortTableDefault - column2.sortTableDefault
   })
 }
 // 更新主列表字段

src/hooks/web/useCrudSchemas.ts

@@ -140,7 +140,8 @@ const filterSearchSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): F
           component,
           ...schemaItem.search,
           field: schemaItem.field,
-          label: schemaItem.search?.label || schemaItem.label
+          label: schemaItem.search?.label || schemaItem.label,
+          sortSearchDefault: schemaItem.sortSearchDefault || 999,
         },
         { componentProps: comonentProps }
       )

src/layout/components/CategoryHeader.vue

@@ -60,9 +60,9 @@ export default defineComponent({
       return appStore.getCategoryRoutePath
     })
     return () => (
-      <div class="category-container">
+      <div class="category-container" style="width:100%">
       <div class="line"></div>
-      <ElMenu 
+      <ElMenu  
         defaultActive={unref(activeMenu)}
         id={`${variables.namespace}-tool-header`}
         popperOffset={16}

src/layout/components/Menu/src/Menu.vue

@@ -107,7 +107,6 @@ export default defineComponent({
             unref(layout) === 'top' || unref(layout) === 'cutMenu' ? false : unref(collapse)
           }
           uniqueOpened={unref(layout) === 'top' ? false : unref(uniqueOpened)}
-          backgroundColor="var(--left-menu-bg-color)"
           textColor="var(--left-menu-text-color)"
           activeTextColor="var(--left-menu-text-active-color)"
           onSelect={menuSelect}
@@ -307,4 +306,18 @@ $prefix-cls: #{$namespace}-menu-popper;
     }
   }
 }
+.v-menu .el-menu .el-menu .el-menu-item:not(.is-active):hover{
+  background-color: rgb(241,243,244) !important;
+}
+.v-menu .el-menu .el-menu-item:not(.is-active):hover{
+  background-color: rgb(241,243,244) !important;
+}
+.v-menu .el-menu .el-sub-menu.is-active>.el-sub-menu__title:hover{
+  background-color: rgb(241,243,244) !important;
+}
+.v-menu .el-menu .el-sub-menu.is-active>.el-sub-menu__title{
+  background-color: #fff !important;
+  color:#666 !important;
+}
+
 </style>

src/store/modules/app.ts

@@ -77,9 +77,9 @@ export const useAppStore = defineStore('app', {
         // 左侧菜单边框颜色
         leftMenuBorderColor: 'inherit',
         // 左侧菜单背景颜色
-        leftMenuBgColor: 'rgb(241,243,244)',
+        leftMenuBgColor: '#fff',
         // 左侧菜单浅色背景颜色
-        leftMenuBgLightColor: 'rgb(241,243,244)',
+        leftMenuBgLightColor: '#fff',
         // 左侧菜单选中背景颜色
         leftMenuBgActiveColor: 'rgb(241,243,244)',
         // 左侧菜单收起选中背景颜色

src/utils/dict.ts

@@ -326,5 +326,5 @@ export enum DICT_TYPE {
   SUPPLIERINVOICE_STATUS = 'supplierinvoice_status', //待开票审核状态
   BASIC_TEAM_TYPE='basic_team_type',//班组类型
   TAX_RATE_DICT='tax_rate_dict', //税率
-
+  INTERFACE_STATUS = 'interfaceStatus', // 接口调用信息 接口状态
 }

src/utils/validator.ts

@@ -21,7 +21,7 @@ export function validateCode(rule, value, callback) {
 //校验邮箱
 export function validateEmail(rule, value, callback) {
     if (value) {
-        const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
+        const mailReg = /^([a-zA-Z0-9_-]+.)+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-]+.)+/
         if (mailReg.test(value)) {
             callback()
         } else {
@@ -315,7 +315,18 @@ export function validateTwoNum(rule, value, callback) {
     }
     callback()
 }
+// 小数点前位数不得大于6位
+export function validateNumSix(rule, value, callback) {
+    if (value) {
+        if (value.split('.')[0].length > 6) {// 校验value值不能大于10000
+            callback(new Error('版本号小数点前位数不得大于6'))
+        }else{
+            callback()
+        }
+    }
 
+    callback()
+}
 
 // 数字格式  小数点后两位  	小数点前保留五位
 export function validateTwoNumThree(rule, value, callback) {
@@ -792,5 +803,6 @@ export default {
     validateChargeperson,
     validateYS,
     validateMaxNumber5,
-    validatePercent
+    validatePercent,
+    validateNumSix
 }

src/views/mes/orderDay/components/orderDetail.vue

@@ -199,7 +199,7 @@ const emit = defineEmits([
 ])
 
 //监视属性
-watch()
+//watch()
 </script>
 <style lang="scss">
 .el-drawer__body {

src/views/mes/qualityformlog/qualityformlog.data.ts

@@ -128,17 +128,21 @@ export const Qualityformlog = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '表单编号',
+    label: '表单模板编号',
     field: 'formNo',
     sort: 'custom',
     isSearch: true,
   },
+  {
+    label: '日计划单号',
+    field: 'planNoDay',
+    sort: 'custom',
+    isSearch: true,
+  },
   {
     label: '操作类型',
     field: 'operation',
     sort: 'custom',
-    dictType: DICT_TYPE.QUALIFY_FORM_OPERATION,
-    dictClass: 'string',
     isSearch: true,
   },
   {
@@ -182,6 +186,12 @@ export const Qualityformlog = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    isSearch: true,
+  },
   {
     label: '操作',
     field: 'action',

src/views/mes/workScheduling/components/Detail.vue

@@ -409,7 +409,6 @@ const remarkHeight = computed(() => {
   const tab = unref(tabRef)
   const tabTop = tab?.$el.getBoundingClientRect().top
   const tabHeight = tab?.$el.getBoundingClientRect().height
-  console.log('tabTop',tabTop)
   const height = window.innerHeight - (tabTop) - (tabHeight) - 60
   return height
 })
@@ -444,7 +443,6 @@ const getFileList = async () => {
 }
 // 获取其他附件列表篇
 const getAnnexFileList =  async (row:id) => {
-  console.log('getAnnexFileList')
   props.annexTable?.forEach(async (item) => {
     let requstData = {...remarksData.data,tableName: item?.tableName} 
     const annexList = await FileApi.getFileList(requstData)
@@ -472,7 +470,6 @@ const getAnnexFileList =  async (row:id) => {
         await getSubList()
         item.subDetailTableData.tableList = subTableObject.tableList
         annexItem.subDetailTableData.tableList
-        console.log('subTableObject',annexTableData.value)
       }
     }
   })

src/views/qms/aql/aql.data.ts

@@ -549,6 +549,9 @@ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    table: {
+      width: 175
+    }
   },
   {
     label: '是否可用',

src/views/qms/basicDataManage/counter/counter.data.ts

@@ -19,31 +19,47 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
-    fixed: 'left'
+    fixed: 'left',
+    table: {
+      fixed: 'left',
+      width: 175
+    }
   },
   {
     label: '检验类型编码',
     field: 'inspectionType',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    table: {
+      width: 175
+    }
   },
   {
     label: '供应商编码',
     field: 'supplierCode',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    table: {
+      width: 175
+    }
   },
   {
     label: '连续合格次数',
     field: 'qualifiedTimes',
     sort: 'custom',
     isSearch: false,
+    table: {
+      width: 140
+    }
   },
   {
     label: '最后合格批次',
     field: 'lastQualifiedBatch',
     sort: 'custom',
-    isSearch: false
+    isSearch: false,
+    table: {
+      width: 140
+    }
   },
   {
     label: '最后合格时间',
@@ -65,6 +81,9 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
         type: 'datetime',
         valueFormat: 'x'
       }
+    },
+    table: {
+      width: 175
     }
   },
   {
@@ -75,6 +94,9 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       value: 0
+    },
+    table: {
+      width: 140
     }
   },
   {
@@ -85,6 +107,9 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       value: 0
+    },
+    table: {
+      width: 175
     }
   },
   {
@@ -107,6 +132,9 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
         type: 'datetime',
         valueFormat: 'x'
       }
+    },
+    table: {
+      width: 175
     }
   },
   {
@@ -114,6 +142,9 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'nextStage',
     sort: 'custom',
     isSearch: false,
+    table: {
+      width: 140
+    }
   },
   // {
   //   label: '操作',

src/views/qms/basicDataManage/inspectionScheme/addForm.vue

@@ -18,7 +18,7 @@
             <el-col :span="12">
               <el-form-item label="物料编码" prop="itemCode">
                 <div style="display: flex; width: 100%">
-                  <el-input v-model="data.itemName" disabled placeholder="请选择物料" />
+                  <el-input v-model="data.itemCode" disabled placeholder="请选择物料编码" />
                   <el-button
                     type="info"
                     plain
@@ -163,7 +163,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="isShowField !=0">
               <el-form-item label="aql" prop="aql">
                 <el-select v-model="data.aql" placeholder="请选择aql">
                   <el-option
@@ -175,7 +175,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="isShowField!=0">
               <el-form-item label="检验水平" prop="inspectionLevel">
                 <el-select v-model="data.inspectionLevel" placeholder="请选择检验水平">
                   <el-option
@@ -761,6 +761,7 @@ const rules = ref({
     { required: true, message: '请输入选定集', trigger: 'blur' }
   ]
 })
+const isShowField = ref(0)//是否显示aql和检验水平字段 0隐藏 大于0显示
 /** 打开弹窗 */
 let tabIndex = 1
 const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
@@ -771,6 +772,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     dialogTitle.value = t('action.' + type)
   }
   formType.value = type
+  isShowField.value=0//设置isShowField == 0隐藏aql和检验水平字段
   if (row) {
     data.value = JSON.parse(JSON.stringify(row))
     let list = []
@@ -779,7 +781,6 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     } else {
       list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode)
     }
-
     rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
       rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
       rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
@@ -797,7 +798,18 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
         if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
         } 
+        if(item.inspectionCharacteristicsBaseVO.sampleType == 4){
+          isShowField.value+=1//设置isShowField > 0显示aql和检验水平字段
+        }
       })
+      // 显示aql和检验水平字段的时候添加必填规则
+      if( isShowField.value>0){
+       rules.value.aql[0].required = true
+       rules.value.aql[0].required = true
+      }else{
+        rules.value.aql[0].required = false
+       rules.value.aql[0].required = false
+      }
     data.value.process = list
   } else {
     data.value = {
@@ -1085,13 +1097,10 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
     } else if (formField == 'inspectionType') {
       data.value.testTypeName = val[0].description
     } else if (formField == 'programmeTemplateCode') {
+      isShowField.value=0//设置isShowField == 0隐藏aql和检验水平字段
       data.value.programmeTemplateName = val[0].description
       data.value['dynamicUpdateCode'] = val[0].dynamicUpdateCode
       data.value.dynamicUpdateName = val[0].dynamicUpdateName
-      
-    }
-    if (formField == 'programmeTemplateCode') {
-      
       let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
       rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
       rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
@@ -1110,11 +1119,20 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
         if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
         } 
+        if(item.inspectionCharacteristicsBaseVO.sampleType == 4){
+          isShowField.value+=1//设置isShowField > 0显示aql和检验水平字段
+        }
       })
+      // 显示aql和检验水平字段的时候添加必填规则
+      if( isShowField.value>0){
+       rules.value.aql[0].required = true
+       rules.value.aql[0].required = true
+      }else{
+        rules.value.aql[0].required = false
+       rules.value.aql[0].required = false
+      }
       data.value.process = list
-    }
-
-    if (formField == 'dynamicUpdateCode') {
+    }else if (formField == 'dynamicUpdateCode') {
       data.value[formField] = val[0].code
       data.value.dynamicUpdateName = val[0].description
     }

src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts

@@ -90,7 +90,7 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemName',
     sort: 'custom',
     table: {
-      width: 150
+      width: 200
     },
     isSearch: true,
   },
@@ -106,6 +106,9 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '描述',
     field: 'description',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   }, {
     label: '版本',
     field: 'version',
@@ -120,14 +123,14 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     sort: 'custom',
     table: {
-      width: 150
+      width: 175
     }
   }, {
     label: '检验模板编码',
     field: 'programmeTemplateCode',
     sort: 'custom',
     table: {
-      width: 150
+      width: 175
     }
   }, {
     label: '拆分规则',
@@ -136,7 +139,7 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.SPLIT_RULES,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     table: {
-      width: 150
+      width: 175
     },
   }, {
     label: 'aql',
@@ -176,6 +179,9 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    table: {
+      width: 175
+    },
   },
   {
     label: '失效时间',
@@ -195,6 +201,9 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    table: {
+      width: 175
+    },
   },
   {
     label: '是否可用',

src/views/qms/basicDataManage/inspectionTemplate/addForm.vue

@@ -345,7 +345,7 @@
                   <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit" type="number"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="12"  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO. quantifyIsTarget">
+              <el-col :span="12"  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO.quantifyIsTarget">
                 <el-form-item
                   label="目标值"
                   prop="inspectionCharacteristicsBaseVO.quantifyTarget"
@@ -434,7 +434,7 @@ import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
 import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则
 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
 import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集
-import { validateInteger,validateTwoNum,validateMaxNumber5 } from '@/utils/validator'
+import { validateInteger,validateTwoNum,validateMaxNumber5,validateNumSix } from '@/utils/validator'
 const message = useMessage() // 消息弹窗
 
 const props = defineProps({
@@ -501,6 +501,7 @@ const rules = ref({
   description: [{ required: true, message: '请填写描述', trigger: 'blur' }],
   version: [
     { required: true, message: '请填写版本', trigger: 'blur' },
+    { validator:validateNumSix, message: '版本号小数点前位数不得大于6', trigger: 'blur'},
     { validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}
   ],
   inspectionCode: [{ required: true, message: '请选择检验方案模板', trigger: 'blur' }],
@@ -562,6 +563,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   formType.value = type
   if (row) {
     data.value = JSON.parse(JSON.stringify(row))
+    data.value.version = String(data.value.version)
     let list = await InspectionProcessPageApi.getListByTempleteCode(row.code)
     list.forEach((item, index) => {
       editableTabsValue.value = index + 1

src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts

@@ -89,8 +89,7 @@ export const InspectionTemplateMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '动态修改规则',
     field: 'dynamicUpdateName',
     sort: 'custom',
-  },
-  ,{
+  },{
     label: '版本',
     field: 'version',
     sort: 'custom',

src/views/qms/inspection/inspectionJob/addForm.vue

@@ -62,9 +62,9 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="检验次数" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionQty">
+                  <el-form-item label="样品份数" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionQty">
                     <div style="display: flex; width: 100%">
-                      <el-input v-model="  item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty" disabled placeholder="请输入检验次数" />
+                      <el-input v-model="  item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty" disabled placeholder="请输入样品份数" />
                     </div>
                   </el-form-item>
                 
@@ -171,6 +171,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
 import { SearchTable } from '@/components/SearchTable'
  import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
+import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
 
 const { proxy } = getCurrentInstance()
 
@@ -317,7 +318,7 @@ const rules = ref({
     { required: true, message: '请选择评估代码', trigger: 'blur' }
   ],
   'inspectionJobCharacteristicsUpdateReqVO.inspectionQty': [
-    { required: true, message: '请输入检验次数', trigger: 'blur' }
+    { required: true, message: '请输入样品份数', trigger: 'blur' }
   ],
   qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }]
 })
@@ -337,7 +338,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
     let list = []
     list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
-    data.value.packageList = await InspectionJobMainApi.getInspectionJobPackageList(row.id)
+    data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
     list.forEach((item, index) => {
       editableTabsValue.value = index + 1
       item.name = index + 1
@@ -528,14 +529,15 @@ const submitForm = async () => {
     if(data.value.packageList?.length>0){
       const validateForm1 = await tableFormRef.value.validateForm()
     if (!validateForm1) return
-      let number = 0
-      data.value.packageList.forEach(cur=>{
-        number += parseFloat(cur.sampleAmount)
-      })
-      if(number != data.value.sampleTotalAmount){
-        message.error(`采样数量之和必须等于采样总数量`)
-        return
-      }
+      // let number = 0
+      // data.value.packageList.forEach(cur=>{
+      //   number += parseFloat(cur.sampleAmount)
+      // })
+      // number = number.toFixed('2')
+      // if(number != data.value.sampleTotalAmount){
+      //   message.error(`采样数量之和必须等于采样总数量`)
+      //   return
+      // }
     }
    
     const bol2 = await validateForm(formFeaturesRef.value)
@@ -618,7 +620,7 @@ const submitForm = async () => {
       return;
     }
     if(isEmptyNumberList){
-      message.error('合格数量和不合格数量之和必须等于检验次数')
+      message.error('合格数量和不合格数量之和必须等于样品份数')
       return;
     }
     if (formType.value == 'create') {
@@ -781,7 +783,7 @@ const resultEntryMethodChange = (e, item) => {
   item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
   if (e == 0) {
     // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-    for (let i = 0; i < data.value.sampleTotalAmount; i++) {
+    for (let i = 0; i <  parseInt(item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty); i++) {
       item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
         inspectionValue: '', //检验值
         qualitativeCode: '', //定性字典项值

src/views/qms/inspection/inspectionJob/index.vue

@@ -51,7 +51,9 @@
     :isShowAddBtn="false" :detailButtonIsShow="true"
   />
   <!-- 包装信息 -->
-  <ListTable ref="listTableRef" titleName="包装信息"/>
+  <ListTable ref="listTableRef" titleName="包装信息" :allSchemas="InspectionJobMain.allSchemas"
+    :detailAllSchemas="InspectionJobPackage.allSchemas" :detailAllSchemasRules="InspectionJobPackageRules"
+    :list="list" />
 </template>
 
 <script setup lang="ts">
@@ -59,6 +61,7 @@
   import { InspectionJobMain, InspectionJobMainRules, InspectionJobDetail, InspectionJobDetailRules,InspectionJobPackage,InspectionJobPackageRules} from './inspectionJobMain.data'
   import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../../basicDataManage/inspectionTemplate/inspectionTemplate.data'
 
+  import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
   import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
   import * as InspectionJobDetailApi from '@/api/qms/inspectionJob/inspectionJobDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -168,13 +171,16 @@
     ]
   }
 const listTableRef = ref()
+const list = ref([])
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
     if (val == 'mainJobExe') { // 执行
       execute('execute', row)
     }else if (val == 'mainPackage') { // 包装
-      const list = await InspectionJobMainApi.getInspectionJobPackageList(row.id)
-      listTableRef.value.openPackage(row,'包装信息',InspectionJobPackage.allSchemas.tableColumns,list)
+      
+      list.value = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
+      // row.status = '1'
+      listTableRef.value.openPackage(row,'包装信息',InspectionJobPackage.allSchemas.tableColumns)
     }else if (val == 'mainJobAba') { // 放弃
     handleAbandon(row.id)
   } else if (val == 'mainJobClo') { // 关闭

src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts

@@ -30,7 +30,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     table: {
-      width: 165,
+      width: 200,
       fixed: 'left'
     }
   },
@@ -45,7 +45,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     table: {
-      width: 150
+      width: 200
     }
   },
   {
@@ -59,7 +59,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     table: {
-      width: 150
+      width: 175
     }
   },{
     label: '供应商名称',
@@ -67,7 +67,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
     table: {
-      width: 150
+      width: 175
     },
     form: {
       componentProps:{
@@ -95,7 +95,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
     table: {
-      width: 150
+      width: 175
     },
     form: {
       componentProps:{
@@ -188,7 +188,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     table: {
-      width: 150
+      width: 200
     }
   },
   {
@@ -219,20 +219,20 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
-  {
-    label: '采样总数量',
-    field: 'sampleTotalAmount',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps:{
-        disabled:true
-      }
-    },
-    table: {
-      width: 150
-    }
-  },
+  // {
+  //   label: '采样总数量',
+  //   field: 'sampleTotalAmount',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   form: {
+  //     componentProps:{
+  //       disabled:true
+  //     }
+  //   },
+  //   table: {
+  //     width: 150
+  //   }
+  // },
   {
     label: '检验类型',
     field: 'inspectionType',
@@ -324,7 +324,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -353,7 +353,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {

src/views/qms/inspection/inspectionRecord/addForm.vue

@@ -26,6 +26,7 @@
             :tableData="data.packageList"
             :isShowButton="false"
             :isShowReduceButton="false"
+            @inputStringBlur="tableFormBlur"
           />
         </div>
       </div>
@@ -43,6 +44,7 @@ import { getCurrentInstance } from 'vue'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { SearchTable } from '@/components/SearchTable'
 import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
+import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
 
 const { proxy } = getCurrentInstance()
 
@@ -123,12 +125,12 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   formType.value = type
   if (row) {
     data.value = JSON.parse(JSON.stringify(row))
-    data.value.packageList = await InspectionRecordMainApi.getInspectionRecordPackageList(row.id)
+    data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(row.id)
     data.value.packageList.forEach(item=>{
-      item.qualifiedAmount =0
-      item.noQualifiedAmount =0
-      item.destroyAmount =0
-      item.frozenAmount =0
+      item.qualifiedAmount = item.qualifiedAmount?item.qualifiedAmount:0
+      item.noQualifiedAmount = item.noQualifiedAmount?item.noQualifiedAmount:0
+      item.destroyAmount = item.destroyAmount?item.destroyAmount:0
+      item.frozenAmount = item.frozenAmount?item.frozenAmount:0
     })
     dialogVisible.value = true
     tableSchemas.value.tableFormColumns.map(item=>{
@@ -140,10 +142,10 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
         item.qualifiedAmount = item.amount
       })
     }
-    // 全不合格只能输入不合格数量
+    // 让步接收和部分合格
     else if(row.useDecision  == 2 || row.useDecision  == 6){
       tableSchemas.value.tableFormColumns.map(item=>{
-        if(item.field == 'qualifiedAmount' ||item.field == 'noQualifiedAmount'){
+        if(item.field == 'noQualifiedAmount'){
           item.tableForm.disabled = false
         }else{
           item.tableForm.disabled = true
@@ -161,8 +163,12 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
         item.frozenAmount = item.amount
       })
     }
+    // 评估代码值是1，接收时候，使用决策下拉列表是全部合格
+    if(row.estimateCode == 1){
+      data.value.useDecision = '1'
+    }
     nextTick(() => {
-      formMainRef.value.setValues(row)
+      formMainRef.value.setValues( data.value)
     })
   } 
   dialogVisible.value = true
@@ -204,8 +210,11 @@ const onChange = (field, cur)=>{
     }
     // 全不合格只能输入不合格数量
     else if(cur == 2 || cur == 6){
+      data.value.packageList.forEach(item=>{
+        item.qualifiedAmount = item.amount
+      })
       tableSchemas.value.tableFormColumns.map(item=>{
-        if(item.field == 'qualifiedAmount' ||item.field == 'noQualifiedAmount'){
+        if(item.field == 'noQualifiedAmount'){
           item.tableForm.disabled = false
         }else{
           item.tableForm.disabled = true
@@ -225,6 +234,16 @@ const onChange = (field, cur)=>{
     }
   }
 }
+// 失去焦点
+const tableFormBlur = (field, val,row)=>{
+  if( row.amount < val){
+    row.noQualifiedAmount = row.amount
+    row.qualifiedAmount = 0
+  }else{
+    row.qualifiedAmount = row.amount - val
+  }
+  
+}
 const buttonBaseClick = (val) => {
   // 保存
   if (val == 'save') {

src/views/qms/inspection/inspectionRecord/detail.vue

@@ -190,6 +190,90 @@
                     />
                   </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                <el-form-item label="计量单位" prop="inspectionRecordCharacteristicsRespVO.quantifyUom" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0" >
+                  <el-select v-model="item.inspectionRecordCharacteristicsRespVO.quantifyUom" placeholder="请选择计量单位" disabled >
+                    <el-option v-for="dict in getStrDictOptions(DICT_TYPE.UOM)"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="小数位" prop="inspectionRecordCharacteristicsRespVO.quantifyDecimal" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0" >
+                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyDecimal" disabled/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0">
+                  <el-form-item label="是否设定上限" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" >
+                    <el-switch v-model="item.inspectionRecordCharacteristicsRespVO.quantifyIsCapping" disabled/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0">
+                  <el-form-item prop="inspectionRecordCharacteristicsRespVO.quantifyIsLowlimit" label="是否设定下限" >
+                    <el-switch v-model="item.inspectionRecordCharacteristicsRespVO.quantifyIsLowlimit" disabled/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item prop="inspectionRecordCharacteristicsRespVO.quantifyIsTarget" label="是否设定目标值" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0" >
+                    <el-switch v-model="item.inspectionRecordCharacteristicsRespVO.quantifyIsTarget" disabled/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0 && item.inspectionRecordCharacteristicsRespVO.quantifyIsCapping">
+                  <el-form-item  label="上限值" prop="inspectionRecordCharacteristicsRespVO.quantifyCapping" >
+                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyCapping" type="number" disabled/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0 && item.inspectionRecordCharacteristicsRespVO.quantifyIsLowlimit">
+                  <el-form-item label="下限值" prop="inspectionRecordCharacteristicsRespVO.quantifyLowlimit" >
+                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyLowlimit" type="number" disabled/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12"  v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0 && item.inspectionRecordCharacteristicsRespVO.quantifyIsTarget">
+                  <el-form-item label="目标值"  prop="inspectionRecordCharacteristicsRespVO.quantifyTarget" >
+                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyTarget" type="number" disabled/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" >
+                  <el-form-item label="评估代码">
+                    <el-select v-model="item.inspectionRecordCharacteristicsRespVO.estimateCode" placeholder="请选择评估代码" disabled>
+                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)" :key="dict.value" :label="dict.label" :value="dict.value" disabled/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-for="(cur, i) in item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList" :key="i" style="border: 1px solid #dedede; border-radius: 4px; padding-top: 16px; margin-bottom: 10px;">
+                  <el-row>
+                    <!-- 汇总录入的时候显示 -->
+                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.resultEntryMethod == 1">
+                      <el-form-item label="合格数量">
+                        <el-input v-model="cur.qualifiedQuantity" placeholder="请输入合格数量"  type="number" disabled/>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.resultEntryMethod == 1">
+                      <el-form-item label="不合格数量">
+                        <el-input v-model="cur.unqualifiedQuantity" type="number" placeholder="请输入不合格数量" disabled/>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == '0'">
+                      <el-form-item label="检验值">
+                        <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" type="number" disabled/>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == '1'">
+                      <el-form-item label="选定集">
+                        <el-input v-model="cur.number" placeholder="" type="number" disabled/>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == '1'" >
+                      <el-form-item label="缺陷级别">
+                        <el-select v-model="cur.defectLevel" placeholder="请选择缺陷级别" disabled>
+                          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.DEFECT_LEVEL)" :key="dict.value" :label="dict.label" :value="dict.value" />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-col>
               </el-row>
             </el-form>
           </el-tab-pane>

src/views/qms/inspection/inspectionRecord/index.vue

@@ -45,14 +45,16 @@
     :apiDelete="InspectionRecordDetailApi.deleteInspectionRecordDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
     :isShowAddBtn="false" :detailButtonIsShow="true"
   /> 
-  <!-- 包装信息 -->
-  <ListTable ref="listTableRef" titleName="包装信息"/>
+  <!-- 包装信息 --> <ListTable ref="listTableRef" titleName="包装信息" :allSchemas="InspectionRecordMain.allSchemas"
+    :detailAllSchemas="InspectionRecordPackage.allSchemas" :detailAllSchemasRules="InspectionRecordPackageRules"
+    :list="list"/>
 </template>
 
 <script setup lang="ts">
   import download from '@/utils/download'
   import { InspectionRecordMain, InspectionRecordMainRules, InspectionRecordDetail, InspectionRecordDetailRules,InspectionRecordPackage, InspectionRecordPackageRules} from './inspectionRecordMain.data'
   // import { InspectionJobPackage,InspectionJobPackageRules} from '../inspectionJob/inspectionJobMain.data'
+  import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
   import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
   import * as InspectionRecordDetailApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -132,6 +134,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
   }
 
   const listTableRef = ref()
+  const list = ref([])
   const useDecisionList =  getStrDictOptions(DICT_TYPE.USAGE_DECISION)
   // const useDecisionList = InspectionRecordMain.allSchemas.formSchema.filter(item=>item.field == "useDecision")
   // 列表-操作按钮事件
@@ -153,14 +156,15 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
       }
       openForm('update', row)
     }else if (val == 'mainPackage') { // 包装
-      const list = await InspectionRecordMainApi.getInspectionRecordPackageList(row.id)
-      list.forEach(item=>{
+      list.value = await InspectionRecordPackageApi.getInspectionRecordPackageList(row.id)
+      list.value.forEach(item=>{
         item.qualifiedAmount = item.qualifiedAmount ?item.qualifiedAmount :0
         item.noQualifiedAmount = item.noQualifiedAmount ?item.noQualifiedAmount :0
         item.destroyAmount = item.destroyAmount ?item.destroyAmount :0
         item.frozenAmount = item.frozenAmount ?item.frozenAmount :0
       })
-      listTableRef.value.openPackage(row,'包装信息',InspectionRecordPackage.allSchemas.tableColumns,list)
+      // row.status = '1'
+      listTableRef.value.openPackage(row,'包装信息',InspectionRecordPackage.allSchemas.tableColumns)
     }else if (val == 'delete') { // 删除
       handleDelete(row.id)
     }else if (val == 'mainOrderPub') { //发布

src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts

@@ -16,7 +16,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm:false,
     table: {
-      width: 165,
+      width: 200,
       fixed: 'left'
     }
   },
@@ -27,7 +27,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm:false,
     table: {
-      width: 150
+      width: 200
     }
   },
   {
@@ -37,7 +37,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isForm:false,
     table: {
-      width: 150
+      width: 200
     }
   },
   {
@@ -47,7 +47,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isForm:false,
     table: {
-      width: 150
+      width: 200
     }
   },{
     label: '供应商名称',
@@ -56,7 +56,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isForm:false,
     table: {
-      width: 150
+      width: 200
     },
     form: {
       componentProps:{
@@ -86,7 +86,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isForm:false,
     table: {
-      width: 150
+      width: 200
     },
     form: {
       componentProps:{
@@ -111,7 +111,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isForm:false,
     table: {
-      width: 150
+      width: 200
     }
   },
   {
@@ -134,16 +134,16 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
-  {
-    label: '采样总数量',
-    field: 'sampleTotalAmount',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 150
-    }
-  },
+  // {
+  //   label: '采样总数量',
+  //   field: 'sampleTotalAmount',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   isForm:false,
+  //   table: {
+  //     width: 150
+  //   }
+  // },
   {
     label: '检验类型',
     field: 'inspectionType',
@@ -258,7 +258,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -287,7 +287,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -316,7 +316,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -345,7 +345,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -400,7 +400,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 170
+      width: 175
     }
   },
 
@@ -582,7 +582,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     tableForm:{
-      disabled:true
+      disabled:true,
+      width:200
     },
     table:{
       width:150
@@ -594,7 +595,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     tableForm:{
-      disabled:true
+      disabled:true,
+      width:160
     },
     table:{
       width:150
@@ -606,7 +608,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     tableForm:{
-      disabled:true
+      disabled:true,
+      width:150
     },
     table:{
       width:150
@@ -622,7 +625,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     },
     tableForm:{
-      disabled:true
+      disabled:true,
+      width:120
     },
     table:{
       width:150
@@ -634,7 +638,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     tableForm:{
-      disabled:true
+      disabled:true,
+      width:120
     },
     table:{
       width:150
@@ -646,7 +651,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     tableForm:{
-      disabled:true
+      disabled:true,
+      width:100
     },
     table:{
       width:150
@@ -658,7 +664,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     tableForm:{
-      disabled:true
+      disabled:true,
+      width:100
     },
     table:{
       width:150
@@ -670,7 +677,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     tableForm:{
-      disabled:true
+      disabled:true,
+      width:100
     },
     table:{
       width:150
@@ -682,7 +690,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     tableForm:{
-      disabled:true
+      disabled:true,
+      width:100
     },
     table:{
       width:150
@@ -694,7 +703,8 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     tableForm:{
-      disabled:true
+      disabled:true,
+      width:100
     },
     table:{
       width:150

src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts

@@ -13,10 +13,7 @@ export const InspectionMainRules = reactive({
   requestEndTime: [required],
   batch: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
   requestInspectionNum: [required,{ validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}],
-  referenceOrderCode: [required],
-  referenceOrderRow: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
-  referenceCertificateCode: [required],
-  referenceCertificateRow: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
+  referenceCertificateRow: [{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
   inspectionType: [required],
 })
 
@@ -60,7 +57,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -89,7 +86,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -117,7 +114,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -145,7 +142,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -173,7 +170,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -182,7 +179,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
     table: {
-      width: 150
+      width: 175
     },
     form:{
       componentProps: {
@@ -192,6 +189,11 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
         multiple:false,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },
@@ -201,7 +203,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
     table: {
-      width: 150
+      width: 175
     },
     form:{
       componentProps: {
@@ -225,6 +227,11 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchPage: ItemApi.getItembasicPage, // 查询弹窗所需分页方法
         multiple:false,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },
@@ -325,7 +332,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   // {

src/views/qms/qualityNotice/qualityNoticeMain.data.ts

@@ -16,7 +16,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false,
     table: {
-      width: 150,
+      width: 200,
       fixed: 'left'
     }
   },
@@ -38,7 +38,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isForm: false,
     table: {
-      width: 150
+      width: 200
     }
   },
   {
@@ -48,7 +48,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isForm: false,
     table: {
-      width: 150
+      width: 200
     }
   }, {
     label: '优先级',
@@ -121,7 +121,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -150,7 +150,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -179,7 +179,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -219,7 +219,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -248,7 +248,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -297,7 +297,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {
@@ -312,7 +312,7 @@ export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     },
     table: {
-      width: 150
+      width: 175
     }
   },
   {

src/views/qms/sampleCode/sampleCode.data.ts

@@ -106,6 +106,9 @@ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    table: {
+      width: 175
+    }
   },
   {
     label: '是否可用',

src/views/qms/samplingProcess/samplingProcess.data.ts

@@ -21,6 +21,7 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false,
     table: {
+      width: 175,
       fixed: 'left'
     }
   },
@@ -29,6 +30,9 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'description',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 175
+    }
   },
   {
     label: '取样类型',
@@ -40,6 +44,9 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Select'
     },
+    table: {
+      width: 140
+    }
   },
   {
     label: '评估模式',
@@ -50,16 +57,25 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
       form: {
         component: 'Select'
       },
+      table: {
+        width: 140
+      }
   },
   {
     label: '样品量',
     field: 'sampleSize',
     sort: 'custom',
+    table: {
+      width: 140
+    }
   },
   {
-    label: '检验次数',
+    label: '样品份数',
     field: 'inspectionQty',
     sort: 'custom',
+    table: {
+      width: 140
+    }
   },
   {
     label: '采样方案编码',
@@ -75,6 +91,9 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
         },
       }
     },
+    table: {
+      width: 175
+    }
   },
  {
    label: '创建时间',
@@ -94,6 +113,9 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x',
      }
    },
+   table: {
+     width: 175
+   }
  },
   {
     label: '是否可用',

src/views/wms/agvManage/interfaceInfo/index.vue

@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '序号', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -66,6 +66,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 
+// 接口调用信息
 defineOptions({ name: 'InterfaceInfo' })
 
 const message = useMessage() // 消息弹窗
@@ -133,8 +134,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:interfaceInfo:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:interfaceInfo:delete'}), // 删除
+  defaultButtons.mainListEditBtn(null), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:interfaceInfo:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts

@@ -12,14 +12,19 @@ export const InterfaceInfo = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 300,
+      fixed: 'left'
+    },
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'SelectV2'
+    table: {
+      width: 180,
+      fixed: 'left'
     },
   },
   {
@@ -27,35 +32,55 @@ export const InterfaceInfo = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'interfaceName',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 180,
+    },
   },
   {
     label: '状态',
     field: 'interfaceStatus',
+    dictType: DICT_TYPE.INTERFACE_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     form: {
       component: 'Radio'
     },
+    table: {
+      width: 180,
+    },
+    isSearch: true,
   },
   {
     label: '请求地址',
     field: 'url',
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 180,
+    },
   },
   {
     label: '请求参数',
     field: 'reqBody',
     sort: 'custom',
+    table: {
+      width: 180,
+    },
   },
   {
     label: '返回结果',
     field: 'respBody',
     sort: 'custom',
+    table: {
+      width: 180,
+    },
   },
   {
     label: '错误信息',
     field: 'errorMsg',
     sort: 'custom',
+    table: {
+      width: 180,
+    },
   },
   {
     label: '创建时间',
@@ -72,6 +97,9 @@ export const InterfaceInfo = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    table: {
+      width: 180,
+    },
   },
   {
     label: '扩展属性',

src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue

@@ -66,8 +66,6 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
-import * as ItembasicApi from "@/api/wms/itembasic";
 
 defineOptions({ name: 'SupplierUser' })
 

src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts

@@ -96,6 +96,18 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '用户账号',
+    field: 'userName',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '用户昵称',
+    field: 'nickName',
+    sort: 'custom',
+    isForm: false,
+  },
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -121,6 +133,12 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    isForm: false,
+  },
   {
     label: '状态',
     field: 'status',

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,9 +127,14 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => [
-  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 []
+  }else{
+    return [defaultButtons.mainListDocumentPrintBtn(null),] // 标签打印
+  }
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
@@ -175,7 +181,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/customersettle/customersettleRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CustomersettleRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CustomersettleRecordMain.allSchemas.searchSchema,...CustomersettleRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CustomersettleRecordMain.allSchemas"
+      :detailAllSchemas="CustomersettleRecordDetail.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(CustomersettleRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...CustomersettleRecordMain.allSchemas.tableColumns,...CustomersettleRecordDetail.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/customersettle/customersettleRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CustomersettleRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CustomersettleRequestMain.allSchemas.searchSchema,...CustomersettleRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CustomersettleRequestMain.allSchemas"
+      :detailAllSchemas="CustomersettleRequestDetail.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>
@@ -96,7 +97,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CustomersettleRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...CustomersettleRequestMain.allSchemas.tableColumns,...CustomersettleRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -205,7 +206,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:customersettle-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customersettle-request-main:reAdd'}), //重新添加
@@ -224,7 +229,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    CustomersettleRequestMainApi.close(row.id).then(() => {
+    CustomersettleRequestMainApi.close(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -234,7 +239,7 @@ const buttonTableClick = async (val, row) => {
     })  } else if (val == 'mainReAdd') { // 重新添加
       await message.confirm('确认要重新添加吗？')
       tableObject.loading = true
-      CustomersettleRequestMainApi.reAdd(row.id).then(() => {
+      CustomersettleRequestMainApi.reAdd(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -245,7 +250,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    CustomersettleRequestMainApi.submit(row.id).then(() => {
+    CustomersettleRequestMainApi.submit(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -256,7 +261,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    CustomersettleRequestMainApi.refused(row.id).then(() => {
+    CustomersettleRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       getList()
     }).catch(err => {
@@ -264,7 +269,7 @@ const buttonTableClick = async (val, row) => {
     })
   } else if (val == 'mainApprove') { // 审批通过
     tableObject.loading = true
-    CustomersettleRequestMainApi.agree(row.id).then(() => {
+    CustomersettleRequestMainApi.agree(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -274,7 +279,7 @@ const buttonTableClick = async (val, row) => {
     })
   } else if (val == 'mainHandle') { // 处理
     tableObject.loading = true
-    CustomersettleRequestMainApi.handle(row.id).then(() => {
+    CustomersettleRequestMainApi.handle(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -285,7 +290,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,9 +127,14 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => [
-  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 []
+  }else{
+    return [defaultButtons.mainListDocumentPrintBtn(null),] // 标签打印
+  }
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
@@ -166,7 +172,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/deliversettlementManage/stockup/stockupMainJob/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="StockupMainJob.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...StockupMainJob.allSchemas.searchSchema,...StockupDetailJob.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="StockupMainJob.allSchemas"
+      :detailAllSchemas="StockupDetailJob.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>
@@ -82,7 +83,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(StockupMainJob.allSchemas.tableColumns)
+const tableColumns = ref([...StockupMainJob.allSchemas.tableColumns,...StockupDetailJob.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -179,7 +180,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'])}), // 关闭
@@ -193,11 +198,11 @@ const buttonTableClick = async (val, row) => {
    if (val == 'mainJobExe') { // 执行
     handleHandle
   } else if (val == 'mainJobAba') { // 放弃
-    StockupJobMainApi.abandonStockupMainJob(row.id)
+    StockupJobMainApi.abandonStockupMainJob(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    StockupJobMainApi.closeStockupMainJob(row.id)
+    StockupJobMainApi.closeStockupMainJob(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
-    StockupJobMainApi.acceptStockupMainJob(row.id)
+    StockupJobMainApi.acceptStockupMainJob(row.masterId)
   }
 }
 // 获取部门 用于详情 部门回显

src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="StockupMainRecord.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...StockupMainRecord.allSchemas.searchSchema,...StockupDetailRecord.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="StockupMainRecord.allSchemas"
+      :detailAllSchemas="StockupDetailRecord.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(StockupMainRecord.allSchemas.tableColumns)
+const tableColumns = ref([...StockupMainRecord.allSchemas.tableColumns,...StockupDetailRecord.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 []
+  }
   return []
 }
 

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="StockupMainRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...StockupMainRequest.allSchemas.searchSchema,...StockupDetailRequest.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="StockupMainRequest.allSchemas"
+      :detailAllSchemas="StockupDetailRequest.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>
@@ -100,7 +101,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(StockupMainRequest.allSchemas.tableColumns)
+const tableColumns = ref([...StockupMainRequest.allSchemas.tableColumns,...StockupDetailRequest.allSchemas.tableMainColumns])
 
 const isShowButton = ref(true)
 
@@ -228,7 +229,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:stockup-main-request:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:stockup-main-request:reAdd'}), //重新添加
@@ -248,7 +253,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    StockupMainRequestApi.close(row.id).then(() => {
+    StockupMainRequestApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -259,7 +264,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    StockupMainRequestApi.reAdd(row.id).then(() => {
+    StockupMainRequestApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -270,7 +275,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    StockupMainRequestApi.submit(row.id).then(() => {
+    StockupMainRequestApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -281,7 +286,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    StockupMainRequestApi.refused(row.id).then(() => {
+    StockupMainRequestApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -292,7 +297,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    StockupMainRequestApi.agree(row.id).then(() => {
+    StockupMainRequestApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -303,7 +308,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    StockupMainRequestApi.handle(row.id).then(() => {
+    StockupMainRequestApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -314,7 +319,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/stockup/stockupMainRequest/stockupMainRequest.data.ts

@@ -283,7 +283,6 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm: false,
   },
   {
     label: '备注',

src/views/wms/inventoryManage/package/index.vue

@@ -246,8 +246,9 @@ const formsSuccess = async (formType,data) => {
     await PackageApi.createPackage(data)
     message.success(t('common.createSuccess'))
   } else {
+    await message.confirm('包装修改后需重新打印标签，是否继续保存？')
     await PackageApi.updatePackage(data)
-    message.success(t('common.updateSuccess'))
+    message.success(t('包装信息已修改，请重新打印标签'))
   }
   basicFormRef.value.dialogVisible = false
   getList()

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InventoryinitRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...InventoryinitRecordMain.allSchemas.searchSchema,...InventoryinitRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="InventoryinitRecordMain.allSchemas"
+      :detailAllSchemas="InventoryinitRecordDetail.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(InventoryinitRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...InventoryinitRecordMain.allSchemas.tableColumns,...InventoryinitRecordDetail.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/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InventoryinitRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...InventoryinitRequestMain.allSchemas.searchSchema,...InventoryinitRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="InventoryinitRequestMain.allSchemas"
+      :detailAllSchemas="InventoryinitRequestDetail.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>
@@ -93,7 +94,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(InventoryinitRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...InventoryinitRequestMain.allSchemas.tableColumns,...InventoryinitRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -185,7 +186,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:inventoryinit-request-main:close'}), // 关闭
     defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:inventoryinit-request-main:reAdd'}), //重新添加
@@ -201,17 +206,17 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
-    handleClose(row.id)
+    handleClose(row.masterId)
   } else if (val == 'mainReAdd') { // 重新添加
-    handleReAdd(row.id)
+    handleReAdd(row.masterId)
   } else if (val == 'mainSubmit') { // 提交审批
-    handleSubmit(row.id)
+    handleSubmit(row.masterId)
   } else if (val == 'mainTurnDown') { // 驳回
-    handleRefused(row.id)
+    handleRefused(row.masterId)
   } else if (val == 'mainApprove') { // 审批通过
-    handleAgree(row.id)
+    handleAgree(row.masterId)
   } else if (val == 'mainHandle') { // 处理
-    handleHandle(row.id)
+    handleHandle(row.masterId)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   }

src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ScrapJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ScrapJobMain.allSchemas.searchSchema,...ScrapJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ScrapJobMain.allSchemas"
+      :detailAllSchemas="ScrapJobDetail.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(ScrapJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...ScrapJobMain.allSchemas.tableColumns,...ScrapJobDetail.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'])}), // 关闭

src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ScrapRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ScrapRecordMain.allSchemas.searchSchema,...ScrapRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ScrapRecordMain.allSchemas"
+      :detailAllSchemas="ScrapRecordDetail.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(ScrapRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...ScrapRecordMain.allSchemas.tableColumns,...ScrapRecordDetail.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/inventoryjobManage/scrap/scrapRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ScrapRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ScrapRequestMain.allSchemas.searchSchema,...ScrapRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ScrapRequestMain.allSchemas"
+      :detailAllSchemas="ScrapRequestDetail.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>
@@ -99,7 +100,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ScrapRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...ScrapRequestMain.allSchemas.tableColumns,...ScrapRequestDetail.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.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:scrap-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:scrap-request-main:reAdd'}), // 重新添加
@@ -226,25 +231,25 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
-    handleClose(row.id)
+    handleClose(row.masterId)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
-    handleReAdd(row.id)
+    handleReAdd(row.masterId)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
-    handleSubmit(row.id)
+    handleSubmit(row.masterId)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
-    handleRefused(row.id)
+    handleRefused(row.masterId)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
-    handleAgree(row.id)
+    handleAgree(row.masterId)
   }  else if (val == 'mainHandle') { // 处理
-    handleHandle(row.id)
+    handleHandle(row.masterId)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue

@@ -75,7 +75,7 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/unplannedissue-request-main/import" :importTemplateData="importTemplateData" 
+  <ImportForm ref="importFormRef" url="/wms/unplannedissue-request-main/importSpare" :importTemplateData="importTemplateData" 
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
@@ -436,7 +436,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '计划外出库申请主导入模版.xlsx'
+  templateTitle: '备件领用申请导入模版.xlsx'
 })
 
 // 导入成功之后
@@ -456,6 +456,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await UnplannedissueRequestMainApi.importTemplate()
+  importTemplateData.templateUrl = await UnplannedissueRequestMainApi.spareImportTemplate()
 })
 </script>

src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="TransferissueJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...TransferissueJobMain.allSchemas.searchSchema,...TransferissueJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="TransferissueJobMain.allSchemas"
+      :detailAllSchemas="TransferissueJobDetail.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>
@@ -84,7 +85,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(TransferissueJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...TransferissueJobMain.allSchemas.tableColumns,...TransferissueJobDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -181,7 +182,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']),hasPermi:'wms:transferissue-job-main:close'}), // 关闭
@@ -196,13 +201,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
-    handleAbandon(row.id)
+    handleAbandon(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
-    handleClose(row.id)
+    handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
-    handleAccept(row.id)
+    handleAccept(row.masterId)
   }
 }
 

src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="TransferissueRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...TransferissueRecordMain.allSchemas.searchSchema,...TransferissueRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="TransferissueRecordMain.allSchemas"
+      :detailAllSchemas="TransferissueRecordDetail.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(TransferissueRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...TransferissueRecordMain.allSchemas.tableColumns,...TransferissueRecordDetail.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/inventoryjobManage/transferissue/transferissueRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="TransferissueRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...TransferissueRequestMain.allSchemas.searchSchema,...TransferissueRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="TransferissueRequestMain.allSchemas"
+      :detailAllSchemas="TransferissueRequestDetail.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>
@@ -96,7 +97,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(TransferissueRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...TransferissueRequestMain.allSchemas.tableColumns,...TransferissueRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -204,7 +205,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']),hasPermi:'wms:transferissue-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:transferissue-request-main:reAdd'}), // 重新添加
@@ -222,25 +227,25 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
-    handleClose(row.id)
+    handleClose(row.masterId)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
-    handleReAdd(row.id)
+    handleReAdd(row.masterId)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
-    handleSubmit(row.id)
+    handleSubmit(row.masterId)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
-    handleRefused(row.id)
+    handleRefused(row.masterId)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
-    handleAgree(row.id)
+    handleAgree(row.masterId)
   } else if (val == 'mainHandle') { // 处理
-    handleHandle(row.id)
+    handleHandle(row.masterId)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 

src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="TransferreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...TransferreceiptJobMain.allSchemas.searchSchema,...TransferreceiptJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="TransferreceiptJobMain.allSchemas"
+      :detailAllSchemas="TransferreceiptJobDetail.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(TransferreceiptJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...TransferreceiptJobMain.allSchemas.tableColumns,...TransferreceiptJobDetail.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'])}), // 关闭

src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="TransferreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...TransferreceiptRecordMain.allSchemas.searchSchema,...TransferreceiptRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="TransferreceiptRecordMain.allSchemas"
+      :detailAllSchemas="TransferreceiptRecordDetail.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(TransferreceiptRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...TransferreceiptRecordMain.allSchemas.tableColumns,...TransferreceiptRecordDetail.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/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="TransferreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...TransferreceiptRequestMain.allSchemas.searchSchema,...TransferreceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="TransferreceiptRequestMain.allSchemas"
+      :detailAllSchemas="TransferreceiptRequestDetail.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>
@@ -97,7 +98,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(TransferreceiptRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...TransferreceiptRequestMain.allSchemas.tableColumns,...TransferreceiptRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -197,7 +198,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']),hasPermi:'wms:transferreceipt-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:transferreceipt-request-main:reAdd'}), // 重新添加
@@ -215,25 +220,25 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
-    handleClose(row.id)
+    handleClose(row.masterId)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
-    handleReAdd(row.id)
+    handleReAdd(row.masterId)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
-    handleSubmit(row.id)
+    handleSubmit(row.masterId)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
-    handleRefused(row.id)
+    handleRefused(row.masterId)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
-    handleAgree(row.id)
+    handleAgree(row.masterId)
   } else if (val == 'mainHandle') { // 处理
-    handleHandle(row.id)
+    handleHandle(row.masterId)
   }else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="UnplannedissueJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...UnplannedissueJobMain.allSchemas.searchSchema,...UnplannedissueJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="UnplannedissueJobMain.allSchemas"
+      :detailAllSchemas="UnplannedissueJobDetail.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(UnplannedissueJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...UnplannedissueJobMain.allSchemas.tableColumns,...UnplannedissueJobDetail.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'])}), // 关闭

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="UnplannedissueRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...UnplannedissueRecordMain.allSchemas.searchSchema,...UnplannedissueRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="UnplannedissueRecordMain.allSchemas"
+      :detailAllSchemas="UnplannedissueRecordDetail.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(UnplannedissueRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...UnplannedissueRecordMain.allSchemas.tableColumns,...UnplannedissueRecordDetail.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/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="UnplannedissueRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...UnplannedissueRequestMain.allSchemas.searchSchema,...UnplannedissueRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="UnplannedissueRequestMain.allSchemas"
+      :detailAllSchemas="UnplannedissueRequestDetail.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>
@@ -96,7 +97,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(UnplannedissueRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...UnplannedissueRequestMain.allSchemas.tableColumns,...UnplannedissueRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -198,7 +199,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']),hasPermi:'wms:unplannedissue-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedissue-request-main:reAdd'}), // 重新添加
@@ -217,25 +222,25 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
-    handleClose(row.id)
+    handleClose(row.masterId)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
-    handleReAdd(row.id)
+    handleReAdd(row.masterId)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
-    handleSubmit(row.id)
+    handleSubmit(row.masterId)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
-    handleRefused(row.id)
+    handleRefused(row.masterId)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
-    handleAgree(row.id)
+    handleAgree(row.masterId)
   } else if (val == 'mainHandle') { // 处理
-    handleHandle(row.id)
+    handleHandle(row.masterId)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="UnplannedreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...UnplannedreceiptJobMain.allSchemas.searchSchema,...UnplannedreceiptJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="UnplannedreceiptJobMain.allSchemas"
+      :detailAllSchemas="UnplannedreceiptJobDetail.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(UnplannedreceiptJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...UnplannedreceiptJobMain.allSchemas.tableColumns,...UnplannedreceiptJobDetail.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'])}), // 关闭

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="UnplannedreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...UnplannedreceiptRecordMain.allSchemas.searchSchema,...UnplannedreceiptRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="UnplannedreceiptRecordMain.allSchemas"
+      :detailAllSchemas="UnplannedreceiptRecordDetail.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(UnplannedreceiptRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...UnplannedreceiptRecordMain.allSchemas.tableColumns,...UnplannedreceiptRecordDetail.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/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="UnplannedreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...UnplannedreceiptRequestMain.allSchemas.searchSchema,...UnplannedreceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="UnplannedreceiptRequestMain.allSchemas"
+      :detailAllSchemas="UnplannedreceiptRequestDetail.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>
@@ -124,7 +125,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(UnplannedreceiptRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...UnplannedreceiptRequestMain.allSchemas.tableColumns,...UnplannedreceiptRequestDetail.allSchemas.tableMainColumns])
 
 //创建标签
 const detailListTableColumns = UnplannedreceiptRequestDetailLabel.allSchemas
@@ -275,7 +276,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']),hasPermi:'wms:unplannedreceipt-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedreceipt-request-main:reAdd'}), // 重新添加
@@ -304,26 +309,26 @@ const buttonTableClick = async (val, row) => {
   console.log("val",val)
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
-    handleClose(row.id)
+    handleClose(row.masterId)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
-    handleReAdd(row.id)
+    handleReAdd(row.masterId)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
-    handleSubmit(row.id)
+    handleSubmit(row.masterId)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
-    handleRefused(row.id)
+    handleRefused(row.masterId)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
-    handleAgree(row.id)
+    handleAgree(row.masterId)
   } else if (val == 'mainHandle') { // 处理
     console.log('列表-操作按钮事件-处理')
-    handleHandle(row.id)
+    handleHandle(row.masterId)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   } else if (val == 'point') {
     // 标签打印
     labelPrint(row)
@@ -343,7 +348,7 @@ const buttonTableClick = async (val, row) => {
     }
     console.log("列表-操作按钮事件-创建标签")
     detatableData.params = {
-      masterId:row.id
+      masterId:row.masterId
     }
     await getDetailList()
     // 判断 是否已创建标签

src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InventorymoveJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...InventorymoveJobMain.allSchemas.searchSchema,...InventorymoveJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="InventorymoveJobMain.allSchemas"
+      :detailAllSchemas="InventorymoveJobDetail.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(InventorymoveJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...InventorymoveJobMain.allSchemas.tableColumns,...InventorymoveJobDetail.allSchemas.tableMainColumns])
 
 const fromInventoryStatus = ref()
 const toInventoryStatus = ref()
@@ -231,7 +232,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'])}), // 关闭
@@ -243,13 +248,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') { // 执行
-    InventorymoveJobMainApi.executeInventorymoveMain(row.id)
+    InventorymoveJobMainApi.executeInventorymoveMain(row.masterId)
   } else if (val == 'mainJobAba') { // 放弃
-    InventorymoveJobMainApi.abandonInventorymoveMain(row.id)
+    InventorymoveJobMainApi.abandonInventorymoveMain(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    InventorymoveJobMainApi.closeInventorymoveMain(row.id)
+    InventorymoveJobMainApi.closeInventorymoveMain(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
-    InventorymoveJobMainApi.acceptInventorymoveMain(row.id)
+    InventorymoveJobMainApi.acceptInventorymoveMain(row.masterId)
   }
 }
 // 获取部门 用于详情 部门回显

src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InventorymoveRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...InventorymoveRecordMain.allSchemas.searchSchema,...InventorymoveRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="InventorymoveRecordMain.allSchemas"
+      :detailAllSchemas="InventorymoveRecordDetail.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 importFileName = ref()
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(InventorymoveRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...InventorymoveRecordMain.allSchemas.tableColumns,...InventorymoveRecordDetail.allSchemas.tableMainColumns])
 
 console.log(99 ,  routeName.value)
 const fromInventoryStatus = ref()
@@ -180,7 +181,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/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InventorymoveRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...InventorymoveRequestMain.allSchemas.searchSchema,...InventorymoveRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="InventorymoveRequestMain.allSchemas"
+      :detailAllSchemas="InventorymoveRequestDetail.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>
@@ -94,7 +95,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(InventorymoveRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...InventorymoveRequestMain.allSchemas.tableColumns,...InventorymoveRequestDetail.allSchemas.tableMainColumns])
 const businessType = ref()
 
 console.log(99 ,  routeName.value)
@@ -394,7 +395,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:inventorymove-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorymove-request-main:reAdd'}), //重新添加
@@ -414,7 +419,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    InventorymoveRequestMainApi.close(row.id).then(() => {
+    InventorymoveRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -425,7 +430,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    InventorymoveRequestMainApi.reAdd(row.id).then(() => {
+    InventorymoveRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -436,7 +441,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    InventorymoveRequestMainApi.submit(row.id).then(() => {
+    InventorymoveRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -447,7 +452,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    InventorymoveRequestMainApi.refused(row.id).then(() => {
+    InventorymoveRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -458,7 +463,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    InventorymoveRequestMainApi.agree(row.id).then(() => {
+    InventorymoveRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -469,7 +474,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    InventorymoveRequestMainApi.handle(row.id).then(() => {
+    InventorymoveRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -480,7 +485,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/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="OfflinesettlementRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...OfflinesettlementRecordMain.allSchemas.searchSchema,...OfflinesettlementRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="OfflinesettlementRecordMain.allSchemas"
+      :detailAllSchemas="OfflinesettlementRecordDetail.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(OfflinesettlementRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...OfflinesettlementRecordMain.allSchemas.tableColumns,...OfflinesettlementRecordDetail.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/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="OfflinesettlementRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...OfflinesettlementRequestMain.allSchemas.searchSchema,...OfflinesettlementRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="OfflinesettlementRequestMain.allSchemas"
+      :detailAllSchemas="OfflinesettlementRequestDetail.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>
@@ -94,7 +95,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(OfflinesettlementRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...OfflinesettlementRequestMain.allSchemas.tableColumns,...OfflinesettlementRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -197,7 +198,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'])}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
@@ -226,7 +231,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/productionManage/productdismantle/productdismantleJobMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductdismantleJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductdismantleJobMain.allSchemas.searchSchema,...ProductdismantleJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductdismantleJobMain.allSchemas"
+      :detailAllSchemas="ProductdismantleJobDetail.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(ProductdismantleJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductdismantleJobMain.allSchemas.tableColumns,...ProductdismantleJobDetail.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'])}), // 关闭

src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductdismantleRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductdismantleRecordMain.allSchemas.searchSchema,...ProductdismantleRecordDetaila.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductdismantleRecordMain.allSchemas"
+      :detailAllSchemas="ProductdismantleRecordDetaila.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>
@@ -101,7 +102,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ProductdismantleRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductdismantleRecordMain.allSchemas.tableColumns,...ProductdismantleRecordDetaila.allSchemas.tableMainColumns])
 
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
@@ -140,9 +141,9 @@ const tableFormButton = async (val , row) => {
     bomModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
-       masterId: row.id
+       masterId: row.masterId
     }
-    rowId.value =  row.id
+    rowId.value =  row.masterId
     await getDetailListBom()
   }
 }
@@ -195,7 +196,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/productionManage/productdismantle/productdismantleRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductdismantleRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductdismantleRequestMain.allSchemas.searchSchema,...ProductdismantleRequestDetaila.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductdismantleRequestMain.allSchemas"
+      :detailAllSchemas="ProductdismantleRequestDetaila.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>
@@ -117,7 +118,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ProductdismantleRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductdismantleRequestMain.allSchemas.tableColumns,...ProductdismantleRequestDetaila.allSchemas.tableMainColumns])
 
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
@@ -234,9 +235,9 @@ const tableFormButton = async (val , row) => {
     detatableDataBom.params = {
        itemCode: row.itemCode,
        bomVersion: row.bomVersion,
-       masterId: row.id
+       masterId: row.masterId
     }
-    rowId.value =  row.id
+    rowId.value =  row.masterId
     detailQty.value = row.qty
     await getDetailListBom()
   }
@@ -346,7 +347,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']), hasPermi:'wms:productdismantle-request-main:close'}), // 关闭
     defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productdismantle-request-main:reAdd'}), // 重新添加
@@ -364,7 +369,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.close(row.id).then(() => {
+    ProductdismantleRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -375,7 +380,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.reAdd(row.id).then(() => {
+    ProductdismantleRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -386,7 +391,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.submit(row.id).then(() => {
+    ProductdismantleRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -397,7 +402,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.refused(row.id).then(() => {
+    ProductdismantleRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -408,7 +413,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.agree(row.id).then(() => {
+    ProductdismantleRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -419,7 +424,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    ProductdismantleRequestMainApi.handle(row.id).then(() => {
+    ProductdismantleRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -430,7 +435,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/productionManage/productputaway/productputawayJobMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductputawayJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductputawayJobMain.allSchemas.searchSchema,...ProductputawayJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductputawayJobMain.allSchemas"
+      :detailAllSchemas="ProductputawayJobDetail.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(ProductputawayJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductputawayJobMain.allSchemas.tableColumns,...ProductputawayJobDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -149,7 +150,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'])}), // 关闭
@@ -231,11 +236,11 @@ const buttonTableClick = async (val, row) => {
     }
     ProductputawayJobMainApi.executeProductputawayMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    ProductputawayJobMainApi.abandonProductputawayMain(row.id)
+    ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    ProductputawayJobMainApi.closeProductputawayMain(row.id)
+    ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
-    ProductputawayJobMainApi.acceptProductputawayMain(row.id)
+    ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
   }
 }
 // 获取部门 用于详情 部门回显

src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductputawayRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductputawayRecordMain.allSchemas.searchSchema,...ProductputawayRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductputawayRecordMain.allSchemas"
+      :detailAllSchemas="ProductputawayRecordDetail.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(ProductputawayRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductputawayRecordMain.allSchemas.tableColumns,...ProductputawayRecordDetail.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/productionManage/productputaway/productputawayRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductputawayRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductputawayRequestMain.allSchemas.searchSchema,...ProductputawayRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductputawayRequestMain.allSchemas"
+      :detailAllSchemas="ProductputawayRequestDetail.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>
@@ -93,7 +94,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ProductputawayRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductputawayRequestMain.allSchemas.tableColumns,...ProductputawayRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -196,7 +197,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']), hasPermi:'wms:productputaway-request-main:close'}), // 关闭
     defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productputaway-request-main:reAdd'}), // 重新添加
@@ -213,7 +218,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    ProductputawayRequestMainApi.close(row.id).then(() => {
+    ProductputawayRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -224,7 +229,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    ProductputawayRequestMainApi.reAdd(row.id).then(() => {
+    ProductputawayRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -235,7 +240,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    ProductputawayRequestMainApi.submit(row.id).then(() => {
+    ProductputawayRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -246,7 +251,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    ProductputawayRequestMainApi.refused(row.id).then(() => {
+    ProductputawayRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -257,7 +262,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    ProductputawayRequestMainApi.agree(row.id).then(() => {
+    ProductputawayRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -268,7 +273,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    ProductputawayRequestMainApi.handle(row.id).then(() => {
+    ProductputawayRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -279,7 +284,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/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue

@@ -0,0 +1,285 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...ProductputawayJobMain.allSchemas.searchSchema,...ProductputawayJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductputawayJobMain.allSchemas"
+      :detailAllSchemas="ProductputawayJobDetail.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductputawayJobMainRules"
+    :formAllSchemas="ProductputawayJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ProductputawayJobDetail.allSchemas"
+    :tableFormRules="ProductputawayJobDetailRules"
+    :apiUpdate="ProductputawayJobMainApi.updateProductputawayJobMain"
+    :apiCreate="ProductputawayJobMainApi.createProductputawayJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductputawayJobMain.allSchemas"
+    :detailAllSchemas="ProductputawayJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductputawayJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ProductputawayJobDetailApi.getProductputawayJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductputawayJobMain,ProductputawayJobMainRules,ProductputawayJobDetail,ProductputawayJobDetailRules } from './productputawayAssembleJobMain.data'
+import * as ProductputawayJobMainApi from '@/api/wms/productputawayJobMain'
+import * as ProductputawayJobDetailApi from '@/api/wms/productputawayJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品上架任务主
+defineOptions({ name: 'ProductputawayJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...ProductputawayJobMain.allSchemas.tableColumns,...ProductputawayJobDetail.allSchemas.tableMainColumns])
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductputawayJobMainApi.getProductputawayJobMainAssemblePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } 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 { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+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'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    let aaa = {
+    "id": "1809190000111838147",
+    "requestNumber": "REC4620231214-0004",
+    "supplierCode": null,
+    "fromWarehouseCode": "W1",
+    "toWarehouseCode": null,
+    "fromAreaCodes": "",
+    "toAreaCodes": "",
+    "fromAreaTypes": "WIP,RAW",
+    "toAreaTypes": "SEMI,FG",
+    "completetime": 1702545291000,
+    "requestTime": 1702524283000,
+    "requestDueTime": 1689562428000,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1702545291000,
+    "updater": "1",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "103",
+    "acceptUserId": "1",
+    "acceptTime": 1702552206000,
+    "completeUserId": null,
+    "number": "JOB2220231214-0007",
+    "businessType": "ProductPutaway",
+    "remark": "111100",
+    "createTime": 1702545291000,
+    "creator": "1",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    "inInventoryStatuses": "OK",
+    "outInventoryStatuses": "OK",
+      subList: [
+      {
+    "id": "1809190001814017359",
+    "packingNumber": "12",
+    "containerNumber": "001",
+    "batch": "21",
+    "inventoryStatus": "OK",
+    "poNumber": null,
+    "poLine": "item01",
+    "fromLocationCode": "H03",
+    "toLocationCode": "L-R-001-002-1-02",
+    "itemCode": "item01",
+    "itemName": "物料01",
+    "itemDesc1": "",
+    "itemDesc2": "",
+    "projectCode": "xm01",
+    "qty": 3,
+    "uom": "EA",
+    "number": "JOB2220231214-0007",
+    "remark": "00",
+    "createTime": 1702545291000,
+    "creator": "1",
+    "fromOwnerCode": null,
+    "toOwnerCode": null
+}
+      ]
+    }
+    ProductputawayJobMainApi.executeProductputawayMain(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
+  } else if (val == 'mainJobClo') { // 关闭
+    ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
+  } else if (val == 'mainJobAcc') { // 承接
+    ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
+  }
+}
+// 获取部门 用于详情 部门回显
+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
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobProductputawayMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductputawayJobMainApi.exportProductputawayJobMain(tableObject.params)
+    download.excel(data, '制品上架任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts

@@ -0,0 +1,809 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品上架任务主表
+ */
+export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  // {
+  //   label: '供应商代码',
+  //   field: 'supplierCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    form: {
+      component: 'InputNumber',
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    form: {
+      component: 'InputNumber',
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人用户名',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人用户名',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const ProductputawayJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品上架任务子表
+ */
+export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemdesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductputawayJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue

@@ -0,0 +1,179 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...ProductputawayRecordMain.allSchemas.searchSchema,...ProductputawayRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductputawayRecordMain.allSchemas"
+      :detailAllSchemas="ProductputawayRecordDetail.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductputawayRecordMainRules"
+    :formAllSchemas="ProductputawayRecordMain.allSchemas"
+    :tableAllSchemas="ProductputawayRecordDetail.allSchemas"
+    :tableFormRules="ProductputawayRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductputawayRecordMain.allSchemas"
+    :detailAllSchemas="ProductputawayRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductputawayRecordDetailRules"
+    :apiPage="ProductputawayRecordDetailApi.getProductputawayRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductputawayRecordMain,ProductputawayRecordMainRules,ProductputawayRecordDetail,ProductputawayRecordDetailRules } from './productputawayAssembleRecordMain.data'
+import * as ProductputawayRecordMainApi from '@/api/wms/productputawayRecordMain'
+import * as ProductputawayRecordDetailApi from '@/api/wms/productputawayRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品上架记录主
+defineOptions({ name: 'ProductputawayRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...ProductputawayRecordMain.allSchemas.tableColumns,...ProductputawayRecordDetail.allSchemas.tableMainColumns])
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductputawayRecordMainApi.getProductputawayRecordMainAssemblePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } 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 { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+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
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductputawayMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
+    download.excel(data, '制品上架记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>