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

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

@@ -187,7 +187,6 @@ export default {
     isActive() {
       const isSel =
         this.selIndex === this.index && this.placeNum === this.selPlaceNum;
-      console.log(isSel);
       return isSel ? "active" : "";
     },
   },

src/views/tool/Instead/components/dialogpackage.vue

@@ -65,7 +65,6 @@ export default {
             this.$set(this.listdata.proGroupVo, index, { ...this.listdata.proGroupVo[index], alertshow: this.listdata.proGroupVo[index].number != this.multipleSelection[index].length ? true : false });
         },
         confirm() {
-            console.log(listdata.proGroupVo)
             this.$emit("dialogpackageconfirm", this.listdata, this.multipleSelection);
             this.show = false;
 
@@ -84,7 +83,6 @@ export default {
                 return false;
             }
             this.disabledshow = true
-            console.log(this.listdata, this.multipleSelection);
             this.show = true;
         },
     },

src/views/tool/Instead/components/keyboard.vue

@@ -7,7 +7,7 @@
         </slot>
       </div>
       <slot name="tips"></slot>
-      <div class="number_list_box">
+      <div class="number_list_box" v-if="!disabled">
         <div class="yd-keyboard">
           <div class="mini-number-box1">
             <div class="mini-number">
@@ -65,6 +65,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    disabled:{
+      type:Boolean,
+      default:false
+    },
     max: {
       type: [Number, String],
       default: Infinity,

src/views/tool/Instead/components/popup-choose-guazhang.vue

@@ -25,6 +25,7 @@
           v-model="number"
           isFloat
           @clear="clear"
+          :disabled="true"
           :max="payMoney"
           :maxTips="'超出未结账金额'"
         >
@@ -36,7 +37,7 @@
           >
             {{ tips }}
           </div>
-          <div slot="input" class="u-p-l-20 u-p-r-20 u-flex w-full">
+          <div slot="input" class="u-p-l-20 u-p-r-20 u-flex w-full u-relative">
             <div class="font-bold u-font-32">¥</div>
             <el-input
               placeholder="请输入挂账金额"
@@ -48,6 +49,7 @@
               :type="focus ? 'number' : 'text'"
             >
             </el-input>
+            <div class="zhezhao"></div>
           </div>
         </key-board>
         <div class="confirm_btns">
@@ -267,7 +269,14 @@ export default {
   font-size: 20px;
   position: relative;
 }
-
+.zhezhao{
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 1;
+}
 .select_desk .select_desk_dialog .inputs .close {
   color: #aaa;
   position: absolute;

src/views/tool/Instead/components/transfertoPinpin.vue

@@ -10,7 +10,7 @@
                 <el-checkbox v-model="isFull">并桌</el-checkbox>
                 <el-select v-model="targetTableId" placeholder="请选择目标台桌">
                     <el-option v-for="item in originTableList" :key="item.tableId" :label="item.name"
-                        :value="item.tableId" @click="changeTable(item, index)">
+                        :value="item.tableId">
                     </el-option>
                 </el-select>
             </div>
@@ -78,7 +78,12 @@ export default {
         return {
             selectalllist: [],
             show: false,
-            itemdata: {},
+            itemdata: {
+                list: [],
+                old: {
+                    list: [],
+                }
+            },
             list: [],
             masterId: "",
             currentTableId: "",
@@ -110,7 +115,6 @@ export default {
             this.refcartSelection = val;
         },
         async confirm() {
-            console.log(this.itemdata, this.multipleSelection);
             if (!this.targetTableId) {
                 this.$message({
                     message: "请选择目标台桌！",
@@ -119,14 +123,14 @@ export default {
                 return false;
             }
             // 判断全选增加课桌费
-            var tzf = []
+            // var tzf = []
-            try {
+            // try {
-                let one = this.itemdata.old.list.every((i, index) => i.info.length == this.multipleSelection[index].length)
+            //     let one = this.itemdata.old.list.every((i, index) => i.info.length == this.multipleSelection[index].length)
-                let tow = this.itemdata.list.every((icon) => icon.length == this.refcartSelection.length)
+            //     let tow = this.itemdata.list.every((icon) => icon.length == this.refcartSelection.length)
-                if (one && tow) {
+            //     if (one && tow) {
-                    tzf = [999]
+            //         tzf = [999]
-                }
+            //     }
-            } catch (error) { }
+            // } catch (error) { }
             // 数据处理  增加cartId方便判断
             if (this.refcartSelection.length) {
                 this.refcartSelection.forEach((i) => {
@@ -134,11 +138,10 @@ export default {
                 });
             }
             let cartIds = [...this.multipleSelection, [...this.refcartSelection]];
-            console.log(cartIds)
             await placeswitch({
                 masterId: this.masterId,
                 orderId: this.itemdata.orderId, //当前台桌订单id 可选
-                cartIds: this.isFull ? "" : [...cartIds.flatMap((subArray) => subArray.map((item) => item.cartId)),...tzf] , //转单的购物车商品  并桌时可不传 可选
+                cartIds: this.isFull ? "" : cartIds.flatMap((subArray) => subArray.map((item) => item.cartId)), //转单的购物车商品  并桌时可不传 可选
                 isFull: this.isFull, //并台会将全部购物车商品转入，默认为false 可选
                 currentTableId: this.currentTableId,
                 targetTableId: this.targetTableId,
@@ -149,7 +152,7 @@ export default {
         },
         open(item, masterId, currentTableId, originTableList) {
             // 订单信息，取餐码，用餐类型,桌台号id，台桌列表
-            console.log(item, masterId, currentTableId, originTableList);
+            // console.log(item, masterId, currentTableId, originTableList);
             this.itemdata = item;
             this.masterId = masterId; //取餐码
             this.currentTableId = currentTableId; //当前桌台id
@@ -171,15 +174,6 @@ export default {
             const item = $status[key];
             return item ? item.type : "";
         },
-        changeTable(item, index) {
-            console.log(item, index);
-        },
-        searchInput(e) {
-            console.log(e);
-            // this.tableList = $originTableList.filter((v) =>
-            //     $strMatch(v.name, e.trim())
-            // );
-        },
     },
 };
 </script>