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

src/components/BasicForm/src/BasicForm.vue

@@ -390,6 +390,13 @@ const opensearchTable = (
           return
         }
       }else if(searchCondition[i].isTableRowValue){
+        if(searchCondition[i].required){
+          if (row[searchCondition[i].value] == '' ||row[searchCondition[i].value] == undefined) {
+                message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
+                return
+            }
+        }
+        row[searchCondition[i].value]
         //查询当前table表数据的值
         _searchCondition[searchCondition[i].key] = row[searchCondition[i].value]
       } else {

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

@@ -260,14 +260,16 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row
         // row['fromLocationCode'] = val[0]['fromLocationCode']
         row['toLocationCode'] = val[0]['toLocationCode']
       }else if(formField=='fromLocationCode'){
-          let params = {
-          itemCode: row.itemCode,
-          batch: row.batch,
-          locationCode:val[0]['code']
-        }
-        let aa  = await  BalanceApi.getSumByConditions(params);
-        console.log('23423423',aa);
-        row['inventoryBalance'] = aa//库存余额
+        //   let params = {
+        //   itemCode: row.itemCode,
+        //   batch: row.batch,
+        //   locationCode:val[0]['code']
+        // }
+        // let aa  = await  BalanceApi.getSumByConditions(params);
+        // console.log('23423423',aa);
+        // row['inventoryBalance'] = aa//库存余额
+      }else if(formField=='packingNumber'){
+        row['inventoryBalance'] = val[0]['qty']//库存余额
       }
     } else {
       const setV = {}
@@ -491,17 +493,17 @@ const butttondata = (row,$index) => {
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:purchasereceipt-request-main:update'
     }), // 编辑
-    {
-      label: '生成标签',
-      name: 'ssbq',
-      hide: isShowMainButton(row, ['3']),
-      type: 'primary',
-      icon: '',
-      color: '',
-      hasPermi: '',
-      link: true // 文本展现按钮
-    },
-    defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印
+    // {
+    //   label: '生成标签',
+    //   name: 'ssbq',
+    //   hide: isShowMainButton(row, ['3']),
+    //   type: 'primary',
+    //   icon: '',
+    //   color: '',
+    //   hasPermi: '',
+    //   link: true // 文本展现按钮
+    // },
+    // defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印
   ]
 }
 

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@@ -10,6 +10,8 @@ import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackag
 import * as ItemPackageApi from '@/api/wms/itempackage/index'
 import * as LocationApi from "@/api/wms/location";
 import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
 
 
@@ -743,7 +745,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     table: {
       width: 150
-    }, 
+    },
+    isTableForm:false,
+    isTable:false, 
     hiddenInMain: true,
     tableForm:{
       disabled:true
@@ -760,7 +764,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     table: {
       width: 150
-    }, 
+    },
+    isTableForm:false,
+    isTable:false, 
     hiddenInMain: true,
     tableForm:{
       disabled:true
@@ -771,7 +777,22 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
   {
     label: '替代批次',
     field: 'altBatch',
@@ -880,6 +901,77 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   //     disabled:false
   //   }
   // },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      // labelMessage: '信息提示说明！！！',
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从库位代码',
+      searchField: 'code',
+      searchTitle: '库位代码信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
+      searchCondition: [{
+        key: 'businessType',
+        value: 'PurchaseReturn',
+        message: '请填写业务类型',
+        isMainValue: false
+      }]
+    },
+    hiddenInMain: true,
+    isTable: false,
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    hiddenInMain: true,
+    isTable: false,
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    },
+    tableForm:{
+      // labelMessage: '信息提示说明！！！',
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码、批次、从库位代码',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息', // 查询弹窗标题
+      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码',
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
+        required:true,
+        isMainValue:false
+      },{
+        key: 'batch',
+        value: 'batch',
+        message: '请填写批次',
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
+        required:true,
+        isMainValue:false
+      },{
+        key: 'locationCode',
+        value: 'fromLocationCode',
+        message: '请选择从库位代码',
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
+        required:true,
+        isMainValue:false
+      }]
+    },
+  },
   {
     label: '库存余额',
     field: 'inventoryBalance',
@@ -922,21 +1014,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       precision: 6
     }
   },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    }, 
-    hiddenInMain: true,
-    isTable: false,
-    form: {
-      componentProps:{
-        disabled:true
-      }
-    }
-  },
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -960,31 +1037,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }, 
-    tableForm:{
-      // labelMessage: '信息提示说明！！！',
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从库位代码',
-      searchField: 'code',
-      searchTitle: '库位代码信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
-      searchCondition: [{
-        key: 'businessType',
-        value: 'PurchaseReturn',
-        message: '请填写业务类型',
-        isMainValue: false
-      }]
-    },
-    hiddenInMain: true,
-    isTable: false,
-  },
   {
     label: '到库位代码',
     field: 'toLocationCode',