From b4204aea94935bca949ad95fbd2e67ff17835391 Mon Sep 17 00:00:00 2001 From: qijq <624811160@qq.com> Date: Sat, 16 Nov 2024 10:54:34 +0800 Subject: [PATCH] update --- src/views/settings/config/receiptMachine.vue | 9 +++--- .../store/base/cloudPrint/editCloudPrint.vue | 7 ++++- .../cloudPrint/editTemplateManagement.vue | 7 ++++- .../store/base/cloudPrint/plotterManager.vue | 31 +++++++++++++------ .../distributionSetup/editSelfPickUpSite.vue | 7 ++++- .../base/distributionSetup/localDelivery.vue | 4 +-- 6 files changed, 45 insertions(+), 20 deletions(-) diff --git a/src/views/settings/config/receiptMachine.vue b/src/views/settings/config/receiptMachine.vue index b00960a..267789e 100644 --- a/src/views/settings/config/receiptMachine.vue +++ b/src/views/settings/config/receiptMachine.vue @@ -14,7 +14,7 @@
小票机名称：
- 取消 + 取消 测试打印 @@ -869,6 +869,11 @@ export default { async handerTestPrint() { let res = testPrinter({ orderId: 'DD-20241112-1' }) }, + handerGoTo() { + this.$router.push({ + path: '/plotterManager', + }) + }, async handerSubmit() { let params = { model_id: this.form.model_id, diff --git a/src/views/store/base/cloudPrint/editTemplateManagement.vue b/src/views/store/base/cloudPrint/editTemplateManagement.vue index c56cd64..e9f91c6 100644 --- a/src/views/store/base/cloudPrint/editTemplateManagement.vue +++ b/src/views/store/base/cloudPrint/editTemplateManagement.vue @@ -3165,7 +3165,7 @@
- 取消 + 取消 保存 @@ -3260,6 +3260,11 @@ export default { //console.log(this.printData); }, methods: { + handerGoTo() { + this.$router.push({ + path: '/templateManagement', + }) + }, showItem(blockName, itemName) { if (!this.printData == null) return return this.printData[blockName][itemName] != 0 ? true : false diff --git a/src/views/store/base/cloudPrint/plotterManager.vue b/src/views/store/base/cloudPrint/plotterManager.vue index 6719276..19a3a84 100644 --- a/src/views/store/base/cloudPrint/plotterManager.vue +++ b/src/views/store/base/cloudPrint/plotterManager.vue @@ -49,7 +49,7 @@ 删除 - {{ row.status == '禁用' ? '启用' : '禁用' }} + {{ row.status == '停用' ? '启用' : '禁用' }} @@ -83,6 +83,7 @@ export default { height: window.innerHeight - 220 - 150, }, params: { + keyword: '', pageNum: 1, pageSize: 20, }, @@ -95,6 +96,18 @@ export default { prop: 'model_name', label: '设备品牌', }, + { + prop: 'printer_sn', + label: '打印机编号', + }, + { + prop: 'printer_key', + label: '打印机密钥', + }, + { + prop: 'website_url', + label: '官网地址', + }, { prop: 'region', label: '打印来源', @@ -136,12 +149,12 @@ export default { async handerDisabledPrint(item) { let res = await updatePrnterStatus({ printer_id: item.printer_id, - status: item.status == '禁用' ? 1 : 0, + status: item.status == '停用' ? 1 : 0, }) if (res && res.status == 200) { this.$message({ type: 'success', - message: item.status == '禁用' ? '启动成功' : '禁用成功', + message: item.status == '停用' ? '启动成功' : '停用成功', }) this.getPrinterList() } else { @@ -189,7 +202,7 @@ export default { if (item.status == 1) { item.status = '启用' } else { - item.status = '禁用' + item.status = '停用' } }) } else { @@ -218,19 +231,17 @@ export default { }, handerColor({ row, column, rowIndex, columnIndex }) { if (row) { - if (row.status == '启用' && columnIndex == 5) { + if (row.status == '启用' && columnIndex == 8) { return 'status-on' } - if (row.status == '停用' && columnIndex == 5) { + if (row.status == '停用' && columnIndex == 8) { return 'status-off' } } }, handleSearch() { - this.params = { - keyword: this.printerName, - ...this.params, - } + this.params.keyword = this.printerName + this.getPrinterList() }, handleSizeChange(pageSize) { diff --git a/src/views/store/base/distributionSetup/editSelfPickUpSite.vue b/src/views/store/base/distributionSetup/editSelfPickUpSite.vue index 6090b3b..a15246d 100644 --- a/src/views/store/base/distributionSetup/editSelfPickUpSite.vue +++ b/src/views/store/base/distributionSetup/editSelfPickUpSite.vue @@ -155,7 +155,7 @@
- 取消 + 取消 保存 @@ -279,6 +279,11 @@ export default { }, created() {}, methods: { + handerGoTo() { + this.$router.push({ + path: '/selfPickUpSite', + }) + }, validateMobile() {}, getAddress(address) { this.form.pickAddress = address.value diff --git a/src/views/store/base/distributionSetup/localDelivery.vue b/src/views/store/base/distributionSetup/localDelivery.vue index fcc2d64..e5e252e 100644 --- a/src/views/store/base/distributionSetup/localDelivery.vue +++ b/src/views/store/base/distributionSetup/localDelivery.vue @@ -2396,8 +2396,8 @@ export default { will-change: top, left; top: -174px; left: 29%; - // opacity: 0; - // visibility: hidden; + opacity: 0; + visibility: hidden; transition: opacity 0.5s ease-out; z-index: 1;