From 8f7aaf87d52a5597077019e6e0ec01b02a9349a1 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Sat, 12 Oct 2024 10:43:56 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/devices/details.vue | 64 +++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/src/views/devices/details.vue b/src/views/devices/details.vue index 0cc9f11..699c92a 100644 --- a/src/views/devices/details.vue +++ b/src/views/devices/details.vue @@ -50,9 +50,12 @@
- - + --> + + +
@@ -113,7 +116,8 @@ export default { forms: { sort: "0", status: "0", - connectionType: "network", printType: [] + connectionType: "network", printType: [], + selectcheckbox: [] }, partList: [] } @@ -121,13 +125,11 @@ export default { filters: { }, mounted() { - if (this.$route.query.id) { - this.getList(this.$route.query.id) - } + this.getpartList() + }, methods: { - handleNodeClick(d) { console.log(d) }, async onSubmit() { // 删除时间字段 @@ -137,17 +139,17 @@ export default { } // 处理打印部分分类 if (this.forms.classifyPrint == 1) { - let data = this.$refs.tree.getCheckedNodes() let idstr = '' let arr = [] - data.forEach(element => { - idstr += element.id + ',' - arr.push({ id: element.id, name: element.name }) - }); - this.forms.categoryList = JSON.stringify(arr) + this.forms.selectcheckbox.forEach(element => { + let prts = this.partList.filter(ele => ele.name == element)[0] + idstr = idstr + prts.id + ',' + arr.push(prts) + }) this.forms.categoryIds = idstr.substring(0, idstr.length - 1) - } + this.forms.categoryList = JSON.stringify(arr) + } const res = await configprinter({ shopId: localStorage.getItem('shopId'), ...this.forms, @@ -163,18 +165,44 @@ export default { page: 0, size: 500 }) - this.partList = res.content + let arr = [] + res.content.forEach(ele => { + arr.push({ + id: ele.id, + name: ele.name + }) + if (ele.childrenList.length > 0) { + ele.childrenList.forEach(element => { + arr.push({ + id: element.id, + name: element.name + }) + }) + } + }) + this.partList = arr + if (this.$route.query.id) { + this.getList(this.$route.query.id) + } }, async getList(id) { const res = await printerd(id) this.forms = res - this.forms.categoryIds=this.forms.categoryIds.split(',') - console.log(this.forms.categoryIds,'调试11111') + if (res.categoryIds) { + let ids = res.categoryIds.split(',') + let arr = [] + ids.forEach(element => { + let prts = this.partList.filter(ele => ele.id == element)[0] + arr.push(prts.name) + }) + this.$set(this.forms, 'selectcheckbox', arr) + } else { + this.$set(this.forms, 'selectcheckbox', []) + } if (res.printType) { this.forms.printType = JSON.parse(res.printType) } else { this.forms.printType = [] - } } } From 893ec1bec48df0fb57aadde8a425b4e63a3ea2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Sat, 12 Oct 2024 11:00:50 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=80=97=E6=9D=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoicing/consumable/information.vue | 19 +++++++++++-------- src/views/invoicing/operation_out.vue | 8 ++++---- src/views/product/add_shop.vue | 17 +++++++++++------ 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue index 97b3e32..7016399 100644 --- a/src/views/invoicing/consumable/information.vue +++ b/src/views/invoicing/consumable/information.vue @@ -166,6 +166,7 @@ + @@ -341,8 +342,8 @@ - - + + 去选择 --> - - + + + + + + @@ -1029,7 +1032,7 @@ export default { this.dialogtitle = "添加"; this.gettbConsType() this.$nextTick(() => { - // this.$refs.refruleForm.resetFields(); + this.$refs.refruleForm.resetFields(); this.resetRuleForms() }); } else { diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue index 266f375..9c5ab10 100644 --- a/src/views/invoicing/operation_out.vue +++ b/src/views/invoicing/operation_out.vue @@ -2,7 +2,7 @@
- + From 79e27f00988209f2da8a3b3471137e07e9e4b87d Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Sat, 12 Oct 2024 13:59:16 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=85=88=E4=BB=98=E8=B4=B9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E5=8F=AA=E8=A6=81=E7=94=9F=E6=88=90=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=B0=B1=E6=B8=85=E7=A9=BA=E8=B4=AD=E7=89=A9=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tool/Instead/index.vue | 92 ++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 21 deletions(-) diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue index aa4c0c6..a2c6ab6 100644 --- a/src/views/tool/Instead/index.vue +++ b/src/views/tool/Instead/index.vue @@ -177,7 +177,7 @@ - + + + + @@ -744,6 +751,15 @@ export default { } }) }, + //跳转订单列表 + toGoodslist(orderNo) { + this.$router.push({ + path: '/order_manage/order_list', + query: { + orderNo: orderNo + } + }) + }, //添加耗材弹窗增加 ruleFormsAdd() { console.log('add') diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue index 08836db..79fef88 100644 --- a/src/views/order_manage/order_list.vue +++ b/src/views/order_manage/order_list.vue @@ -244,6 +244,7 @@ export default { this.getTableData(); }, 200); } + }, methods: { // 获取订单汇总 From 2c7042e6e2d8baa0cde9153b614cb02b9c37a7ec Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Sat, 12 Oct 2024 15:53:29 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E5=AE=A2?= =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tool/Instead/components/scan-pay.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/tool/Instead/components/scan-pay.vue b/src/views/tool/Instead/components/scan-pay.vue index b2f2de8..60830a0 100644 --- a/src/views/tool/Instead/components/scan-pay.vue +++ b/src/views/tool/Instead/components/scan-pay.vue @@ -52,7 +52,7 @@
-
32.00元
+
{{price|to2}}元
等待用户支付 @@ -91,6 +91,11 @@ export default { default: "请使用扫码枪扫描付款码", }, }, + filters:{ + to2(n){ + return n.toFixed(2) + } + }, data() { return { tips: "", @@ -191,7 +196,7 @@ export default { this.show = true; this.form.money = Number(this.price).toFixed(2); if (this.openSwitch) { - $getOrderPayUrl({ orderId: this.order.id }).then((res) => { + $getOrderPayUrl({ orderId: this.order.id,payAmount:this.price.toFixed(2) }).then((res) => { console.log(res); this.paymentQrcode = res; }); From f1a599881c10120c48fd1cc72ef24c8ccbca6ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Mon, 14 Oct 2024 14:48:51 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/invoicing/consumable/information.vue | 1 + src/views/product/category.vue | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue index 79cb332..57d9a23 100644 --- a/src/views/invoicing/consumable/information.vue +++ b/src/views/invoicing/consumable/information.vue @@ -963,6 +963,7 @@ export default { shopId: localStorage.getItem("shopId"), productId: '',//预留耗材id column: this.stockData.column,//列名 + conName:this.query.conName, createdAt: arr//耗材id }) this.stockData.loading = false; diff --git a/src/views/product/category.vue b/src/views/product/category.vue index 9c49823..50f658e 100644 --- a/src/views/product/category.vue +++ b/src/views/product/category.vue @@ -50,7 +50,12 @@
+ @current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper" @size-change="(e) => { + tableData.size = e; + tableData.page = 0; + getTableData(); + } + ">