FWHL-249

src/api/wms/location/index.ts

@@ -34,6 +34,16 @@ export const getLocationPage = async (params) => {
     return await request.get({ url: `/wms/location/page`, params })
   }
 }
+// 查询库位列表
+export const getLocationPageOnlineSettlement = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/location/seniorOnlineSettlement', data })
+  } else {
+    return await request.get({ url: `/wms/location/pageOnlineSettlement`, params })
+  }
+}
 // 校验库位
 export const verifyLocation = async (params) => {
   return await request.get({ url: `/wms/location/listLocationByCode`, params })

src/views/wms/issueManage/onlinesettlement/settlementReport/index.vue

@@ -143,7 +143,9 @@ const butttondata = (row) => {
 
 const searchTableRef = ref()
 // 列表-操作按钮事件
+const settlementRow = ref(null)
 const buttonTableClick = async (val, row) => {
+  settlementRow.value = row
   if(val == 'settlement'){
     // 结算
     searchTableRef.value.open(
@@ -228,16 +230,15 @@ const opensearchTable = (
     searchTableRef1.value.open(
       "结算库位",
       Location.allSchemas,
-      LocationApi.getLocationPage,
+      LocationApi.getLocationPageOnlineSettlement,
       "toLocationCode",
       "code",
       false,
       'form',
       null,
       {
-        // supplierCode:row.supplierCode,
+        supplierCode:settlementRow.value?.supplierCode,
-        // itemCode:row.itemCode,
+        itemCode:settlementRow.value?.itemCode,
-        // batch:row.batch
       },
       undefined,
       false,

src/views/wms/issueManage/onlinesettlement/settlementReport/settlementReport.data.ts

@@ -161,10 +161,20 @@ export const SettlementReportSelectionForm = useCrudSchemas(reactive<CrudSchema[
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchPage: LocationApi.getLocationPageOnlineSettlement, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
+        },{
+          key: 'supplierCode',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
         }],
         verificationParams: [{
           key: 'code',