diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue index 310c76e4..68672e48 100644 --- a/src/views/basic/workplace/workplaceManage.vue +++ b/src/views/basic/workplace/workplaceManage.vue @@ -218,14 +218,14 @@ - {{ workplaceName }}-单据类型 + {{ workplaceName }}-业务类型 - + @@ -244,7 +244,7 @@ > 新增单据类型 + >新增业务类型 @@ -254,7 +254,7 @@ highlight-current-row > - + @@ -700,8 +700,8 @@ export default { }, busName: '', busTypeMap: { - 'add': '新增单据类型', - 'edit': '编辑单据类型' + 'add': '新增业务类型', + 'edit': '编辑业务类型' }, formData: { operationType: 1, diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue index c61d17d7..f269a317 100644 --- a/src/views/collect/CollectOrderAllotCardComponents.vue +++ b/src/views/collect/CollectOrderAllotCardComponents.vue @@ -208,6 +208,7 @@ :total="total" :limit.sync="filterQuery.limit" :page.sync="filterQuery.page" + :page-sizes="[12, 24, 48]" @pagination="handleCurrentChange" > @@ -306,6 +307,7 @@ :total="total" :limit.sync="filterQuery.limit" :page.sync="filterQuery.page" + :page-sizes="[12, 24, 48]" @pagination="handleCurrentChange" > @@ -408,7 +410,7 @@ export default { billNo: null, tagStatus: null, page: 1, - limit: 10, + limit: 12, }, defaultSort: {prop: 'createTime', order: 'desc'}, loading: false, @@ -488,7 +490,12 @@ export default { this.showSearch = !this.showSearch; }, onReset() { - this.filterQuery = {}; + this.filterQuery = { + billNo: null, + tagStatus: null, + page: 1, + limit: 12, + }; this.actDateRange = []; this.getList(); }, diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 9163bc7c..b3b10082 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -872,6 +872,7 @@ export default { this.isLinkDisabled = true this.selectBusTypeDisabled = true this.corpOrderIdDisabled = true + this.workplaceId = Number(this.$route.query.workplaceId); this.formData.workPlaceCode = Number(this.$route.query.workplaceId); this.getWorkBindBusTypes(this.formData.workPlaceCode); } diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue index c614b8a2..3e5f953e 100644 --- a/src/views/collect/DealOrderBlank.vue +++ b/src/views/collect/DealOrderBlank.vue @@ -418,18 +418,16 @@ export default { }, methods: { - getBillNo(billNo,workPlaceCode){ + getBillNo(billNo){ let post = { billNo: billNo, - workPlaceCode: workPlaceCode, page: 1, limit: 10, } findByBill(post).then(res => { if (res.code == 20000) { - if (res.data.billNo != null){ - this.formData = res.data - this.startDeal(); + if (res.data.list.length > 0){ + this.formData = res.data.list[0] } } }) @@ -457,7 +455,7 @@ export default { this.findFromInvList(""); } if (this.formData.billNo != null){ - this.getBillNo(this.formData.billNo,this.formData.workPlaceCode) + this.getBillNo(this.formData.billNo) }else { this.findCurOrder(); } @@ -874,6 +872,7 @@ export default { this.isLinkDisabled = true this.selectBusTypeDisabled = true this.corpOrderIdDisabled = true + this.workplaceId = Number(this.$route.query.workplaceId); this.formData.workPlaceCode = Number(this.$route.query.workplaceId); this.getWorkBindBusTypes(this.formData.workPlaceCode); }