diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue index 8f4d966d..05a305cd 100644 --- a/src/views/distribution/inventory/distributionStockListDetails.vue +++ b/src/views/distribution/inventory/distributionStockListDetails.vue @@ -48,6 +48,11 @@ <span>{{ stockquantity || 0 }}</span> </el-form-item> </el-col> + <el-col :span="10"> + <el-form-item label="货位总数:"> + <span>{{ locations || 0 }}</span> + </el-form-item> + </el-col> </el-row> <!-- <el-row> <el-col :span="10"> @@ -100,7 +105,7 @@ @size-change="sizeChange" @current-change="currentChange" :current-page="page.currentPage" - :page-sizes="[30, 50, 80, 120]" + :page-sizes="[200, 250,300, 500]" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page.total" @@ -129,7 +134,7 @@ @size-change="sizeChange" @current-change="currentChange" :current-page="page1.currentPage" - :page-sizes="[30, 50, 80, 120]" + :page-sizes="[200, 250,300, 500]" :page-size="page1.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page1.total" @@ -174,7 +179,7 @@ @size-change="sizeChange" @current-change="currentChange" :current-page="page2.currentPage" - :page-sizes="[30, 50, 80, 120]" + :page-sizes="[200, 250,300, 500]" :page-size="page2.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page2.total" @@ -213,7 +218,7 @@ @size-change="sizeChange" @current-change="currentChange" :current-page="page3.currentPage" - :page-sizes="[30, 50, 80, 120]" + :page-sizes="[200, 250,300, 500]" :page-size="page3.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page3.total" @@ -314,6 +319,7 @@ export default { return { dialogVisibleF: false, stockquantity:0,//在库数 + locations:0,//货位总数 html: '', columnListarrs: { //入库明细 @@ -726,26 +732,26 @@ export default { // 分页信息 page: { currentPage: 1, - pageSize: 30, - total: 40, + pageSize: 200, + total: 0, }, // 分页信息 page1: { currentPage: 1, - pageSize: 30, - total: 40, + pageSize: 200, + total: 0, }, // 分页信息 page2: { currentPage: 1, - pageSize: 30, - total: 40, + pageSize: 200, + total: 0, }, // 分页信息 page3: { currentPage: 1, - pageSize: 30, - total: 40, + pageSize: 200, + total: 0, }, // 表单数据 form: {}, @@ -1152,9 +1158,25 @@ export default { page.pageSize, Object.assign(params, this.query) ); - this.data = b.data.data.records; + console.log(b,'bbvvv===>'); + if( b.data.code == 200 && b.data.data){ + this.data = b.data.data.records; + this.page.total = b.data.data.total; + let sum=0 + if( b.data.data.records.length){ + b.data.data.records.forEach(res=>{ + sum+= res.num + }) + this.locations =sum + } + + + }else{ + this.page.total=0 + } + console.log('库存品信息', this.data); - this.page.total = b.data.data.total; + this.loading = false; }, async onLoad(page, params = {}) { @@ -1175,7 +1197,6 @@ export default { if(a.data.code !=200){ return } - console.log('aaaa', a.data.data.records); this.queryOwn = a.data.data.records[0] || {}; console.log(this.queryOwn, '参数'); diff --git a/src/views/financialsector/CustomerBaseprice.vue b/src/views/financialsector/CustomerBaseprice.vue index b80a6086..307ee97c 100644 --- a/src/views/financialsector/CustomerBaseprice.vue +++ b/src/views/financialsector/CustomerBaseprice.vue @@ -111,7 +111,6 @@ import { processRowProperty, setNodeHeight, deepClone, downloadXls } from '@/uti import { getToken } from 'utils/auth'; // 用于获取存储的Token import functions from '@/utils/functions.js'; import { ElMessageBox, ElMessage } from 'element-plus'; -import { popmsg } from '@/utils/poptxt'; import { useStore } from 'vuex'; import dayjs from 'dayjs'; const $router = useRouter(); //跳转