shish 1 anno fa
parent
commit
f65ed422de

+ 1 - 1
ghsApp/src/admin/breakage/index.vue

@@ -75,7 +75,7 @@
 		<modal-module :show="showSubmitModel" title="确认下一步?" color="#333" :size="32" padding="30upx 30upx" >
 		<modal-module :show="showSubmitModel" title="确认下一步?" color="#333" :size="32" padding="30upx 30upx" >
 		</modal-module>
 		</modal-module>
 
 
-		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmToSave" :selectJobType="selectJobType" ></FooterCart>
+		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmToSave" :displayTotalPrice="false"></FooterCart>
 
 
 		<uni-popup ref="globalClassImgRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
 		<uni-popup ref="globalClassImgRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
 			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
 			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">

+ 4 - 4
ghsApp/src/components/module/app-footer-cart.vue

@@ -5,10 +5,10 @@
 				<view class="cart-dot_bx">
 				<view class="cart-dot_bx">
 					<i class="iconfont icongouwuche"></i>
 					<i class="iconfont icongouwuche"></i>
 				</view>
 				</view>
-				<view class="price" v-if="!offPrice">
+				<view class="price">
 					<text v-if="count.bigLength>0">{{count.bigLength}}扎</text>
 					<text v-if="count.bigLength>0">{{count.bigLength}}扎</text>
 					<text v-if="count.smallLength>0">{{count.smallLength}}支</text>
 					<text v-if="count.smallLength>0">{{count.smallLength}}支</text>
-					<text v-if="selectJobType!='wastage'" style="margin-left:15upx;">¥{{ price }}</text>
+					<text v-if="displayTotalPrice==true" style="margin-left:15upx;">¥{{ price }}</text>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="cart-rg_bx" @click="confirmEvent"> 选好了 </view>
 			<view class="cart-rg_bx" @click="confirmEvent"> 选好了 </view>
@@ -23,9 +23,9 @@ export default {
 			type:String,
 			type:String,
 			default:''
 			default:''
 		},
 		},
-		offPrice:{
+		displayTotalPrice:{
 			type: Boolean,
 			type: Boolean,
-			default: false
+			default: true
 		},
 		},
 		price: {
 		price: {
 			type: Number,
 			type: Number,

+ 1 - 1
ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -89,7 +89,7 @@
 		<modal-module :show="showSubmitModel" @cancel="cancelEvent" @click="submitEvent" title="确认下一步?" color="#333" :size="32" padding="30upx 30upx" >
 		<modal-module :show="showSubmitModel" @cancel="cancelEvent" @click="submitEvent" title="确认下一步?" color="#333" :size="32" padding="30upx 30upx" >
 		</modal-module>
 		</modal-module>
 
 
-		<FooterCart :offPrice="true" :price="allPrice" :count="allCount" @confirm="confirmToSaveItem"></FooterCart>
+		<FooterCart :displayTotalPrice="false" :price="allPrice" :count="allCount" @confirm="confirmToSaveItem"></FooterCart>
 
 
 		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
 		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
 			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
 			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">

+ 1 - 1
ghsApp/src/pagesStorehouse/inventory/select2.vue

@@ -83,7 +83,7 @@
 		<modal-module :show="showSubmitModel" @cancel="cancelEvent" @click="submitEvent" title="确认下一步?" color="#333" :size="32" padding="30upx 30upx" >
 		<modal-module :show="showSubmitModel" @cancel="cancelEvent" @click="submitEvent" title="确认下一步?" color="#333" :size="32" padding="30upx 30upx" >
 		</modal-module>
 		</modal-module>
 
 
-		<FooterCart :offPrice="true" :price="allPrice" :count="allCount" @confirm="confirmToSaveItem"></FooterCart>
+		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmToSaveItem" :displayTotalPrice="false"></FooterCart>
 
 
 		<uni-popup ref="globalClassImgRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
 		<uni-popup ref="globalClassImgRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
 			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
 			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">