前端

config/index.js

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

pages/fuelfilling/apply_for_edit_reimbursement.vue

@@ -47,7 +47,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个字
@@ -490,10 +490,13 @@
 	.remark {
 		position: absolute;
 		right: 10px;
-		bottom: 20px;
+		bottom: 8rpx;
 		color: #AFB3BF;
 	}
-
+	/deep/.uni-textarea-textarea{
+		height:61px;
+		
+	}
 	.voucher {
 		margin-left: 20rpx;
 	}

pages/fuelfilling/apply_for_reimbursement.vue

@@ -185,7 +185,7 @@
 							uni.showToast({
 								title: res.data.message,
 								icon:'none',
-								duration:2000
+								duration:5000
 							});
 							this.isUseSubmit = true
 						}
@@ -595,10 +595,13 @@
 	.remark {
 		position: absolute;
 		right: 10px;
-		bottom: 20px;
+		bottom: 8rpx;
 		color: #AFB3BF;
 	}
-
+	/deep/.uni-textarea-textarea{
+		height:61px;
+		
+	}
 	.voucher {
 		margin-left: 20rpx;
 	}

pages/fuelfilling/apply_see_reimbursement.vue

@@ -98,6 +98,10 @@
 				});
 			},
 			seeInfo() {
+				uni.showLoading({
+					mask: true,
+					title: "加载中"
+				})
 				var that = this
 				this.$api.doRequest('get', '/fuelFillingInfo/getFilling', {
 					id: this.id
@@ -114,7 +118,7 @@
 							}
 							this.detailData.fillingDetailInfo.urlList = urlList
 						}
-
+						uni.hideLoading()
 						// setTimeout(()=>{
 						// 	that.loading=false
 						// },1000)

pages/fuelfilling/the_fuel_filling.vue

@@ -15,7 +15,7 @@
 			</view>
 		</view>
 		<mescroll-body ref="mescrollRef" :down="downOption" @down="downCallback" @up="upCallback" @init="mescrollInit">
-			<view v-for="(item,index) in fuelFilling" :key="index" @click.stop="getInfo(item)">
+			<view v-for="(item,index) in fuelFilling" :key="index">
 				<view class="good-list">
 					<view style="padding: 0 35rpx 20rpx 35rpx;position: relative;">
 						<view class="flex top">
@@ -32,7 +32,7 @@
 							<view class="row">
 								油耗
 								<view class="text">
-									{{item.fillingDetailInfo?item.fillingDetailInfo.oilConsumption:'0'}}L
+									{{item.fillingDetailInfo?item.fillingDetailInfo.oilConsumption:''}}L
 								</view>
 							</view>
 							<!-- 			<view class="row">
@@ -44,22 +44,24 @@
 							<view class="row">
 								申请费用
 								<view class="text">
-									{{item.fillingDetailInfo?item.fillingDetailInfo.currentConsumption:0}}元
+									{{item.fillingDetailInfo?item.fillingDetailInfo.currentConsumption:''}}元
 								</view>
 							</view>
 						</view>
 						<view class="see">
 							<view class="btn" @click.stop="seeInfo(item.id)"
-								v-if="item.approveStatus=='待加油审批'||item.status=='已通过'">
+								v-if="item.approveStatus=='待加油审批'||item.status=='已通过'||item.status=='已驳回'">
 								查看
 							</view>
 							<view class="btn" @click.stop="backInfo(item)" v-if="item.approveStatus=='待加油审批'">
 								撤回
 							</view>
-							<view class="btn" @click.stop="editInfo(item.id)" v-if="item.approveStatus=='发起人撤回'">
+							<view class="btn" @click.stop="editInfo(item.id)"
+								v-if="item.approveStatus=='发起人撤回'||item.status=='已驳回'">
 								编辑
 							</view>
-							<view class="btn" @click.stop="delInfo(item.id)" v-if="item.approveStatus=='发起人撤回'">
+							<view class="btn" @click.stop="delInfo(item)"
+								v-if="item.approveStatus=='发起人撤回'||item.status=='已驳回'">
 								删除
 							</view>
 						</view>
@@ -68,6 +70,7 @@
 			</view>
 		</mescroll-body>
 		<u-modal v-model="show1" @confirm='submit' content="确认撤回加油申请？" :show-cancel-button='true'></u-modal>
+		<u-modal v-model="show2" @confirm='submit1' content="确认删除加油申请？" :show-cancel-button='true'></u-modal>
 	</view>
 </template>
 
@@ -84,6 +87,7 @@
 				},
 				backInfodata:{},
 				show1:false,
+				show2:false,
 				searchType: 0,
 				fuelFilling: [],
 			}
@@ -104,6 +108,21 @@
 				console.log("mescroll", mescroll)
 				this.mescroll = mescroll;
 			},
