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

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

@@ -6,7 +6,7 @@
   >
     <div class="absolute status-box">
       <span class="pack" v-if="item.isPack === 'true'"> 包 </span>
-      <span class="da" v-if="item.isPrint"> 打 </span>
+      <span class="da" v-if="item.isPrint||item.isPrint===null"> 打 </span>
       <span class="isWaitCall" v-if="item.isWaitCall">等 </span>
       <span class="tui" v-if="item.status === 'return'"> 退 </span>
     </div>
@@ -35,6 +35,9 @@
             >赠</span
           >
         </div>
+        <div v-if="item.typeEnum=='weight'" class="specSnap">
+          ￥{{ currentPrice}}/{{ item.unit }}
+        </div>
         <div v-if="item.specSnap" class="specSnap">
           {{ item.specSnap }}
         </div>
@@ -164,6 +167,12 @@ export default {
     };
   },
   computed: {
+    currentPrice(){
+      if(!this.isShowVipPrice){
+        return this.item.salePrice
+      }
+      return this.memberPrice?this.memberPrice:this.item.salePrice
+    },
     discountNewPrice(){
       const item = this.item;
       const originPrice=this.isShowVipPrice?this.vipAllPrice:this.allPrice
@@ -317,6 +326,7 @@ export default {
   .pack {
     background: #35ac6a;
   }
+
   .da {
     background: #35ac6a;
   }

src/views/tool/Instead/index.vue

@@ -1833,7 +1833,8 @@ export default {
       if (this.order.selIndex < 0) {
         return "免厨打";
       }
-      return this.order.list[this.order.selIndex].isPrint 
+      const cart=this.order.list[this.order.selIndex]
+      return (cart.isPrint||cart.isPrint===null) 
         ? "免厨打"
         : "打印";
     },
@@ -2312,23 +2313,20 @@ export default {
       const oldGoods = this.order.old.list.find((v) => {
         return v.productId === productId && v.skuId === skuId;
       });
+      const newNum=this.order.number + (oldGoods ? oldGoods.number : 0)
       $updateCart({
         cartId: item.id,
         productId,
         skuId,
         tableId: this.table.tableId,
-        num: this.order.number + (oldGoods ? oldGoods.number : 0), // 0会删除此商品
+        num:newNum.toFixed(2) , // 0会删除此商品
       }).then((res) => {
         this.$set(this.order.list, this.order.selIndex, {
           ...res,
           specSnap: item.specSnap || res.skuName,
-          number: this.order.number,
         });
       });
       return;
-      this.updateOrder({
-        num: newval, // 0会删除此商品
-      });
     }, 30),
     "goods.query.productId": function (newval) {
       if (!this.$goodsData) {
@@ -2581,9 +2579,9 @@ export default {
       });
     },
     async returnCreateOrderData() {
+      this.isWaitCall=false;
       if (this.key == "isJieZhang" || this.order.list.length <= 0) {
         //结账来的下单或者已经生成订单
-        // this.order.old.list = formatOrderGoodsList(this.createOrder.data.detailList||[]);
         this.isCreateOrder = true;
         return this.createOrder.data;
       }
@@ -3373,7 +3371,7 @@ export default {
         return this.removeCart();
       }
       if (key === "print") {
-        const isPrint = orderGoods.isPrint;
+        const isPrint = (orderGoods.isPrint||orderGoods.isPrint===null)?true:false;
         this.updateOrder({ isPrint: !isPrint });
         return;
       }
@@ -3902,6 +3900,7 @@ export default {
     },
     reset() {
       // this.goods.list = [];
+      this.isAllWaitCall=false;
       this.guazhangRen = "";
       this.order.status = "";
       this.loading = false;