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

src/utils/limits.js

@@ -102,7 +102,7 @@ export async function hasPermission (params) {
     }
     params = returnFormatParams(params)
     if (!params) {
-      return infoBox.showToast('未找到相关权限，请检查代码或在权限配置文件commons/utils/hasPermission.js文件进行修改或增加')
+      return Notification.error('未找到相关权限，请检查代码或在权限配置文件commons/utils/hasPermission.js文件进行修改或增加')
     }
     const option = Object.assign({
       tips: true,

src/views/table/table_list.vue

@@ -38,7 +38,12 @@
         >
           下载台桌码
         </el-button>
-        <el-button type="primary" icon="el-icon-download">下载店铺码</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-download"
+          @click="downloadShopCode"
+          >下载店铺码</el-button
+        >
       </div>
     </div>
     <div class="u-flex u-p-b-15 u-font-14">
@@ -224,6 +229,7 @@ import tableDiancan from "./components/table-diancan.vue";
 import $status from "./status.js";
 import chooseDinersNumber from "./components/table-diancan-components/choose-diners-number.vue";
 import { tbShopInfo } from "@/api/user";
+import { hasPermission } from "@/utils/limits.js";
 
 import {
   tbShopTableGet,
@@ -233,7 +239,7 @@ import {
   tbShopTable,
 } from "@/api/table";
 import dayjs from "dayjs";
-
+import { downloadFile } from "@/utils/index";
 
 export default {
   components: {
@@ -255,12 +261,12 @@ export default {
       selTable: "", //当前选中的桌台
       areaMap: {},
       shopInfo: {},
-      timer:null
+      timer: null,
     };
   },
   beforeDestroy() {
     this.clearTimer();
-    console.log('beforeDestroy')
+    console.log("beforeDestroy");
   },
   mounted() {
     this.clearTimer();
@@ -270,7 +276,7 @@ export default {
   },
   filters: {
     formatTime(milliseconds) {
-      console.log(milliseconds)
+      console.log(milliseconds);
       if (!milliseconds) {
         return "";
       }
@@ -281,21 +287,37 @@ export default {
       const minutes = Math.floor(
         (milliseconds % (1000 * 60 * 60)) / (1000 * 60)
       );
-      return `${days ? days + "天" : ""} ${hours ? hours + "时" : ""} ${minutes + "分"
+      return `${days ? days + "天" : ""} ${hours ? hours + "时" : ""} ${
+        minutes + "分"
       }`;
     },
   },
   methods: {
-    clearTimer(){
+    async downloadShopCode() {
-      console.log('clearTimer')
+      try {
-      clearInterval(this.timer);
+        const link = document.createElement("a");
-      this.timer=null;
+        link.href = this.shopInfo.smallQrcode;
+        const fileName = this.shopInfo.shopName +"店铺码"+ ".png";
+        console.log(fileName)
+        link.setAttribute("download", fileName);
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+        this.$message.success("下载成功");
+      } catch (error) {
+        console.log(error);
+      }
     },
-    setTimter(time=60){
+    clearTimer() {
-      this.timer=setInterval(() => {
+      console.log("clearTimer");
-        const showloading=false
+      clearInterval(this.timer);
-        this.tbShopTableGet(showloading)
+      this.timer = null;
-      }, time*1000);
+    },
+    setTimter(time = 60) {
+      this.timer = setInterval(() => {
+        const showloading = false;
+        this.tbShopTableGet(showloading);
+      }, time * 1000);
     },
     //获取店铺信息
     async getShopInfo() {
@@ -348,7 +370,12 @@ export default {
     onDiancanClose() {
       this.tbShopTableGet();
     },
-    diancanShow(item, key) {
+    async diancanShow(item, key) {
+      const canXiadan=await hasPermission('允许下单')
+      if(!canXiadan){
+        return 
+      }
+
       //key isAddGoods 加菜
       //key isPayOrder结账
       this.selTable = item;
@@ -372,9 +399,9 @@ export default {
           table_name: this.selTable.name,
           tableId: this.selTable.tableId,
           useType: this.selTable.useType,
-          maxCapacity:this.selTable.maxCapacity,
+          maxCapacity: this.selTable.maxCapacity,
-          masterId:this.selTable.masterId,
+          masterId: this.selTable.masterId,
-          orderId:this.selTable.orderId,
+          orderId: this.selTable.orderId,
           ...query,
         },
       });
@@ -406,7 +433,7 @@ export default {
       }
     },
     // 台桌列表
-    async tbShopTableGet(showloading=true) {
+    async tbShopTableGet(showloading = true) {
       this.loading = showloading;
       try {
         const { content, total } = await tbShopTableGet({

src/views/tool/Instead/components/cart-item.vue

@@ -1,8 +1,12 @@
 <template>
-  <div class="flex order-item relative" :class="[isActive]" @click="itemClick">
+  <div
+    class="flex order-item u-m-b-14 relative"
+    :class="[isActive]"
+    @click="itemClick"
+  >
     <span class="absolute pack" v-if="item.isPack === 'true'"> 包 </span>
     <span class="absolute tui" v-if="item.status === 'return'"> 退 </span>
-    <div class="flex">
+    <div class="flex u-col-top">
       <div class="img">
         <div
           class="isSeatFee img u-line-1 u-flex u-col-center u-row-center"
@@ -12,7 +16,7 @@
         </div>
         <img v-else :src="item.coverImg" class="" alt="" />
       </div>
-      <div class="good-info">
+      <div class="good-info u-p-t-6">
         <div class="flex lh-16">
           <div class="name" :class="{ 'free-price': item.status === 'return' }">
             {{ item.name }}
@@ -24,13 +28,23 @@
         <div v-if="item.specSnap" class="specSnap">
           {{ item.specSnap }}
         </div>
-        <template v-if="item.note">
+
-          <div class="note">备注:{{ item.note || "" }}</div>
+        <div class="" v-if="placeNum == 0">
-        </template>
+          <div class="note" v-if="item.note">
+            备注:{{ item.note || "" }}
+          </div>
+          <div class="note flex" v-else>
+            <span>备注:</span>
+            <span class="el-icon-edit u-font-12" @click="editNote"></span>
+          </div>
+        </div>
+        <div class="note" v-if="placeNum != 0 && item.note">
+          备注:{{ item.note || "" }}
+        </div>
       </div>
     </div>
-    <div class="flex">
+    <div class="flex u-p-t-6">
-      <div class="order-number-box">
+      <div class="order-number-box u-font-12">
         <div class="" v-if="isSeatFee">X{{ item.totalNumber }}</div>
         <div class="" v-else>X{{ item.number }}</div>
         <div class="absolute" v-if="canChangeNumber">
@@ -136,6 +150,11 @@ export default {
     this.number = this.item.number;
   },
   methods: {
+    editNote() {
+      if (this.placeNum === 0) {
+        this.$emit("editNote", this.index);
+      }
+    },
     //购物车商品输入框数量改变
     cartGoodsNumberChange(newval) {
       if (newval <= 0) {
@@ -207,13 +226,13 @@ export default {
   font-size: 22px;
   cursor: pointer;
 }
-.order-item {
+.flex.order-item {
   padding: 4px;
   border-radius: 2px;
   display: flex;
-  overflow: hidden;
+  overflow: visible;
   cursor: pointer;
-  align-items: center;
+  align-items: flex-start;
   justify-content: space-between;
   background-color: rgba(0, 0, 0, 0);
   transition: all 0.3s;
@@ -245,6 +264,7 @@ export default {
 
   .total-price {
     width: 94px;
+    font-size: 16px;
     text-align: right;
   }
 
@@ -269,25 +289,25 @@ export default {
   }
 
   .img {
-    width: 40px;
+    width: 59px;
-    height: 40px;
+    height: 59px;
     position: relative;
     margin-right: 10px;
 
     img {
-      width: 40px;
+      width: 59px;
-      height: 40px;
+      height: 59px;
     }
   }
 }
-.note{
+.note {
   max-width: 70%;
-    font-size: 12px;
+  font-size: 12px;
-    font-weight: 400;
+  font-weight: 400;
-    text-align: left;
+  text-align: left;
-    color: #999;
+  color: #999;
-    margin-top: 2px;
+  margin-top: 5px;
-    word-break: break-all;
+  word-break: break-all;
 }
 .order-number-box {
   position: relative;
@@ -295,8 +315,8 @@ export default {
   .absolute {
     width: 60px;
     height: 40px;
-    right: -30px;
+    right: -38px;
-    top: -12px;
+    top: -14px;
     position: absolute;
 
     .order-input-number {

src/views/tool/Instead/components/number-box.vue

@@ -0,0 +1,121 @@
+<template>
+  <div>
+    <div class="flex">
+      <i class="icon-remove" @click="reduce"></i>
+      <div style="width: 40px" class="number-box">
+        <el-input
+          :min="min"
+          :max="max"
+          type="number"
+          v-model="number"
+          placeholder="0"
+          @blur="valChange(number, true)"
+          @input="valChange"
+        ></el-input>
+      </div>
+      <!-- <i class="el-icon-remove"></i> -->
+      <i class="el-icon-circle-plus icon-add" @click="add"></i>
+    </div>
+  </div>
+</template>
+<script>
+import { formatPrice } from "@/utils/format";
+
+export default {
+  props: {
+    modelValue: {
+      type: Number,
+      default: 1,
+    },
+    min: {
+      type: Number,
+      default: 0,
+    },
+    max: {
+      type: Number,
+      default: Infinity,
+    },
+  },
+  watch: {
+    min(val) {
+      this.number = val;
+    },
+  },
+  data() {
+    return { number: 1 };
+  },
+  methods: {
+    valChange(val, isNow = false) {
+      console.log(val);
+      const max = this.max;
+      const min = this.min;
+      const returnNewval = formatPrice(val, min, max, true);
+      let newval = 0;
+      if (typeof returnNewval !== "number") {
+        newval = returnNewval.value;
+      } else {
+        newval = returnNewval;
+      }
+      newval=parseInt(newval);
+      console.log(newval);
+      if (isNow) {
+        this.number = newval;
+        this.$emit("input", this.number);
+        return;
+      }
+      setTimeout(() => {
+        this.number = newval;
+        this.$emit("input", this.number);
+      }, 100);
+    },
+    emitInput() {
+      this.$emit("input", this.number);
+    },
+    reduce() {
+      if (this.number > this.min) {
+        this.number--;
+        this.emitInput();
+      }
+    },
+    add() {
+      if (this.number < this.max) {
+        this.number++;
+        this.$emit("input", this.number);
+      }
+    },
+  },
+  mounted(){
+    this.number = this.modelValue;
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .number-box .el-input__inner {
+  border: none;
+}
+.icon-add {
+  color: #1890ff;
+  font-size: 22px;
+  cursor: pointer;
+}
+.icon-remove {
+  border: 1px solid #d8d8d8;
+  width: 22px;
+  height: 22px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+  box-sizing: border-box;
+  cursor: pointer;
+
+  &::after {
+    content: "";
+    display: block;
+    width: 10px;
+    height: 1px;
+    background: #999;
+  }
+}
+</style>

src/views/tool/Instead/components/return-cart.vue

@@ -1,10 +1,19 @@
 <template>
   <el-dialog title="退菜" width="410px" :visible.sync="show" @close="reset">
-    <div>
+    <div class="flex u-row-between u-p-b-20 border-bottom">
+      <span>退菜数量</span>
+      <div class="u-flex">
+        <number-box v-model="number" :min="1" :max="2"></number-box>
+      </div>
+    </div>
+    <div class="u-m-t-10 u-font-12 color-999">
+      菜品已点数量 2 份
+    </div>
+    <div class="u-m-t-26">
       <div><span>退菜原因</span> <span class="color-red">*</span></div>
     </div>
 
-    <div class="u-flex u-flex-wrap tags">
+    <div class="u-flex u-flex-wrap tags ">
       <div
         class="tag"
         v-for="(tag, index) in tags"
@@ -23,9 +32,7 @@
       ></el-input>
     </div>
     <div class="u-m-t-20">
-      <el-checkbox v-model="isPrint" 
+      <el-checkbox v-model="isPrint">打印退菜单</el-checkbox>
-        >打印退菜单</el-checkbox
-      >
     </div>
     <div slot="footer">
       <el-button size="medium" @click="close"> 取消 </el-button>
@@ -34,20 +41,35 @@
   </el-dialog>
 </template>
   <script>
+import numberBox from './number-box.vue';
 export default {
+  components:{numberBox},
+  props:{
+    goods:{
+      type:Object,
+      default:()=>{
+        return{}
+      }
+    }
+  },
   data() {
     return {
-        isPrint:false,
+      number:1,
+      isPrint: false,
       tagSel: -1,
       show: false,
-      tags: [{label:"不想要了",checked:false} ,{label:"食材不足",checked:false} ,{label:"等待时间过长",checked:false}],
+      tags: [
+        { label: "不想要了", checked: false },
+        { label: "食材不足", checked: false },
+        { label: "等待时间过长", checked: false },
+      ],
       note: "",
     };
   },
 
   methods: {
     changeSel(item) {
-      item.checked = !item.checked ;
+      item.checked = !item.checked;
     },
     reset() {
       this.note = "";
@@ -68,7 +90,13 @@ export default {
       this.show = false;
     },
     confirm() {
-      this.$emit("confirm", this.note);
+      const selTag=this.tags.filter(item=>item.checked).map(item=>item.label).join(",")
+      const note=selTag+(this.note.length>0?","+this.note:"");
+      console.log(note)
+      if(!note){
+        return this.$message.error("请输入退菜原因");
+      }
+      this.$emit("confirm", {note:note,num:this.number});
       this.close();
     },
   },

src/views/tool/Instead/index.vue

@@ -1,12 +1,76 @@
 <!-- eslint-disable no-empty -->
 <template>
   <div class="el-dialog">
-    <div class="bg-fff">
+    <div class="bg-fff u-relative">
+      <div
+        class="u-fixed position-all"
+        style="z-index: 999"
+        v-if="!canXiadan"
+        @click="xiadanClick"
+      ></div>
       <div class="flex head row-between flex-y-center u-m-l-20">
         <div class="flex" style="width: 500px">
-          <div class="el-dialog__title" style="margin-right: 10px">
+          <div class="u-font-16 color-333 font-bold" style="margin-right: 10px">
             {{ title }}
           </div>
+          <div class="choose-user flex u-m-l-24">
+            <el-button
+              type="primary"
+              v-if="vipUser.id === ''"
+              @click="refChooseUserOpen"
+              >选择用户</el-button
+            >
+            <template v-else>
+              <div class="flex cur-pointer" @click="refChooseUserOpen">
+                <img
+                  v-if="vipUser.headImg"
+                  class="headimg"
+                  :src="vipUser.headImg"
+                  alt=""
+                />
+                <div v-else class="headimg flex flex-x-y-center">
+                  <i class="el-icon-user"></i>
+                </div>
+                <div>
+                  <div class="ft-13 color-000">{{ vipUser.nickName }}</div>
+                  <div style="margin-top: 2px" class="color-666 ft-12">
+                    余额：{{ vipUser.amount }}
+                  </div>
+                </div>
+              </div>
+            </template>
+          </div>
+          <el-popover
+            placement="right"
+            width="333"
+            trigger="click"
+            v-model="tableShow"
+          >
+            <div style="max-height: 398px; overflow-y: scroll">
+              <div
+                class="u-flex u-row-between u-p-t-8 table-item u-p-b-8 u-p-r-30"
+                v-for="(item, index) in tableList"
+                :key="index"
+                @click="changeTable(item, index)"
+              >
+                <span> {{ item.name }}</span>
+                <span :style="{ color: status[item.status].type }">
+                  {{
+                    status[item.status] ? status[item.status].label : ""
+                  }}</span
+                >
+              </div>
+              <div
+                class="color-999 u-p-30 u-text-center"
+                v-if="!tableList.length"
+              >
+                无可用桌台
+              </div>
+            </div>
+            <div class="tableId u-m-l-28" slot="reference">
+              {{ table ? "桌台号：" + table.name : "选择桌号" }}
+            </div>
+          </el-popover>
           <!-- 先付后付start -->
           <!-- <el-dropdown @command="changePostPay">
               <el-button plain type="primary" size="mini">
@@ -18,9 +82,11 @@
                 <el-dropdown-item :command="true">后付费</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown> -->
-          <el-button plain type="primary" size="mini">
+
+          <!-- <el-button plain type="primary" size="mini">
             {{ postPay ? "后付费" : "先付费" }}
-          </el-button>
+          </el-button> -->
+
           <!-- 先付后付end -->
           <span
             @click="toggleFullScreen"
@@ -64,6 +130,7 @@
         </div>
 
         <div class="flex flex-1">
+          <div class="flex-1"></div>
           <div class="flex-1">
             <el-input
               v-model="goods.query.productId"
@@ -75,7 +142,8 @@
               suffix-icon="el-icon-search"
             />
           </div>
-          <div
+
+          <!-- <div
             style="display: flex; justify-content: flex-end; margin-left: 10px"
           >
             <div style="width: 100px; margin-left: 20px">
@@ -90,7 +158,7 @@
                 </el-option>
               </el-select>
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
       <div class="head-container search-box flex row-between" v-if="false">
@@ -123,10 +191,6 @@
           <div
             style="display: flex; justify-content: flex-end; margin-left: 10px"
           >
-            <!-- <el-button style="margin-right: 10px" type="primary" @click="getGoods"
-              >查询</el-button
-            >
-            <el-button @click="reset">重置</el-button> -->
             <div style="width: 100px; margin-left: 20px">
               <el-select v-model="layout.sel" placeholder="请选择">
                 <el-option
@@ -146,33 +210,6 @@
         <div class="order">
           <div class="relative u-flex u-flex-col u-row-between">
             <div class="w-full" style="padding-right: 14px">
-              <div class="choose-user flex u-m-l-20">
-                <el-button
-                  type="primary"
-                  v-if="vipUser.id === ''"
-                  @click="refChooseUserOpen"
-                  >选择用户</el-button
-                >
-                <template v-else>
-                  <div class="flex cur-pointer" @click="refChooseUserOpen">
-                    <img
-                      v-if="vipUser.headImg"
-                      class="headimg"
-                      :src="vipUser.headImg"
-                      alt=""
-                    />
-                    <div v-else class="headimg flex flex-x-y-center">
-                      <i class="el-icon-user"></i>
-                    </div>
-                    <div>
-                      <div class="ft-13 color-000">{{ vipUser.nickName }}</div>
-                      <div style="margin-top: 2px" class="color-666 ft-12">
-                        余额：{{ vipUser.amount }}
-                      </div>
-                    </div>
-                  </div>
-                </template>
-              </div>
               <div class="u-m-l-20 u-p-b-10 meal_box">
                 <el-button-group>
                   <el-button
@@ -187,31 +224,6 @@
               </div>
               <div class="flex row-between table-list u-m-l-20">
                 <!-- <div class="tableId" @click="chooseTableOpen"> -->
-                <el-popover
-                  placement="right"
-                  width="333"
-                  trigger="click"
-                  v-model="tableShow"
-                >
-                  <div style="max-height: 398px; overflow-y: scroll">
-                    <div
-                      class="u-flex u-row-between u-p-t-8 table-item u-p-b-8 u-p-r-30"
-                      v-for="(item, index) in tableList"
-                      :key="index"
-                      @click="changeTable(item, index)"
-                    >
-                      <span> {{ item.name }}</span>
-                      <span :style="{ color: status[item.status].type }">
-                        {{
-                          status[item.status] ? status[item.status].label : ""
-                        }}</span
-                      >
-                    </div>
-                  </div>
-                  <div class="tableId" slot="reference">
-                    {{ table ? "桌台号：" + table.name : "桌台号/取餐号" }}
-                  </div>
-                </el-popover>
 
                 <div class="u-flex">
                   <div class="u-p-r-14 border-r u-m-r-14">
@@ -260,6 +272,7 @@
                     @changeOrderNumber="changeOrderNumber"
                     @cartGoodsNumberInput="cartGoodsNumberInput"
                     @cartGoodsNumberChange="cartGoodsNumberChange"
+                    @editNote="refNoteShow(true)"
                     v-for="(item, index) in order.list"
                     :key="index"
                     :index="index"
@@ -268,16 +281,30 @@
                     :selIndex="order.selIndex"
                   ></cart-item>
                 </template>
-                <div v-if="order.gift.list.length">
-                  <div class="carts_list_title">以下是优惠菜品</div>
-                </div>
-
                 <div v-if="!order.list.length">
                   <el-empty
                     :image-size="50"
                     description="点餐列表为空"
                   ></el-empty>
                 </div>
+                <!-- 优惠菜品 -->
+                <div v-if="order.gift.list.length">
+                  <div class="carts_list_title">以下是优惠菜品</div>
+                  <template v-if="order.gift.list.length">
+                    <cart-item
+                      @itemClick="changeOrderSel"
+                      @changeOrderNumber="changeOrderNumber"
+                      @cartGoodsNumberInput="cartGoodsNumberInput"
+                      @cartGoodsNumberChange="cartGoodsNumberChange"
+                      v-for="(item, index) in order.gift.list"
+                      :key="index"
+                      :index="index"
+                      :item="item"
+                      :selPlaceNum="order.selPlaceNum"
+                      :selIndex="order.selIndex"
+                    ></cart-item>
+                  </template>
+                </div>
               </div>
               <!-- 已下单菜品列表 -->
               <template v-if="order.old.list.length">
@@ -321,6 +348,24 @@
                   ></cart-item>
                 </div>
               </template>
+              <!-- 打包费 -->
+              <template v-if="allPackMoney > 0">
+                <div class="list">
+                  <div class="carts_list_title">打包费</div>
+                  <cart-item
+                    @itemClick="changeOrderExtraSel"
+                    :canChangeNumber="false"
+                    key="seatFee"
+                    :index="0"
+                    :item="order.packFee"
+                    isSeatFee
+                    :selIndex="order.extra.selIndex"
+                    :placeNum="-10"
+                    :selPlaceNum="order.selPlaceNum"
+                  ></cart-item>
+                </div>
+              </template>
+
               <div class="order_remark" v-if="note.content">
                 订单备注： {{ note.content }}
               </div>
@@ -329,7 +374,7 @@
             <div class="w-full bottom">
               <div class="border-top">
                 <div class="flex row-right youhui" v-if="giftLen">
-                  <span> 已优惠￥{{ allGiftMoney | to2 }} </span>
+                  <span> 已优惠￥{{ allGiftMoney }} </span>
                   <i class="el-icon-arrow-right"></i>
                 </div>
 
@@ -551,17 +596,17 @@
         </div>
         <div class="goods">
           <template v-if="!isCreateOrder">
-            <div class="flex categoty">
+            <div class="flex categoty u-col-center">
               <div
                 class="show_more_btn"
                 :class="{ showAll: category.showAll }"
                 @click="toggleShowAll"
               >
                 <div class="flex">
-                  <div class="flex">
+                  <div class="flex showmore">
-                    <i class="el-icon-arrow-down"></i>
+                    <i class="el-icon-caret-bottom color-fff"></i>
                   </div>
-                  <span>展开</span>
+                  <span>{{ category.showAll ? "收起" : "展开" }}</span>
                 </div>
               </div>
               <div
@@ -1140,6 +1185,7 @@ import returnCart from "./components/return-cart.vue";
 import moneyKeyboard from "./components/money-keyboard.vue";
 import dayjs from "dayjs";
 import { tbShopInfo } from "@/api/user";
+import { hasPermission } from "@/utils/limits.js";
 
 import {
   getGoodsLists,
@@ -1169,6 +1215,7 @@ import {
   arrayContainsAll,
   generateCombinations,
   returnReverseVal,
+  returnGiftArr,
 } from "./util.js";
 import { $status } from "@/utils/table.js";
 export default {
@@ -1186,6 +1233,10 @@ export default {
   },
   data() {
     return {
+      //是否允许收款
+      canShoukuan: false,
+      //是否允许下单
+      canXiadan: false,
       //是否是单品备注
       isDanNote: false,
       //店铺信息
@@ -1271,6 +1322,13 @@ export default {
         total: 0,
       },
       order: {
+        packFee: {
+          totalNumber: 0,
+          status: "",
+          number: 0,
+          name: "打包费",
+          totalAmount: 0,
+        },
         extra: {
           selIndex: -1,
         },
@@ -1341,7 +1399,7 @@ export default {
           { label: "图文显示", value: "img-and-text" },
           { label: "文字显示", value: "text" },
         ],
-        sel: "img-and-text",
+        sel: "default",
       },
       // 选择用户
       vipUser: {
@@ -1381,15 +1439,53 @@ export default {
       return this.table ? "代客下单" + `(${this.table.name})` : "代客下单";
     },
     allGiftMoney() {
-      const price = this.order.list
+      const nowprice = this.order.list
         .filter((v) => v.isGift === "true" || v.status == "return")
         .reduce((a, b) => {
           return a + b.number * b.salePrice;
         }, 0);
-      return price;
+
+      const oldPrice = this.order.old.list.reduce((a, b) => {
+        const total = b.info
+          .filter((v) => v.isGift === "true")
+          .reduce((prve, cur) => {
+            return prve + cur.number * cur.salePrice;
+          }, 0);
+        return a + total;
+      }, 0);
+      return (nowprice + oldPrice).toFixed(2);
+    },
+    allPackMoney() {
+      let n = 0;
+      const nowPrice = this.order.list
+        .filter((v) => v.isPack === "true")
+        .reduce((a, b) => {
+          n += b.number * 1;
+          return a + b.packFee * 1;
+        }, 0);
+      const oldPrice = this.order.old.list.reduce((a, b) => {
+        const bPrice = b.info
+          .filter((v) => v.isPack === "true")
+          .reduce((prve, cur) => {
+            n += cur.number * 1;
+            return prve + cur.packFee * 1;
+          }, 0);
+        return a + bPrice;
+      }, 0);
+
+      const total = (nowPrice + oldPrice).toFixed(2);
+      this.order.packFee.totalAmount = total;
+      this.order.packFee.totalNumber = n;
+      return total;
     },
     giftLen() {
-      return this.order.list.filter((v) => v.isGift === "true").length;
+      const nowlen = this.order.list.filter((v) => v.isGift === "true").length;
+      const oldlen = this.order.old.list.reduce((prve, cur) => {
+        const arr = cur.info.filter((v) => v.isGift === "true");
+        prve.push(...arr);
+        return prve;
+      }, []).length;
+      return nowlen + oldlen;
     },
     isSku() {
       if (this.order.selIndex < 0 || this.order.list.length <= 0) {
@@ -1436,6 +1532,7 @@ export default {
       return (
         oldPrice +
         price +
+        +this.order.packFee.totalAmount +
         this.order.seatFee.totalAmount *
           (this.order.seatFee.status == "return" ? 0 : 1)
       ).toFixed(2);
@@ -1608,7 +1705,7 @@ export default {
       }).then((res) => {
         this.$set(this.order.list, this.order.selIndex, {
           ...res,
-          specSnap: item.specSnap,
+          specSnap: item.specSnap || res.skuName,
           number: this.order.number,
         });
       });
@@ -1633,6 +1730,7 @@ export default {
     },
   },
   mounted() {
+    this.xiadanClick();
     // this.getGoods();
     // this.getCategory();
     // this.refToggle('refScanCode',true)
@@ -1641,8 +1739,16 @@ export default {
     this.open(this.$route.query.tableId ? this.$route.query : "");
   },
   methods: {
+    async shoukuanClick() {
+      this.canShoukuan = await hasPermission("允许收款");
+    },
+    // 打开页面
+    async xiadanClick() {
+      this.canXiadan = await hasPermission("允许下单");
+    },
     changeOrderExtraSel(index, canChangeNumber, placeNum) {
       // console.log(index,canChangeNumber,placeNum)
+      this.order.selIndex = -1;
       this.order.selGoods = this.order.seatFee;
       this.order.selPlaceNum = placeNum;
       this.order.extra.selIndex = index;
@@ -1651,6 +1757,10 @@ export default {
       if (this.order.list.length <= 0) {
         return this.$message("请选择菜品");
       }
+      const canJiesuan = await this.shoukuanClick();
+      if (!canJiesuan) {
+        return;
+      }
       // if(this.isCreateOrder){
       //   return
       // }
@@ -1660,7 +1770,11 @@ export default {
       this.order.payType = "";
       this.isCreateOrder = true;
     },
-    cashPayClick() {
+    async cashPayClick() {
+      const canJiesuan = await this.shoukuanClick();
+      if (!canJiesuan) {
+        return;
+      }
       this.$confirm("是否确认已现金收款:" + this.allPrice + "?", "快捷支付", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1692,9 +1806,9 @@ export default {
       return res;
     },
     async payBeforeClear() {
-      this.getMasterId().then(res=>{
+      this.getMasterId().then((res) => {
         this.masterId = res.masterId;
-      })
+      });
       this.loading = false;
       this.order.list = [];
       this.order.query.page = 1;
@@ -1721,27 +1835,36 @@ export default {
       this.key = "";
       this.order.orderId = "";
       this.perpole = "";
-      this.useTypes.sel = "dine-in";
+      // this.useTypes.sel = "dine-in";
     },
     async cachePay() {
+      const canJiesuan = await this.shoukuanClick();
+      if (!canJiesuan) {
+        return;
+      }
       await this.returnCreateOrderData();
       this.payBeforeClear({});
       this.pays();
     },
     async scanPayClick() {
+      const canJiesuan = await this.shoukuanClick();
+      if (!canJiesuan) {
+        return;
+      }
       await this.returnCreateOrderData();
       this.payBeforeClear();
       this.order.payType = "scanCode";
       this.payTypeItemClick({ payType: "scanCode" });
     },
-    changeOrderUseType(useType) {
+    async changeOrderUseType(useType) {
       if (useType && this.order.list.length) {
         const tableId = useType == "takeout" ? undefined : this.table.tableId;
-        $changeUseType({
+        await $changeUseType({
           useType,
           tableId,
           cartIds: this.order.list.map((v) => v.id),
         });
+        this.getCart();
       }
     },
     //设置用餐类型
@@ -1867,15 +1990,18 @@ export default {
         .catch(() => {});
     },
     //退菜
-    async refReturnCartConfirm() {
+    async refReturnCartConfirm(e) {
       const res = await $returnCart({
+        ...e,
         cartId: this.order.selGoods.id,
         tableId: this.table.tableId,
       });
       this.order.selGoods.status = "return";
       this.order.old.selIndex = -1;
+      this.getCart();
       console.log(this.order.selGoods);
     },
+
     // 台桌列表
     async getTable() {
       try {
@@ -1923,7 +2049,11 @@ export default {
     ChangeDiscount(discount) {
       this.createOrder.discount = discount;
     },
-    disCountShow() {
+    async disCountShow() {
+      const canDiscount = await hasPermission("允许打折");
+      if (!canDiscount) {
+        return;
+      }
       const { amount } = this.createOrder.data;
       this.refToggle("refDiscount", true, {
         amount,
@@ -1955,7 +2085,8 @@ export default {
     isSellOut(item) {
       return (
         item.isPauseSale ||
-        (item.typeEnum !== "sku" && item.specList[0].stockNumber <= 0)
+        (item.typeEnum !== "sku" &&
+          (item.isStock == 1 ? item.stockNumber <= 0 : false))
       );
     },
     toggleFullScreen() {
@@ -2020,7 +2151,10 @@ export default {
           note: note,
           num: cart.number, // 0会删除此商品
         });
-        this.$set(this.order.list, this.order.selIndex, res);
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: res.skuName,
+        });
         this.$notify({
           title: "更新成功",
           type: "success",
@@ -2104,7 +2238,21 @@ export default {
       this.isCreateOrder = false;
     },
     //生成订单
-    toCreateOrderDebounce(isNowPay) {
+    async toCreateOrderDebounce(isNowPay) {
+      if (!isNowPay) {
+        //仅下单
+        const canXiadan = await this.xiadanClick();
+        if (!canXiadan) {
+          return;
+        }
+      }else{
+        //去结算
+        const canJiesuan = await this.shoukuanClick();
+        if (!canJiesuan) {
+          return;
+        }
+      }
+
       console.log(this.createOrder.status);
       if (
         this.createOrder.status != "" &&
@@ -2120,6 +2268,14 @@ export default {
       console.log(this.order.orderId);
       let res = "";
       try {
+        const seatFee = await $choseCount({
+          masterId: this.masterId,
+          tableId: this.table.tableId,
+          num: this.perpole,
+        });
+        this.order.seatFee = seatFee;
+
+        this.order.seatFee = res;
         res = await $createOrder({
           masterId: this.order.masterId || this.masterId,
           vipUserId: this.vipUser.id,
@@ -2183,8 +2339,9 @@ export default {
     updateOrder(par = {}) {
       let item = this.order.list[this.order.selIndex];
       console.log(item.specSnap);
-      const { productId, skuId, isPack, isGift, number } = item;
+      const { productId, skuId, isPack, isGift, number, id } = item;
-      addCart({
+      $updateCart({
+        cartId: id,
         masterId: this.masterId,
         vipUserId: this.vipUser.id,
         productId,
@@ -2794,12 +2951,16 @@ export default {
     },
     //设置购物车数据
     setCart(res) {
+      console.log(res);
       this.order.seatFee = res.seatFee ? res.seatFee : this.order.seatFee;
       this.perpole = res.seatFee ? res.seatFee.totalNumber : 1;
       const nowCart = res.records.find((v) => v.placeNum == 0);
+      // this.order.list = nowCart ? nowCart.info.filter(v=>v.isGift!=='true') : [];
       this.order.list = nowCart ? nowCart.info : [];
       const oldCart = res.records.filter((v) => v.placeNum != 0);
       this.order.old.list = oldCart ? oldCart : [];
+      // this.order.gift.list = returnGiftArr(res.records);
+      console.log(this.order.old.list);
     },
     //获取购物车数据
     async getCart() {
@@ -2951,9 +3112,9 @@ export default {
           return false;
         }
         let isShow = true;
-        if (v.typeEnum !== "sku") {
+        // if (v.typeEnum !== "sku") {
-          isShow = v.specList.length >= 1;
+        //   isShow = v.specList.length >= 1;
-        }
+        // }
         v.specList.map((spe) => {
           $goodsMap[`${v.id}_${spe.id}`] = spe;
         });
@@ -3318,7 +3479,7 @@ input[type="number"]::-webkit-outer-spin-button {
 }
 
 .tableId {
-  padding: 9px 15px;
+  padding: 8px 15px;
   border: 1px solid #dcdfe6;
   font-size: 12px;
   border-radius: 3px;
@@ -3512,7 +3673,7 @@ input[type="number"]::-webkit-outer-spin-button {
 
   .show_more_btn {
     padding: 0 10px;
-    color: #1890ff;
+    color: #333;
     font-size: 16px;
     display: flex;
     align-items: center;
@@ -3528,12 +3689,21 @@ input[type="number"]::-webkit-outer-spin-button {
     justify-content: center;
     align-items: center;
 
-    .el-icon-arrow-down {
+    .showmore {
       transition: all 0.2s;
+      margin-right: 8px;
+      width: 21px;
+      height: 21px;
+      border-radius: 50%;
+      background: #3f9eff;
+      display: flex;
+      justify-content: center;
+      align-items: center;
     }
-
+    &.showAll {
-    &.showAll .el-icon-arrow-down {
+      .showmore {
-      transform: rotate(180deg);
+        transform: rotate(180deg);
+      }
     }
   }
 }
@@ -3756,7 +3926,7 @@ input[type="number"]::-webkit-outer-spin-button {
 
     .list {
       width: 352px;
-      padding: 12px 12px 0 0;
+      padding: 0 12px 0 0;
     }
 
     .controls {
@@ -3788,69 +3958,6 @@ input[type="number"]::-webkit-outer-spin-button {
         }
       }
     }
-
-    .order-item {
-      padding: 4px;
-      border-radius: 2px;
-      display: flex;
-      cursor: pointer;
-      align-items: center;
-      justify-content: space-between;
-      background-color: rgba(0, 0, 0, 0);
-      transition: all 0.3s;
-      .pack {
-        right: 100%;
-        width: 18px;
-        height: 18px;
-        background: #35ac6a;
-        border-radius: 4px 0 4px 0;
-        font-size: 12px;
-        color: #fff;
-        text-align: center;
-        line-height: 17px;
-        z-index: 2;
-      }
-      &.active {
-        background-color: rgba(0, 0, 0, 0.04);
-      }
-
-      .total-price {
-        width: 94px;
-        text-align: right;
-      }
-
-      .good-info {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        min-width: 70px;
-
-        .specSnap {
-          color: #999;
-          font-size: 12px;
-          margin-top: 3px;
-        }
-      }
-
-      .name {
-        font-size: 13px;
-        text-align: left;
-        color: #212121;
-        overflow: hidden;
-      }
-
-      .img {
-        width: 40px;
-        height: 40px;
-        position: relative;
-        margin-right: 10px;
-
-        img {
-          width: 40px;
-          height: 40px;
-        }
-      }
-    }
   }
 
   .goods {
@@ -3877,12 +3984,13 @@ input[type="number"]::-webkit-outer-spin-button {
         .timeSale {
           text-align: center;
           border-radius: 10px;
-          background-color: hsla(0, 0%, 99.2%, 0.5);
+          background-color: rgb(245, 245, 245, 0.6);
           color: #fff;
           font-size: 10px;
           line-height: 16px;
-          padding: 2px 10px;
+          padding: 3px 10px;
-          margin-top: 2px;
+          margin-top: 4px;
+          width: 100%;
         }
         .sell-out {
           width: 100%;
@@ -3915,7 +4023,7 @@ input[type="number"]::-webkit-outer-spin-button {
           font-size: 14px;
           position: absolute;
           inset: 0;
-          background: rgba(0, 0, 0, 0.4);
+          background: rgba(46, 46, 46, 0.38);
           color: #fff;
           box-sizing: border-box;
           padding: 10px;

src/views/tool/Instead/util.js

@@ -45,3 +45,16 @@ export function returnReverseVal(val, isReturnString = true) {
     }
     return reverseNewval;
 }
+
+export function returnGiftArr(arr){
+    let result=[]
+    for(let i=0;i<arr.length;i++){
+        const info=arr[i].info
+        for(let j=0;j<info.length;j++){
+            if(info[j].isGift==='true'){
+                result.push(info[j])
+            }
+        }
+    }
+    return result
+}