+			submit1(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true
+				})
+				this.$api.doRequest('post', '/fuelFillingInfo/api/deleteFilling', {
+					id: this.backInfodata.id,
+				}).then(res => {
+					uni.hideLoading()
+					console.log(res)
+					if (res.data.code == 200) {
+						this.mescroll.resetUpScroll()
+					}
+				})
+			},
 			seeInfo(id) {
 				uni.navigateTo({
 					url: '/pages/fuelfilling/apply_see_reimbursement?id=' + id
@@ -135,20 +154,9 @@
 					url: '/pages/fuelfilling/apply_for_edit_reimbursement?id=' + id
 				})
 			},
-			delInfo(id) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true
-				})
-				this.$api.doRequest('post', '/fuelFillingInfo/api/deleteFilling', {
-					id: id,
-				}).then(res => {
-					uni.hideLoading()
-					console.log(res)
-					if (res.data.code == 200) {
-						this.mescroll.resetUpScroll()
-					}
-				})
+			delInfo(row) {
+				this.show2=true
+				this.backInfodata=row
 			},
 			/*下拉刷新的回调 */
 			downCallback() {

pages/reimbursement/request_funds.vue

@@ -505,7 +505,7 @@
 						return
 					}
 				}
-				if (!this.detailData.amountMoney) {
+				if (!this.detailData.amountMoney||this.detailData.amountMoney==0) {
 					this.$api.msg('金额不能为空')
 					return
 				}

pages/task/audit/refuel.vue

@@ -32,12 +32,31 @@
 			<u-form-item label-width='260' :borderBottom="false" label="申请时间">
 				<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">
-					{{datalist.remark}}
-				</view>
+			<u-form-item label-position='top' label-width='150' :borderBottom="false" label="备注">
+				<u-input disabled="" class='textarea1' v-model="datalist.remark" type="textarea" :border="border" :height="height" :auto-height="autoHeight" />
 			</u-form-item>
 		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">共{{datalist.urlList.length}}个附件</view>
+			<view v-if='datalist.urlList.length>0'>
+				<view style="justify-content: space-between;" class='flex' v-for='item in datalist.urlList'>
+					<view class="img_item">
+						<view class="" style="width: 16%;">
+							<image  class="imgsign" :src="item.url" mode="">
+							</image>
+						</view>
+						<view class="" style="width: 70%;">
+							<view class="char_css">{{item.name}}</view>
+						</view>
+						<view style="color: #22C572;" class="img_dowload" @click="openDocument(item)">
+							下载
+						</view>
+					</view>
+					<!-- <u-icon name="attach" ></u-icon> -->
+					<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
+				</view>
+			</view>
+		</u-form>
 		<view>
 			<view class="" @click.stop="playPlace">
 				查看轨迹
@@ -205,6 +224,9 @@
 					latitude: 0,
 					longitude: 0
 				}],
+				border: true,
+				height: 100,
+				autoHeight: true,
 				polyline: [{
 					points: [], // 点集合
 					color: '#3591fc', // 线的颜色
@@ -223,6 +245,7 @@
 					fillingDetailInfo: {
 						oilConsumption: ''
 					},
+					urlList:[],
 					status: "",
 					contractGoodsInfo: {},
 					contractProcessInfo: {}
@@ -317,7 +340,7 @@
 			},
 			openDocument(src) {
 				uni.downloadFile({
-					url: src.appendixPath,
+					url: src.url,
 					success: function(res) {
 						var filePath = res.tempFilePath;
 						uni.openDocument({
@@ -355,10 +378,13 @@
 							let datalist = that.datalist.fillingDetailInfo.addressUrl.split(",")
 							for (let j = 0; j < datalist.length; j++) {
 								urlList.push({
-									url: datalist[j]
+									url: datalist[j],
+									name:datalist[j].split('liangeyun/')[1]
 								})
 							}
-							that.datalist.fillingDetailInfo.urlList = urlList
+							that.datalist.urlList = urlList
+						}else{
+							that.datalist.urlList=[]
 						}
 
 						// 审核流程
@@ -533,10 +559,10 @@
 					}
 				})
 				await this.$api.doRequest('post', '/CarPostionController/api/gettrack', {
-						startDate:this.datalist.amountDeadline ,
-						endDate: this.datalist.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)
@@ -883,7 +909,7 @@
 		color: #22C572;
 	}
 
-	.textarea {
+	.textarea,.textarea1 {
 		margin: 18rpx auto;
 		width: 100%;
 		background: #F9F9FA;
@@ -926,7 +952,9 @@
 	/deep/.u-input__textarea {
 		height: 300rpx !important;
 	}
-
+	/deep/.textarea1 .u-input__textarea {
+		height: 200rpx !important;
+	}
 	.content2 {
 		background: white;
 		margin: 20rpx 0;
@@ -1262,5 +1290,7 @@
 }
 	/deep/.place {
 		color: #000;
+		width:50%;
+		flex-flow: wrap;
 	}
 </style>