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

src/api/wms/productputawayRecordDetail/index.ts

@@ -54,7 +54,7 @@ export const getProductputawayRecordDetailPage = async (params) => {
 
 // 查询制品上架记录子列表
 export const getProductputawayRecordDetailPageAssemble = async (params) => {
-    params.type = 'assemble'
+  params.type = 'assemble'
   if (params.isSearch) {
     const cmd = {
       'column':'type',

src/api/wms/productputawayRecordMain/index.ts

@@ -74,8 +74,14 @@ export const deleteProductputawayRecordMain = async (id: number) => {
 
 // 导出制品上架记录主 Excel
 export const exportProductputawayRecordMain = async (params) => {
-  params.type = 'predict'
+  params.type = 'assemble'
   if (params.isSearch) {
+    const cmd = {
+      'column':'type',
+      'action':'==',
+      'value':'assemble'
+    }
+    params.filters.push(cmd)
     delete params.isSearch
     const data = {...params}
     return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data })

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

@@ -142,7 +142,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-job-main:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-main-job:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置

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

@@ -305,6 +305,15 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'predict'
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

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

@@ -83,7 +83,7 @@
   </template>
   </BasicForm>
   <!-- 添加明细：采购收货记录单号 -->
-  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
+  <SearchTable ref="searchTableRef" :hiddenFilterBtn="true" @searchTableSuccess="searchTableSuccess1" >
     <template #searchQueryhahaha>
       <el-form :inline="true">
         <el-form-item label="供应商">
@@ -278,10 +278,13 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
         setV['asnNumber'] = ''
         tableData.value = []
         getSupplierOptions(val[0][searchField])
-        
       }
       
       formRef.setValues(setV)
+      if(formField=='itemCode'){
+        onChangeForm('itemCode',null,formRef)
+      }
+
     }
   })
 }
@@ -788,7 +791,6 @@ const handleAddTable = () => {
   // })
 }
 const onChangeForm = async (field, cur, formRef)=>{
-  console.log('onChangeForm',field, cur, formRef)
   if(field=='supplierCode'){
     //供应商
     PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
@@ -799,11 +801,16 @@ const onChangeForm = async (field, cur, formRef)=>{
         formRef.value.setValues(setV)
       }
     })
-  }else if(field == 'locationCode'){
+  }else if(field == 'locationCode' || field == 'itemCode'){
     // 退货库位 获取明细列表
+    let itemCode = field == 'locationCode'?formRef.value.formModel.itemCode:formRef.formModel.itemCode
+    let fromLocationCode = field == 'locationCode'?formRef.value.formModel.locationCode:formRef.formModel.locationCode
+    if(!itemCode||!fromLocationCode){
+      return
+    }
     let subList = await PurchasereturnRequestDetailApi.getBalancePurchaseReceiptReturn({
-      itemCode:formRef.value.formModel.itemCode,
-      fromLocationCode:formRef.value.formModel.locationCode
+      itemCode,
+      fromLocationCode
     })
 
     console.log('subList',subList)