11

pages/teamLeader/itineraryDetails.vue

@@ -143,12 +143,6 @@
 					<u-icon class="backIcon" name="arrow-left" size="32" color="#FFF"></u-icon>
 				</view>
 			</view>
-			<!-- <view @click="goback" :style="[titleStyle, { opacity: '100% !important' }]"
-                style="position: fixed; top: 0; right: 200rpx; padding-right: 6rpx">
-                <view class="backBox text-center">
-                    <img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638762515984923148.png" />
-                </view>
-            </view> -->
 			<view class="detailsType fz24">{{ dataList.teamType==0?'跟团游':dataList.teamType==1?'小包团':'一日游' }}</view>
 		</view>
 		<view class="itiner-title" :style="[titleStyle]">
@@ -655,6 +649,7 @@
 						this.priceList = res.data.priceList
 						this.formatDay()
 					}
+					uni.hideLoading();
 				}, (failed) => {
 					uni.hideLoading()
 					uni.showToast({

pages/teamLeader/reimbursementInfor.vue

@@ -341,30 +341,38 @@
 			VerificationBusList() {
 				let msg = ''
 				for (let i = 0; i < this.params.BusList.length; i++) {
-					let obj = this.params.BusList[i]
+					let obj = this.params.BusList[i];
+					console.log("bus_obj", obj);
 					for (let j = 0; j < obj.ReimburseList.ReimburseDetailsList.length; j++) {
-						let child = obj.ReimburseList.ReimburseDetailsList[j]
+						let child = obj.ReimburseList.ReimburseDetailsList[j];
+						if (!this.$utils.checkIsNum(child.UserNum)) {
+							child.UserNum = 0;
+						}
+						if (!this.$utils.checkIsNum(child.UnitPrice)) {
+							child.UnitPrice = 0;
+						}
+
 						if (msg == '' &&
 							(obj.ReimburseList.CurrencyId == 0 || obj.ReimburseList.CurrencyId == null) &&
 							(obj.ReimburseList.SettlementType > 0 || obj.ReimburseList.Remarks != '' ||
 								obj.ReimburseList.VoucherPicList.length > 0 || child.StartPlace != '' ||
 								child.EndPlace != '' || child.UserNum > 0 || child.UnitPrice > 0 || child.UserType)
 						) {
-							msg = `请选择车辆币种`
+							msg = `请选择[` + obj.UseTime + `]车辆币种`;
 						}
 						if (msg == '' && child.StartPlace == '' &&
 							(obj.ReimburseList.SettlementType > 0 || obj.ReimburseList.Remarks != '' ||
 								obj.ReimburseList.VoucherPicList.length > 0 || obj.ReimburseList.CurrencyId ||
 								child.EndPlace != '' || child.UserNum > 0 || child.UnitPrice > 0 || child.UserType)
 						) {
-							msg = `请输入车辆出发地`
+							msg = `请输入[` + obj.UseTime + `]车辆出发地`
 						}
 						if (msg == '' && child.EndPlace == '' &&
 							(obj.ReimburseList.SettlementType > 0 || obj.ReimburseList.Remarks != '' ||
 								obj.ReimburseList.VoucherPicList.length > 0 || child.StartPlace != '' ||
 								obj.ReimburseList.CurrencyId || child.UserNum > 0 || child.UnitPrice > 0 || child.UserType)
 						) {
-							msg = `请输入车辆目的地`
+							msg = `请输入[` + obj.UseTime + `]车辆目的地`
 						}
 					}
 				}

plugin/utils.js

@@ -274,6 +274,17 @@ function checkInteger(value, isMinus) {
 	return newValue;
 }
 
+//判断是否为整数,小数，支持负数
+function checkIsNum(str) {
+	var flag = false;
+	if (!str) {
+		str = '';
+	}
+	flag = /^-?(\d*.)?\d+$/.test(str);
+	console.log("checkIsNum", str + '_' + flag);
+	return flag;
+}
+
 export default {
 	calcContentHeight,
 	SystemInfo,
@@ -289,4 +300,5 @@ export default {
 	goZanYangUrl,
 	checkInteger,
 	checkPrice,
+	checkIsNum,
 }
\ No newline at end of file