shish 3 vuotta sitten
vanhempi
commit
8e576a8dad
2 muutettua tiedostoa jossa 42 lisäystä ja 2 poistoa
  1. 22 1
      ghsApp/src/admin/billing/affirm.vue
  2. 20 1
      ghsApp/src/pagesPurchase/details.vue

+ 22 - 1
ghsApp/src/admin/billing/affirm.vue

@@ -42,7 +42,11 @@
             <view class="summary-bar">
             <view class="summary-bar">
               <view class="operate-view" v-if="isScanEnv" @click="removeFromSave(option.customId)"> <text class="iconfont iconshanchu1"></text>清除花材 </view>
               <view class="operate-view" v-if="isScanEnv" @click="removeFromSave(option.customId)"> <text class="iconfont iconshanchu1"></text>清除花材 </view>
               <view class="operate-view" v-else @click="gobackEvent" style="font-size:33upx;font-weight:bold;"><text class="iconfont icongouwuche" style="margin-right:5upx;"></text>返回修改</view>
               <view class="operate-view" v-else @click="gobackEvent" style="font-size:33upx;font-weight:bold;"><text class="iconfont icongouwuche" style="margin-right:5upx;"></text>返回修改</view>
-              <view class="describe-view">共{{ selectList.length }}种,合计 ¥<text class="price">{{ allPrice }}</text></view>
+              <view class="describe-view">
+                共&nbsp;<text style="font-size:30upx;font-weight:bold;" v-if="Number(totalItemNum.big)>0">{{totalItemNum.big?parseFloat(totalItemNum.big):0}}扎</text>
+                <text style="font-size:30upx;font-weight:bold;" v-if="Number(totalItemNum.small)>0">{{totalItemNum.small?parseFloat(totalItemNum.small):0}}支</text>
+                ,{{ selectList.length }}种,合计 ¥<text class="price">{{ allPrice }}</text>
+              </view>
             </view>
             </view>
             <view class="summary-bar">
             <view class="summary-bar">
               <view class="operate-view" v-if="isScanEnv" @click="pageToItemList()"> <text class="iconfont iconzeng"></text>手动添加花材</view>
               <view class="operate-view" v-if="isScanEnv" @click="pageToItemList()"> <text class="iconfont iconzeng"></text>手动添加花材</view>
@@ -352,6 +356,23 @@ export default {
 	},
 	},
   computed: {
   computed: {
     ...mapGetters(["getMerchantInfo", "getLoginInfo"]),
     ...mapGetters(["getMerchantInfo", "getLoginInfo"]),
+    totalItemNum(){
+      let big = 0
+      let small = 0
+      if(!this.$util.isEmpty(this.selectList)){
+          for(const ele of this.selectList){
+            if(Number(ele.bigCount)>0){
+              big = Number(big)+Number(ele.bigCount)
+              big = big.toFixed(0)
+            }
+            if(Number(ele.smallCount)){
+              small = Number(small) + Number(ele.smallCount)
+              small = small.toFixed(0)
+            }
+          }
+      }
+      return {big:big,small:small}
+    },
     finalPrice(){
     finalPrice(){
       let totalPrice = this.allPrice.toFixed(2)
       let totalPrice = this.allPrice.toFixed(2)
       let finalPrice = Number(totalPrice)
       let finalPrice = Number(totalPrice)

+ 20 - 1
ghsApp/src/pagesPurchase/details.vue

@@ -30,7 +30,9 @@
 								<text class="iconfont icongouwuche"></text>返回修改
 								<text class="iconfont icongouwuche"></text>返回修改
 							</view>
 							</view>
 							<view class="describe-view">
 							<view class="describe-view">
-								共{{ selectList.length }}种,合计 ¥{{ selectAllPrice }}
+								共&nbsp;<text style="font-size:30upx;font-weight:bold;" v-if="Number(totalItemNum.big)>0">{{totalItemNum.big?parseFloat(totalItemNum.big):0}}扎</text>
+								<text style="font-size:30upx;font-weight:bold;" v-if="Number(totalItemNum.small)>0">{{totalItemNum.small?parseFloat(totalItemNum.small):0}}支</text>
+								,{{ selectList.length }}种,合计 ¥{{ selectAllPrice }}
 							</view>
 							</view>
 						</view>
 						</view>
 					</view>
 					</view>
@@ -192,6 +194,23 @@ export default {
 	computed: {
 	computed: {
 		...mapGetters(["getMerchantInfo", "getLoginInfo"]),
 		...mapGetters(["getMerchantInfo", "getLoginInfo"]),
 		...mapGetters({ myShopInfo: "getMyShopInfo" }),
 		...mapGetters({ myShopInfo: "getMyShopInfo" }),
+		totalItemNum(){
+			let big = 0
+			let small = 0
+			if(!this.$util.isEmpty(this.selectList)){
+				for(const ele of this.selectList){
+					if(Number(ele.bigCount)>0){
+						big = Number(big)+Number(ele.bigCount)
+						big = big.toFixed(0)
+					}
+					if(Number(ele.smallCount)){
+						small = Number(small) + Number(ele.smallCount)
+						small = small.toFixed(0)
+					}
+				}
+			}
+			return {big:big,small:small}
+		},
 		selectAllPrice(){
 		selectAllPrice(){
 			let price = 0;
 			let price = 0;
 			if (this.selectList) {
 			if (this.selectList) {