前端

src/api/V2/warehouse/index.js

@@ -67,6 +67,8 @@ export const API_POST_ADD_INVENTORYCOSTINFO = '/inventoryCostInfo/api/addInvento
 export const API_POST_EDIT_INVENTORYCOSTINFO = '/inventoryCostInfo/api/editInventoryCostInfo'
 // 加权明细
 export const API_GET_WEIGHTEDDETAILS = '/weightedDetails/selectInventoryCostInfo'
+// 库
+export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouse'
 
 
 

src/model/warehouse/index.js

@@ -32,7 +32,8 @@ import {
     API_GET_INVENTORYCOSTINFO,
     API_POST_ADD_INVENTORYCOSTINFO,
     API_POST_EDIT_INVENTORYCOSTINFO,
-    API_GET_WEIGHTEDDETAILS
+    API_GET_WEIGHTEDDETAILS,
+    API_GET_WAREHOUSE
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -100,6 +101,8 @@ export const addinventory = appRx.post(API_POST_ADD_INVENTORYCOSTINFO,errorCatch
 export const editinventory = appRx.post(API_POST_EDIT_INVENTORYCOSTINFO,errorCatcher, errorHandle, filter)
 // 编辑库点费用
 export const weighteddetails = appRx.get(API_GET_WEIGHTEDDETAILS,errorCatcher, errorHandle, filter)
+// 编辑库点费用
+export const getwarehousebase = appRx.get(API_GET_WAREHOUSE,errorCatcher, errorHandle, filter)
 
 
 

src/views/warehouse/costmanagement.vue

@@ -101,14 +101,12 @@
   </div>
 </template>
 <script>
-import {
-  selectWarehouseSelf
-} from '@/model/houseSelfCollect/index'
 import {
   getcost,
   editcost,
   export1,
   editstatus,
+  getwarehousebase,
   billoperatehis,
   clearancee,
 } from '@/model/warehouse/index'
@@ -190,7 +188,7 @@ export default {
   },
   methods: {
     changeradio(e) {
-      this.getList()
+      this.selectWarehouse()
     },
     warehouselocation(){
       this.$router.push({ path: 'warehouselocation'})
@@ -264,8 +262,9 @@ export default {
       this.getList()
     },
     selectWarehouse(){
-       selectWarehouseSelf({
+       getwarehousebase({
         compId: sessionStorage.getItem('ws-pf_compId'),
+        warehouseType:this.warehouseType
       })
         .toPromise()
         .then((response) => {

src/views/warehouse/warehouselocation.vue

@@ -322,6 +322,10 @@ export default {
         }
     },
     addInventory(){
+      if(this.dialogtitle=='编辑费用'){
+        this.editInventory()
+        return
+      }
         if(!this.expenseName){
             this.$message({
               message: '费用名称不能为空！',