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

.env.development

@@ -5,7 +5,10 @@ ENV = 'development'
 # VUE_APP_BASE_API  = 'http://192.168.2.42:8000'
 # VUE_APP_BASE_API  = 'http://192.168.2.133:8000'
 # 测试
-VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+#预发布
+VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
+
 # 生产
 # VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 # VUE_APP_BASE_API  = 'http://192.168.2.96:8000'

.env.production

@@ -3,13 +3,13 @@ ENV = 'production'
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
 # 测试
-VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
 
 # 生产
 # VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 
 # 预发布接口
-# VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
+VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
 
 # VUE_APP_BASE_API  = 'http://192.168.2.98:8000'
 # 如果接口是 http 形式， wss 需要改为 ws

src/api/table.js

@@ -450,3 +450,14 @@ export function $returnOrder(data) {
     }
   });
 }
+//获取台桌详情状态
+export function $returnTableDetail(data) {
+  return request({
+    url: '/api/tbShopTable/state',
+    method: "get",
+    params:{
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}

src/views/devices/details.vue

@@ -49,7 +49,7 @@
                     <el-radio label="1">部分分类</el-radio>
                     <!-- <el-radio label="2">部分商品</el-radio> -->
                 </el-radio-group>
-                <div style="color: rgb(255, 77, 79);margin-left: 80px;">仅打印制作单[厨房]</div>
+                <div  v-if="forms.classifyPrint == 1"  style="color: rgb(255, 77, 79);margin-left: 80px;">仅打印制作单[厨房]</div>
                 <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' }">

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

@@ -118,6 +118,7 @@ export default {
       number: "0",
       show: false,
       timer: null,
+      payPar:{}
     };
   },
   watch: {
@@ -136,18 +137,10 @@ export default {
           this.$refs.refInputCode.focus();
         });
       } else {
+        this.getPayUrl()
         this.tips = "请用户使用微信/支付宝扫描付款码";
         this.startGetOrderInfo();
-        this.$nextTick(() => {
+        
-          QRCode.toCanvas(
-            this.$refs.canvas,
-            this.paymentQrcode,{width: 160,
-              height: 160,},
-            function (error) {
-              console.log(error);
-            }
-          );
-        });
       }
     },
     number(newval) {
@@ -193,14 +186,28 @@ export default {
       this.close();
       this.$emit("confirm", this.form.code);
     },
+    getPayUrl(){
+      $getOrderPayUrl(this.payPar).then((res) => {
+          console.log(res);
+          this.paymentQrcode = res;
+          this.$nextTick(() => {
+          QRCode.toCanvas(
+            this.$refs.canvas,
+            this.paymentQrcode,{width: 160,
+              height: 160,},
+            function (error) {
+              console.log(error);
+            }
+          );
+        });
+        });
+    },
     open(data) {
       this.show = true;
       this.form.money = Number(this.price).toFixed(2);
+      this.payPar=data
       if (this.openSwitch) {
-        $getOrderPayUrl({ orderId: this.order.id||data.id,payAmount:this.form.money||data.settlementAmount }).then((res) => {
+        // this.getPayUrl();
-          console.log(res);
-          this.paymentQrcode = res;
-        });
       }
       this.$nextTick(() => {
         this.$refs.refInputCode.focus();

src/views/tool/Instead/index.vue

@@ -46,7 +46,13 @@
             trigger="click"
             v-model="tableShow"
           >
-            <div style="max-height: 398px; overflow-y: scroll">
+          <el-input
+              placeholder="请输入内容"
+              prefix-icon="el-icon-search"
+              v-model="tableSearchText"
+              @input="searchInput">
+            </el-input>
+            <div style="max-height: 398px; overflow-y: scroll" class="u-m-t-12">
               <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"
@@ -54,7 +60,7 @@
                 @click="changeTable(item, index)"
               >
                 <span> {{ item.name }}</span>
-                <span :style="{ color: status[item.status].type }">
+                <span :style="{ color: returnTableColor(item.status) }">
                   {{
                     status[item.status] ? status[item.status].label : ""
                   }}</span
@@ -396,6 +402,7 @@
                 </div>
 
                 <div class="flex mt-14">
+                  <template v-if="table">
                     <template v-if="!postPay">
                       <template v-if="isCreateOrder">
                         <!-- <template v-if="false"> -->
@@ -469,6 +476,20 @@
                         </div>
                       </template>
                     </template>
+                  </template>
+                  <template v-else>
+                    <button class="my-btn flex-1 primary" @click="scanPayClick">
+                      <span>微信/支付宝</span>
+                    </button>
+                    <div style="width: 15px"></div>
+                    <button class="my-btn flex-1 primary" @click="cashPayClick">
+                      <span>现金</span>
+                    </button>
+                    <div style="width: 15px"></div>
+                    <button class="my-btn flex-1 default" @click="morePayClick">
+                      <span>更多支付</span>
+                    </button>
+                  </template>
                 </div>
               </div>
             </div>
@@ -594,7 +615,11 @@
               </div> -->
           </div>
         </div>
-        <div class="goods">
+        <div
+          class="goods"
+          v-infinite-scroll="loadMoreGoods"
+          infinite-scroll-distance="40"
+        >
           <template v-if="!isCreateOrder">
             <div class="flex categoty u-col-center">
               <div
@@ -637,7 +662,8 @@
             >
               未找到相关商品
             </div>
-            <div class="goods-list" v-if="goods.list.length">
+            <template v-if="goods.list.length">
+              <div class="goods-list">
                 <div
                   class="goods-item"
                   :class="{
@@ -659,7 +685,12 @@
                   </div> -->
 
                   <div class="flex img-box" v-if="layout.sel !== 'text'">
-                  <img class="goods-img" :src="item.coverImg" alt="" />
+                    <!-- <img class="goods-img" :src="item.coverImg" alt="" /> -->
+                    <el-image
+                      :src="item.coverImg"
+                      scroll-container="goods"
+                      class="goods-img"
+                    ></el-image>
                     <template v-if="layout.sel === 'img-and-text'">
                       <div class="sell-out-svg" v-if="isSellOut(item)">
                         <svg
@@ -749,6 +780,16 @@
                   </div>
                 </div>
               </div>
+              <div class="u-m-t-20 color-999 text-center">
+                {{ goods.status == "end" ? "没有更多了" : "加载中" }}
+              </div>
+            </template>
+            <div
+              class="no-search-result"
+              v-if="goods.list.length <= 0 && goods.query.productId === ''"
+            >
+              未找到相关商品
+            </div>
           </template>
 
           <template v-else>
@@ -945,9 +986,10 @@
       </div>
 
       <div slot="footer">
+        <template v-if="skuGoods.data">
           <div class="flex row-between">
             <div>
-            <div class="price">￥{{ skuGoods.data.salePrice | to2 }}</div>
+              <div class="price">￥ {{ skuGoods.data.salePrice | to2 }}</div>
               <div class="sku-group-text">
                 <span> {{ skuText }}</span>
                 <span>库存：{{ skuGoods.data.stockNumber || 0 }}</span>
@@ -973,26 +1015,51 @@
               v-if="!skuGoods.data.isGrounding"
               disabled
             >
-            已下架/库存不足
+              已下架
             </button>
-          <template v-else>
             <button
               class="my-btn disabled flex-1"
-              v-if="skuGoods.data.stockNumber <= 0"
+              v-else-if="
+                selGoods.isStock == 1 && skuGoods.data.stockNumber <= 0
+              "
               disabled
             >
               库存不足
             </button>
-            <button
+            <template v-else>
-              class="my-btn primary flex-1"
+              <button class="my-btn primary flex-1" @click="chooseSkuConfirm">
-              v-else
-              :disabled="CanConfirm"
-              @click="chooseSkuConfirm"
-            >
                 确定
               </button>
             </template>
           </div>
+        </template>
+        <template v-else>
+          <div class="flex row-between">
+            <div>
+              <div class="price">￥</div>
+              <div class="sku-group-text">
+                <span> </span>
+                <span>库存：</span>
+              </div>
+            </div>
+            <div class="flex">
+              <i class="icon-remove" @click="skuNumberReduce"></i>
+              <div style="width: 40px" class="number-box">
+                <el-input
+                  :min="0"
+                  :max="0"
+                  type="number"
+                  placeholder="0"
+                ></el-input>
+              </div>
+              <!-- <i class="el-icon-remove"></i> -->
+              <i class="el-icon-circle-plus icon-add" @click="skuNumberAdd"></i>
+            </div>
+          </div>
+          <div class="flex" style="margin-top: 14px">
+            <button class="my-btn disabled flex-1" disabled>已下架/售罄</button>
+          </div>
+        </template>
       </div>
     </el-dialog>
 
@@ -1166,7 +1233,7 @@
 
     <return-cart
       ref="refReturnCart"
-      :max="order.selGoods?order.selGoods.number:1"
+      :max="order.selGoods ? order.selGoods.number : 1"
       @confirm="refReturnCartConfirm"
     ></return-cart>
   </div>
@@ -1209,16 +1276,19 @@ import {
   $printOrder,
   tbShopTableGet,
   $changeUseType,
+  $returnTableDetail,
 } from "@/api/table";
 import { tbShopCategoryGet } from "@/api/shop";
 import {
   isCanBuy,
   arrayContainsAll,
   generateCombinations,
-  returnReverseVal,
+  returnReverseVal,$strMatch,
   returnGiftArr,
 } from "./util.js";
 import { $status } from "@/utils/table.js";
+
+let $originTableList=[]
 export default {
   components: {
     returnCart,
@@ -1234,6 +1304,8 @@ export default {
   },
   data() {
     return {
+      //台桌搜索文字
+      tableSearchText:"",
       //是否允许收款
       canShoukuan: false,
       //是否允许下单
@@ -1261,6 +1333,11 @@ export default {
       },
       //台桌列表
       tableList: [],
+      //台桌参数
+      tableQuery: {
+        page: 1,
+        size: 999,
+      },
       tableShow: false,
       status: $status,
       //就餐人数
@@ -1293,10 +1370,7 @@ export default {
       },
       skuGoods: {
         number: 1,
-        data: {
+        data: undefined,
-          stockNumber: 0,
-          salePrice: 0,
-        },
       },
       selGoods: {
         isEdit: false,
@@ -1312,12 +1386,13 @@ export default {
       informationdialogshow: false,
       informationdialogshowedit: false,
       goods: {
+        status: "loadmore", //loadmore end
         list: [],
         query: {
           productId: "",
           categoryId: "",
           page: 1,
-          size: 300,
+          size: 66,
         },
         loading: false,
         total: 0,
@@ -1554,13 +1629,22 @@ export default {
       this.selGoods.show = false;
     },
     CanConfirm() {
-      if (!this.selGoods.skuList.length) {
+      // if (!this.skuGoods.data) {
-        return true;
+      //   return;
-      }
+      // }
-      return (
+      // if (!this.selGoods.skuList.length) {
-        this.selGoods.skuList.filter((v) => v.sel !== "").length !==
+      //   return true;
-        this.selGoods.skuList.length
+      // }
-      );
+      // const canBuyArr = this.selGoods.skuList.filter((v) =>
+      //   isCanBuy(v, this.selGoods.isStock)
+      // );
+      // if (canBuyArr.length <= 0) {
+      //   return true;
+      // }
+      // return (
+      //   this.selGoods.skuList.filter((v) => v.sel !== "").length !==
+      //   this.selGoods.skuList.length
+      // );
     },
   },
   filters: {
@@ -1581,6 +1665,12 @@ export default {
     },
   },
   watch: {
+    "goods.query.categoryId": function (newval) {
+      this.goods.query.page = 1;
+      this.goods.list = [];
+      this.goods.status = "loadmore";
+      this.getGoods();
+    },
     "useTypes.sel": function (newval, oldval) {
       console.log(newval);
       this.setPostPay();
@@ -1740,6 +1830,20 @@ export default {
     this.open(this.$route.query.tableId ? this.$route.query : "");
   },
   methods: {
+    searchInput(e){
+      console.log(e)
+      this.tableList=$originTableList.filter(v=>$strMatch(v.name,e.trim()))
+    },
+    returnTableColor(key) {
+      const item = $status[key];
+      return item ? item.type : "";
+    },
+    loadMoreGoods() {
+      if (this.goods.query.page * this.goods.query.size < this.goods.total) {
+        this.goods.query.page = this.goods.query.page + 1;
+        this.getGoods();
+      }
+    },
     async shoukuanClick() {
       this.canShoukuan = await hasPermission("允许收款");
       return this.canShoukuan;
@@ -1748,7 +1852,6 @@ export default {
     async xiadanClick() {
       this.canXiadan = await hasPermission("允许下单");
       return this.canXiadan;
-
     },
     changeOrderExtraSel(index, canChangeNumber, placeNum) {
       // console.log(index,canChangeNumber,placeNum)
@@ -1855,10 +1958,10 @@ export default {
       if (!canJiesuan) {
         return;
       }
-      await this.returnCreateOrderData();
+      const order = await this.returnCreateOrderData();
-      console.log( this.createOrder.data )
+      console.log(this.createOrder.data);
       this.order.payType = "scanCode";
-      this.payTypeItemClick({ payType: "scanCode" });
+      this.payTypeItemClick({ payType: "scanCode", order });
       this.payBeforeClear();
     },
     async changeOrderUseType(useType) {
@@ -2011,16 +2114,51 @@ export default {
     async getTable() {
       try {
         const { content, total } = await tbShopTableGet({
+          ...this.tableQuery,
           shopId: localStorage.getItem("shopId"),
         });
         this.tableList = content.filter(
           (v) => v.status != "closed" && v.status != "cleaning"
         );
+        $originTableList=this.tableList
       } catch (error) {
         console.log(error);
       }
     },
-    changeTable(item) {
+    async changeTable(item) {
+      console.log(this.table);
+      if (this.table || this.order.list.length <= 0) {
+        this.table = item;
+        this.tableShow = false;
+        return;
+      }
+      if (item.status != "idle") {
+        return this.$message.error("该台桌已在使用中");
+      }
+      const res = await $returnTableDetail({
+        tableId: item.tableId,
+      });
+      let res1 = null;
+      if (res.cartCount > 0) {
+        try {
+          res1 = await this.$confirm(
+            "该台桌购物车里有商品，是否清除该台桌里的商品?",
+            "提示",
+            {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }
+          );
+        } catch (e) {
+          console.log(e);
+        }
+      }
+      await $choseTable({
+        masterId: this.masterId,
+        tableId: item.tableId,
+        isClear: res1 == "confirm" ? true : false,
+      });
       this.table = item;
       this.tableShow = false;
     },
@@ -2036,9 +2174,8 @@ export default {
       }
       this.pays();
     },
-    payTypeItemClick(item) {
+    payTypeItemClick(item, order) {
-      console.log(item);
+      order = order ? order : this.createOrder.data;
-      console.log(this.vipUser.id);
       if (item.payType == "vipPay") {
         return this.refChooseUserOpen();
       }
@@ -2048,7 +2185,10 @@ export default {
       }
       if (item.payType == "scanCode") {
         //扫码支付
-        return this.refToggle("refWxScanCode", true,this.createOrder.data);
+        return this.refToggle("refWxScanCode", true, {
+          orderId: order.id,
+          payAmount: (this.createOrder.data.amount * order.discount).toFixed(2),
+        });
       }
     },
     ChangeDiscount(discount) {
@@ -2182,7 +2322,12 @@ export default {
         return this.refChooseUserOpen();
       }
       if (this.order.payType == "scanCode") {
-        return this.refToggle("refWxScanCode", true,this.createOrder.data);
+        return this.refToggle("refWxScanCode", true, {
+          orderId: this.createOrder.data.id,
+          payAmount: (
+            this.createOrder.data.amount * this.createOrder.discount
+          ).toFixed(2),
+        });
       }
       if (this.order.payType == "deposit") {
         return this.refToggle("refScanCode", true);
@@ -2250,7 +2395,7 @@ export default {
         if (!canXiadan) {
           return;
         }
-      }else{
+      } else {
         //去结算
         const canJiesuan = await this.shoukuanClick();
         if (!canJiesuan) {
@@ -2273,14 +2418,15 @@ export default {
       console.log(this.order.orderId);
       let res = "";
       try {
+        if (!this.shopInfo.isTableFee) {
           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,
@@ -2316,23 +2462,15 @@ export default {
     },
 
     // 获取取餐号
-    getMasterId() {
+    async getMasterId() {
-      // if(!this.table.tableId){
+      const res = await $getMasterId({
-      //   return this.$message.error("请选择桌台");
-      // }
-      if (this.table.tableId) {
-        return $getMasterId({
         tableId: this.table.tableId,
         orderId: this.table.orderId,
         vipUserId: this.vipUser.id,
         useType: this.useTypes.sel == "takeout" ? "takeout" : "",
       });
-      } else {
+      this.masterId = res.masterId;
-        // return $getMasterId({
+      return res;
-        //   useType:'takeout',
-        //   vipUserId: this.vipUser.id,
-        // });
-      }
     },
     onSelGoodsSkuClose() {
       this.selGoods.isEdit = false;
@@ -2885,7 +3023,7 @@ export default {
               .filter((v) => v.specSnap.match(i))
               .every((v) => {
                 // return isCanBuy(v,this.selGoods.data.isStock)
-                return !isCanBuy(v, true);
+                return !isCanBuy(v, this.selGoods.data);
               });
           }
         }
@@ -3008,7 +3146,7 @@ export default {
         return prve;
       }, {});
       const canBudyGoods = this.selGoods.data.specList
-        .filter((v) => isCanBuy(v, true))
+        .filter((v) => isCanBuy(v, this.selGoods.data))
         .sort((a, b) => {
           const aNumber = a.specSnap.split(",").reduce((prve, cur) => {
             return prve + skuMapNumber[cur];
@@ -3022,6 +3160,7 @@ export default {
     },
     //设置商品默认选中,规格禁止以及选中
     setSkugoodsDefaultInit() {
+      this.skuGoods.data = undefined;
       const skuList = this.selGoods.skuList;
       const goodsListMap = this.selGoods.skuMap;
       const skuGoods = this.findGoods(skuList, goodsListMap);
@@ -3057,9 +3196,9 @@ export default {
     },
     //根据右侧商品单规格多规格做不同处理
     async goodsClick(item) {
-      if (!this.table) {
+      // if (!this.table) {
-        return this.$message.error("暂不支持无桌台下单，请先选择桌台");
+      //   return this.$message.error("暂不支持无桌台下单，请先选择桌台");
-      }
+      // }
       if (item.typeEnum === "sku") {
         this.selGoods.data = item;
         this.selGoods.skuMap = {};
@@ -3110,6 +3249,10 @@ export default {
       }
     },
     async getGoods() {
+      if (this.goods.status == "end") {
+        return;
+      }
+      this.goods.status = "loadmore";
       const res = await getGoodsLists(this.goods.query);
       let $goodsMap = {};
       const goods = res.records.filter((v) => {
@@ -3125,8 +3268,11 @@ export default {
         });
         return isShow;
       });
-      console.log($goodsMap);
+      for (let i in goods) {
-      this.goods.list = goods;
+        this.goods.list.push(goods[i]);
+      }
+      this.goods.status =
+        this.goods.list.length >= res.total ? "end" : "loadmore";
       this.goods.total = res.total;
       this.$goodsData = goods;
     },
@@ -3182,7 +3328,7 @@ export default {
     },
     close() {
       if (this.table.tableId) {
-        this.$router.replace({ path: "/table/table_list" });
+        this.$router.replace({ path: "/tool/table_list" });
       } else {
         this.$router.go(0);
         // this.reset();
@@ -3976,11 +4122,12 @@ input[type="number"]::-webkit-outer-spin-button {
     .goods-list {
       display: flex;
       flex-wrap: wrap;
-
+      min-height: 10px;
       .goods-item {
         position: relative;
         cursor: pointer;
-        min-width: 98px;
+        // min-width: 98px;
+        min-width: 100px;
         max-width: 100px;
         height: 100px;
         // flex: 1;
@@ -4448,6 +4595,11 @@ input[type="number"]::-webkit-outer-spin-button {
 ::v-deep .cashier_left .el-form-item__label {
   text-align: left;
 }
+::v-deep .goods .el-image {
+  display: flex;
+  width: 100%;
+  justify-content: center;
+}
 .cashier_left .detail_box .usercard .info .nickname .vip_level {
   font-size: 12px;
   padding: 0 5px;

src/views/tool/Instead/util.js

@@ -1,6 +1,17 @@
 //判断商品是否可以下单
-export function isCanBuy(goods,isStock) {
+export function isCanBuy(skuGoods,goods) {
-    return goods.isGrounding && goods.isPauseSale == 0 && (isStock?goods.stockNumber > 0:true) ;
+    if(goods.typeEnum=='normal'){
+        //单规格
+        return goods.isGrounding&&goods.isPauseSale==0&&(goods.isStock?goods.stockNumber>0:true);
+    }else{
+        //多规格
+        return  goods.isGrounding&&goods.isPauseSale==0&&skuGoods.isGrounding&&skuGoods.isPauseSale==0&&(goods.isStock?goods.stockNumber>0:true);
+
+    }
+}
+//字符匹配
+export function $strMatch(matchStr,str){
+    return matchStr.toLowerCase().includes(str.toLowerCase())
 }
 
 // 一个数组是否包含另外一个数组全部元素
@@ -15,6 +26,8 @@ export function arrayContainsAll(arr1, arr2) {
 
 //n项 n-1项组合，生成全部结果
 export function generateCombinations(arr, k) {
+    console.log(arr)
+    console.log(k)
     let result = [];
 
     function helper(index, current) {