zhongtianhaoyuan 2 rokov pred
rodič
commit
c55d3b6802
2 zmenil súbory, kde vykonal 16 pridanie a 1 odobranie
  1. 1 1
      App.vue
  2. 15 0
      pages/order/signContract.vue

+ 1 - 1
App.vue

@@ -349,7 +349,7 @@
 								// console.log(this.$helper.gjList)
 								// console.log("条数", uni.getStorageSync('mapGJ').length)
 								if (uni.getStorageSync('mapGJ').length > 100) {
-									console.log(JSON.stringify(uni.getStorageSync('mapGJ')))
+									// console.log(JSON.stringify(uni.getStorageSync('mapGJ')))
 									this.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo', {
 											orderId: "cdae6ec34c2349768c490a9fefa03fb3",
 											longitudeLatitude: JSON.stringify(uni.getStorageSync(

+ 15 - 0
pages/order/signContract.vue

@@ -282,6 +282,7 @@
 			console.log(this.dataDetails)
 			if (this.dataDetails.hyCarrierInfo) {
 				this.dataDetails.weight = this.dataDetails.hyCarrierInfo.loadingWeight
+				this.dataDetails.grossWeight = this.dataDetails.hyCarrierInfo.loadingGrossWeight
 			}
 			if (this.dataDetails.freightAdvance == 1) {
 				this.proportion = this.dataDetails.driverAdvancePayment >= this.dataDetails.ownerAdvancePayment ? this
@@ -455,6 +456,13 @@
 						})
 						return
 					}
+					if (uni.$u.test.isEmpty(that.dataDetails.grossWeight)) {
+						that.$refs.uToast.show({
+							type: 'error',
+							message: "装车毛重不能为空!",
+						})
+						return
+					}
 					if (uni.$u.test.isEmpty(that.dataDetails.weight)) {
 						that.$refs.uToast.show({
 							type: 'error',
@@ -462,6 +470,13 @@
 						})
 						return
 					}
+					if(Number(that.dataDetails.weight) > Number(that.dataDetails.grossWeight)){
+						that.$refs.uToast.show({
+							type: 'error',
+							message: "装车净重大于装车毛重!",
+						})
+						return
+					}
 					if (uni.$u.test.isEmpty(that.dataDetails.freight)) {
 						that.$refs.uToast.show({
 							type: 'error',