增加收银挂单

releaselog.md

@@ -1,4 +1,8 @@
 
+# 0.4.2 (21.01.13 18:00) 
+### 增加收银挂单
+
+
 # 0.4.1 (21.01.09 18:00) 
 ### 收银修改
 

src/pages/manage/cashier/cache-detail.vue

@@ -3,40 +3,21 @@
         <div class="head">
             <section class="item">
                 <!-- <my-image class="img" src=""></my-image> -->
-                订单号： {{ data.tradeNo }}
-            </section>
-            <section class="item">
-                <!-- <my-image class="img" src=""></my-image> -->
-                状态： {{ data.status | statusFilter }}
-            </section>
-            <section class="item">
-                <!-- <my-image class="img" src=""></my-image> -->
-                备注：
-                {{ data.payRemark || "" }}
+                挂单号： {{ data.suspendNo }}
             </section>
             <my-image class="line-img" src="/static/icon/line.jpg"></my-image>
         </div>
         <div class="goods">
             <div class="good-head">
                 <div>
-                    {{ data.payTime }} 销售{{
-                        data.orderItems ? data.orderItems.length : 0
-                    }}件
+                    {{ data.orderItems ? data.orderItems.length : 0 }}件 商品
                 </div>
                 <!-- <div>{{ data.tradeNo }}</div> -->
             </div>
             <ul class="good-list">
-                <li
-                    class="item"
-                    v-for="item of data.orderItems"
-                    :key="item.id"
-                    :class="{ invalid: item.status === 9 }"
-                >
+                <li class="item" v-for="item of data.orderItems" :key="item.id">
                     <div class="name">{{ item.productName }}</div>
                     <div class="num">
-                        <span class="refund" v-if="item.status === 9"
-                            >已退货</span
-                        >
                         {{ item.count }}
                     </div>
                 </li>
@@ -49,90 +30,112 @@
             </section>
             <section class="item">
                 <div>商品总额</div>
-                <div>￥{{ data.amount | minuteToRmb2 }}</div>
-            </section>
-            <section class="item">
-                <div>折扣</div>
-                <div>
-                    -￥{{ (data.amount - data.payAmount) | minuteToRmb2 }}
-                </div>
-            </section>
-            <section class="item color">
-                <div>应付</div>
-                <div>￥{{ data.payAmount | minuteToRmb2 }}</div>
+                <div>￥{{ amount  }}</div>
             </section>
         </div>
 
-        <div class="tool">
-            <span class="btn" @click="">删除</span>
-            <span class="btn btn2" @click="">追加</span>
-            <span class="btn btn1" @click="">收银</span>
+        <div class="tool" v-if="data.orderItems">
+            <span class="btn" @click="remove">删除</span>
+            <!-- <span class="btn btn2" @click="">追加</span> -->
+            <span class="btn btn1" @click="submit">收银</span>
         </div>
     </div>
 </template>
 
 <script>
 import MyImage from "../../../components/image/index";
