diff --git a/src/pages/modules/finished/index.vue b/src/pages/modules/finished/index.vue
index 4c495ab..704d0ad 100644
--- a/src/pages/modules/finished/index.vue
+++ b/src/pages/modules/finished/index.vue
@@ -26,7 +26,7 @@ export default {
},
computed: {
title () {
- let res = ['成品入库', '选择成品箱物料', '成品入库查询'][Number(this.$route.meta.guidePath) - 1]
+ let res = ['成品入库', '选择销售订单', '成品入库查询'][Number(this.$route.meta.guidePath) - 1]
return res
},
...mapGetters(['keepAlive'])
diff --git a/src/pages/modules/finished/select-finished-mater.vue b/src/pages/modules/finished/select-finished-mater.vue
index 1b52c4e..7f1e931 100644
--- a/src/pages/modules/finished/select-finished-mater.vue
+++ b/src/pages/modules/finished/select-finished-mater.vue
@@ -39,33 +39,27 @@
| 选择 |
- 序号 |
- 日期 |
- 单据号 |
- 客户 |
- 箱号 |
- 物料编码 |
- 物料名称 |
+ 交期 |
+ 销售单 |
+ 行号 |
物料规格 |
数量 |
- 单位 |
+ 物料编码 |
+ 客户 |
-
+
|
|
- {{i + 1}} |
- {{e.create_time}} |
+ {{e.plandeliver_date}} |
{{e.sale_code}} |
- {{e.cust_name}} |
- {{e.bucketunique}} |
- {{e.material_code}} |
- {{e.material_name}} |
+ {{e.seq_no}} |
{{e.material_spec}} |
- {{e.sale_qty | numeric(3)}} |
- {{e.qty_unit_name}} |
+ {{e.sale_qty | numeric(0)}} |
+ {{e.material_code}} |
+ {{e.cust_name}} |
@@ -80,7 +74,7 @@ export default {
data () {
return {
page: 1,
- size: '30',
+ size: '22',
busy: false,
desc: '',
val1: '',
@@ -99,30 +93,34 @@ export default {
this.page = 1
this.busy = false
this.desc = ''
- let res = await getMaterial(this.date !== null ? dateTimeFtt(this.date[0]) : '', this.date !== null ? dateTimeFtt(this.date[1]) : '', this.val1, this.val2)
- this.dataList = []
- res.data.map(el => {
- this.$set(el, 'checked', false)
- })
- this.dataList = [...res.data]
- if (res.data.length < 30) {
- this.busy = true
- this.desc = '已加载全部数据'
+ let res = await getMaterial(this.page + '', this.size, this.date !== null ? dateTimeFtt(this.date[0]) : '', this.date !== null ? dateTimeFtt(this.date[1]) : '', this.val1, this.val2)
+ if (res.code === 200) {
+ this.dataList = []
+ res.content.map(el => {
+ this.$set(el, 'checked', false)
+ })
+ this.dataList = [...res.content]
+ if (res.content.length < 22) {
+ this.busy = true
+ this.desc = '已加载全部数据'
+ }
}
},
async loadMore () {
this.busy = true
this.page++
- let res = await getMaterial(this.date !== null ? dateTimeFtt(this.date[0]) : '', this.date !== null ? dateTimeFtt(this.date[1]) : '', this.val1, this.val2)
- res.data.map(el => {
- this.$set(el, 'checked', false)
- })
- this.dataList = [...this.dataList, ...res.data]
- if (res.data.length < 30) {
- this.busy = true
- this.desc = '已加载全部数据'
- } else {
- this.busy = false
+ let res = await getMaterial(this.page + '', this.size, this.date !== null ? dateTimeFtt(this.date[0]) : '', this.date !== null ? dateTimeFtt(this.date[1]) : '', this.val1, this.val2)
+ if (res.code === 200) {
+ res.content.map(el => {
+ this.$set(el, 'checked', false)
+ })
+ this.dataList = [...this.dataList, ...res.content]
+ if (res.content.length < 22) {
+ this.busy = true
+ this.desc = '已加载全部数据'
+ } else {
+ this.busy = false
+ }
}
},
colseUp () {