Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

config/index.js

@@ -3,10 +3,9 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	// baseUrlNew: 'http://192.168.110.9:9888/',
+	baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.67:9888/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.171",
-    "versionCode" : 21171,
+    "versionName" : "2.1.173",
+    "versionCode" : 21173,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},
@@ -200,7 +200,9 @@
             "VideoPlayer" : {},
             "Bluetooth" : {},
             "Geolocation" : {},
-            "LivePusher" : {}
+            "LivePusher" : {},
+            "Camera" : {},
+            "Gallery" : {}
         },
         "splashscreen" : {
             "waiting" : false

pages/clock/supp_clock.vue

@@ -173,6 +173,7 @@
 									} else {
 										// that.$api.msg('提交失败')
 									}
+									uni.hideLoading()
 								})
 						}
 					}

pages/clock/the_clock.vue

@@ -61,13 +61,11 @@
 			}
 		},
 		onLoad() {
-			if(!uni.getStorageSync("clockwerehouse")){
-				this.getWarehouse()
-			}else{
+			if(uni.getStorageSync("clockwerehouse")){
 				this.detailData.targetLocation=uni.getStorageSync("clockwerehouse")
 			}
-			
-			// this.getLocation()
+			this.getWarehouse()
+			this.getLocation()
 		},
 		methods: {
 			calculate() {
@@ -77,6 +75,9 @@
 			},
 			getWarehouse() {
 				var that = this
+				uni.showLoading({
+					title: "正在加载"
+				})
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
 					compId: uni.getStorageSync("pcUserInfo").compId,
 					warehouseType: '1'
@@ -93,12 +94,25 @@
 								that.lat2 = res.latitude
 								that.lng2 = res.longitude
 								if (that.warehouseBaseInfoList.length > 0) {
-									that.clockDistance = that.utils.getDistance(that
+									if(that.detailData.targetLocation){
+										for(var i = 0 ; i < that.warehouseBaseInfoList.length ; i++){
+											if(that.warehouseBaseInfoList[i].warehouseName==that.detailData.targetLocation){
+												that.clockDistance = that.utils.getDistance(that
+												.warehouseBaseInfoList[i].warehousePositioning.split(',')[
+													0],
+												that.warehouseBaseInfoList[i].warehousePositioning.split(
+													',')[1], that.lat2, that.lng2)
+											}
+										}
+									}
+									else{
+										that.clockDistance = that.utils.getDistance(that
 										.warehouseBaseInfoList[0].warehousePositioning.split(',')[
 											0],
 										that.warehouseBaseInfoList[0].warehousePositioning.split(
 											',')[1], that.lat2, that.lng2)
 											that.detailData.targetLocation = that.warehouseBaseInfoList[0].warehouseName
+									}
 								}
 							},
 							fail: function(req) {
@@ -107,6 +121,7 @@
 						});
 
 					}
+					uni.hideLoading()
 				})
 			},
 			targetLPicker(e) {

pages/erpbusiness/edit_quality_testing.vue

@@ -1406,6 +1406,7 @@
 												that.$api.msg('编辑质检成功')
 												that.gridList.warehouseId = that.cangid
 												
+												uni.setStorageSync('checkcustomer',{})
 												console.log('that.gridList', that.gridList)
 												if(that.utils.getCurrectRoles('acquisitionQuality.initial')){
 													that.isShowPrint = true

pages/fuelfilling/apply_for_reimbursement.vue

@@ -60,7 +60,9 @@
 				</view>
 				<view class="c-row">
 					<view class="title">加油凭证</view>
-					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+				</view>
+				<view class="voucher">
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="9"
 						:size-type="['compressed']" @on-success="getImgUrl($event,index)" @on-error="onError"
 						@on-remove="onRemove($event,index)" @on-uploaded="isAdd = true" :before-upload="filterFileType"
 						@on-progress="onProgress"></upload>
@@ -94,7 +96,7 @@
 		data() {
 			return {
 				detailData: {
-					carNo: '辽A11111',
+					carNo: '',
 					destinationProvince: "",
 					destinationCity: "",
 					destinationArea: "",
@@ -209,12 +211,40 @@
 			},
 			submitApply() {
 				var that = this
+				for (let i = 0; i < that.fillingDetail.fillingDetailInfoList.length; i++) {
+					let count = i + 1
+					if (!that.fillingDetail.fillingDetailInfoList[i].oilConsumption) {
+						uni.showToast({
+							title: "加油-" + count + " 油耗不能为空！",
+							icon: "none"
+						})
+						return
+					}
+					if (!that.fillingDetail.fillingDetailInfoList[i].currentOilPrice) {
+						uni.showToast({
+							title: "加油-" + count + " 当前油价不能为空！",
+							icon: "none"
+						})
+						return
+					}
+					if (that.fillingDetail.fillingDetailInfoList[i].addressUrl.length == 0) {
+						uni.showToast({
+							title: "加油-" + count + " 请上传加油凭证！",
+							icon: "none"
+						})
+						return
+					}
+				}
 				uni.showModal({
 					content: "确定提交申请信息？",
 					showCancel: true,
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中',
+								mask: true
+							});
 							that.fillingDetail.tfc = that.tfc
 							that.fillingDetail.totalCost = that.totalCost
 							for (let i = 0; i < that.fillingDetail.fillingDetailInfoList.length; i++) {
@@ -225,6 +255,7 @@
 									that.fillingDetail
 								)
 								.then(res => {
+									uni.hideLoading()
 									if (res.data.code == 200) {
 										that.$api.msg('提交成功')
 										uni.navigateTo({
@@ -244,7 +275,7 @@
 
 <style lang='scss' scoped>
 	.center {
-		padding-bottom: 330rpx;
+		padding-bottom: 400rpx;
 	}
 
 	page {
@@ -392,7 +423,7 @@
 		}
 
 		.upload {
-			margin-left: 157px;
+			/* margin-left: 157px; */
 		}
 	}
 
@@ -459,4 +490,7 @@
 		background: #F9F9FA;
 		border: 1px solid #EEEEEE;
 	}
+	.voucher{
+		margin-left: 20rpx;
+	}
 </style>

pages/fuelfilling/apply_see_reimbursement.vue

@@ -54,8 +54,11 @@
 				</view>
 				<view class="c-row" style="justify-content: space-between;">
 					<view class="title">加油凭证</view>
-					<image :src="item.addressUrl" mode="widthFix" style="width: 200rpx;" v-if='item.addressUrl'
-						@click="previewImage(item.addressUrl)"></image>
+					<!-- <image :src="item.addressUrl" mode="widthFix" style="width: 200rpx;" v-if='item.addressUrl'
+						@click="previewImage(item.addressUrl)"></image> -->
+				</view>
+				<view class="voucher">
+					<u-upload :action="action" :file-list="item.urlList" max-count="1" :deletable="false" :show-progress="false"></u-upload>
 				</view>
 			</view>
 			<view class="footer">
@@ -126,6 +129,18 @@
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.detailData = res.data.data
+						for (let i = 0; i < this.detailData.fillingDetailInfoList.length; i++) {
+							let urlList = []
+							if (this.detailData.fillingDetailInfoList[i].addressUrl) {
+								let datalist = this.detailData.fillingDetailInfoList[i].addressUrl.split(",")
+								for (let j = 0; j < datalist.length; j++) {
+									urlList.push({
+										url: datalist[j]
+									})
+								}
+								this.detailData.fillingDetailInfoList[i].urlList = urlList
+							}
+						}
 					}
 				})
 			},
@@ -229,7 +244,7 @@
 
 <style lang='scss' scoped>
 	.center {
-		padding-bottom: 330rpx;
+		padding-bottom: 220rpx;
 	}
 
 	page {
@@ -443,4 +458,7 @@
 		background: #F9F9FA;
 		border: 1px solid #EEEEEE;
 	}
+	.voucher{
+		margin-left: 20rpx;
+	}
 </style>

pages/fuelfilling/track_addition.vue

@@ -89,6 +89,7 @@
 								that.detailData.originArea = that.$helper.filterUrban(res.address.district)
 								that.detailData.originAddress = res.address.street + res.address.streetNum
 							} else if (type == '结束轨迹') {
+								// console.log("res",res)
 								that.detailData.destinationLongitude = res.longitude;
 								that.detailData.destinationLatitude = res.latitude;
 								that.detailData.destinationProvince = res.address.province;
@@ -97,16 +98,19 @@
 									.district)
 								that.detailData.destinationAddress = res.address.street + res.address.streetNum
 								that.detailData.trackFlag = "1"
-								console.log(that.detailData)
+								// console.log("asddfadsad",that.detailData)
+								if (!that.detailData.destinationAddress) {
+									uni.showToast({
+										title: "未获取结束位置，请开启定位在试！",
+										icon: "none"
+									})
+									return
+								}
 								that.$api.doRequest('post', '/fuelFillingInfo/api/addFilling', that.detailData)
 									.then(res1 => {
-										console.log(111)
-										console.log(res1)
 										if (res1.data.code == 200) {
-
 											this.titleBtn = "申请报销"
 										}
-
 									})
 									.catch(res => {
 										uni.$u.toast(res.message);
@@ -258,14 +262,18 @@
 			//开始轨迹
 			startTrack() {
 				var that=this
-				console.log('车牌号')
-				console.log(this.detailData.carNo)
 				if (!this.detailData.carNo) {
 					uni.showToast({
 						title: "车牌号不能为空！",
 						icon: "none"
 					})
-
+					return
+				}
+				if (!this.detailData.originAddress) {
+					uni.showToast({
+						title: "未获取起始位置，请开启定位在试！",
+						icon: "none"
+					})
 					return
 				}
 				uni.showLoading({
@@ -278,11 +286,7 @@
 				that.detailData.trackFlag = "0"
 				console.log(that.detailData)
 				that.$api.doRequest('post', '/fuelFillingInfo/api/addFilling', that.detailData).then(res1 => {
-						console.log(111)
-						console.log(res1)
 						if (res1.data.code == 200) {
-							console.log(222)
-							
 							that.$helper.fUN_AmapLocation.start({
 									intervalTime: 5000,
 									isReport: false

pages/leave/the_leave.vue

@@ -253,7 +253,7 @@
 			},
 			ltCheck(e) {
 				this.detailData.leaveType = this.leaveTypeList[e].leaveType
-				if (this.detailData.leaveType = "事假") {
+				if (this.detailData.leaveType == "事假") {
 					this.detailData.leaveTypeKey = "1"
 				} else {
 					this.detailData.leaveTypeKey = "3"

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -167,7 +167,7 @@
 						</u-form-item>
 						<u-form-item v-if='!retreatList.status&&retreatList.inOutType != "退库"' label="单价(元/吨)"
 							prop="unitPrice" label-width="160">
-							<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
+							<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" disabled />
 						</u-form-item>
 						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top"
 							v-if="OutList.inOutType != '移库出库'">

pages/task/audit/charge_against_revenue.vue

@@ -234,7 +234,7 @@
 						</view>
 						<view class="flex audit_img">
 							<view v-for="(items,indexs) in item.fileUrl" class="url_css">
-								<image :src="items" mode="" class="url_img" @click="auditFile(items)"></image>
+								<image :src="items" mode='aspectFill' class="url_img" @click="auditFile(items)"></image>
 							</view>
 						</view>
 					</view>
@@ -1059,18 +1059,22 @@
 				}
 				.audit_img {
 					flex-wrap: wrap;
-					margin:0 20rpx;
+					// margin: 0 10rpx;
+					margin-left: 20rpx;
 				
 					.url_css {
 						border: 1px solid #999999;
 						border-radius: 10px;
 						margin-top: 10px;
-						margin-right: 10px;
+						margin-right: 4px;
+						overflow: hidden;
+						width: 73px;
+						height: 73px;
 				
 						.url_img {
-							width: 80px;
-							height: 80px;
-							border-radius: 10px;
+							width: 73px;
+							height: 73px;
+							// border-radius: 10px;
 						}
 					}
 				}

pages/task/audit/charge_against_revenue_detail.vue

@@ -227,7 +227,7 @@
 						</view>
 						<view class="flex audit_img">
 							<view v-for="(items,indexs) in item.fileUrl" class="url_css">
-								<image :src="items" mode="" class="url_img" @click="auditFile(items)"></image>
+								<image :src="items" mode='aspectFill' class="url_img" @click="auditFile(items)"></image>
 							</view>
 						</view>
 					</view>
@@ -882,18 +882,22 @@
 				}
 				.audit_img {
 					flex-wrap: wrap;
-					margin:0 20rpx;
+					// margin: 0 10rpx;
+					margin-left: 20rpx;
 				
 					.url_css {
 						border: 1px solid #999999;
 						border-radius: 10px;
 						margin-top: 10px;
-						margin-right: 10px;
+						margin-right: 4px;
+						overflow: hidden;
+						width: 73px;
+						height: 73px;
 				
 						.url_img {
-							width: 80px;
-							height: 80px;
-							border-radius: 10px;
+							width: 73px;
+							height: 73px;
+							// border-radius: 10px;
 						}
 					}
 				}

pages/task/audit/refuel.vue

@@ -1,16 +1,21 @@
 <template>
 	<view class="container">
-		
-		<u-form ref="uForm" >
+
+		<u-form ref="uForm">
 			<view class="form_top">基本信息</view>
-			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" class="label_css"  label="车牌号">
+			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" class="label_css"
+				label="车牌号">
 				<u-input v-model="list.carNo" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="起点">
-				{{list.originProvince}}{{list.originCity}}{{list.originArea}}{{list.originAddress}}
+			<u-form-item v-if='list.strokeType==1' label-width='150' :borderBottom="false" label="起点">
+				<view class="place">
+					{{list.originProvince}}{{list.originCity}}{{list.originArea}}{{list.originAddress}}
+				</view>
 			</u-form-item>
-			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="终点">
-				{{list.destinationProvince}}{{list.destinationCity}}{{list.destinationArea}}{{list.destinationAddress}}
+			<u-form-item v-if='list.strokeType==1' label-width='150' :borderBottom="false" label="终点">
+				<view class="place">
+					{{list.destinationProvince}}{{list.destinationCity}}{{list.destinationArea}}{{list.destinationAddress}}
+				</view>
 			</u-form-item>
 			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="总油耗(升)">
 				<u-input v-model="list.tfc" input-align="right" placeholder="--" disabled />
@@ -33,111 +38,121 @@
 			<u-form-item v-if='list.strokeType==3' label-width='260' :borderBottom="false" label="请款时间">
 				<u-input v-model="list.createDate" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-
-			
 		</u-form>
-		
-		 <view v-if="list.fillingDetailInfoList">
-		    <u-form v-for="(item,index) in list.fillingDetailInfoList">
-		      <div>加油-{{index+1}}</div>
-		      <el-form-item label="油耗（升）">
-		        {{item.oilConsumption}}
-		      </el-form-item>
-		      <el-form-item label="单价（元/升）">
-		        {{item.currentOilPrice}}
-		      </el-form-item>
-		      <el-form-item label="油费（元）">
-		        {{item.currentConsumption}}
-		      </el-form-item>
-		      <el-form-item label="凭证">
-		        <img :src="item.addressUrl" alt="">
-		      </el-form-item>
-		    </u-form>
-		  </view>
-		    <view v-if="list.shortFillingInfoList">
-		    <u-form v-for="(item,index) in list.shortFillingInfoList">
-		      <div>加油-{{index+1}}</div>
-		      <el-form-item label="车牌号">
-		        {{item.carNo}}
-		      </el-form-item>
-		      <el-form-item label="起始地">
-		        {{item.originProvince}}{{item.originCity}}{{item.originArea}}{{item.originAddress}}
-		      </el-form-item>
-		      <el-form-item label="终到地">
-		        {{item.destinationProvince}}{{item.destinationCity}}{{item.destinationArea}}{{item.destinationAddress}}
-		      </el-form-item>
-		    </u-form>
-		  </view>
+		<view v-if="list.fillingDetailInfoList">
+			<u-form v-for="(item,index) in list.fillingDetailInfoList" :labelWidth="200">
+				<div>加油-{{index+1}}</div>
+				<u-form-item label="油耗（升）">
+					<!-- {{item.oilConsumption}} -->
+					<u-input v-model="item.oilConsumption" disabled inputAlign="right" />
+				</u-form-item>
+				<u-form-item label="单价（元/升）">
+					<!-- {{item.currentOilPrice}} -->
+					<u-input v-model="item.currentOilPrice" disabled inputAlign="right" />
+				</u-form-item>
+				<u-form-item label="油费（元）">
+					<!-- {{item.currentConsumption}} -->
+					<u-input v-model="item.currentConsumption" disabled inputAlign="right" />
+				</u-form-item>
+				<!-- <u-form-item label="凭证"> -->
+					<!-- <img :src="item.addressUrl" alt="" mode="aspectFill"> -->
+					<!-- <upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+						:size-type="['compressed']" :deletable="false" @on-uploaded="isAdd = true"
+						:before-upload="filterFileType" @on-progress="onProgress" :fileList="item.urlList">
+					</upload> -->
+				<!-- </u-form-item> -->
+				<view class="voucher">
+					<view class="voucher_tips">加油凭证</view>
+					<view >
+						<u-upload :action="action" :file-list="item.urlList" max-count="1" :deletable="false" :show-progress="false"></u-upload>
+					</view>
+				</view>
+			</u-form>
+		</view>
+		<view v-if="list.shortFillingInfoList">
+			<u-form v-for="(item,index) in list.shortFillingInfoList">
+				<div>加油-{{index+1}}</div>
+				<u-form-item label="车牌号">
+					{{item.carNo}}
+				</u-form-item>
+				<u-form-item label="起始地">
+					{{item.originProvince}}{{item.originCity}}{{item.originArea}}{{item.originAddress}}
+				</u-form-item>
+				<u-form-item label="终到地">
+					{{item.destinationProvince}}{{item.destinationCity}}{{item.destinationArea}}{{item.destinationAddress}}
+				</u-form-item>
+			</u-form>
+		</view>
 		<u-form ref="uForm">
 			<view class="form_top">流程</view>
 			<view class="content2">
-			<view v-for="(item,index) in auditList" :key='index' class="audit">
-				<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
-					<view class="left">
-						<view class="item1">
-							<view class="item-content">{{item.operatorTitle}}</view>
-							<view v-if="item.status=='success'" class='status success'>
-								<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
-							</view>
-							<view v-if="item.status=='error'" class='status error'>
-								<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
-							</view>
-							<view v-if="item.status=='question'" class='status question'>
-								<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
-							</view>
-						</view>
-					</view>
-					<view class="right">
-						<view class="right-item">
-							<view class="item2">
-								<view class="name">{{item.desc}}
+				<view v-for="(item,index) in auditList" :key='index' class="audit">
+					<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
+						<view class="left">
+							<view class="item1">
+								<view class="item-content">{{item.operatorTitle}}</view>
+								<view v-if="item.status=='success'" class='status success'>
+									<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
 								</view>
-								<!-- <view class='time'>{{item.updateDate}}</view> -->
-								<view v-if="item.status=='success'" class="status success">
-									{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
-										v-if='!item.commonStaffs1&&index!=0'>已审核</text>
+								<view v-if="item.status=='error'" class='status error'>
+									<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
 								</view>
-								<view v-if="item.status=='error'" class="status error">
-									{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
-										v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text>
+								<view v-if="item.status=='question'" class='status question'>
+									<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
+								</view>
+							</view>
+						</view>
+						<view class="right">
+							<view class="right-item">
+								<view class="item2">
+									<view class="name">{{item.desc}}
+									</view>
+									<!-- <view class='time'>{{item.updateDate}}</view> -->
+									<view v-if="item.status=='success'" class="status success">
+										{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
+											v-if='!item.commonStaffs1&&index!=0'>已审核</text>
+									</view>
+									<view v-if="item.status=='error'" class="status error">
+										{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
+											v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text>
+									</view>
+									<view v-if="item.status=='question'" class="status question">
+										{{item.commonStaffs1?item.staffscontent:''}}<text
+											v-if='!item.commonStaffs1'>未审核</text>
+									</view>
+									<!-- <view  class="status success">吕波（已审核）</view> -->
+
 								</view>
-								<view v-if="item.status=='question'" class="status question">
-									{{item.commonStaffs1?item.staffscontent:''}}<text
-										v-if='!item.commonStaffs1'>未审核</text>
+								<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
+									class='time'>
+									{{item.updateDate}}
 								</view>
-								<!-- <view  class="status success">吕波（已审核）</view> -->
-			
 							</view>
-							<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
-								class='time'>
-								{{item.updateDate}}
+							<view v-if='item.auditMind' class="right-content">
+								{{item.auditMind}}
 							</view>
 						</view>
-						<view v-if='item.auditMind' class="right-content">
-							{{item.auditMind}}
+						<view v-if='item.commonStaffs1' class="right">
+							<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'" size="28">
+							</u-icon>
 						</view>
 					</view>
-					<view v-if='item.commonStaffs1' class="right">
-						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'" size="28">
-						</u-icon>
-					</view>
-				</view>
-				<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
-					<view class='row2'>
-						<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
-							<view class="item-content">
-								<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
-								<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+					<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+						<view class='row2'>
+							<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+								<view class="item-content">
+									<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+									<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+								</view>
+								<view class="name">{{item1.staffName}}</view>
 							</view>
-							<view class="name">{{item1.staffName}}</view>
 						</view>
 					</view>
+					<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 				</view>
-				<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
-			</view>
 			</view>
 		</u-form>
-		<view v-if='list.taskId' style='padding:10px;' class='flex bottom-btn'>
+		<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'>
 				驳回
 			</u-button>
@@ -156,8 +171,9 @@
 					<view class="right-bottom">
 						{{auditMind.length}}/1000个字
 					</view>
-					<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
-		
+					<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30"
+						rows="11"></textarea>
+
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -204,7 +220,7 @@
 				rejectInfo: "",
 				rejectInfo1: "",
 				isSHowBtn: true,
-				auditCheck:"question",//判断审核是否通过
+				auditCheck: "question", //判断审核是否通过
 			}
 		},
 		onBackPress(e) {
@@ -250,11 +266,23 @@
 					title: '加载中',
 					mask: true
 				})
-				this.$api.doRequest('get', '/fuelFillingInfo/getFilling', {
-					id: this.id
+				that.$api.doRequest('get', '/fuelFillingInfo/getFilling', {
+					id: that.id
 				}).then(res => {
 					if (res.data.code == 200) {
-						this.list = res.data.data
+						that.list = res.data.data
+						for (let i = 0; i < that.list.fillingDetailInfoList.length; i++) {
+							let urlList = []
+							if (that.list.fillingDetailInfoList[i].addressUrl) {
+								let datalist = that.list.fillingDetailInfoList[i].addressUrl.split(",")
+								for (let j = 0; j < datalist.length; j++) {
+									urlList.push({
+										url: datalist[j]
+									})
+								}
+								that.list.fillingDetailInfoList[i].urlList = urlList
+							}
+						}
 						// this.$api.doRequest('get', '/appendix/query/getFileList', {
 						// 	appendixIds: that.list.addressUrl
 						// }).then(res1 => {
@@ -265,136 +293,136 @@
 						// 			that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
 						// 		}
 						// 	}
-							// 审核流程
-							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-								businessCode: 'JIAYOU-SHENHE-APPROVE',
-								tmpCompId: uni.getStorageSync('pcUserInfo').compId
-							}).then(res1 => {
-								this.$api.doRequest('get', '/commonUser/getHis', {
-									workflowId: res1.data.data[0].id,
-									businessKey: this.id,
-									// branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
-								}).then(response => {
-									uni.hideLoading()
-									for (let i = 0; i < response.data.data.length; i++) {
-										this.$set(response.data.data[i], 'status', 'question')
-										// console.log(response.data.data[i].workflowHistoricTasks,i)
-										if (response.data.data[i].commonStaffs) {
-											response.data.data[i].showflow = false
-											response.data.data[i].operatorTitle = response.data.data[i]
-												.desc.substring(0, 2)
-											response.data.data[i].operatorName = response.data.data[i]
-												.desc
-											response.data.data[i].staffscontent = '共' + response.data
-												.data[i].commonStaffs.length + '人，当前审核' + response.data
-												.data[i].workflowHistoricTasks.length + '人'
-											if (response.data.data[i].workflowHistoricTasks && response
-												.data.data[i].workflowHistoricTasks.length > 0) {
-												if (response.data.data[i].workflowHistoricTasks
-													.length != response.data.data[i].commonStaffs
-													.length) {
-													// response.data.data[i].status='question'
-													this.$set(response.data.data[i], 'status',
-														'question')
-												} else {
-													this.$set(response.data.data[i], 'status',
-														'success')
-													// response.data.data[i].status='success'
-												}
-												response.data.data[i].workflowlen = response.data.data[
-													i].workflowHistoricTasks.length
-												var workflowdata = response.data.data[i]
-													.workflowHistoricTasks
-												var staffsdata = response.data.data[i].commonStaffs
-												for (let q = 0; q < staffsdata.length; q++) {
-													staffsdata[q].status = false
-													staffsdata[q].staffTitle = staffsdata[q].staffName
-													for (let k = 0; k < workflowdata.length; k++) {
-														if (staffsdata[q].staffId == workflowdata[k]
-															.operatorId) {
-															staffsdata[q].status = true
-														}
+						// 审核流程
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'JIAYOU-SHENHE-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id,
+								// branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i], 'status', 'question')
+									// console.log(response.data.data[i].workflowHistoricTasks,i)
+									if (response.data.data[i].commonStaffs) {
+										response.data.data[i].showflow = false
+										response.data.data[i].operatorTitle = response.data.data[i]
+											.desc.substring(0, 2)
+										response.data.data[i].operatorName = response.data.data[i]
+											.desc
+										response.data.data[i].staffscontent = '共' + response.data
+											.data[i].commonStaffs.length + '人，当前审核' + response.data
+											.data[i].workflowHistoricTasks.length + '人'
+										if (response.data.data[i].workflowHistoricTasks && response
+											.data.data[i].workflowHistoricTasks.length > 0) {
+											if (response.data.data[i].workflowHistoricTasks
+												.length != response.data.data[i].commonStaffs
+												.length) {
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i], 'status',
+													'question')
+											} else {
+												this.$set(response.data.data[i], 'status',
+													'success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen = response.data.data[
+												i].workflowHistoricTasks.length
+											var workflowdata = response.data.data[i]
+												.workflowHistoricTasks
+											var staffsdata = response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status = false
+												staffsdata[q].staffTitle = staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if (staffsdata[q].staffId == workflowdata[k]
+														.operatorId) {
+														staffsdata[q].status = true
 													}
 												}
 											}
-											response.data.data[i].commonStaffs1 = response.data.data[i]
-												.commonStaffs
+										}
+										response.data.data[i].commonStaffs1 = response.data.data[i]
+											.commonStaffs
+									} else {
+										if (response.data.data[i].workflowHistoricTasks && response
+											.data.data[i].workflowHistoricTasks.length > 0) {
+											var len = response.data.data[i].workflowHistoricTasks
+												.length - 1
+											if (response.data.data[i].workflowHistoricTasks[len]
+												.approved) {
+												this.$set(response.data.data[i], 'status',
+													'success')
+											} else {
+												this.$set(response.data.data[i], 'status', 'error')
+											}
+											response.data.data[i].operatorTitle = response.data
+												.data[i].workflowHistoricTasks[len].operatorName
+												.substring(response.data.data[i]
+													.workflowHistoricTasks[0].operatorName.length -
+													2)
+											response.data.data[i].operatorName = response.data
+												.data[i].workflowHistoricTasks[len].operatorName
+											var time = new Date(response.data.data[i]
+													.workflowHistoricTasks[len].claimTime)
+												.getTime()
+											response.data.data[i].updateDate = this.$u.timeFormat(
+												time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind = response.data.data[i]
+												.workflowHistoricTasks[len].auditMind
 										} else {
-											if (response.data.data[i].workflowHistoricTasks && response
-												.data.data[i].workflowHistoricTasks.length > 0) {
-												var len = response.data.data[i].workflowHistoricTasks
-													.length - 1
-												if (response.data.data[i].workflowHistoricTasks[len]
-													.approved) {
-													this.$set(response.data.data[i], 'status',
-														'success')
-												} else {
-													this.$set(response.data.data[i], 'status', 'error')
-												}
-												response.data.data[i].operatorTitle = response.data
-													.data[i].workflowHistoricTasks[len].operatorName
-													.substring(response.data.data[i]
-														.workflowHistoricTasks[0].operatorName.length -
-														2)
-												response.data.data[i].operatorName = response.data
-													.data[i].workflowHistoricTasks[len].operatorName
-												var time = new Date(response.data.data[i]
-														.workflowHistoricTasks[len].claimTime)
-													.getTime()
-												response.data.data[i].updateDate = this.$u.timeFormat(
-													time, 'mm.dd hh:MM')
-												response.data.data[i].auditMind = response.data.data[i]
-													.workflowHistoricTasks[len].auditMind
+											this.$set(response.data.data[i], 'status', 'question')
+											// response.data.data[i].status='question'
+											if (response.data.data[i].desc == '总经理助理审核') {
+												response.data.data[i].operatorTitle = '总助'
+											} else if (response.data.data[i].desc == '杜大光审核') {
+												response.data.data[i].operatorTitle = '大光'
 											} else {
-												this.$set(response.data.data[i], 'status', 'question')
-												// response.data.data[i].status='question'
-												if (response.data.data[i].desc == '总经理助理审核') {
-													response.data.data[i].operatorTitle = '总助'
-												} else if (response.data.data[i].desc == '杜大光审核') {
-													response.data.data[i].operatorTitle = '大光'
-												} 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')
-												response.data.data[i].auditMind = ''
+												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')
+											response.data.data[i].auditMind = ''
 										}
 									}
-									console.log(response.data.data)
-									for(let i = 0 ;i<response.data.data.length;i++){
-										if(response.data.data[i].status == "error"){
-											this.auditCheck = "error"
-											break;
-										}else if(response.data.data[i].status == "question"){
-											this.auditCheck = "question"
-											break;
-										}else{ 
-											this.auditCheck = "success"
-										}
+								}
+								console.log(response.data.data)
+								for (let i = 0; i < response.data.data.length; i++) {
+									if (response.data.data[i].status == "error") {
+										this.auditCheck = "error"
+										break;
+									} else if (response.data.data[i].status == "question") {
+										this.auditCheck = "question"
+										break;
+									} else {
+										this.auditCheck = "success"
 									}
-									this.auditList = response.data.data
-									var time2 = new Date(this.list.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,
-										updateDate: time3,
-										auditMind: '',
-										desc: '发起申请',
-										showflow: false,
-										commonStaffs1: null,
-										commonStaffs: null,
-										workflowHistoricTasks: [],
-										status: 'success'
-									})
+								}
+								this.auditList = response.data.data
+								var time2 = new Date(this.list.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,
+									updateDate: time3,
+									auditMind: '',
+									desc: '发起申请',
+									showflow: false,
+									commonStaffs1: null,
+									commonStaffs: null,
+									workflowHistoricTasks: [],
+									status: 'success'
 								})
 							})
+						})
 					}
 				})
 			},
@@ -487,9 +515,6 @@
 						}, 1000);
 					})
 				}
-
-
-
 			},
 			//审核方法
 			audit(item, index, status, status2, reason) {
@@ -657,7 +682,7 @@
 		height: 100%;
 		width: 100%;
 		background: rgba(0, 0, 0, 0.4);
-		z-index: 3;
+		z-index: 11;
 
 		.wrap {
 			position: absolute;
@@ -741,10 +766,12 @@
 		padding: 10rpx 20rpx;
 		position: relative;
 
-		height:240px;
-		/deep/.uni-textarea-textarea{
+		height: 240px;
+
+		/deep/.uni-textarea-textarea {
 			width: 80%;
 		}
+
 		.right-bottom {
 			position: absolute;
 			right: 20rpx;
@@ -762,17 +789,17 @@
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-	
+
 		.row {
 			display: flex;
-	
+
 			.left {
 				display: flex;
 				align-items: center;
-	
+
 				.item1 {
 					position: relative;
-	
+
 					.item-content {
 						background: #617AE0;
 						width: 44px;
@@ -783,7 +810,7 @@
 						font-size: 15px;
 						color: #fff;
 					}
-	
+
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -792,27 +819,27 @@
 						bottom: -3px;
 						background: #fff;
 					}
-	
+
 					.status.success {
 						border: 1px solid rgb(60, 156, 255);
 					}
-	
+
 					.status.error {
 						border: 1px solid rgb(245, 108, 108);
 					}
-	
+
 					.status.question {
 						border: 1px solid #f9ae3d;
 					}
 				}
-	
+
 			}
-	
+
 			.right {
 				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-	
+
 				.right-content {
 					background: #F2F3F7;
 					margin-left: 10px;
@@ -821,33 +848,33 @@
 					border-radius: 5px;
 					color: #B0B1B5;
 				}
-	
+
 				.right-item {
 					display: flex;
 					justify-content: space-between;
-	
+
 					.time {
 						color: #999;
 					}
-	
+
 					.item2 {
 						margin-left: 20rpx;
 						margin-top: -7px;
-	
+
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
 							margin-bottom: 4px;
 						}
-	
+
 						.status.success {
 							color: #6CC48C;
 						}
-	
+
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
-	
+
 						.status.question {
 							color: #f9ae3d;
 						}
@@ -855,10 +882,10 @@
 				}
 			}
 		}
-	
+
 		.row2 {
 			display: flex;
-	
+
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -871,22 +898,22 @@
 				padding: 0 2px;
 				margin: 0 auto;
 			}
-	
+
 			.status {
 				position: absolute;
 				top: 0;
 				right: 0;
 			}
 		}
-	
+
 		.row-line {
 			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;
-	
+
 		}
-	
+
 		.audit {
 			margin-top: 20rpx;
 		}
@@ -899,94 +926,118 @@
 		font-size: 30rpx;
 		font-weight: 600;
 	}
-	.form_view{
+	.place{
+		margin: auto;
+		margin-right: 0px;
+		text-align: right;
+	}
+
+	.form_view {
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		background: #F9F9FA;
 		padding: 30rpx 20rpx;
 		margin-top: 30rpx;
 	}
-	.label_css{
+
+	.label_css {
 		font-size: 26rpx;
 		color: #878C9C;
 	}
-	.input_css{
+
+	.input_css {
 		font-size: 20rpx;
 	}
-	/deep/.uni-textarea-wrapper{
-		height:200px;
+
+	/deep/.uni-textarea-wrapper {
+		height: 200px;
 	}
-	
+
 	// .fujian_title{
 	// 	font-size: 34rpx;
 	// 	margin-top: 20px;
 	// 	font-weight: 600;
 	// 	// margin-left: 10px;
 	// }
-	.headInfo{
+	.headInfo {
 		height: 100px;
 		background-color: #FFFFFF;
 		margin-bottom: 20rpx;
 		border-radius: 10px;
 		padding: 30rpx 10px;
 		display: flex;
-		.headInfo_left{
+
+		.headInfo_left {
 			width: 10%;
 			line-height: 60px;
 			text-align: center;
 		}
-		.headInfo_middle{
+
+		.headInfo_middle {
 			width: 60%;
 			padding-left: 10px;
 			margin-top: 10px;
 		}
-		.headInfo_right{
+
+		.headInfo_right {
 			width: 30%;
 			line-height: 60px;
-			.char_a{
+
+			.char_a {
 				color: #22C572;
 			}
-			.char_b{
-				 color: #FE6430;
+
+			.char_b {
+				color: #FE6430;
 			}
-			.char_c{
+
+			.char_c {
 				color: #FB2323;
 			}
-			.char_a,.char_b,.char_c{
+
+			.char_a,
+			.char_b,
+			.char_c {
 				font-size: 16px;
 			}
 		}
-		.adopt{
+
+		.adopt {
 			position: absolute;
 			right: 30px;
 			top: 60px;
-			.adopt_img{
+
+			.adopt_img {
 				width: 90px;
 				height: 90px;
 			}
 		}
-		.headInfo_title{
+
+		.headInfo_title {
 			font-size: 19px;
 			color: #333333;
 			font-weight: 600;
 		}
-		.headInfo_No{
+
+		.headInfo_No {
 			color: #878C9C;
 			font-size: 13px;
 			margin-top: 6px;
 		}
 	}
-	
+
 	.img_item {
 		display: flex;
 		width: 100%;
 		margin: 10px 0;
 		padding: 0 10rpx;
-		.imgsign{
+
+		.imgsign {
 			width: 25px;
 			height: 25px;
 			margin-top: 6px;
 		}
+
 		.char_css {
 			font-size: 28rpx;
 			font-weight: 600;
@@ -999,16 +1050,30 @@
 			text-overflow: ellipsis;
 			word-break: break-all;
 		}
-		.img_size{
+
+		.img_size {
 			color: #B0B3BF;
 			font-size: 12px;
 			margin-top: 5px;
 		}
-	
+
 		.img_dowload {
 			width: 14%;
 			color: #22C572;
 			text-align: right;
 		}
 	}
+	//凭证
+	.voucher{
+		.voucher_tips{
+			margin-top: 20rpx;
+			color: #878C9C;
+		}
+	}
+	
+
+	.upload {
+	   margin: auto;
+	   margin-right: 0px;
+	}
 </style>

pages/task/audit/supp_clock_approve.vue

@@ -23,6 +23,12 @@
 		<view class="content1">
 			<!-- :model="OutList" -->
 			<u-form  ref="uForm">
+				<u-form-item label="申请人" prop="empName" label-width="140" class="uForm_item">
+					<u-input input-align="right" disabled v-model="dataList.empName" />
+				</u-form-item>
+				<u-form-item label="补卡日期" prop="suppDay" label-width="140" class="uForm_item">
+					<u-input input-align="right" disabled v-model="dataList.suppDay" />
+				</u-form-item>
 				<u-form-item label="补卡原因" prop="supplementClockType" label-width="140" class="uForm_item">
 					<u-input input-align="right" disabled v-if="dataList.supplementClockType=='1'" value="上班">上班</u-input>
 					<u-input  input-align="right" disabled v-if="dataList.supplementClockType=='3'" value="下班">下班</u-input>