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

src/api/wms/supplieritem/index.ts

@@ -68,7 +68,10 @@ export const importTemplate = () => {
 
 // 查询供应商物品列表
 export const selectItembasicTypeToSupplieritem = async (params) => {
-  
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.post({ url: `/wms/supplieritem/pageItembasicTypeToSupplieritemSenior`, data })
+  } else {
     return await request.get({ url: `/wms/supplieritem/pageItembasicTypeToSupplieritem`, params })
-  
+}
 }

src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue

@@ -177,7 +177,7 @@ const formsSuccess = async (formType,data) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'basicEnterprise')
 }
 
 /** 删除按钮操作 */

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

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordCustomerreceiptMain')
 }
 
 /** 导出按钮操作 */

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

@@ -264,7 +264,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestCustomerreceiptMain')
 }
 
 /** 删除按钮操作 */

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

@@ -325,7 +325,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobCustomerreturnMain')
 }
 
 /** 执行按钮操作 */

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

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordCustomerreturnMain')
 }
 
 /** 导出按钮操作 */

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

@@ -309,7 +309,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     }else {
       trueFalse.value = true
     }
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestCustomerreturnMain')
 }
 
 /** 删除按钮操作 */
@@ -369,11 +369,12 @@ const submitForm = async (formType, data) => {
     if(obj.qty == 0){
       message.error(`数量不能为0!`)
       flag.value = true
-      formRef.value.formLoading = false
+      
       return;
     }
   })
   if(flag.value){
+    formRef.value.formLoading = false
     return
   }
   try {

src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordCustomersettleMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue

@@ -274,7 +274,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestCustomersettleMain')
 }
 
 /** 删除按钮操作 */

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

@@ -295,7 +295,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobDeliverMain')
 }
 
 const handleHandle = async (data) => {

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

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordDeliverMain')
 }
 
 /** 导出按钮操作 */

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

@@ -322,7 +322,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     }else {
       trueFalse.value = true
     }
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestDeliverMain')
 }
 
 /** 删除按钮操作 */
@@ -388,11 +388,11 @@ const submitForm = async (formType, data) => {
     if(obj.qty == 0){
       message.warning(`数量不能为0!`)
       flag.value = true
-      formRef.value.formLoading = false
       return;
     }
   })
   if(flag.value){
+    formRef.value.formLoading = false
     return
   }
   try {

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

@@ -273,7 +273,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'planDeliverMain')
 }
 
 /** 删除按钮操作 */
@@ -333,11 +333,11 @@ const submitForm = async (formType, data) => {
     if(obj.qty == 0){
       message.error(`数量不能为0!`)
       flag.value = true
-      formRef.value.formLoading = false
       return;
     }
   })
   if(flag.value){
+    formRef.value.formLoading = false
     return
   }
  var isHave =DeliverPlanMain.allSchemas.formSchema.some(function (item) {

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

@@ -218,7 +218,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'orderSaleMain')
 }
 
 /** 删除按钮操作 */

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

@@ -163,7 +163,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionBalance')
 }
 
 /** 删除按钮操作 */

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

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionContainerMain')
 }
 
 /** 导出按钮操作 */

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

@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionExpectin')
 }
 
 /** 删除按钮操作 */

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

@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionExpectout')
 }
 
 /** 删除按钮操作 */

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

@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionLocationcapacity')
 }
 
 /** 删除按钮操作 */

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

@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionTransaction')
 }
 
 /** 删除按钮操作 */

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

@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionTransferlog')
 }
 
 /** 删除按钮操作 */

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

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordInventoryinitMain')
 }
 
 /** 导出按钮操作 */

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

@@ -287,7 +287,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestInventoryinitMain')
 }
 
 /** 删除按钮操作 */

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

@@ -197,7 +197,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobScrapMain')
 }
 
 /** 导出按钮操作 */

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

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordScrapMain')
 }
 
 /** 导出按钮操作 */

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

@@ -293,7 +293,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestScrapMain')
 }
 
 /** 删除按钮操作 */

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

@@ -232,7 +232,7 @@ const handleAccept = async (id: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobTransferissueMain')
 }
 
 /** 导出按钮操作 */

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

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordTransferissueMain')
 }
 
 /** 导出按钮操作 */

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

@@ -307,7 +307,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestTransferissueMain')
 }
 
 /** 删除按钮操作 */

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

@@ -197,7 +197,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobTransferreceiptMain')
 }
 
 /** 导出按钮操作 */

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

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordTransferreceiptMain')
 }
 
 /** 导出按钮操作 */

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

@@ -303,7 +303,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestTransferreceiptMain')
 }
 
 /** 删除按钮操作 */

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

@@ -197,7 +197,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobUnplannedissueMain')
 }
 
 /** 导出按钮操作 */

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

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordUnplannedissueMain')
 }
 
 /** 导出按钮操作 */

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

@@ -301,7 +301,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestUnplannedissueMain')
 }
 
 /** 删除按钮操作 */

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

@@ -197,7 +197,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobUnplannedreceiptMain')
 }
 
 /** 导出按钮操作 */

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

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordUnplannedreceiptMain')
 }
 
 /** 导出按钮操作 */

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

