From e0abb6a589d56fbf43e10be70622bde8685af68f Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Mon, 25 Nov 2024 13:59:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/application/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/application/index.vue b/src/views/application/index.vue index ebb48f2..5b268b2 100644 --- a/src/views/application/index.vue +++ b/src/views/application/index.vue @@ -2,7 +2,7 @@
应用中心
-
+
From d9f97b6ddbd313d032c87e95b2fd8b04e578ee0b Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Mon, 25 Nov 2024 14:25:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/application/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/application/index.vue b/src/views/application/index.vue index 5b268b2..34f2dae 100644 --- a/src/views/application/index.vue +++ b/src/views/application/index.vue @@ -67,7 +67,7 @@ export default { }, mounted() { this.appCenterGet() - this.getbinding() + // this.getbinding() }, methods: { upPop() { From ba5c3714cf0b4cbd87407c70c5914283b24ffaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Mon, 25 Nov 2024 14:41:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=AE=A2=E5=8D=95->?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=80=BB=E9=87=91=E9=A2=9D=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/order_manage/order_list.vue | 35 ++++++++++++++------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue index b158085..9332d4d 100644 --- a/src/views/order_manage/order_list.vue +++ b/src/views/order_manage/order_list.vue @@ -57,9 +57,9 @@
-
+ -
+
+
@@ -76,9 +76,9 @@
￥{{ item.payAmount || 0 }}
{{ item.payType }}
-
+
-
+
-->
@@ -150,7 +150,8 @@ @@ -207,24 +208,24 @@ export default { filters: { orderTypeFilter(t) { if (t) { - const item= orderEnum.orderType.find(item => item.key == t); - return t && item?item.label:''; + const item = orderEnum.orderType.find(item => item.key == t); + return t && item ? item.label : ''; } else { return t; } }, sendTypeFilter(t) { if (t) { - const item= orderEnum.sendType.find(item => item.key == t); - return item?item.label:''; + const item = orderEnum.sendType.find(item => item.key == t); + return item ? item.label : ''; } else { return t; } }, statusFilter(t) { if (t) { - const item= orderEnum.status.find(item => item.key == t); - return t && item?item.label:''; + const item = orderEnum.status.find(item => item.key == t); + return t && item ? item.label : ''; } else { return t; } @@ -254,11 +255,11 @@ export default { this.getTableData(); }, 200); } - + }, methods: { //结账 - payOrder(order){ + payOrder(order) { console.log(order); this.$router.push({ path: "/tool/Instead/index", @@ -268,7 +269,7 @@ export default { useType: order.useType, masterId: order.masterId, orderId: order.id, - key:'isJieZhang' + key: 'isJieZhang' }, }); }, @@ -324,7 +325,7 @@ export default { async getTableData(switchs = false) { this.tableData.loading = true; try { - this.payCount(); + // this.payCount(); const productName = this.query.productName.replace(/\s+/g, '') const res = await tbOrderInfoData({ page: this.tableData.page, From 8cf46745cd6a2a70dd7d290bbe72a997808b4c42 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Mon, 25 Nov 2024 16:51:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96pad=E7=82=B9=E5=8D=95?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/shopList/index.vue | 2 +- src/views/shop/components/addPadPage.vue | 13 ++++++++- src/views/shop/pad_setting.vue | 35 ++++++++++++++++++++++-- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/src/components/shopList/index.vue b/src/components/shopList/index.vue index c59d543..8de9ffd 100644 --- a/src/components/shopList/index.vue +++ b/src/components/shopList/index.vue @@ -54,7 +54,7 @@ - + diff --git a/src/views/shop/components/addPadPage.vue b/src/views/shop/components/addPadPage.vue index 981cd6b..c1439c6 100644 --- a/src/views/shop/components/addPadPage.vue +++ b/src/views/shop/components/addPadPage.vue @@ -192,7 +192,18 @@ export default { }, // 确认选择商品 selectConfirmGoods(res) { - this.$set(this.form.list, this.activeItem, { ...res[0] }) + // this.form.list = res + const flag = this.form.list.filter(item => item.id == res[0].id) + + if (flag.length) { + this.$notify({ + title: '注意', + message: '请勿重复添加', + type: 'error' + }) + } else { + this.$set(this.form.list, this.activeItem, { ...res[0] }) + } }, // 切换tab tabChange() { diff --git a/src/views/shop/pad_setting.vue b/src/views/shop/pad_setting.vue index df8d0ac..14fd611 100644 --- a/src/views/shop/pad_setting.vue +++ b/src/views/shop/pad_setting.vue @@ -7,8 +7,12 @@
- + +
+ {{ item.name }} +
@@ -62,6 +66,7 @@ export default { query: { name: '' }, + selectCatoryIndex: 0, selectCatory: '', treeDataOrgin: [], treeData: [], @@ -88,6 +93,12 @@ export default { this.treeData = this.treeDataOrgin.filter(item => { return item.name.includes(this.query.name) }) + + if (this.treeData.length) { + this.selectCatoryIndex = 0 + this.selectCatory = this.treeData[this.selectCatoryIndex] + this.getTableData() + } }, //表格拖拽 tableDrag() { @@ -147,7 +158,8 @@ export default { } }, // 分类被点击 - treeItemClick(data) { + treeItemClick(data, index) { + this.selectCatoryIndex = index this.selectCatory = data this.tableData.page = 1 this.getTableData() @@ -164,6 +176,7 @@ export default { }) this.treeDataOrgin = res.content this.treeData = res.content + this.selectCatory = res.content[this.selectCatoryIndex] this.getTableData() } catch (error) { console.log(error) @@ -235,6 +248,22 @@ export default { width: 100%; height: calc(100% - 70px); overflow-y: auto; + + .item { + padding: 10px 15px; + font-size: 14px; + display: flex; + align-items: center; + + &:hover { + cursor: pointer; + } + + &.active { + background-color: #1890ff; + color: #fff; + } + } } } From dc0b2f7605362a858eb4aab4b808feb6bc90e390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Tue, 26 Nov 2024 10:05:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=80=97=E6=9D=90=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/invoicing/components/addConsTakin.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/invoicing/components/addConsTakin.vue b/src/views/invoicing/components/addConsTakin.vue index c848d00..349b22f 100644 --- a/src/views/invoicing/components/addConsTakin.vue +++ b/src/views/invoicing/components/addConsTakin.vue @@ -81,7 +81,8 @@ export default { stocktakinNum: '', // 必传 price: '', // 商品价格 非必传 为空盘点价格为商品价格 remark: "", // 盘点备注 非必传 - stockNumber: 0 + stockNumber: 0, + balance: '' }, rules: { stocktakinNum: [ @@ -155,6 +156,7 @@ export default { }) }, async show(obj) { + console.log(obj, 111) let res = await hasPermission('允许耗材盘点'); if (!res) { return; } this.form.remark = '' @@ -165,8 +167,9 @@ export default { this.form = Object.assign(this.form, obj) this.dialogVisible = true this.form.conInfoId = obj.consId - this.form.stockNumber = obj.stockNumber - this.form.balance = obj.stockNumber + this.form.stockNumber = obj.balance < 0 ? 0 : obj.balance + // this.form.balance = obj.stockNumber + this.form.balance = obj.balance this.form.price == null ? 0 : this.form.price this.searhForm.productId = obj.id this.getTableData() @@ -186,7 +189,7 @@ export default { try { this.tableData.loading = true const res = await tbConCheckGet({ - + page: this.tableData.page, size: this.tableData.size, conInfoId: this.searhForm.productId,