称重

src/pages/manage/cashier/index.vue

@@ -313,15 +313,28 @@
                                 <div class="tool">
                                     <span
                                         class="remove-num"
+                                        v-if="!item.isWeightGood"
                                         @click="selectRemove(item)"
                                     ></span>
-                                    <span class="num-input">{{
-                                        item.select_num
-                                    }}</span>
+                                    <span
+                                        class="num-input"
+                                        :class="{ isWeight: item.isWeightGood }"
+                                        >{{ item.select_num }}
+                                        {{
+                                            item.isWeightGood ? "(kg)" : ""
+                                        }}</span
+                                    >
                                     <span
                                         class="add-num"
+                                        v-if="!item.isWeightGood"
                                         @click="selectAdd(item)"
                                     ></span>
+                                    <!-- 称重删除 -->
+                                     <span
+                                        v-if="item.isWeightGood"
+                                        class="remove-num"
+                                        @click="weightRemove(item)"
+                                    ></span>
                                 </div>
                             </div>
                         </li>
@@ -569,10 +582,13 @@ export default {
                 pageIndex: self.page,
                 pageSize: 20,
                 type: self.subCategoryId || self.categoryId,
-                status: this.typeStatus,
+                // status: this.typeStatus,
                 keyword: this.searchVal || "",
-                weighingGoods:this.viewWeighGood?1:0,   // ，0-非称重商品，1-称重商品
+                weighingGoods: this.viewWeighGood ? 1 : 0, // ，0-非称重商品，1-称重商品
             };
+            if (this.viewWeighGood) {
+                sendData.status = 0;
+            }
 
             uni.showLoading({
                 title: "加载中...",
@@ -605,8 +621,12 @@ export default {
                 pageIndex: self.page,
                 pageSize: 20,
                 type: self.subCategoryId || self.categoryId,
-                status: this.typeStatus,
+                // status: this.typeStatus,
+                weighingGoods: this.viewWeighGood ? 1 : 0, // ，0-非称重商品，1-称重商品
             };
+            if (this.viewWeighGood) {
+                sendData.status = 0;
+            }
             self.api.get("/Product/GetSlimList", sendData).then((res) => {
                 if (res.data.data.length) {
                     self.page++;
@@ -692,26 +712,8 @@ export default {
                     uni.hideLoading();
                     if (goodRes.success) {
                         let goodDetail = goodRes.data;
-                        self.$refs.weigh.open(goodDetail, (res, type) => {
-                            // if (type === "add") {
-                            //     this.selectList.push(res);
-                            // } else {
-                            //     let arr = [];
-                            //     for (let item of this.selectList) {
-                            //         if (
-                            //             item.id === res.id &&
-                            //             item._sku.skuId === res._sku.skuId
-                            //         ) {
-                            //             if (res.select_num !== 0) {
-                            //                 item.select_num = res.select_num;
-                            //                 arr.push(item);
-                            //             }
-                            //         } else {
-                            //             arr.push(item);
-                            //         }
-                            //     }
-                            //     this.selectList = arr;
-                            // }
+                        self.$refs.weigh.open(goodDetail, (res) => {
+                            this.selectList.push(res);
                         });
                     } else {
                         self.fn.showModal({
@@ -761,6 +763,18 @@ export default {
             this.selectList = arr;
         },
 
+        weightRemove(val){
+            let arr = [];
+            for (let item of this.selectList) {
+                if (val.id === item.id) {
+                   
+                } else {
+                    arr.push(item);
+                }
+            }
+            this.selectList = arr;
+        },
+
         selectAdd(val) {
             let arr = [];
             for (let item of this.selectList) {
@@ -1190,6 +1204,9 @@ page {
                 width: px(140);
                 font-size: px(40);
                 text-align: center;
+                &.isWeight {
+                    width: px(240);
+                }
             }
         }
         .remove-num,

src/pages/manage/cashier/settlement.vue

@@ -431,7 +431,7 @@ export default {
                     productId: item.id,
                     // skuId:item.id,
                     skuId: item._sku ? item._sku.skuId : "",
-                    count: item.select_num,
+                    count: item.isWeightGood?parseInt(item.select_num*1000):item.select_num,
                     remark: "",
                 });
             }

src/pages/manage/cashier/weighModal.vue

@@ -13,11 +13,11 @@
                 </li>
                 <li class="g-list__item">
                     <div class="g-list__title">重量:</div>
-                    <div class="g-list__value">{{ weighData.weight }}g</div>
+                    <div class="g-list__value">{{ weighData.weight }}kg</div>
                 </li>
                 <li class="g-list__item">
                     <div class="g-list__title">总价:</div>
-                    <div class="g-list__value">{{ weighData.amt }}g</div>
+                    <div class="g-list__value">{{ weighData.amt }}元</div>
                 </li>
                 <!-- <li style="text-align: right;">
                     <span class="refresh" @click="getData">刷新重量</span>
@@ -66,6 +66,7 @@ export default {
             self.show = true;
             self.good = good;
             self.callBack = callBack;
+            this.weighData.price = good.baseInfo.price / 100;
             this.getData();
         },
 
@@ -80,28 +81,16 @@ export default {
         addCart() {
             const self = this;
 
-            if (this.weighData.weight && this.weighData.price) {
+            if (!this.weighData.weight && !this.weighData.amt) {
                 self.fn.showToast("没有称重数据");
             } else {
-                // this.callBack(
-                //     {
-                //         ...this.good.baseInfo,
-                //         _sku: this.cartSku,
-                //         name:
-                //             this.good.baseInfo.name +
-                //             "(" +
-                //             this.cartSku.key +
-                //             ")",
-                //         select_num: 1,
-                //     },
-                //     "add"
-                // );
-                // for (let item of self.good.skuInfo.skus) {
-                //     if (item.skuId === this.cartSku.skuId) {
-                //         item.select_num = 1;
-                //         this.cartSku = item;
-                //     }
-                // }
+                this.callBack({
+                    ...this.good.baseInfo,
+                    name: this.good.baseInfo.name,
+                    select_num: this.weighData.weight,
+                    isWeightGood: true,
+                });
+                this.close();
                 this.$forceUpdate();
             }
         },
@@ -113,8 +102,8 @@ export default {
             });
             setInterval(() => {
                 this.getWeight();
-                this.getPrice();
-                this.getAmt();
+                // this.getPrice();
+                // this.getAmt();
             }, 300);
         },
 
@@ -126,7 +115,15 @@ export default {
             if (!ret) {
                 this.fn.showToast("获取weight错误");
             }
+            // let ret = { code: "1.340" };
             this.weighData.weight = ret.code;
+
+            let num = Number(ret.code);
+            if (num) {
+                let amt = num * this.weighData.price;
+                amt = amt.toFixed(2);
+                this.weighData.amt = Number(amt);
+            }
         },
         getPrice() {
             var ret = testModule.getPrice({