-let statusEnum = {
-    2: "待支付",
-    3: "待发货",
-    4: "待收货",
-    6: "已取消",
-    7: "售后中",
-    8: "已删除",
-    9: "已完成",
-    10: "已评价",
-    11: "已售后",
-    12: "已退款",
-    20: "待接单",
-    21: "拣货中",
-    22: "拣货完成",
-    23: "待配送",
-    24: "配送中",
-    25: "已送达",
-    26: "待提货",
-    27: "已提货",
-    31: "订单已推单",
-    32: "订单已被骑手接单",
-    33: "骑手已到店",
-    34: "骑手已取餐",
-    35: "订单完成",
-    36: "订单失败",
-};
 export default {
     name: "",
     components: { MyImage },
-    filters: {
-        statusFilter(v) {
-            return statusEnum[v] || "";
-        },
-    },
     // 数据
     data() {
         return {
+            suspendNo: "",
             pageIndex: 1,
             pageSize: 20,
             data: {},
+            removeLoading: false,
         };
     },
 
     onLoad(opts) {
-        this.orderNo = opts.orderNo;
+        this.suspendNo = opts.suspendNo;
     },
     async onShow() {
-        // this.getData(this.orderNo);
+        this.getData();
     },
     // 函数
     methods: {
         getData(orderNo) {
+            uni.showLoading({
+                title: "加载中...",
+                mask: true,
+            });
             this.api
-                .get("/Order/GetSettleDetail", {
-                    orderNo: orderNo,
+                .get("/Order/GetOrderSuspend", {
+                    suspendNo: this.suspendNo,
                 })
                 .then((res) => {
+                    uni.hideLoading();
                     this.data = res.data;
                 });
         },
+
+        submit() {
+            let list = [];
+            for (let item of this.data.orderItems) {
+                list.push({
+                    ...item,
+                    select_num: item.count,
+                });
+            }
+            this.$store.commit("common/update", {
+                cashierGoodList: list,
+            });
+            // this.selectList = [];
+            this.router.push("/pages/manage/cashier/settlement");
+        },
+
+        remove() {
+            if (this.removeLoading) {
+                return;
+            }
+            this.fn
+                .showModal({
+                    content: "是否确认删除?",
+                })
+                .then((res) => {
+                    if (res.confirm) {
+                        this.removeLoading = true;
+                        uni.showLoading({
+                            title: "提交中...",
+                            mask: true,
+                        });
+                        this.api
+                            .post(
+                                "/Order/RemoveOrderSuspend",
+                                {
+                                    suspendNo: this.suspendNo,
+                                    query: true,
+                                },
+                                { pass: true }
+                            )
+                            .then((res) => {
+                                this.removeLoading = false;
+                                uni.hideLoading();
+                                if (res.success) {
+                                    this.fn.showToast("删除成功");
+                                    this.router.back();
+                                } else {
+                                    this.fn.showModal({
+                                        content: res.message,
+                                        showCancel: false,
+                                    });
+                                }
+                            });
+                    }
+                });
+        },
     },
 
     // 数据计算
@@ -140,6 +143,17 @@ export default {
         user() {
             return this.$store.state.user.user;
         },
+
+        amount() {
+            let num = 0;
+            if (this.data.orderItems) {
+                for (let item of this.data.orderItems) {
+                    num += (item.price / 100) * item.count;
+                }
+                num = num.toFixed(2);
+            }
+            return num;
+        },
     },
 
     // 数据监听
@@ -242,12 +256,12 @@ export default {
         border: 1px solid #f1f1f1;
         margin-left: px(30);
     }
-    .btn1{
+    .btn1 {
         background-color: #ff1135;
         border-color: #ff1135;
         color: #fff;
     }
-    .btn2{
+    .btn2 {
         background-color: #a9998a;
         border-color: #a9998a;
         color: #fff;

src/pages/manage/cashier/cache.vue

@@ -18,10 +18,12 @@
         </div>
         <div class="page__content">
             <ul class="list">
-                <li class="item" @click="goDetail">100</li>
-                <li class="item">12</li>
-                <li class="item">130</li>
-                <li class="item">1550</li>
+                <li class="item" v-for="item of dataList" :key="item._id" @click="goDetail(item)">
+                    <div class="box">
+                        {{item.suspendNo}}
+                    </div>
+                </li>
+      
             </ul>
         </div>
     </div>
@@ -40,27 +42,26 @@ export default {
         return {
             searchVal: "",
             dataList: [],
-            pageIndex:1,
-            pageSize:20
+            pageIndex: 1,
+            pageSize: 20,
         };
     },
 
-    onLoad() {},
+    onLoad() {
+    },
 
-    async onShow() {},
+    async onShow() {
+        this.getList();},
 
     onPullDownRefresh() {
-
         this.getList();
-
     },
-    onReachBottom(){
+    onReachBottom() {
         this.getMoreList();
     },
 
     // 函数
     methods: {
-
         getList() {
             uni.showLoading({
                 title: "加载中...",
@@ -68,40 +69,44 @@ export default {
             });
             this.pageIndex = 1;
             this.dataEnd = false;
-            this.api
-                .get("/Order/GetSettleList", {
-                    pageIndex: this.pageIndex,
-                    pageSize: this.pageSize,
-                })
-                .then((res) => {
-                    uni.hideLoading();
-                    this.dataList = res.data.data;
-                });
+            let sendData = {
+                pageIndex: this.pageIndex,
+                pageSize: this.pageSize,
+            };
+            if (this.searchVal) {
+                sendData.suspendNo = this.searchVal;
+            }
+            this.api.get("/Order/GetOrderSuspendList", sendData).then((res) => {
+                uni.hideLoading();
+                this.dataList = res.data.data;
+            });
         },
         getMoreList() {
             if (this.dataEnd) {
                 return;
             }
             this.pageIndex++;
-            this.api
-                .get("/Order/GetSettleList", {
-                    pageIndex: this.pageIndex,
-                    pageSize: this.pageSize,
-                })
-                .then((res) => {
-                    if (res.data.data.length === 0) {
-                        this.dataEnd = true;
-                    } else {
-                        this.dataList = [...this.dataList, ...res.data.data];
-                    }
-                });
+            let sendData = {
+                pageIndex: this.pageIndex,
+                pageSize: this.pageSize,
+            };
+            if (this.searchVal) {
+                sendData.suspendNo = this.searchVal;
+            }
+            this.api.get("/Order/GetOrderSuspendList", sendData).then((res) => {
+                if (res.data.data.length === 0) {
+                    this.dataEnd = true;
+                } else {
+                    this.dataList = [...this.dataList, ...res.data.data];
+                }
+            });
         },
 
         goDetail(item) {
             this.router.push({
                 path: "/pages/manage/cashier/cache-detail",
                 query: {
-                    
+                    suspendNo:item.suspendNo
                 },
             });
         },
@@ -114,7 +119,7 @@ export default {
         },
         closeSearchVal() {
             this.searchVal = "";
-            this.getGoodsList();
+            this.getList();
         },
     },
 
@@ -167,17 +172,21 @@ export default {
 }
 .list {
     display: flex;
-    justify-content: space-between;
+    justify-content: flex-start;
     flex-wrap: wrap;
     padding: 0 px(35);
     margin-top: px(30);
     .item {
+        width: 33.333333%;
+        margin-top: px(30);
+    }
+    .box{
         width: px(300);
         height: px(100);
+        margin: 0 auto;;
         display: flex;
         align-items: center;
         justify-content: center;
-        margin-top: px(30);
         background-color: #fff;
         border-radius: px(8);
     }

src/pages/manage/cashier/index.vue

@@ -347,12 +347,22 @@
         <!-- 规格选择 -->
         <g-spec-modal ref="spec" @change="modalCartChange()"></g-spec-modal>
         <!-- 挂单 -->
-        <div class="cache-modal" v-if="cacheShow">
-            <div class="bg"></div>
+        <uni-popup ref="popupCache" type="dialog">
+            <uni-popup-dialog
+                mode="input"
+                :title="'牌号'"
+                :inputType="'number'"
+                :content="' '"
+                placeholder="请输入牌号"
+                @confirm="cacheConfirm"
+            ></uni-popup-dialog>
+        </uni-popup>
+        <!-- <div class="cache-modal" v-if="cacheShow">
+            <div class="bg" @click="cacheShow = false"></div>
             <div class="cache-body">
                 <div class="head">
                     <div class="tit">挂单</div>
-                    <div class="close">取消</div>
+                    <div class="close" @click="cacheShow = false">取消</div>
                 </div>
                 <div class="body">
                     <div class="item">
@@ -363,17 +373,10 @@
                             :maxlength="8"
                         />
                     </div>
-                    <div class="item">
-                        <input
-                            type="text"
-                            placeholder="备注"
-                            v-model="cacheForm.remarks"
-                        />
-                    </div>
                 </div>
                 <div class="cache-btn" @click="cacheSubmit">确定</div>
             </div>
-        </div>
+        </div> -->
     </div>
 </template>
 
@@ -433,12 +436,6 @@ export default {
             selectList: [],
             showSelectList: false,
 
-            // 挂单
-            cacheShow: false,
-            cacheForm: {
-                num: "",
-                remarks: "",
-            },
         };
     },
 
@@ -809,40 +806,56 @@ export default {
 
         // 挂单显示
         viewCache() {
-            this.cacheForm.num === "";
-            this.cacheForm.remarks === "";
-            this.cacheShow = true;
+            if(this.selectList.length === 0){
+                return  this.fn.showToast("请先选择商品");
+            }
+              this.$refs.popupCache.open({
+                type: "dialog",
+            });
         },
 
-        cacheSubmit() {
+        cacheConfirm(done,value) {
+
             this.cacheShow = false;
-            console.log(this.cacheForm,this.selectList);
-            // uni.showLoading({
-            //     title: "提交中...",
-            //     mask: true,
-            // });
-            // this.api
-            //     .post(
-            //         "/order/reverseSettle",
-            //         {
-            //             query: true,
-            //             id: this.data.id,
-            //         },
-            //         { pass: true }
-            //     )
-            //     .then((res) => {
-            //         this.btnLoading = false;
-            //         uni.hideLoading();
-            //         if (res.success) {
-            //             this.fn.showToast("挂单成功");
-            //             this.cacheShow = false;
-            //         } else {
-            //             this.fn.showModal({
-            //                 content: res.message,
-            //                 showCancel: false,
-            //             });
-            //         }
-            //     });
+            console.log(value)
+            if(!value){
+                return this.fn.showToast("请输入牌号");
+            }
+            uni.showLoading({
+                title: "提交中...",
+                mask: true,
+            });
+            let sendData = {
+                suspendNo: value,
+                orderItems: [],
+            }
+            for(let item of this.selectList){
+                sendData.orderItems.push({
+                     productId: item.id,
+                    skuId: item._sku ? item._sku.skuId : "",
+                    count: item.select_num,
+                })
+            }
+            this.api
+                .post(
+                    "/order/Suspend",
+                    sendData,
+                    { pass: true }
+                )
+                .then((res) => {
+                    this.btnLoading = false;
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.fn.showToast("挂单成功");
+                        this.selectList = [];
+                        done();
+                    } else {
+                        this.fn.showModal({
+                            content: res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
         },
 
         goCacheList(){

src/pages/manage/index.vue

@@ -62,7 +62,7 @@
 
         <button class="btn" @click="layout">退出登录</button>
 
-        <div class="ver">0.4.12</div>
+        <div class="ver">0.4.2</div>
     </div>
 </template>