|
@@ -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++) {
|