前端

config/index.js

@@ -4,13 +4,13 @@ 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.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
-	// 上传图片的
+	// 上传图片的 
 	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages/fuelfilling/apply_for_edit_reimbursement.vue

@@ -57,6 +57,7 @@
 				<view @click='submitApply' class="button">提交申请</view>
 			</view>
 		</view>
+		
 		<u-modal v-model="show" @confirm='submit' content="确定提交申请信息？" :show-cancel-button='true'></u-modal>
 	</view>
 </template>
@@ -246,13 +247,23 @@
 					.then(res => {
 						console.log(res)
 						uni.hideLoading()
-						// uni.navigateBack()
+						uni.showToast({
+							title: '编辑成功',
+							icon: "none"
+						})
+						setTimeout(()=>{
+							uni.navigateBack()
+						})
 						// if (res1.data.code == 200) {
 						// 	this.titleBtn = "申请报销"
 						// }
 					})
 					.catch(res => {
-						uni.$u.toast(res.message);
+						uni.showToast({
+							title: res.message,
+							icon: "none"
+						})
+						// uni.$u.toast(res.message);
 					});
 			}
 		}
@@ -262,6 +273,7 @@
 <style lang='scss' scoped>
 	.center {
 		overflow: hidden;
+		padding-bottom:200rpx;
 	}
 
 	page {

pages/fuelfilling/apply_for_reimbursement.vue

@@ -56,7 +56,7 @@
 				<view class="left">备注</view>
 			</view>
 			<view style='position:relative;' class="wrap1 no-boder">
-				<u-input ref='textarea' class='textarea' v-model="detailData.remark" :type="typeRemark" :border="border"
+				<u-input ref='textarea' :clearable='false' class='textarea' v-model="detailData.remark" :type="typeRemark" :border="border"
 					placeholder="选填,不超过150字" :height="height" :auto-height="autoHeight" maxlength="150" />
 				<view class="remark">
 					{{detailData.remark?detailData.remark.length:'0'}}/150个字
@@ -87,6 +87,7 @@
 <script>
 	import * as config from '../../config'
 	import upload from '@/components/upload.vue';
+	
 	export default {
 		components: {
 			upload,
@@ -176,10 +177,16 @@
 						console.log(res)
 						if (res.data.data) {
 							this.amountDeadline = res.data.data
+							this.isUseSubmit = false
 						} else {
-							uni.showModal({
-								content: res.data.message,
-							})
+							// uni.showModal({
+							// 	content: res.data.message,
+							// })
+							uni.showToast({
+								title: res.data.message,
+								icon:'none',
+								duration:2000
+							});
 							this.isUseSubmit = true
 						}
 					})
@@ -316,8 +323,8 @@
 					carNo: this.detailData.carNo,
 					flag: 1,
 					remark: this.detailData.remark,
-					amountDeadline: this.amountDeadline
-
+					amountDeadline: this.amountDeadline,
+					commonId: uni.getStorageSync('pcUserInfo').userId,
 				}
 				console.log(_obj)
 				this.$api.doRequest('post', '/fuelFillingInfo/api/addFilling', _obj)
@@ -330,7 +337,11 @@
 						// }
 					})
 					.catch(res => {
-						uni.$u.toast(res.message);
+						uni.showToast({
+							title: res.message,
+							icon: "none"
+						})
+						// uni.$u.toast(res.message);
 					});
 
 
@@ -356,6 +367,7 @@
 <style lang='scss' scoped>
 	.center {
 		overflow: hidden;
+		padding-bottom:200rpx;
 	}
 
 	page {

pages/fuelfilling/the_fuel_filling.vue

@@ -32,7 +32,7 @@
 							<view class="row">
 								油耗
 								<view class="text">
-									{{item.fillingDetailInfo.oilConsumption}}L
+									{{item.fillingDetailInfo?item.fillingDetailInfo.oilConsumption:'0'}}L
 								</view>
 							</view>
 							<!-- 			<view class="row">
@@ -44,7 +44,7 @@
 							<view class="row">
 								申请费用
 								<view class="text">
-									{{item.fillingDetailInfo.currentConsumption}}元
+									{{item.fillingDetailInfo?item.fillingDetailInfo.currentConsumption:0}}元
 								</view>
 							</view>
 						</view>
@@ -67,6 +67,7 @@
 				</view>
 			</view>
 		</mescroll-body>
+		<u-modal v-model="show1" @confirm='submit' content="确认撤回加油申请？" :show-cancel-button='true'></u-modal>
 	</view>
 </template>
 
@@ -81,6 +82,8 @@
 				downOption: {
 					auto: false //是否在初始化后,自动执行downCallback; 默认true
 				},
+				backInfodata:{},
+				show1:false,
 				searchType: 0,
 				fuelFilling: [],
 			}
