Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz

src/api/devices.js

@@ -14,7 +14,18 @@ export function tbPrintMachine(data, method = 'post') {
         }
     })
 }
+// 打印机切换
 
+export function switchtbPrintMachine(data, method = 'post') {
+    return request({
+        url: '/api/shop-config/printer/update-status',
+        method: method,
+        data: {
+            shopId: localStorage.getItem('shopId'),
+            ...data
+        }
+    })
+}
 /**
  * 打印机列表
  * @returns

src/views/devices/details.vue

@@ -47,15 +47,15 @@
                 <el-radio-group v-model="forms.classifyPrint">
                     <el-radio label="0">打印所有</el-radio>
                     <el-radio label="1">部分分类</el-radio>
-                    <el-radio label="2">部分商品</el-radio>
+                    <!-- <el-radio label="2">部分商品</el-radio> -->
                 </el-radio-group>
             </el-form-item>
-            <el-form-item label="桌台打印">
+            <!-- <el-form-item label="桌台打印">
                 <el-radio-group v-model="forms.tablePrint">
                     <el-radio label="0">打印所有</el-radio>
                     <el-radio label="1">打印部分桌台</el-radio>
                 </el-radio-group>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="打印数量">
                 <el-radio-group v-model="forms.printQty">
                     <el-radio label="c1m1^2">顾客联+商家联「2张」</el-radio>

src/views/devices/devices_list.vue

@@ -54,8 +54,7 @@
                 </el-table-column>
                 <el-table-column label="操作" width="200">
                     <template v-slot="scope">
-                        <el-button type="text" icon="el-icon-edit"
+                        <el-button type="text" icon="el-icon-edit" @click="toUrl(scope.row)">编辑</el-button>
-                            @click="toUrl(scope.row)">编辑</el-button>
                         <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
                             <el-button type="text" icon="el-icon-delete" style="margin-left: 20px !important;"
                                 slot="reference">删除</el-button>
@@ -75,7 +74,7 @@
 <script>
 import { devices, models, subTypes } from './devices'
 import addDevice from './components/addDevice'
-import { tbPrintMachineGet, tbPrintMachine, delTableHandle } from '@/api/devices'
+import { tbPrintMachineGet, switchtbPrintMachine, delTableHandle } from '@/api/devices'
 import dayjs from 'dayjs'
 export default {
     components: {
@@ -123,7 +122,7 @@ export default {
     },
     methods: {
         toUrl(item) {
-            this.$router.push({ path: '/shop/devices/details', query:{id:item.id}})
+            this.$router.push({ path: '/shop/devices/details', query: { id: item.id } })
         },
         // 切换状态
         async statusChange(e, row) {
@@ -131,7 +130,11 @@ export default {
                 this.tableData.loading = true
                 const data = { ...row }
                 data.status = e
-                await tbPrintMachine(data, 'put')
+                if (data.id) {
+                    delete data.createdAt
+                    delete data.updatedAt
+                }
+                await switchtbPrintMachine(data)
                 this.getTableData()
             } catch (error) {
                 console.log(error)

src/views/table/table_list.vue

@@ -373,6 +373,8 @@ export default {
           tableId: this.selTable.tableId,
           useType: this.selTable.useType,
           maxCapacity:this.selTable.maxCapacity,
+          masterId:this.selTable.masterId,
+          orderId:this.selTable.orderId,
           ...query,
         },
       });

src/views/tool/Instead/components/scan-pay.vue

@@ -7,7 +7,7 @@
           @click="changeKey('paysSel', index)"
           v-for="(item, index) in pays"
           :key="index"
-          :type="paysSel == index ? 'success' : ''"
+          :type="paysSel == index ? 'primary' : ''"
           >{{ item.text }}</el-button
         >
       </div>
@@ -189,10 +189,12 @@ export default {
     open() {
       this.show = true;
       this.form.money = Number(this.price).toFixed(2);
-      $getOrderPayUrl({ orderId: this.order.id }).then((res) => {
+      if (this.openSwitch) {
-        console.log(res);
+        $getOrderPayUrl({ orderId: this.order.id }).then((res) => {
-        this.paymentQrcode = res;
+          console.log(res);
-      });
+          this.paymentQrcode = res;
+        });
+      }
       this.$nextTick(() => {
         this.$refs.refInputCode.focus();
       });

src/views/tool/Instead/index.vue

@@ -2112,6 +2112,7 @@ export default {
       if (this.table.tableId) {
         return $getMasterId({
           tableId: this.table.tableId,
+          orderId:this.table.orderId,
           vipUserId: this.vipUser.id,
           useType: this.useTypes.sel == "takeout" ? "takeout" : "",
         });
@@ -2944,6 +2945,8 @@ export default {
           tableId: params.tableId,
           useType: params.useType,
           maxCapacity: params.maxCapacity * 1,
+          masterId:params.masterId,
+          orderId:params.orderId,
         },
         key = params.key,
         perpoleNumber = params.num;
@@ -2959,6 +2962,7 @@ export default {
       this.isCreateOrder = this.key == "isPayOrder" ? true : false;
       this.perpole = perpoleNumber;
       this.table = item;
+      this.masterId = item.masterId;
     },
     close() {
       if (this.table.tableId) {