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

src/views/table/components/addTable.vue

@@ -6,6 +6,11 @@
                     <el-option :label="item.name" :value="item.id" v-for="item in areaList" :key="item.id"></el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item label="台桌状态" prop="status" v-if="form.id">
+                <el-select v-model="form.status" placeholder="请选择台桌状态">
+                    <el-option :label="item.name" :value="item.value" v-for="item in status" :key="item.value"></el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item label="台桌名称">
                 <el-input v-model="form.name" placeholder="请输入台桌名称"></el-input>
             </el-form-item>
@@ -43,6 +48,16 @@ export default {
             dialogVisible: false,
             resetForm: '',
             loading: false,
+            status:[
+                {value:'pending',name:'挂单中'},
+                {value:'using',name:'开台中'},
+                {value:'paying',name:'结算中'},
+                {value:'idle',name:'空闲'},
+                {value:'subscribe',name:'预定'},
+                {value:'closed',name:'关台'},
+                {value:'opening ',name:'开台中'},
+                {value:'cleaning ',name:'台桌清理中'},
+            ],
             form: {
                 id: '',
                 name: '',

src/views/table/components/table-diancan.vue

@@ -311,6 +311,8 @@
                           <el-input
                             :min="0"
                             type="number"
+                            @input="cartGoodsNumberInput($event,item)"
+                            @change="cartGoodsNumberChange($event,item)"
                             v-model="item.number"
                             placeholder="0"
                           ></el-input>
@@ -1248,7 +1250,7 @@ export default {
     },
     allNumber() {
       return this.order.list.reduce((a, b) => {
-        return a + b.number;
+        return a + b.number*1;
       }, 0);
     },
     selGoodsHide() {
@@ -1420,6 +1422,30 @@ export default {
     // this.getCategory();
   },
   methods: {
+    //购物车商品输入框数量输入
+    cartGoodsNumberInput(newval,item){
+      if(newval<=0){
+        return this.order.cacheNumber=1
+      }
+      newval=`${newval}`.split('.')[0]*1
+      this.order.cacheNumber=newval
+      this.$nextTick(()=>{
+        item.number=newval
+      })
+    },
+    //购物车商品输入框数量改变
+    cartGoodsNumberChange(newval,item){
+      console.log(newval)
+      if(newval<=0){
+        item.number=1
+       return this.order.number=1
+      }
+      newval=`${newval}`.split('.')[0]*1
+      console.log(newval)
+      this.order.cacheNumber=newval
+      this.order.number=newval
+     
+    },
     //判读单规格商品是否售尽
     isSellOut(item) {
       return (
@@ -2358,16 +2384,16 @@ export default {
     },
     async getGoods() {
       const res = await getGoodsLists(this.goods.query);
-      console.log(res);
-      this.goods.list = res.records.filter((v) => {
+      const goods= res.records.filter((v) => {
         let isShow = true;
         if (v.typeEnum !== "sku") {
           isShow = v.specList.length >= 1;
         }
         return isShow;
       });
+      this.goods.list =goods
       this.goods.total = res.total;
-      this.$goodsData = res;
+      this.$goodsData = goods;
     },
     async open(item) {
       this.table = item;