前端

config/index.js

@@ -4,14 +4,14 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.110.9:8099/',
 	// baseUrlNew: 'http://192.168.110.9:9888/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.67:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erpbusiness/add_quality_testing.vue

@@ -1744,6 +1744,7 @@
 						.then(res => {
 							console.log("InOutWarehouse")
 							this.gridList.warehouseInOutId = res.data.data
+							this.addQualityInspection(1)
 						})
 					return
 				}
@@ -1753,6 +1754,7 @@
 							console.log("InOutWarehouse")
 							if (this.isQY) {
 								if (!this.isZJ) {
+									this.gridList.brazer=1
 									this.gridList.statusFlag = 7
 								} else {
 									this.gridList.statusFlag = 0
@@ -1826,7 +1828,7 @@
 								}
 								that.gridList.inOutFlag = 2
 								that.inOutWarehouse(1)
-								that.addQualityInspection(1)
+								// that.addQualityInspection(1)
 							}
 						}
 					})
@@ -1947,6 +1949,7 @@
 						confirmText: '提交',
 						success: function(res) {
 							if (res.confirm) {
+								// 收购入库
 								if (that.typevalue == 3) {
 									uni.showLoading({
 										title: "加载中"
@@ -1959,7 +1962,7 @@
 								})
 								that.gridList.inOutFlag = 2
 								that.inOutWarehouse(1)
-								that.addQualityInspection(1)
+								
 							}
 
 						}

pages/fuelfilling/track_addition.vue

@@ -10,12 +10,12 @@
 				<view class="title">车牌号</view>
 				<view class="con-list">
 					
-					<!-- <input :disabled='titleBtn=="申请报销"' v-model='detailData.carNo' placeholder="请输入车牌号" maxlength="7"></input> -->
+					<input :disabled='titleBtn=="申请报销"' v-model='detailData.carNo' placeholder="请输入车牌号" maxlength="7"></input>
 				</view>
-				<picker :range="carNolist" range-key="carNo" @change='carnopicker($event)'
+				<!-- <picker :range="carNolist" range-key="carNo" @change='carnopicker($event)'
 					:disabled='titleBtn=="申请报销"' mode="selector">
 					<view >{{detailData.carNo?detailData.carNo:'请选择车牌号'}}</view>
-				</picker>
+				</picker> -->
 			</view>
 			<view @click='startTrack' class="button" v-if='titleBtn=="开始轨迹"'>{{titleBtn}}</view>
 			<view @click='endTrack' class="button1" v-if='titleBtn=="结束轨迹"'>{{titleBtn}}</view>
@@ -88,32 +88,32 @@
 		    uni.$off("page-popup-submit")
 		  },
 		onLoad(options) {
-			this.$api.doRequest('get', '/carInfo/selectCars', { currentPage:1,
-            pageSize:9999,
-            compId: uni.getStorageSync('pcUserInfo').compId,})
-				.then(res1 => {
-					if(res1.data.code==200){
-						this.carNolist=res1.data.data.records
-					}
-				})
-				.catch(res => {
-					uni.$u.toast(res.message);
-				});
+			// this.$api.doRequest('get', '/carInfo/selectCars', { currentPage:1,
+   //          pageSize:9999,
+   //          compId: uni.getStorageSync('pcUserInfo').compId,})
+			// 	.then(res1 => {
+			// 		if(res1.data.code==200){
+			// 			this.carNolist=res1.data.data.records
+			// 		}
+			// 	})
+			// 	.catch(res => {
+			// 		uni.$u.toast(res.message);
+			// 	});
 			this.id = options.id
 			that = this
 			
 		},
 		onShow() {
-			this.$api.doRequest('post', '/CarPostionController/api/getlocation', {currentPage:1,
-            pageSize:9999,compId: uni.getStorageSync('pcUserInfo').compId,})
-				.then(res1 => {
-					// if(res1.data.code==200){
-						console.log(res1,11111111)
-					// }
-				})
-				.catch(res => {
-					uni.$u.toast(res.message);
-				});
+			// this.$api.doRequest('post', '/CarPostionController/api/getlocation', {currentPage:1,
+   //          pageSize:9999,compId: uni.getStorageSync('pcUserInfo').compId,})
+			// 	.then(res1 => {
+			// 		// if(res1.data.code==200){
+			// 			console.log(res1,11111111)
+			// 		// }
+			// 	})
+			// 	.catch(res => {
+			// 		uni.$u.toast(res.message);
+			// 	});
 			var that = this
 			if (this.id) {
 				console.log(1111111)

pages/shortDistance/short_track_addition.vue

@@ -6,11 +6,11 @@
 			<view class="c-row">
 				<view class="title">车牌号</view>
 				<view class="con-list">
-					<!-- <input v-model='detailData.carNo' placeholder="请输入车牌号" maxlength="7"></input> -->
-				<picker :range="carNolist" range-key="carNo" @change='carnopicker($event)'
+					<input v-model='detailData.carNo' placeholder="请输入车牌号" maxlength="7"></input>
+				<!-- <picker :range="carNolist" range-key="carNo" @change='carnopicker($event)'
 					 mode="selector">
 					<view >{{detailData.carNo?detailData.carNo:'请选择车牌号'}}</view>
-				</picker>
+				</picker> -->
 				</view>
 			</view>
 			<view @click='startTrack' class="button" v-if='titleBtn=="开始轨迹"'>{{titleBtn}}</view>

pages/task/audit/refuel.vue

@@ -28,11 +28,14 @@
 			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="总金额(元)">
 				<u-input v-model="list.totalCost" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="上次申请时间">
+			<!-- <u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="上次申请时间">
 				<u-input v-model="list.createDate" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="本次申请时间">
 				<u-input v-model="list.createDate" input-align="right" placeholder="--" disabled />
+			</u-form-item> -->
+			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="申请时间">
+				<u-input v-model="list.createDate" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item v-if='list.strokeType==3' label-width='260' :borderBottom="false" label="仓库名">
 				<u-input v-model="list.warehouseName" input-align="right" placeholder="--" disabled />