From ca496bf0dbfafc155fe933a93f942aabf941627d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Fri, 11 Oct 2024 10:55:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BD=AE=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/unit.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/product/unit.vue b/src/views/product/unit.vue
index d76a1e3..d5e021d 100644
--- a/src/views/product/unit.vue
+++ b/src/views/product/unit.vue
@@ -23,9 +23,11 @@
                 <el-table-column label="操作" width="200">
                     <template v-slot="scope">
                         <el-button type="text" size="mini" round icon="el-icon-edit"
+                            :disabled="ShopId == scope.row.shopId ? false : true"
                             @click="$refs.addUnitRef.show(scope.row)">编辑</el-button>
                         <el-popconfirm title="确定删除吗？" @confirm="delHandle([scope.row.id])">
-                            <el-button type="text" size="mini" round icon="el-icon-delete" slot="reference">删除</el-button>
+                            <el-button :disabled="ShopId == scope.row.shopId ? false : true" type="text" size="mini"
+                                round icon="el-icon-delete" slot="reference">删除</el-button>
                         </el-popconfirm>
                     </template>
                 </el-table-column>
@@ -47,6 +49,7 @@ export default {
     },
     data() {
         return {
+            ShopId: localStorage.getItem('shopId'),
             query: {
                 blurry: ''
             },

From 0e030b29c10284e50a7b0002ae39dd6d4eb63a38 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 11 Oct 2024 14:51:27 +0800
Subject: [PATCH 2/3] =?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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/devices.js            | 10 ++++--
 src/views/devices/details.vue | 62 ++++++++++++++++++++++++++++-------
 2 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/src/api/devices.js b/src/api/devices.js
index ed75171..0f9ca7f 100644
--- a/src/api/devices.js
+++ b/src/api/devices.js
@@ -15,7 +15,6 @@ export function tbPrintMachine(data, method = 'post') {
     })
 }
 // 打印机切换
-
 export function switchtbPrintMachine(data, method = 'post') {
     return request({
         url: '/api/shop-config/printer/update-status',
@@ -26,6 +25,14 @@ export function switchtbPrintMachine(data, method = 'post') {
         }
     })
 }
+// 打印机部分
+export function tbShopCategory(params) {
+    return request({
+        url: '/api/tbShopCategory',
+        method: 'get',
+        params
+    })
+}
 /**
  * 打印机列表
  * @returns
@@ -35,7 +42,6 @@ export function tbPrintMachineGet(params) {
         url: '/api/shop-config/printer/list',
         method: 'get',
         params: {
-
             ...params
         }
     })
diff --git a/src/views/devices/details.vue b/src/views/devices/details.vue
index aba762f..0cc9f11 100644
--- a/src/views/devices/details.vue
+++ b/src/views/devices/details.vue
@@ -49,7 +49,13 @@
                     <el-radio label="1">部分分类</el-radio>
                     <!-- <el-radio label="2">部分商品</el-radio> -->
                 </el-radio-group>
+                <div v-if="forms.classifyPrint == 1" style="margin-left:70px">
+                    <el-tree :data="partList" show-checkbox node-key="id" ref="tree" :default-checked-keys="this.forms.categoryIds"
+                        :props="{ children: 'childrenList', label: 'name' }">
+                    </el-tree>
+                </div>
             </el-form-item>
+
             <!-- <el-form-item label="桌台打印">
                 <el-radio-group v-model="forms.tablePrint">
                     <el-radio label="0">打印所有</el-radio>
@@ -66,17 +72,18 @@
             </el-form-item>
             <el-form-item label="打印方式">
                 <el-radio-group v-model="forms.printMethod">
-                    <el-radio label="1">普通</el-radio>
-                    <el-radio label="2">单个菜</el-radio>
+                    <el-radio label="normal">普通出菜</el-radio>
+                    <el-radio label="one">一菜一品</el-radio>
+                    <el-radio label="callTicket">排队取号</el-radio>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item label="打印类型">
+            <!-- <el-form-item label="打印类型">
                 <el-checkbox-group v-model="forms.printType">
                     <el-checkbox label="1">确认退款单</el-checkbox>
                     <el-checkbox label="2">交班单</el-checkbox>
                     <el-checkbox label="3">排队取号</el-checkbox>
                 </el-checkbox-group>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="打印单据">
                 <el-radio-group v-model="forms.printReceipt">
                     <el-radio label="0">全部打印</el-radio>
@@ -97,7 +104,7 @@
 </template>
 
 <script>
-import { configprinter, printerd } from '@/api/devices'
+import { configprinter, printerd, tbShopCategory } from '@/api/devices'
 export default {
     components: {
     },
@@ -107,7 +114,8 @@ export default {
                 sort: "0",
                 status: "0",
                 connectionType: "network", printType: []
-            }
+            },
+            partList: []
         }
     },
     filters: {
@@ -116,15 +124,29 @@ export default {
         if (this.$route.query.id) {
             this.getList(this.$route.query.id)
         }
+        this.getpartList()
     },
     methods: {
+        handleNodeClick(d) { console.log(d) },
         async onSubmit() {
 
-// 删除时间字段
-if(  this.$route.query.id ){
-    delete this.forms.createdAt
-    delete this.forms.updatedAt
-}
+            // 删除时间字段
+            if (this.$route.query.id) {
+                delete this.forms.createdAt
+                delete this.forms.updatedAt
+            }
+            // 处理打印部分分类
+            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.categoryIds = idstr.substring(0, idstr.length - 1)
+            }
 
             const res = await configprinter({
                 shopId: localStorage.getItem('shopId'),
@@ -134,10 +156,26 @@ if(  this.$route.query.id ){
             )
             this.$router.go(-1)
         },
+        async getpartList() {
+            const res = await tbShopCategory({
+                shopId: localStorage.getItem('shopId'),
+                sort: "sort,desc",
+                page: 0,
+                size: 500
+            })
+            this.partList = res.content
+        },
         async getList(id) {
             const res = await printerd(id)
             this.forms = res
-            this.forms.printType = JSON.parse(res.printType)
+            this.forms.categoryIds=this.forms.categoryIds.split(',')
+            console.log(this.forms.categoryIds,'调试11111')
+            if (res.printType) {
+                this.forms.printType = JSON.parse(res.printType)
+            } else {
+                this.forms.printType = []
+
+            }
         }
     }
 }

From 9785038621a477e5b1195783eb97df0d10c8b9f1 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 11 Oct 2024 17:21:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E8=AF=BE?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E7=94=A8=E6=88=B7=E6=89=AB=E7=A0=81=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=90=8E=E6=9C=AA=E6=B8=85=E9=99=A4=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/components/scan-pay.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/tool/Instead/components/scan-pay.vue b/src/views/tool/Instead/components/scan-pay.vue
index d37f0ec..b2f2de8 100644
--- a/src/views/tool/Instead/components/scan-pay.vue
+++ b/src/views/tool/Instead/components/scan-pay.vue
@@ -155,6 +155,7 @@ export default {
     async getOrderDetail() {
       const res = await tbOrderInfoDetail(this.order.id);
       if (res.status == "closed") {
+        this.clear()
         this.$emit("paySuccess");
       }
     },