@@ -422,7 +422,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestUnplannedreceiptMain')
 }
 
 /** 删除按钮操作 */

src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordOfflinesettlementMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue

@@ -233,7 +233,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestOfflinesettlementMain')
 }
 
 /** 删除按钮操作 */

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

@@ -197,7 +197,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobProductdismantleMain')
 }
 
 /** 导出按钮操作 */

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

@@ -200,7 +200,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductdismantleMain')
 }
 
 /** 导出按钮操作 */

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

@@ -426,7 +426,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
     defaultButtons.formCloseBtn(null) // 关闭
   ]
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductdismantleMain')
 }
 
 /** 删除按钮操作 */

src/views/wms/productionManage/productionplan/productionMain/index.vue

@@ -314,7 +314,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'planProductionMain')
 }
 
 /** 删除按钮操作 */

src/views/wms/productionManage/productionplan/workMain/index.vue

@@ -205,7 +205,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'orderWorkMain')
 }
 
 /** 删除按钮操作 */

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

@@ -236,7 +236,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobProductputawayMain')
 }
 
 /** 导出按钮操作 */

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

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductputawayMain')
 }
 
 /** 导出按钮操作 */

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

@@ -268,7 +268,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductputawayMain')
 }
 
 /** 删除按钮操作 */

src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue

@@ -257,7 +257,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobProductreceiptMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@@ -173,7 +173,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductreceiptMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@@ -423,7 +423,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductreceiptMain')
 }
 
 /** 删除按钮操作 */

src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue

@@ -239,7 +239,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductrepairMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@@ -458,7 +458,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     defaultButtons.formCloseBtn(null) // 关闭
   ]
   lsBomSave.value = false
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductrepairMain')
 }
 
 /** 删除按钮操作 */

src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue

@@ -197,7 +197,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobProductscrapMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue

@@ -238,7 +238,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductscrapMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@@ -464,7 +464,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
     defaultButtons.formCloseBtn(null) // 关闭
   ]
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductscrapMain')
 }
 
 /** 删除按钮操作 */

src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue

@@ -207,7 +207,7 @@ const handleClose = async (id: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobInspectMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue

@@ -136,7 +136,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordInspectMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@@ -260,7 +260,7 @@
   /** 详情操作 */
   const detailRef = ref()
   const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue)
+    detailRef.value.openDetail(row, titleName, titleValue,'requestInspectMain')
   }
 
   /** 删除按钮操作 */

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts

@@ -155,15 +155,6 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue

@@ -199,7 +199,7 @@ const handleClose = async (id: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobPurchasereceiptMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@@ -133,7 +133,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordPurchasereceiptMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@@ -223,7 +223,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereceiptMain')
 }
 
 /** 关闭按钮操作 */

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue

@@ -207,7 +207,7 @@ const handleClose = async (id: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobPurchasereturnMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordPurchasereturnMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -125,6 +125,13 @@ const updataTableColumns = (val) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  console.log("formField",formField)
+  console.log("searchField",searchField)
+  console.log("val",val)
+  console.log("formRef",formRef)
+  console.log("type",row)
+
+
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
@@ -170,6 +177,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       setV[formField] = val[0][searchField]
       setV['purchaseReceiptRecordNumber'] = val[0]['number']
       setV['supplierCode'] = val[0]['supplierCode']
+      setV['asnNumber'] = val[0]['asnNumber']
+      setV['ppNumber'] = val[0]['ppNumber']
 
       // 获取子表数据 getBomDisassemble
       PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailList({
@@ -374,7 +383,7 @@ const openForm = async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereturnMain')
 }
 
 /** 关闭按钮操作 */

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@@ -197,7 +197,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'jobPutawayMain')
 }
 
 /** 关闭按钮操作 */

src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue

@@ -130,7 +130,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordPutawayMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -290,7 +290,7 @@ const handleSubmit = async (id: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestPutawayMain')
 }
 
 /** 删除按钮操作 */

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

@@ -296,15 +296,6 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
   {
     label: '到库位类型范围',
     field: 'toLocationTypes',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@@ -225,7 +225,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'planDemandforecastingMain')
 }
 
 /** 删除按钮操作 */

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue

@@ -196,7 +196,7 @@
   /** 详情操作 */
   const detailRef = ref()
   const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue)
+    detailRef.value.openDetail(row, titleName, titleValue,'orderPurchaseMain')
   }
 
   /** 删除按钮操作 */

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -227,7 +227,7 @@
   /** 详情操作 */
   const detailRef = ref()
   const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue)
+    detailRef.value.openDetail(row, titleName, titleValue,'planPurchaseMain')
   }
 
   /** 删除按钮操作 */

src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue

@@ -195,7 +195,7 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'supplierPackage')
 }
 
 /** 删除按钮操作 */

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@@ -132,7 +132,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'recordSupplierdeliverMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -311,7 +311,7 @@ const buttonTableClick = async (val, row) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,'requestSupplierdeliverMain')
 }
 //添加/修改操作
 const formRef = ref()