lilei 1 vuosi sitten
vanhempi
commit
7aa1baacba
3 muutettua tiedostoa jossa 15 lisäystä ja 3 poistoa
  1. 11 0
      src/api/stock.js
  2. 3 2
      src/views/allocationManagement/transferOut/edit.vue
  3. 1 1
      vue.config.js

+ 11 - 0
src/api/stock.js

@@ -59,6 +59,17 @@ export const queryStockProductPage = (params) => {
     method: 'post'
   })
 }
+// 非经销商产品库存列表
+export const queryStockProductForOtherPage = (params) => {
+  const url = `/stock/queryStockProductForOtherPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
 // 分页查询促销产品
 export const queryPromoProductPage = (params) => {
   const url = `/stock/queryPromoProductPage/${params.pageNo}/${params.pageSize}`

+ 3 - 2
src/views/allocationManagement/transferOut/edit.vue

@@ -353,7 +353,7 @@ import printModal from './printModal.vue'
 import dsModal from './dsModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import { printBase64Fun, exportExcel } from '@/libs/JGPrint.js'
-import { queryStockProductPage } from '@/api/stock'
+import { queryStockProductPage, queryStockProductForOtherPage } from '@/api/stock'
 import { productPriceInfo } from '@/api/product'
 import { departmentQueryList } from '@/api/expenseManagement'
 import { allocateBillDetailList, allocateBillDetailCount, allocateBillDetail, allocateBillDetailSave, allocateBillSubmit, allocateBillDetailDel, allocateBillDetailDelAll, allocateBillDetailPrint, allocateBillBatchInsert, allocateBillDetailExcel, updateBatchDepartment } from '@/api/allocateBill'
@@ -387,7 +387,8 @@ export default {
         this.disabled = true
         const dealerLevel = this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel
         const warehouseSn = this.basicInfoData.warehouseSn
-        return queryStockProductPage(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0', dealerLevel: dealerLevel, warehouseSn: warehouseSn })).then(res => {
+        const fun = this.$route.params.dealerLevel == 'OTHER' ? queryStockProductForOtherPage : queryStockProductPage
+        return fun(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0', dealerLevel: dealerLevel, warehouseSn: warehouseSn })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.117/ocs-admin',
+        target: 'http://192.168.2.113:8660/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
         // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,