diff --git a/src/router/index.js b/src/router/index.js index b554a6a..e553ae1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -51,7 +51,7 @@ const mainRoutes = { { path: '/book-comments', component: _import('modules/book/bookComments'), name: 'book-comments', meta: { title: '书评管理', isTab: true } }, { path: '/clock', component: _import('modules/book/clock'), name: 'clock', meta: { title: '打卡管理', isTab: true } }, { path: '/talkBook', component: _import('modules/book/talkBook'), name: 'talkBook', meta: { title: '讲书管理', isTab: true } }, - + { path: '/acupointManagement', component: _import('modules/acupointManagement'), name: 'acupointManagement', meta: { title: '穴位管理', isTab: true } }, ], beforeEnter (to, from, next) { let token = Vue.cookie.get('token') diff --git a/src/views/modules/order/buyorder.vue b/src/views/modules/order/buyorder.vue index 26f80f6..34f6ed3 100644 --- a/src/views/modules/order/buyorder.vue +++ b/src/views/modules/order/buyorder.vue @@ -18,23 +18,38 @@ 已发货订单 打印面单 - - + + - -
- +
+ 全部 + 未打印 + 已打印 +
+
+ + +
+ + + +
+ + - - - - 查询 + 查询
@@ -91,7 +106,7 @@ @@ -108,7 +123,7 @@
@@ -502,7 +517,7 @@ export default { key: '', time: '' }, - PrintSheetList: [],//可打印列表 + PrintSheetList: [],//打印列表 selectedPrintList: [], // 选中的面单列表 mergeList: [], // 检查订单可合并项数组 checkboxGroup: { @@ -520,9 +535,9 @@ export default { dataList: [], tabChange: { tabActiveName: '1', // tab筛选默认all全部 0：待付款 1：待发货 2：已发货 3：已完成 - isPrint: '0', // 已发货列表筛选 0：显示订单 1：显示可打印列表, + isPrint: 0, // 已发货列表筛选 0：显示订单 1：显示可打印列表, orderName: '0', //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单 - sheetCode:0, // 面单状态0 未打印，1 已打印 + sheetCode: 0, // 面单状态2 未打印，1 已打印 0全部 }, editBeizhudialogVisible: false, // 修改备注按钮 editBeizhuform: { @@ -535,7 +550,7 @@ export default { dataListLoading: false, dataListSelections: [], addOrUpdateVisible: false, - MDtotalPage:0, + MDtotal:0, // 时间段设置项 timePickerOptions: { shortcuts: [{ @@ -578,6 +593,9 @@ export default { haveValue:false, orderSn:null, }, + MdDataForm:{ + date:'' // 时间 + }, provinceEntity:[], // 城市列表 cityEntity:[], // 市 countyEntity:[], // 区 @@ -743,28 +761,42 @@ export default { }, // 混合发货 showAnyDialog(item) { - this.anyDialogContent = item.printTemplate - console.log('面单',item) - if (item.printTemplate == null) return this.$message.error('暂无面单数据') + if (!item.printString || item.printString == '') return this.$message.error('暂无面单数据') + this.anyDialogContent = item.printString + console.log('面单',item) this.anyDialogVisible = true this.anyDialogTitle = '查看面单' }, - // 查询可打印面单 - getNotPrintSheetList() { + // 查询印面单列表 + getPrintSheetList() { + // let dateString = '' + // if(this.MdDataForm.date != ''){ + // dateString = this.MdDataForm.date.toString() + // } + this.dataListLoading = true this.$http({ - url: this.$http.adornUrl('/express/getPrintTemplateList'), - method: 'get', - /// data: {} + url: this.$http.adornUrl('/express/getExpressPrints'), + method: 'post', + data: this.$http.adornData({ + "limit": this.pageSize, + "page": this.pageIndex, + "type": this.tabChange.sheetCode, //类型，0不限1已打印2未打印 + "date": this.MdDataForm.date,//string类型,非必传字段2023-10-30 + "expressOrderSn":"" //string类型，非必传字段 + }) }).then(({ data }) => { - console.log(data.result.totalDataSize,'面单列表') - if (data && data.code === 0) { - this.PrintSheetList = data.result.data - this.MDtotalPage = data.result.totalDataSize + console.log(data.page.records,'面单列表') + if (data && data.code === 0 && data.page.records.length > 0) { + this.PrintSheetList = data.page.records + this.MDtotal = data.page.total } else { this.PrintSheetList = [] - this.totalPage = 0 + this.MDtotal = 0 } this.dataListLoading = false + }).catch(({e}) => { + console.log(e,'e') + this.dataListLoading = false }) }, // 检查待发货单选按钮是否可用 @@ -930,7 +962,7 @@ export default { } } }, - // 批量/打印面单 + // 批量/单个打印面单 printHandle(id, row) { console.log(id, row) // 如果是传了id @@ -942,7 +974,7 @@ export default { type: 'warning' }).then(() => { this.SheetSelectionList = [row] - let SheetList = this.SheetSelectionList.map(item => item.printTemplate) + let SheetList = this.SheetSelectionList.map(item => item.printString) this.selectedPrintList = SheetList console.log(this.selectedPrintList, 'this.selectedPrintList') //遍历数组列表 @@ -969,7 +1001,7 @@ export default { }).then(() => { // 计算出选中了多少条面单 - let SheetList = this.SheetSelectionList.map(item => item.printTemplate) + let SheetList = this.SheetSelectionList.map(item => item.printString) this.selectedPrintList = SheetList console.log(this.selectedPrintList,'即将打印的面单数组') setTimeout(() => { @@ -1024,7 +1056,7 @@ export default { console.log(data,'data') this.selectedPrintList = [] this.SheetSelectionList = [] - this.getNotPrintSheetList() + this.getPrintSheetList() loading.close() } }).catch(({e}) => { this.selectedPrintList = [] @@ -1159,7 +1191,7 @@ export default { if (this.tabChange.tabActiveName === '0' || this.tabChange.tabActiveName === '1' || this.tabChange.tabActiveName === '3') { this.tabChange.isPrint = '0' } - if (this.tabChange.isPrint === '1') { this.getNotPrintSheetList() } + if (this.tabChange.isPrint === '1') { this.getPrintSheetList() } }, deep: true diff --git a/src/views/modules/order/buyorderdetail.vue b/src/views/modules/order/buyorderdetail.vue index 7d377f8..b1580d9 100644 --- a/src/views/modules/order/buyorderdetail.vue +++ b/src/views/modules/order/buyorderdetail.vue @@ -9,6 +9,7 @@