单支的支持

ghsApp/src/admin/billing/affirm.vue

@@ -21,7 +21,13 @@
                   <view class="info-line">
                     <text class="item-type"></text>
                     <text class="item-count">
-                      <text>{{`${item.bigCount}`}}扎</text>
+                      <text v-if="item.bigCount > 0 || item.smallCount > 0">{{
+                        `${item.bigCount}`
+                      }}</text>
+                      <text v-if="item.smallCount > 0">/</text>
+                      <text v-if="item.smallCount > 0">{{
+                        `${item.smallCount}`
+                      }}</text>
                     </text>
                   </view>
                 </view>

ghsApp/src/admin/billing/index.vue

@@ -62,10 +62,11 @@
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"><text class="unit_price">库存 {{ customData.stock }}</text><text class="unit_price"> 单价 {{ customData.price }}</text>1扎={{customData.ratio}}支</view>
 					<view class="num_bx">
-						<input v-model="customData.bigCount" style="width: 495rpx" :focus="isFocus" type="number" />扎
+						<input v-model="customData.bigCount" :focus="isFocus" type="number" />扎
+						<input v-model="customData.smallCount" type="number" style="margin-left:24upx" />支
 					</view>
 					<view class="num_bx">
-						<input style="width: 495rpx" v-model="customData.userPrice" @focus="customData.userPrice = null" type="number" placeholder="单价" />
+						<input style="width: 495rpx" v-model="customData.userPrice" @focus="customData.userPrice = null" type="number" placeholder="每扎单价" />
 						<text>元</text>
 					</view>
 				</view>

ghsApp/src/mixins/product.js

@@ -62,6 +62,8 @@ export default {
 					if (itemInfo && !this.$util.isEmpty(itemInfo.bigPrice) && !this.$util.isEmpty(itemInfo.smallPrice)) {
 						if(item.userPrice>0){
 							price += Number(item.bigCount) * Number(itemInfo.userPrice);
+							let currentSmallPrice = (itemInfo.userPrice/itemInfo.ratio).toFixed(2)
+							price += Number(item.smallCount)*Number(currentSmallPrice)
 						}else{
 							price += item.bigCount * Number(itemInfo.bigPrice);
 							price += item.smallCount * Number(itemInfo.smallPrice);

hdApp/src/pagesPurchase/purDetails.vue

@@ -168,7 +168,7 @@
             <div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.prePrice }}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.discountAmount > 0">
-            <div class="tui-title">优惠减免</div>
+            <div class="tui-title">优惠</div>
             <div class="detail-price_box" style="font-size: 28rpx;">-¥{{ detailInfo.discountAmount}}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.refundPrice > 0">