@@ -106,15 +109,15 @@
 					url: '/pages/fuelfilling/apply_see_reimbursement?id=' + id
 				})
 			},
-			backInfo(row) {
+			submit(){
 				uni.showLoading({
 					mask: true,
 					title: "撤回中..."
 				})
-				console.log(row)
+				// console.log(row)
 				this.$api.doRequest('post', '/newWorkflow/api/stopInstance', {
-					workflowId: row.workflowId,
-					businessKey: row.id,
+					workflowId: this.backInfodata.workflowId,
+					businessKey: this.backInfodata.id,
 				}).then(res => {
 					uni.hideLoading()
 					console.log(res)
@@ -123,6 +126,10 @@
 					}
 				})
 			},
+			backInfo(row) {
+				this.show1=true
+				this.backInfodata=row
+			},
 			editInfo(id) {
 				uni.navigateTo({
 					url: '/pages/fuelfilling/apply_for_edit_reimbursement?id=' + id

pages/grain_pulse/localtion/localtion.nvue

@@ -111,4 +111,7 @@
 	.metre{
 		font-size: 24rpx;
 	}
+	.bottom-list-item:last-child{
+		padding:20rpx;
+	}
 </style>

pages/task/audit/refuel.vue

@@ -4,7 +4,7 @@
 		<u-form ref="uForm">
 			<view class="form_top">基本信息</view>
 			<u-form-item label-width='260' :borderBottom="false" class="label_css" label="车牌号">
-				<u-input v-model="list.carNo" input-align="right" placeholder="--" disabled />
+				<u-input v-model="datalist.carNo" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<!-- 	<u-form-item label-width='150' :borderBottom="false" label="起点">
 				<view class="place">
@@ -18,23 +18,23 @@
 			</u-form-item> -->
 
 			<u-form-item label-width='260' :borderBottom="false" label="油耗(升)">
-				<u-input v-model="list.fillingDetailInfo.oilConsumption" input-align="right" placeholder="--"
+				<u-input v-model="datalist.fillingDetailInfo.oilConsumption" input-align="right" placeholder="--"
 					disabled />
 			</u-form-item>
 			<u-form-item label-width='260' :borderBottom="false" label="油耗单价(元)">
 				<u-input input-align="right" placeholder="--" disabled
-					v-model="list.fillingDetailInfo.currentOilPrice" />
+					v-model="datalist.fillingDetailInfo.currentOilPrice" />
 			</u-form-item>
 			<u-form-item label-width='260' :borderBottom="false" label="金额(元)">
 				<u-input input-align="right" placeholder="--" disabled
-					v-model="list.fillingDetailInfo.currentConsumption" />
+					v-model="datalist.fillingDetailInfo.currentConsumption" />
 			</u-form-item>
 			<u-form-item label-width='260' :borderBottom="false" label="申请时间">
-				<u-input input-align="right" placeholder="--" disabled v-model="list.fillingDetailInfo.createDate" />
+				<u-input input-align="right" placeholder="--" disabled v-model="datalist.fillingDetailInfo.createDate" />
 			</u-form-item>
 			<u-form-item label-width='150' :borderBottom="false" label="备注">
 				<view class="place">
-					{{list.remark}}
+					{{datalist.remark}}
 				</view>
 			</u-form-item>
 		</u-form>
@@ -132,11 +132,11 @@
 				</view>
 			</view>
 		</u-form>
-		<view v-if='list.taskId' style='padding:10px;z-index: 12;' class='flex bottom-btn'>
-			<u-button v-if='list.approveStatus||isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>
+		<view v-if='datalist.taskId' style='padding:10px;z-index: 12;' class='flex bottom-btn'>
+			<u-button v-if='datalist.approveStatus||isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>
 				驳回
 			</u-button>
-			<u-button v-if='list.approveStatus||isSHowBtn' @click='pass' type="success" class="btn2">通过
+			<u-button v-if='datalist.approveStatus||isSHowBtn' @click='pass' type="success" class="btn2">通过
 			</u-button>
 		</view>
 		<view v-if='show' class="shade">
@@ -219,7 +219,7 @@
 				currentPage: 1,
 				pageSize: 10,
 				fileUrl: [],
-				list: {
+				datalist: {
 					fillingDetailInfo: {
 						oilConsumption: ''
 					},
@@ -239,6 +239,7 @@
 				url: "",
 				imgShow: false,
 				height: 200,
+				list:[],
 				autoHeight: true,
 				border: false,
 				rejectInfo: "",
@@ -265,10 +266,17 @@
 			//播放轨迹
 			playPlace() {
 				console.log("tiaozhuan")
+				if(this.list.length<=0){
+					this.$api.msg('暂无轨迹')
+					return
+				}
 				uni.navigateTo({
 					url: "/pages/task/playMap?startDate=" + this.datalist.amountDeadline + "&endDate=" + this
-						.datalist.amountDeadline.createDate
+						.datalist.createDate
 				})
+				// uni.navigateTo({
+				// 	url: "/pages/task/playMap?startDate=2023-02-20 01:00:00&endDate=2023-02-20 24:00:00"
+				// })
 				// startDate: "2023-02-20 01:00:00",
 				// endDate: "2023-02-20 24:00:00",
 				// uni.navigateTo({
@@ -340,17 +348,17 @@
 				}).then(res => {
 					if (res.data.code == 200) {
 
-						that.list = res.data.data
+						that.datalist = res.data.data
 						let urlList = []
-						console.log(this.list)
-						if (that.list.fillingDetailInfo.addressUrl) {
-							let datalist = that.list.fillingDetailInfo.addressUrl.split(",")
+						console.log(this.datalist)
+						if (that.datalist.fillingDetailInfo.addressUrl) {
+							let datalist = that.datalist.fillingDetailInfo.addressUrl.split(",")
 							for (let j = 0; j < datalist.length; j++) {
 								urlList.push({
 									url: datalist[j]
 								})
 							}
-							that.list.fillingDetailInfo.urlList = urlList
+							that.datalist.fillingDetailInfo.urlList = urlList
 						}
 
 						// 审核流程
@@ -505,11 +513,11 @@
 									}
 								}
 								this.auditList = response.data.data
-								var time2 = new Date(this.list.createDate).getTime()
+								var time2 = new Date(this.datalist.createDate).getTime()
 								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
-									operatorTitle: this.list.creater.substring(0, 2),
-									operatorName: this.list.creater,
+									operatorTitle: this.datalist.creater.substring(0, 2),
+									operatorName: this.datalist.creater,
 									updateDate: time3,
 									auditMind: '',
 									desc: '发起申请',
@@ -525,16 +533,16 @@
 					}
 				})
 				await this.$api.doRequest('post', '/CarPostionController/api/gettrack', {
-						// startDate:this.datalist.amountDeadline ,
-						// endDate: this.datalist.amountDeadline.createDate,
-						startDate: "2023-02-20 01:00:00",
-						endDate: "2023-02-20 24:00:00",
+						startDate:this.datalist.amountDeadline ,
+						endDate: this.datalist.createDate,
+						// startDate: "2023-02-20 01:00:00",
+						// endDate: "2023-02-20 24:00:00",
 
 					}).then(res => {
 						console.log(res)
 						if (res.data.code == 200) {
 							// uni.hideLoading()
-
+							this.list=JSON.parse(res.data.data)
 							let _list = JSON.parse(res.data.data)
 							this.latitude = _list[0].lat
 							this.longitude = _list[0].lng
@@ -597,7 +605,7 @@
 					info = that.auditMind + "##" + that.fileUrl.toString()
 				}
 				that.$api.doRequest('post', '/newWorkflow/api/handle', {
-					taskId: that.list.taskId,
+					taskId: that.datalist.taskId,
 					approved: false,
 					auditMind: info ? info : "",
 					needReapply: true,
@@ -606,7 +614,7 @@
 					that.show = false
 					setTimeout(function() {
 						if (that.everyCheck) {
-							helper.setAudit(that.list)
+							helper.setAudit(that.datalist)
 						} else {
 							uni.navigateBack()
 						}
@@ -630,7 +638,7 @@
 						info = that.auditMind + "##" + that.fileUrl.toString()
 					}
 					that.$api.doRequest('post', '/newWorkflow/api/handle', {
-						taskId: that.list.taskId,
+						taskId: that.datalist.taskId,
 						approved: true,
 						auditMind: info ? info : "",
 						needReapply: true,
@@ -639,7 +647,7 @@
 						that.show = false
 						setTimeout(function() {
 							if (that.everyCheck) {
-								helper.setAudit(that.list)
+								helper.setAudit(that.datalist)
 							} else {
 								uni.navigateBack()
 							}
@@ -650,14 +658,14 @@
 			},
 			//审核方法
 			audit(item, index, status, status2, reason) {
-				if (index < this.list.length) {
+				if (index < this.datalist.length) {
 					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',
 						needReapply: status2 != undefined ? true : false,
 					}).then(res => {
-						this.audit(this.list[index + 1], index + 1, status)
+						this.audit(this.datalist[index + 1], index + 1, status)
 					})
 				} else {
 					if (status == true) {