Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/api/Inventory/MaterialOut.js

@@ -60,7 +60,7 @@ export function searchListDetail(...params) {
   })
 }
 // 查看领料单明细相关的物料货位数量
-export function searchStockNumber(...params) {
+export function searchStockNumber1(...params) {
   return request({
     url: '',
     method: 'post',
@@ -71,6 +71,18 @@ export function searchStockNumber(...params) {
     }
   })
 }
+// 查看领料单明细相关的物料货位数量
+export function searchStockNumber2(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_物料出库_基本件_查询数据',
+      param: `基本件流水号=${params[0]}`
+    }
+  })
+}
 // 出库
 export function submitOutStore(...params) {
   return request({

src/views/Inventory/MaterialOut/index.vue

@@ -210,7 +210,7 @@
 </template>
 
 <script>
-import { initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber, submitOutStore } from '@/api/Inventory/MaterialOut'
+import { initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore } from '@/api/Inventory/MaterialOut'
 import { mapGetters } from 'vuex'
 export default {
   name: 'MaterialOut',
@@ -342,11 +342,14 @@ export default {
       row && row.组件流水号 ? this.groupNumValue = row.组件流水号 : this.groupNumValue
       row && row.总数量 ? this.outNumber = row.总数量 : this.outNumber
       if (this.materialNum) {
-        searchStockNumber(this.materialNum).then(res => {
+        searchStockNumber1(this.materialNum).then(res => {
           this.StockNumberTable = res.data
         })
       } else if (this.basePartNum) {
         console.log(this.basePartNum)
+        searchStockNumber2(this.basePartNum).then(res => {
+          this.StockNumberTable = res.data
+        })
       }
     },
     // 出库