前端

pages/fuelfilling/track_addition.vue

@@ -9,8 +9,13 @@
 			<view class="c-row">
 				<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)'
+					:disabled='titleBtn=="申请报销"' mode="selector">
+					<view >{{detailData.carNo?detailData.carNo:'请选择车牌号'}}</view>
+				</picker>
 			</view>
 			<view @click='startTrack' class="button" v-if='titleBtn=="开始轨迹"'>{{titleBtn}}</view>
 			<view @click='endTrack' class="button1" v-if='titleBtn=="结束轨迹"'>{{titleBtn}}</view>
@@ -35,6 +40,8 @@
 				}],
 				carNo:'',
 				show:false,
+				show4:false,
+				carNolist:[],
 				detailData: {
 					carNo: '',
 					travelStatus: '',
@@ -81,11 +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.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);
+				});
 			var that = this
 			if (this.id) {
 				console.log(1111111)
@@ -97,6 +125,9 @@
 			}
 		},
 		methods: {
+			carnopicker(e){
+				this.detailData.carNo=this.carNolist[e.target.value].carNo
+			},
 			getLngLat(type) {
 				this.checkOpenGPSServiceByAndroidIOS()
 				var that = this

pages/oa_office/the_oaOffice.vue

@@ -74,17 +74,17 @@
 						url: `/pages/fuelfilling/the_fuel_filling`,
 						show: true
 					},
+					// {
+					// 	num: 3,
+					// 	name: '短途记录',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/oa_office/shortfull.png',
+					// 	tips: 0,
+					// 	url: `/pages/shortDistance/short_distance_record`,
+					// 	show: true
+					// },
 					{
 						num: 3,
-						name: '短途记录',
-						// icon: 'cuIcon-edit',
-						src: '../../static/img/oa_office/shortfull.png',
-						tips: 0,
-						url: `/pages/shortDistance/short_distance_record`,
-						show: true
-					},
-					{
-						num: 4,
 						name: '报销',
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/oa_office/reimbursement.png',
@@ -93,7 +93,7 @@
 						show: true
 					},
 					{
-						num: 5,
+						num: 4,
 						name: '申请审批',
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/oa_office/shneqingshenpi.png',

pages/reimbursement/the_reimbursement.vue

@@ -18,7 +18,7 @@
 						<view class="wenzi audit3" v-else-if="item.status == '已驳回' ">{{item.status}}</view>
 					</view>
 				</view>
-				<view class="c-row" style="color: #777e7d;">
+				<view class="c-row" style="color:#777e7d;">
 					<view class="title">
 						<view class="title1" v-if="item.expensesPurpose == '1'">{{item.contractNo}}</view>
 						<view class="title1" v-else-if="item.expensesPurpose == '3'">{{item.warehouseName}}

pages/shortDistance/short_track_addition.vue

@@ -6,7 +6,11 @@
 			<view class="c-row">
 				<view class="title">车牌号</view>
 				<view class="con-list">
-					<input v-model='detailData.carNo' placeholder="请输入车牌号" maxlength="7"></input>
+					<!-- <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>
 				</view>
 			</view>
 			<view @click='startTrack' class="button" v-if='titleBtn=="开始轨迹"'>{{titleBtn}}</view>
@@ -29,6 +33,7 @@
 					width: 1, //线的宽度
 					// 　　　　dottedLine:true,//是否虚线
 				}],
+				carNolist:[],
 				detailData: {
 					carNo: '',
 					travelStatus: '',
@@ -68,6 +73,9 @@
 			}
 		},
 		methods: {
+			carnopicker(e){
+				this.detailData.carNo=this.carNolist[e.target.value].carNo
+			},
 			getLngLat(type) {
 				this.checkOpenGPSServiceByAndroidIOS()
 				var that = this

pages/task/audit/refuel.vue

@@ -28,7 +28,10 @@
 			<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==3' label-width='260' :borderBottom="false" label="仓库名">

pages/task/audit/warehouse_approval.vue

@@ -343,7 +343,6 @@
 											}else{
 												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
 											}
-											
 											response.data.data[i].operatorName=response.data.data[i].desc
 											var time1=new Date(response.data.data[i].updateDate).getTime()
 											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')