Merge remote-tracking branch 'origin/master_hella' into master_hella

src/api/wms/productreceiptRecordMain/index.ts

@@ -102,6 +102,26 @@ export const exportProductreceiptRecordMain = async (params) => {
   }
 }
 
+
+// 导出制品收货记录主 Excel
+export const exportProductreceiptRecordScapMain = async (params) => {
+  // params.type = 'predict'
+  if (params.isSearch) {
+    // const cmd = {
+    //   'column':'type',
+    //   'action':'==',
+    //   'value':'predict'
+    // }
+    // params.filters.push(cmd)
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/productreceipt-record-main/export-excel-senior-scrap', data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-record-main/export-excel-scrap`, params })
+  }
+}
+
+
 // 导出装配收货记录主 Excel
 export const exportProductreceiptRecordAssembleMain = async (params) => {
   params.type = 'assemble'

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -143,7 +143,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(
           isConcatDetailSchemas: true, // 是否主子表合并
           searchAllSchemas: DeliverRecordMain.allSchemas, // 查询弹窗所需类
           searchDetailSchemas: DeliverRecordDetail.allSchemas, // 查询弹窗所需类
-          searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage, // 查询弹窗所需分页方法
+          searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPageCustomerreturn, // 查询弹窗所需分页方法
           searchCondition: [
             {
               key: 'available',

src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

@@ -566,7 +566,6 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       multiple:true,
       disabled:true,
-      isShowTableFormSearch: true,
       // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue

@@ -290,7 +290,7 @@ const handleExport = async () => {
       }
       tableObject.params.filters.push(cmd)
     }
-    const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params)
+    const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordScapMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {