收银端逻辑优化

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -619,9 +619,10 @@ let vm = new Vue({
         afterScore: 0,
         // 会员openid
         openId: '',
-        // 是否点击了加号或减号的标识
+        // 是否点击了加号或减号和操作新扫描商品的标识
         clickFlag: false,
-        deleteFlag: false
+        // 是否点击了计算活动价格
+        calActivityFlag: false
     },
     watch: {
         prodBarcode (){
@@ -672,6 +673,8 @@ let vm = new Vue({
         },
         searchQuery: function (prodBarcode){
             vm.prodBarcode = prodBarcode;
+            vm.clickFlag = true;
+            vm.calActivityFlag = false;
             vm.query();
         },
         queryOrderStatus:function(){
@@ -791,6 +794,7 @@ let vm = new Vue({
                 }
             }
             vm.clickFlag = true;
+            vm.calActivityFlag = false;
         },
         minus:function(value){
             // 减少数量
@@ -830,13 +834,14 @@ let vm = new Vue({
                 }
             }
             vm.clickFlag = true;
+            vm.calActivityFlag = false;
 
         },
         selectItem:function(value) {
             console.log(value);
         },
         deleteItem:function(value){
-            vm.deleteFlag = true;
+            vm.calActivityFlag = false;
             vm.clickFlag = true;
             // 删除这条记录
             for(var i = 0 ; i < this.goodsList.length ; i++){
@@ -848,6 +853,9 @@ let vm = new Vue({
                     if(vm.mz.get(this.goodsList[i].prodBarcode)){
                         vm.mz.get(this.goodsList[i].prodBarcode).useMz = false ;
                     }
+                    // 同时删除
+                    this.calGoodsList.splice(i,1);
+
                     if(vm.brandGetOneFree.get(this.goodsList[i].brand)){
                         var giftBarcode = vm.brandGetOneFree.get(this.goodsList[i].brand).giftBarcode;
                         var muilty = vm.brandGetOneFree.get(this.goodsList[i].brand).buyNum;
@@ -897,6 +905,7 @@ let vm = new Vue({
                 }
             }
             this.index = value;
+            vm.deductionScore = '';
 
         },
         clearGoodsList:function(){
@@ -934,6 +943,8 @@ let vm = new Vue({
             vm.levelName = '';
             vm.deductionScore = '';
             vm.memberCurrentAvailableScore = '';
+            vm.clickFlag = true;
+            vm.calActivityFlag = false;
             vm.customClearData();
         },
         toResumePending:function(){
@@ -944,6 +955,8 @@ let vm = new Vue({
             vm.levelName = '';
             vm.deductionScore = '';
             vm.memberCurrentAvailableScore = '';
+            vm.clickFlag = true;
+            vm.calActivityFlag = false;
             $('#pendignOrderModal').modal('show');
         },
         resumePending:function(key){
@@ -964,6 +977,9 @@ let vm = new Vue({
             vm.actualPrice = pendingObject.actualPrice;
             // 清除恢复的数据
             vm.pendingOrderMap.delete(key);
+
+            vm.clickFlag = true;
+            vm.calActivityFlag = false;
             removeByValue(vm.pendingOrderKeys,key);
             $('#pendignOrderModal').modal('hide')
         },
@@ -975,12 +991,10 @@ let vm = new Vue({
             }
 
             console.log("vm.clickFlag==>" + vm.clickFlag);
-            if (vm.clickFlag) {
-                let value = vm.$refs.couponBarCode.value;
-                if (value != null || value != "" || value != 'undefined' || vm.deleteFlag) {
-                    alert("请重新计算优惠价再提交订单！");
-                    return;
-                }
+            if (vm.clickFlag && !vm.calActivityFlag) {
+                // 提示点击
+                alert("请先计算活动优惠价！");
+                return;
             }
             $('#myModal').modal('show')
             // 每次点击提交订单的时候清空姓名和身份证信息和手机号
@@ -1002,6 +1016,11 @@ let vm = new Vue({
                 alert("请选择商品");
                 return;
             }
+            if (this.goodsList.length == 0) {
+                alert("请选择商品");
+                return;
+            }
+            vm.calActivityFlag = true;
 
             vm.clickFlag = false;
             $("#calculateOrderPriceDialog").modal('show');
@@ -2076,6 +2095,7 @@ function toPayOrder(payCode){
                     vm.levelName = '';
                     vm.deductionScore = '';
                     vm.memberCurrentAvailableScore = '';
+                    vm.clickFlag = false;
                     vm.customClearData();
 
                 }else{