文字

ghsApp/src/pagesGys/details.vue

@@ -54,7 +54,7 @@
 				</view>
 			</template>
 			<view class="btn-view">
-				<button :class="['admin-button-com', 'blue']" @click="batchEvent" >结算</button>
+				<button :class="['admin-button-com', 'blue']" @click="batchEvent" >结帐</button>
 			</view>
 		</view>
 	</view>
@@ -184,7 +184,7 @@ export default {
 			let self = this;
 				uni.showModal({
 					title: '提示',
-					content: '确定已结算？',
+					content: '确定已结帐？',
 					success: function (res) {
 						if (res.confirm) {
 							self.paySuccess(parameter)
@@ -196,7 +196,7 @@ export default {
 		// 支付成功
 		async paySuccess(parameter) {
 			await clearOrderApi(parameter);
-			this.pageTo({url:'/common/pageSuccess?title=结算成功', type: 2});
+			this.pageTo({url:'/common/pageSuccess?title=结帐成功', type: 2});
 		},
 		payFail() {
 		}

ghsApp/src/pagesPurchase/details.vue

@@ -85,7 +85,7 @@
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">总重量</view>
-						<view>{{(Number(selectAllRealityWeight) + Number(form.packWeight)).toFixed(2)}}</view>
+						<view>{{totalWeight}}</view>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">打包费</view>
@@ -208,7 +208,7 @@ export default {
 			showCustomer: false,
 			detailsInfo: {},
 			totalPrice:0,
-			modifyPrice:0,
+			modifyPrice:0
 		};
 	},
 	onLoad() {
@@ -250,11 +250,18 @@ export default {
 					}
 				}
 			}
-			return realityWeight.toFixed(2);
+			let calcWeight = realityWeight.toFixed(2);
+			return calcWeight
+		},
+		totalWeight(){
+			let totalWeight = this.selectAllRealityWeight
+			if(Number(this.form.packWeight) > 0){
+				totalWeight = (Number(this.form.packWeight) + Number(totalWeight)).toFixed(2)
+			}
+			return totalWeight
 		},
 		canIEdit() {
 			const { orderSn } = this.option || {};
-
 			if (!orderSn || this.detailsInfo.status == PURCHASE_ORDER_STATUS.CONFIRM) {
 				return true;
 			}
@@ -268,7 +275,21 @@ export default {
 		},
 		inputFn(e) {
 			let price = Number(this.selectAllPrice);
-			price = price + Number(this.form.packingCharge) + Number(this.form.shortCharge) + Number(this.form.longCharge) + Number(this.form.pickCharge) + Number(this.form.localCharge)
+			if(Number(this.form.packingCharge) > 0){
+				price	 = Number(price) + Number(this.form.packingCharge)
+			}
+			if(Number(this.form.shortCharge) > 0){
+				price	 = Number(price) + Number(this.form.shortCharge)
+			}
+			if(Number(this.form.longCharge) > 0){
+				price	 = Number(price) + Number(this.form.longCharge)
+			}
+			if(Number(this.form.pickCharge) > 0){
+				price	 = Number(price) + Number(this.form.pickCharge)
+			}
+			if(Number(this.form.localCharge) > 0){
+				price	 = Number(price) + Number(this.form.localCharge)
+			}
 			this.totalPrice = price.toFixed(2);
 			this.modifyPrice = price.toFixed(2);
 		},