LongYuFei 2 년 전
부모
커밋
175d85bf36
8개의 변경된 파일609개의 추가작업 그리고 264개의 파일을 삭제
  1. 1 1
      config.js
  2. 37 4
      manifest.json
  3. 10 2
      pages.json
  4. 25 16
      pages/index.vue
  5. 391 159
      pages/particulars/claimExpense/index.vue
  6. 143 80
      pages/particulars/index.vue
  7. 2 2
      pages/register.vue
  8. BIN
      static/appLogo.png

+ 1 - 1
config.js

@@ -10,7 +10,7 @@ module.exports = {
 		// 应用版本
 		version: "0.0.1",
 		// 应用logo
-		logo: "/static/logo.png",
+		// logo: "/static/logo.png",
 		// 官方网站
 		// site_url: "http://ruoyi.vip",
 		// 政策协议

+ 37 - 4
manifest.json

@@ -46,22 +46,55 @@
             },
             "sdkConfigs" : {
                 "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
             }
         }
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wxcb883133c203ce07",
         "setting" : {
-            "urlCheck" : false,
-            "es6" : false,
+            "urlCheck" : true,
+            "es6" : true,
             "minified" : true,
             "postcss" : true
         },
         "optimization" : {
             "subPackages" : true
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "permission" : {}
     },
     "vueVersion" : "2",
     "h5" : {

+ 10 - 2
pages.json

@@ -18,7 +18,10 @@
 			"style": {
 				"navigationBarTitleText": "运单列表",
 				"navigationBarBackgroundColor": "#3c9cff",
+				// "navigationStyle": "custom",
 				"navigationBarTextStyle": "white" //状态栏字体颜色
+				
+				
 			},
 			"app-plus": {
 				// 将回弹属性关掉
@@ -78,7 +81,9 @@
 		}, {
 			"path": "pages/particulars/index",
 			"style": {
-				"navigationBarTitleText": "报单详情"
+				"navigationBarTitleText": "报单详情",
+				"navigationBarBackgroundColor": "#3c9cff",
+				"navigationBarTextStyle": "white" //状态栏字体颜色
 			}
 
 		}, {
@@ -91,6 +96,8 @@
 			"path": "pages/particulars/claimExpense/index",
 			"style": {
 				"navigationBarTitleText": "费用报销",
+				"navigationBarBackgroundColor": "#3c9cff",
+				"navigationBarTextStyle": "white", //状态栏字体颜色
 				"enablePullDownRefresh": false
 			}
 
@@ -124,6 +131,7 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "RuoYi",
-		"navigationBarBackgroundColor": "#FFFFFF"
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#c4c6c9"
 	}
 }

+ 25 - 16
pages/index.vue

@@ -3,10 +3,11 @@
 		<!-- 头部 -->
 		<view class="example-body vertical-layout">
 			<!-- 用户头像 -->
-			<image :src="avatar" class="user" @click="userTo()">
-			</image>
+			<!-- <image :src="avatar" class="user" @click="userTo()">
+			</image> -->
+			<!-- <view style="width: 100%; height: 98rpx"></view> -->
 			<view class="falseSearch">
-				<u-search bgColor="#fff" hover-class="search" @confirm="getOrderBillsPlansList()" :showAction="false"
+				<u-search bgColor="#fff" hover-class="search" @search="getOrderBillsPlansList()" @confirm="getOrderBillsPlansList()" :showAction="false"
 					placeholder="请输入订单号码" v-model="condition.orderNo">
 				</u-search>
 				<text class="search" hover-class="search-click" @click="getOrderBillsPlansList()">搜索</text>
@@ -25,7 +26,7 @@
 				@click="jumpDetails(item.orderNo, item.status317, item.status376)">
 				<!-- 头部 -->
 				<view class="head vertical-layout">
-					<view class="no">
+					<view class="no" style="font-size: 34rpx;">
 						<view class="blueStick-blue"></view>
 						<!-- <view class="blueStick-red" v-if="item.billStatus == 6"></view> -->
 						<!-- 订单号 -->
@@ -41,9 +42,8 @@
 						<text class="true" v-if="item.status317 == 2">{{ item.billStatusName }}</text>
 						<!-- item.status376 == 0 -->
 						<!-- item.status376 == 2  -->
-						<text class="yellow"
-							v-if="item.status317 == 6">{{ item.billStatusName }}</text>
-						<text class="false" v-if="item.status376 == 6">{{ item.billStatusName }}</text>
+						<text class="yellow" v-if="item.status317 == 6 && (item.status376 == 0 || item.status376 == 2)">{{ item.billStatusName }}</text>
+						<text class="false" v-if="item.status317 == 6 && item.status376 == 6">{{ item.billStatusName }}</text>
 					</view>
 				</view>
 				<!-- <view class="details">
@@ -187,7 +187,19 @@
 
 				//30天前(月份判断是否小于10,小于10的前面+0)
 				var agoDay =
-					`${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+					`${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}`;
+					
+					var date = date2.getDate() + "";
+					
+					if(date.length == 1) {
+						date = 0 + date
+					}
+					
+					agoDay += "-" + date
+					
+					
+					console.log(agoDay);
+					console.log(endDate);
 
 				this.condition.range.push(agoDay, endDate);
 
@@ -272,15 +284,12 @@
 
 		// 搜索框
 		.falseSearch {
-			// width: calc(100% - 130rpx);
 			height: 80rpx;
-			// width: 1000rpx;
 			border-radius: 35rpx;
+			
+			width: 680rpx;
 
 			display: flex;
-			// align-items: center;
-
-			// margin-left: 0rpx;
 			background-color: #fff;
 
 			align-content: center;
@@ -324,7 +333,7 @@
 
 			.head {
 
-				font-size: 34rpx;
+				
 
 				height: 50rpx;
 				margin: 10rpx 20rpx 20rpx 20rpx;
@@ -370,9 +379,9 @@
 
 			.details {
 
-				width: 100%;
+				// width: 100%;
 
-				font-size: 30rpx;
+				// font-size: 30rpx;
 
 				// margin-left: 20rpx;
 				margin-right: 20rpx;

+ 391 - 159
pages/particulars/claimExpense/index.vue

@@ -1,25 +1,46 @@
 <template>
 	<view class="content">
-		<view class="head">
-			<text>订单号: {{formData.orderNo}}</text>
-		</view>
+		<u-sticky>
+			<view class="head" style="background-color: #3c9cff; color: #fff; width: 960rpx;">
+				<text>订单号: {{formData.orderNo}}</text>
+			</view>
+		</u-sticky>
 		<view class="striping"></view>
 		<view class="head" @click="telFun">
 			<text>驾驶员: {{formData.driver1Name == null ? '' : formData.driver1Name}}&nbsp;电话:&nbsp;{{formData.driver1mobile == null ? '' : formData.driver1mobile}}</text>
 		</view>
-		<u-collapse>
-			<!-- <u-collapse-item title="报销费用" name="claim expense"> -->
+
+		<u-tabs :list="tabs" @change="change" 
+			:activeStyle="{
+				width: '180rpx',
+				height: '60rpx',
+				color: '#fff',
+				backgroundColor: '#3c9cff',
+				borderRadius: '80rpx',
+				lineHeight: '60rpx',
+				textAlign: 'center'
+				}"
+			:inactiveStyle="{
+				width: '180rpx',
+				height: '60rpx',
+				color: '#3c9cff',
+				backgroundColor: '#f0f0f0f0',
+				borderRadius: '80rpx',
+				lineHeight: '60rpx',
+				textAlign: 'center'
+				}"></u-tabs>
+		<view v-if="isTabs == '行程费用'">
 			<view class="box-box">
 				<view class="box">
 					<view class="data">
 						<text class="key">ETC金额</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnLoadetc" v-model="formData.loadetc" />
+							type="digit" @input="checkUnLoadetc" v-model="formData.loadetc" />
 					</view>
 					<view class="data">
 						<text class="key">现金过路费</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnLoadtoll" v-model="formData.loadtoll" />
+							type="digit" @input="checkUnLoadtoll" v-model="formData.loadtoll" />
 					</view>
 				</view>
 
@@ -27,12 +48,12 @@
 					<view class="data">
 						<text class="key">公司加油(升)</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnOilhomeQty" v-model="formData.oilhomeQty" />
+							type="digit" @input="checkUnOilhomeQty" v-model="formData.oilhomeQty" />
 					</view>
 					<view class="data">
 						<text class="key">加油金额</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnOilhomeAmt" v-model="formData.oilhomeAmt" />
+							type="digit" @input="checkUnOilhomeAmt" v-model="formData.oilhomeAmt" />
 					</view>
 				</view>
 
@@ -54,14 +75,14 @@
 					<view class="data">
 						<text class="key">升数</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnOilappoint1Qty" placeholder="请输入升数"
+							type="digit" @input="checkUnOilappoint1Qty" placeholder="请输入升数"
 							v-model="formData.oilappoint1Qty" />
 					</view>
 					<view class="data">
 						<text class="key">金额</text>
 
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnOilappoint1Amt" placeholder="请输入金额"
+							type="digit" @input="checkUnOilappoint1Amt" placeholder="请输入金额"
 							v-model="formData.oilappoint1Amt" />
 					</view>
 				</view>
@@ -79,14 +100,14 @@
 					<view class="data">
 						<text class="key">升数</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnOilappoint2Qty" placeholder="请输入升数"
+							type="digit" @input="checkUnOilappoint2Qty" placeholder="请输入升数"
 							v-model="formData.oilappoint2Qty" />
 					</view>
 					<view class="data">
 						<text class="key">金额</text>
 
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnOilappoint2Amt" placeholder="请输入金额"
+							type="digit" @input="checkUnOilappoint2Amt" placeholder="请输入金额"
 							v-model="formData.oilappoint2Amt" />
 					</view>
 				</view>
@@ -95,12 +116,12 @@
 					<view class="data">
 						<text class="key">现金加油(升)</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnOilcash1Qty" v-model="formData.oilcash1Qty" />
+							type="digit" @input="checkUnOilcash1Qty" v-model="formData.oilcash1Qty" />
 					</view>
 					<view class="data">
 						<text class="key">加油金额</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnOilcash1Amt" v-model="formData.oilcash1Amt" />
+							type="digit" @input="checkUnOilcash1Amt" v-model="formData.oilcash1Amt" />
 					</view>
 				</view>
 
@@ -109,25 +130,27 @@
 					<view class="data">
 						<text class="key">油卡加油(升)</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnOilcardQty" v-model="formData.oilcardQty" />
+							type="digit" @input="checkUnOilcardQty" v-model="formData.oilcardQty" />
 					</view>
 					<view class="data">
 						<text class="key">加油金额</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							inputmode="decimal" @input="checkUnOilcardAmt" v-model="formData.oilcardAmt" />
+							type="digit" @input="checkUnOilcardAmt" v-model="formData.oilcardAmt" />
 					</view>
 				</view>
-				
+
 				<view class="box-two">
 					<text class="key">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</text>
-					<input class="value" selection-start="0" selection-end="9999" :disabled="disabled" v-model="formData.driverassdesc" />
+					<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
+						v-model="formData.driverassdesc" />
 				</view>
 				<!-- </u-collapse-item> -->
 			</view>
-			
+
 			<view class="box-box" style="margin-top: 40rpx;">
-				<u-upload :fileList="fileList1" @afterRead="imgUploading" @delete="deletePic" name="1" multiple
-					:disabled="this.status376 == 6" :previewFullImage="true"></u-upload>
+				<u-upload :fileList="fileList1" accept="image" :sizeType="['compressed']" capture="camera"
+					@afterRead="imgUploading" @delete="deletePic" name="1" multiple :disabled="disabled"
+					:previewFullImage="true"></u-upload>
 			</view>
 
 			<!-- <u-collapse-item title="照片" name="img" ref="collapseHeight">
@@ -136,41 +159,72 @@
 				
 			</u-collapse-item> -->
 
+		</view>
 
+		<view v-if="isTabs == '其他费用'">
+			<!-- <view class="h">其他费用</view> -->
 
-			<u-collapse-item title="其他费用" name="cost breakdown">
-				<view class="table">
-					<view class="data vertical-layout" v-for="(item, index) in itemsList" :key="index">
-						<view class="name">
-							<text style="color: #3c9cff;">{{ item.cname }}</text>
-						</view>
-						<view class="sum">
-							<!-- <input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-								inputmode="decimal" @input="checkUnAmt(item.amt, index)" cursor-spacing="15"
+			<!-- <u-collapse-item title="其他费用 ¥" name="cost breakdown"> -->
+			<view class="table">
+				<view class="data vertical-layout" v-for="(item, index) in itemsList" :key="index">
+					<view class="name">
+						<text style="color: #3c9cff;">{{ item.cname }}</text>
+					</view>
+					<view class="sum">
+						<!-- <input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
+								type="digit" @input="checkUnAmt(item.amt, index)" cursor-spacing="15"
 								:adjust-position="true" v-model="item.amt" /> -->
-								<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-									inputmode="decimal" @input="checkUnAmt(item.amt, index)" @click="inputHeight" cursor-spacing="30"
-									:always-embed="true" :adjust-position="true" v-model="item.amt" />
-						</view>
+						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
+							type="digit" @input="checkUnAmt(item.amt, index)" @click="inputHeight"
+							cursor-spacing="30" :always-embed="true" :adjust-position="true" v-model="item.amt" />
+					</view>
+
+					<view class="remarks" style="border-bottom: 2rpx dotted #000;">
+						<input v-model="item.remarks" placeholder="请输入备注">
 					</view>
 				</view>
-			</u-collapse-item>
-		</u-collapse>
-		
-		<view class="input" :style="{'height':vHeight + 'rpx'}">
-		
+			</view>
+			<!-- </u-collapse-item> -->
+			<!-- </u-collapse> -->
+
+
 		</view>
 
+		<!-- <view class="input" :style="{'height':vHeight + 'rpx'}">
+
+		</view> -->
+
 		<view class="cushion">
 
 		</view>
 
-		<view class="bottom vertical-layout" v-if="status376 == 2 || status376 == 0">
+
+		<view class="bottom vertical-layout" style="z-index: 4;" v-if="status376 == 2 || status376 == 0">
+			<!-- <view style="height: 20rpx;"></view>
 			<button class="submit" iconColor="#3c9cff" type="primary" @click="submit">提交费用</button>
+			<view style="height: 20rpx;"></view> -->
+
+			<view class="bottom-bottom">
+				<view class="money">
+					<!-- 金额合集 -->
+					<text>报销:</text> {{' '}}
+					<text style="color: #ff9f1c;">¥ {{money}}</text>
+				</view>
+
+				<view class="button">
+					<!-- 提交按钮 -->
+					<view class="button-button">
+						<u-button iconColor="#3c9cff" shape="circle" type="primary" @click="submit"
+							text="提交费用"></u-button>
+					</view>
+				</view>
+
+			</view>
+
 		</view>
 
 		<!-- 遮盖罩 -->
-		<u-loading-page :loading="loading"></u-loading-page>
+		<u-loading-page :loading="loading" style="z-index: 9999;"></u-loading-page>
 
 		<!-- 消息提示 -->
 		<u-toast ref="uToast"></u-toast>
@@ -190,7 +244,7 @@
 		insertLoadFeeItems,
 		getLoadFeeItems
 	} from "@/api/reimbursement"
-	
+
 	import {
 		getOrderBillsPlansByid,
 		putOrderBillsPlansByid,
@@ -227,7 +281,16 @@
 				// 删除弹框
 				deleteShow: false,
 				event: {},
-				vHeight: 0
+				vHeight: 0,
+				tabs: [{
+					name: '行程费用'
+				}, {
+					name: '其他费用'
+				}],
+				isTabs: '行程费用',
+				// 报销金额
+				money: 0
+
 			}
 		},
 		onUnload() {
@@ -258,11 +321,16 @@
 						this.itemsList = costBreakdownList;
 						this.fileList1 = res.data.fileList1;
 						this.loading = false;
+
+						this.calculatMoney();
 					})
 				})
 			})
 		},
 		methods: {
+			change(item) {
+				this.isTabs = item.name;
+			},
 			// 保存内容
 			submit() {
 
@@ -275,57 +343,118 @@
 					})
 				} else if (this.status376 == 2 || this.status376 == 0) {
 
+					// let isMo = false;
+
+					// for (const key in this.itemsList) {
+					// 	if (this.itemsList[key].amt == null) {
+					// 		isMo = true;
+					// 		continue;
+					// 	}
+					// }
+					// if (this.formData.loadetc == null ||
+					// 	this.formData.loadtoll == null ||
+					// 	this.formData.oilhomeQty == null ||
+					// 	this.formData.oilhomeAmt == null ||
+					// 	this.formData.oilappoint1Qty == null ||
+					// 	this.formData.oilappoint1Amt == null ||
+					// 	this.formData.oilappoint2Qty == null ||
+					// 	this.formData.oilappoint2Amt == null ||
+					// 	this.formData.oilcash1Qty == null ||
+					// 	this.formData.oilcash1Amt == null ||
+					// 	this.formData.oilcardQty == null ||
+					// 	this.formData.oilcardAmt == null || isMo
+					// ) {
+					// 	this.$refs.uToast.show({
+					// 		type: 'warning',
+					// 		icon: false,
+					// 		message: "请输入金额或升数!",
+					// 		iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
+					// 	})
+					// } else {
+
+					let isMo = false;
+
+					for (const key in this.itemsList) {
+						if (this.itemsList[key].amt == null) {
+							this.itemsList[key].amt = 0;
+						}
+					}
 
+					// let money = ['loadetc', 'loadtoll', 'oilhomeQty', 'oilhomeAmt', 'oilappoint1Qty', 'oilappoint1Amt', 'oilappoint2Qty', 'oilappoint2Amt', 'oilcash1Qty', 'oilcash1Amt', 'oilcardQty', 'oilcardAmt'];
+					// for (const item of money) {
+					// 	this.formData[item] = 0
+					// 	// this.formData.money[key] == null;
+					// 	// this.formData.loadetc == null;
+					// 	// this.formData.money[key] = 0;
+					// }
 
-					if (this.formData.loadetc == null ||
-						this.formData.loadtoll == null ||
-						this.formData.oilhomeQty == null ||
-						this.formData.oilhomeAmt == null ||
-						this.formData.oilappoint1Qty == null ||
-						this.formData.oilappoint1Amt == null ||
-						this.formData.oilappoint2Qty == null ||
-						this.formData.oilappoint2Amt == null ||
-						this.formData.oilcash1Qty == null ||
-						this.formData.oilcash1Amt == null ||
-						this.formData.oilcardQty == null ||
-						this.formData.oilcardAmt == null
-					) {
-						this.$refs.uToast.show({
-							type: 'warning',
-							icon: false,
-							message: "请输入金额或升数!",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
-						})
-					} else {
-						this.loading = true;
-						var list = [];
-						for (var item in this.itemsList) {
-							var amt = this.itemsList[item].amt;
-							if (amt != null) {
-								var items = this.itemsList[item];
-								list.push(items);
-							}
+					if (this.formData.loadetc == null) {
+						this.formData.loadetc = 0;
+					}
+					if (this.formData.loadtoll == null) {
+						this.formData.loadtoll = 0;
+					}
+					if (this.formData.oilhomeQty == null) {
+						this.formData.oilhomeQty = 0;
+					}
+					if (this.formData.oilhomeAmt == null) {
+						this.formData.oilhomeAmt = 0;
+					}
+					if (this.formData.oilappoint1Qty == null) {
+						this.formData.oilappoint1Qty = 0;
+					}
+					if (this.formData.oilappoint1Amt == null) {
+						this.formData.oilappoint1Amt = 0;
+					}
+					if (this.formData.oilappoint2Qty == null) {
+						this.formData.oilappoint2Qty = 0;
+					}
+					if (this.formData.oilappoint2Amt == null) {
+						this.formData.oilappoint2Amt = 0;
+					}
+					if (this.formData.oilcash1Qty == null) {
+						this.formData.oilcash1Qty = 0;
+					}
+					if (this.formData.oilcash1Amt == null) {
+						this.formData.oilcash1Amt = 0;
+					}
+					if (this.formData.oilcardQty == null) {
+						this.formData.oilcardQty = 0;
+					}
+					if (this.formData.oilcardAmt == null) {
+						this.formData.oilcardAmt = 0;
+					}
+
+
+					this.loading = true;
+					var list = [];
+					for (var item in this.itemsList) {
+						var amt = this.itemsList[item].amt;
+						if (amt != null) {
+							var items = this.itemsList[item];
+							list.push(items);
 						}
-						this.formData.itemsVoList = list;
-						insertLoadFeeItems(this.formData).then(res => {
-							this.loading = false;
-							if (res.code == 200) {
-								// 保存成功弹窗提示
-								this.$refs.uToast.show({
-									type: 'success',
-									message: "保存成功!",
-									iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
-								})
-							} else {
-								// 保存失败消息
-								this.$refs.uToast.show({
-									icon: false,
-									message: "保存失败请重试!",
-									iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
-								})
-							}
-						})
 					}
+					this.formData.itemsVoList = list;
+					insertLoadFeeItems(this.formData).then(res => {
+						this.loading = false;
+						if (res.code == 200) {
+							// 保存成功弹窗提示
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "保存成功!",
+								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
+							})
+						} else {
+							// 保存失败消息
+							this.$refs.uToast.show({
+								icon: false,
+								message: "保存失败请重试!",
+								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
+							})
+						}
+					})
+					// }
 				}
 
 			},
@@ -340,12 +469,12 @@
 						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
 					})
 				} else if (this.status376 == 2 || this.status376 == 0) {
-				this.event = event;
-				this.deleteShow = true;
+					this.event = event;
+					this.deleteShow = true;
 				}
 			},
 			deleteImg() {
-				
+
 				var event = this.event;
 				var url = event.file.url;
 				var index = url.lastIndexOf("\/");
@@ -375,7 +504,6 @@
 			},
 			// 新增图片
 			imgUploading(event) {
-
 				// 当设置 multiple 为 true 时, file 为数组格式,否则为对象格式
 				let lists = [].concat(event.file)
 				let fileListLen = this[`fileList${event.name}`].length
@@ -387,15 +515,34 @@
 					})
 				})
 				for (let i = 0; i < lists.length; i++) {
+					let date = this.dateToString("yyyyMMdd");
+					let dateHHmmss = this.dateToString("yyyy-MM-dd HH:mm:ss");
+					this.formData.date = date;
 					insertTmsAttachMngs(this.formData).then(res => {
 						if (res.code == 200) {
 							let data = {
 								name: 'avatarfile',
 								filePath: lists[i].url
 							}
+							// 获取经纬度
+							let longitude = '';
+							let latitude = '';
+							// uni.getLocation({
+							// 	type: 'wgs84',
+							// 	success: function(res) {
+							// 		console.log('当前位置的经度:' + res.longitude);
+							// 		console.log('当前位置的纬度:' + res.latitude);
+							// 	}
+							// });
 							let dataForm = {
-								attachId: res.data
+								attachId: res.data,
+								longitude: longitude,
+								latitude: latitude,
+								updateDate: dateHHmmss
 							}
+
+							console.log(dataForm);
+							// 上传图片
 							pictureUploading(data, dataForm).then(res => {
 								let item = this[`fileList${event.name}`][fileListLen]
 								this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(
@@ -411,6 +558,23 @@
 					})
 				}
 			},
+			dateToString(fmt) {
+				var date = new Date();
+				var o = {
+					"M+": date.getMonth() + 1, //月份 
+					"d+": date.getDate(), //日 
+					"H+": date.getHours(), //小时 
+					"m+": date.getMinutes(), //分 
+					"s+": date.getSeconds(), //秒 
+					"q+": Math.floor((date.getMonth() + 3) / 3), //季度 
+					"S": date.getMilliseconds() //毫秒 
+				};
+				if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+				for (var k in o)
+					if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[
+						k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+				return fmt;
+			},
 			// 定点加油1清空
 			gasstation1Change() {
 				this.formData.oilappoint1Qty = 0;
@@ -439,39 +603,35 @@
 			selectionChange(e) {
 				this.selectedIndexs = e.detail.index;
 			},
-			groupChangeOne(n) {
-				if (n == this.radioValueOne && this.numOne == 0) {
-					// 第一次相等即执行以下代码
-					this.numOne++
-				} else {
-					// 第一次后相等即执行以下代码
-					// 置空 radioGroupValue 即取消选中的值
-					this.formData.gasstation1 = ''
-					// 初始化 num
-					this.numOne = 0
-				}
-			},
-			radioChangeOne(n) {
-				this.radioValueOne = n
-				// 切换选项后需要初始化 num
-				this.numOne = 0
-			},
-			groupChangeTwo(n) {
-				if (n == this.radioValueTwo && this.numTwo == 0) {
-					// 第一次相等即执行以下代码
-					this.numTwo++
-				} else {
-					// 第一次后相等即执行以下代码
-					// 置空 radioGroupValue 即取消选中的值
-					this.formData.gasstation2 = ''
-					// 初始化 num
-					this.numTwo = 0
+
+			// 计算报销金额
+			calculatMoney() {
+				let loadetc = this.formData.loadetc == null ? 0 : this.formData.loadetc;
+				let loadtoll = this.formData.loadtoll == null ? 0 : this.formData.loadtoll;
+				let oilhomeAmt = this.formData.oilhomeAmt == null ? 0 : this.formData.oilhomeAmt;
+				let oilappoint1Amt = this.formData.oilappoint1Amt == null ? 0 : this.formData.oilappoint1Amt;
+				let oilappoint2Amt = this.formData.oilappoint2Amt == null ? 0 : this.formData.oilappoint2Amt;
+				let oilcash1Amt = this.formData.oilcash1Amt == null ? 0 : this.formData.oilcash1Amt;
+				let oilcardAmt = this.formData.oilcardAmt == null ? 0 : this.formData.oilcardAmt;
+
+				let itemsMoney = 0;
+
+				for (const key in this.itemsList) {
+					let a = this.itemsList[key].amt == null ? 0 : this.itemsList[key].amt;
+					itemsMoney += Number(a);
 				}
-			},
-			radioChangeTwo(n) {
-				this.radioValueTwo = n
-				// 切换选项后需要初始化 num
-				this.numTwo = 0
+
+				loadetc = Number(loadetc)
+				loadtoll = Number(loadtoll)
+				oilhomeAmt = Number(oilhomeAmt)
+				oilappoint1Amt = Number(oilappoint1Amt)
+				oilappoint2Amt = Number(oilappoint2Amt)
+				oilcash1Amt = Number(oilcash1Amt)
+				oilcardAmt = Number(oilcardAmt)
+				itemsMoney = Number(itemsMoney)
+
+				this.money = loadetc + loadtoll + oilhomeAmt + oilappoint1Amt + oilappoint2Amt + oilcash1Amt + oilcardAmt +
+					itemsMoney;
 			},
 			checkUnLoadetc(e) {
 				//正则表达试
@@ -480,7 +640,7 @@
 				this.$nextTick(() => {
 					this.formData.loadetc = e.target.value
 				})
-
+				this.calculatMoney();
 			},
 			checkUnLoadtoll(e) {
 				//正则表达试
@@ -489,6 +649,7 @@
 				this.$nextTick(() => {
 					this.formData.loadtoll = e.target.value
 				})
+				this.calculatMoney();
 
 			},
 			checkUnOilhomeQty(e) {
@@ -498,6 +659,7 @@
 				this.$nextTick(() => {
 					this.formData.oilhomeQty = e.target.value
 				})
+				this.calculatMoney();
 
 			},
 			checkUnOilhomeAmt(e) {
@@ -507,6 +669,7 @@
 				this.$nextTick(() => {
 					this.formData.oilhomeAmt = e.target.value
 				})
+				this.calculatMoney();
 
 			},
 			checkUnOilappoint1Qty(e) {
@@ -516,6 +679,7 @@
 				this.$nextTick(() => {
 					this.formData.oilappoint1Qty = e.target.value
 				})
+				this.calculatMoney();
 
 			},
 			checkUnOilappoint1Amt(e) {
@@ -525,6 +689,7 @@
 				this.$nextTick(() => {
 					this.formData.oilappoint1Amt = e.target.value
 				})
+				this.calculatMoney();
 
 			},
 			checkUnOilappoint2Qty(e) {
@@ -534,6 +699,7 @@
 				this.$nextTick(() => {
 					this.formData.oilappoint2Qty = e.target.value
 				})
+				this.calculatMoney();
 
 			},
 			checkUnOilappoint2Amt(e) {
@@ -544,6 +710,7 @@
 					this.formData.oilappoint2Amt = e.target.value
 				})
 
+				this.calculatMoney();
 			},
 			checkUnOilcash1Qty(e) {
 				//正则表达试
@@ -552,6 +719,7 @@
 				this.$nextTick(() => {
 					this.formData.oilcash1Qty = e.target.value
 				})
+				this.calculatMoney();
 
 			},
 			checkUnOilcash1Amt(e) {
@@ -561,6 +729,7 @@
 				this.$nextTick(() => {
 					this.formData.oilcash1Amt = e.target.value
 				})
+				this.calculatMoney();
 
 			},
 			checkUnOilcardQty(e) {
@@ -570,6 +739,7 @@
 				this.$nextTick(() => {
 					this.formData.oilcardQty = e.target.value
 				})
+				this.calculatMoney();
 
 			},
 			checkUnOilcardAmt(e) {
@@ -579,15 +749,17 @@
 				this.$nextTick(() => {
 					this.formData.oilcardAmt = e.target.value
 				})
+				this.calculatMoney();
 
 			},
 			checkUnAmt(amt, index) {
-				
+
 				var amt = (amt.match(/^\d*(\.?\d{0,2})/g)[0]) || null
 				//重新赋值给input
 				this.$nextTick(() => {
 					this.itemsList[index].amt = amt
 				})
+				this.calculatMoney();
 			},
 			inputHeight() {
 				// if (this.vHeight == 0) {
@@ -606,6 +778,22 @@
 		display: flex;
 	}
 
+	.h {
+		margin-top: 20rpx;
+		height: 100rpx;
+		padding-left: 40rpx;
+		font-weight: 900;
+		border-top: 2rpx solid #f0f0f0f0;
+		border-bottom: 2rpx solid #f0f0f0f0;
+
+		line-height: 100rpx;
+
+		font-size: 30rpx;
+		color: #3c9cff;
+
+		// background-color: pink;
+	}
+
 	// 分割线
 	.striping {
 		width: 100%;
@@ -614,8 +802,8 @@
 	}
 
 	.box-box {
-		padding-left: 50rpx;
-		padding-right: 50rpx;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
 	}
 
 	.content {
@@ -644,7 +832,7 @@
 			width: 100%;
 			border-bottom: 2rpx solid #f0f0f0f0;
 			// padding-left: 50rpx;
-			font-size: 30rpx;
+			// font-size: 30rpx;
 
 
 			color: #3b3b3b;
@@ -671,7 +859,7 @@
 
 				flex-wrap: wrap;
 
-				font-size: 30rpx;
+				// font-size: 30rpx;
 			}
 
 			.quantity-aum {
@@ -711,9 +899,9 @@
 			// overflow: hidden;
 			height: 100rpx;
 
-			border-bottom: 2rpx solid #f0f0f0f0;
+			// border-bottom: 2rpx solid #f0f0f0f0;
 
-			font-size: 30rpx;
+			// font-size: 30rpx;
 
 			display: flex;
 			align-items: center;
@@ -762,51 +950,52 @@
 
 					flex-wrap: wrap;
 
-					font-size: 30rpx;
+					// font-size: 30rpx;
 				}
 			}
 		}
-		
+
 		.box-two {
-		
+
 			color: #3b3b3b;
-		
+
 			overflow: hidden;
 			height: 100rpx;
-		
+
 			padding-left: 20rpx;
 			// margin-right: 20rpx;
-		
-			font-size: 30rpx;
-		
+
+			// font-size: 30rpx;
+
 			display: flex;
 			align-items: center;
-		
+
 			.key {
-				
-				
+
+
 				display: inline-block;
 				width: 24%;
-				color:  #3c9cff;
-		
+				color: #3c9cff;
+
 			}
-		
+
 			.value {
 				margin-left: 20rpx;
 				width: calc(100% - 24%);
 				color: #3b3b3b;
 				// margin-right: 20rpx;
 				border-bottom: 2rpx dotted #000;
-		
+
 			}
 		}
 
 		.table {
+			// margin-top: 40rpx;
 			margin-left: 20rpx;
 			margin-right: 20rpx;
 
 			.data {
-				font-size: 30rpx;
+				// font-size: 30rpx;
 				width: 100%;
 				height: 100rpx;
 				border-bottom: 2rpx solid #f0f0f0f0;
@@ -815,16 +1004,21 @@
 				.name {
 
 					text-align: right;
-					width: 20%;
+					width: 25%;
 					margin-left: 20rpx;
 					color: #000;
 				}
 
 				.sum {
+					width: 20%;
 					margin-left: 20rpx;
-					margin-right: 80rpx;
+					margin-right: 40rpx;
 					border-bottom: 2rpx dotted #000;
 				}
+
+				.remarks {
+					width: 30%;
+				}
 			}
 		}
 
@@ -840,26 +1034,64 @@
 
 		// 底部提交按钮
 		.bottom {
+			height: 130rpx;
 			display: block;
 			position: fixed;
 			bottom: calc(var(--window-bottom));
 			width: 100%;
+			// background-color: #f0f0f0f0;
+			// background-color: pink;
+			background-color: white;
+
+			.bottom-bottom {
+				width: 100%;
+				height: 100%;
+
+				position: relative;
+
+				display: flex;
+
+				// .submit {
+				// 	width: 95%;
+				// 	background-color: #0b68ffff;
+				// }
+
+				.money {
+
+					font-size: 28rpx;
+					height: 130rpx;
+					margin-right: 80rpx;
+					line-height: 130rpx;
+
+					margin-left: 10%;
+				}
 
-			.submit {
-				background-color: #0b68ffff;
+				.button {
+					width: 300rpx;
+					position: absolute;
+					right: 0;
+
+					margin-right: 10%;
+
+					.button-button {
+						padding: 10% 0;
+						background-clip: content-box;
+					}
+
+				}
 			}
 		}
-		
+
 		.input {
 			width: 100%;
 			// height: 100rpx;
 			// background-color: red;
-			
+
 		}
 
 		.cushion {
 			width: 100%;
-			height: 104rpx;
+			height: 200rpx;
 			background-color: #f0f0f0f0;
 		}
 

+ 143 - 80
pages/particulars/index.vue

@@ -1,8 +1,10 @@
 <template>
 	<view class="content">
-		<view class="head-no a-blue">
-			<text>订单号: {{formData.orderNo}}</text>
-		</view>
+		<u-sticky>
+			<view class="head-no">
+				<text>订单号: {{formData.orderNo}}</text>
+			</view>
+		</u-sticky>
 		<view class="striping"></view>
 		<view class="head a-blue" @click="telFun">
 			<text>驾驶员: {{formData.driver1Name == null ? '' : formData.driver1Name}}&nbsp;{{formData.driver1mobile == null ? '' : formData.driver1mobile}}</text>
@@ -15,7 +17,7 @@
 			<!-- <view class="box">
 					<view class="data">
 						<text class="key">装车吨位</text>
-						<input class="value" :disabled="disabled" inputmode="decimal" @input="checkLoadQty"
+						<input class="value" :disabled="disabled" type="digit" @input="checkLoadQty"
 							v-model="formData.loadQty" />
 					</view>
 					<view class="data">
@@ -28,7 +30,7 @@
 			<view class="box-two">
 				<text class="key">装车吨位</text>
 				<input class="value-two" selection-start="0" selection-end="9999" :disabled="disabled"
-					inputmode="decimal" @input="checkLoadQty" v-model="formData.loadQty" />
+					type="digit" @input="checkLoadQty" v-model="formData.loadQty" />
 			</view>
 
 			<view class="box-two">
@@ -44,7 +46,7 @@
 			<!-- <view class="box">
 					<view class="data">
 						<text class="key">卸车吨位</text>
-						<input class="value" :disabled="disabled" inputmode="decimal" @input="checkUnLoadQty"
+						<input class="value" :disabled="disabled" type="digit" @input="checkUnLoadQty"
 							v-model="formData.unLoadQty" />
 					</view>
 					<view class="data">
@@ -57,7 +59,7 @@
 			<view class="box-two">
 				<text class="key">卸车吨位</text>
 				<input class="value-two" selection-start="0" selection-end="9999" :disabled="disabled"
-					inputmode="decimal" @input="checkUnLoadQty" v-model="formData.unLoadQty" />
+					type="digit" @input="checkUnLoadQty" v-model="formData.unLoadQty" />
 			</view>
 
 			<view class="box-two">
@@ -78,7 +80,7 @@
 				<view class="data">
 					<text class="key">空车里程</text>
 					<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-						inputmode="decimal" v-model="formData.odometerstart" />
+						type="digit" v-model="formData.odometerstart" />
 				</view>
 			</view>
 
@@ -91,14 +93,14 @@
 				<view class="data">
 					<text class="key">空车里程</text>
 					<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-						inputmode="decimal" v-model="formData.odometerend" />
+						type="digit" v-model="formData.odometerend" />
 				</view>
 			</view>
 
 			<view class="box-two">
 				<text class="key">重车里程</text>
 				<input class="value-two" selection-start="0" selection-end="9999" :disabled="disabled"
-					inputmode="decimal" @input="checkUnLoadmile" v-model="formData.loadmile" />
+					type="digit" @input="checkUnLoadmile" v-model="formData.loadmile" />
 			</view>
 			<view class="box-two">
 				<text class="key">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</text>
@@ -113,8 +115,9 @@
 		<!-- <u-collapse-item title="照片" name="img" ref="collapseHeight"> -->
 		<!-- @afterRead="imgUploading" -->
 		<view class="box-box" style="margin-top: 40rpx;">
-			<u-upload :fileList="fileList1" @afterRead="imgUploading" @delete="deletePic" name="1" multiple
-				:previewFullImage="true" :disabled="this.status317 == 6"></u-upload>
+			<u-upload :fileList="fileList1" accept="image" :sizeType="['compressed']" capture="camera"
+				@afterRead="imgUploading" @delete="deletePic" name="1" multiple :previewFullImage="true"
+				:disabled="disabled"></u-upload>
 		</view>
 		<!-- </u-collapse-item> -->
 		<u-collapse>
@@ -160,20 +163,49 @@
 		<view class="cushion">
 		</view>
 
-		<view class="bottom vertical-layout">
+		<view class="bottom" style="z-index: 4;">
+			<!-- <view style="height: 20rpx; background-color: #f0f0f0f0;"></view>
+			<view class="between vertical-layout">
+				<view class="onsubmit-script" @click="setOrderBillsPlansByid()">
+					<text v-if="status317 == 2">提交里程</text>
+					<text v-if="status317 == 6 || status317 == 0">里程信息</text>
+				</view>
+				<view class="claim-expense" @click="skipClaimExpense()">
+					<text v-if="status376 == 2 || status376 == 0">报销费用</text>
+					<text v-if="status376 == 6">查看报销</text>
+				</view>
+			</view>
+
+			<view style="height: 20rpx; background-color: #f0f0f0f0;"></view> -->
+
+
+
+			<!-- <u-row style="height: 100%; padding: 2.5% 0; margin: 0 40rpx;"> -->
+
+			<view class="row">
+
+				<view class="button">
+					<u-button iconColor="#3c9cff" shape="circle" type="primary" :disabled="disabled"
+						@click="setOrderBillsPlansByid" text="提交里程"></u-button>
+				</view>
+
+				<view class="button">
+					<u-button iconColor="#3c9cff" shape="circle" type="primary" @click="skipClaimExpense"
+						text="报销费用"></u-button>
+				</view>
 
-			<view class="onsubmit-script" @click="setOrderBillsPlansByid()">
-				<text v-if="status317 == 2">提交里程</text>
-				<text v-if="status317 == 6 || status317 == 0">里程信息</text>
 			</view>
-			<view class="claim-expense" @click="skipClaimExpense()">
-				<text v-if="status376 == 2 || status376 == 0">报销费用</text>
-				<text v-if="status376 == 6">查看报销</text>
+
+			<!-- </u-row> -->
+
+			<view>
+
 			</view>
 
+
 		</view>
 		<!-- 遮盖罩 -->
-		<u-loading-page :loading="loading"></u-loading-page>
+		<u-loading-page :loading="loading" style="z-index: 999;"></u-loading-page>
 		<!-- 消息提示 -->
 		<u-toast ref="uToast"></u-toast>
 
@@ -260,14 +292,33 @@
 				// console.log(this.status317);
 				if (this.status317 == 2) {
 
-					if (this.formData.unLoadQty == '' || this.formData.unLoadQty == null) {
-						this.$refs.uToast.show({
-							type: 'warning',
-							icon: false,
-							message: "请输入卸车吨位!",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
-						})
-					} else if (this.formData.unLoadDateString == '' || this.formData.unLoadDateString == null) {
+					// if (this.formData.unLoadQty == '' || this.formData.unLoadQty == null) {
+					// 	this.$refs.uToast.show({
+					// 		type: 'warning',
+					// 		icon: false,
+					// 		message: "请输入卸车吨位!",
+					// 		iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
+					// 	})
+					// } else if (this.formData.unLoadDateString == '' || this.formData.unLoadDateString == null) {
+					// 	this.$refs.uToast.show({
+					// 		type: 'warning',
+					// 		icon: false,
+					// 		message: "请选择卸车时间!",
+					// 		iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
+					// 	})
+
+					// } else if (this.formData.loadmile == '' || this.formData.loadmile == null) {
+					// 	this.$refs.uToast.show({
+					// 		type: 'warning',
+					// 		icon: false,
+					// 		message: "请输入重车里程!",
+					// 		iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
+					// 	})
+
+
+					// } else {
+
+					if (this.formData.unLoadDateString == '' || this.formData.unLoadDateString == null) {
 						this.$refs.uToast.show({
 							type: 'warning',
 							icon: false,
@@ -275,16 +326,20 @@
 							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
 						})
 
-					} else if (this.formData.loadmile == '' || this.formData.loadmile == null) {
-						this.$refs.uToast.show({
-							type: 'warning',
-							icon: false,
-							message: "请输入重车里程!",
-							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
-						})
-
 					} else {
 
+
+						this.formData.loadQty = this.formData.loadQty == null || this.formData.loadQty == '' ? 0 : this
+							.formData.loadQty
+						this.formData.unLoadQty = this.formData.unLoadQty == null || this.formData.unLoadQty == '' ? 0 :
+							this.formData.unLoadQty
+						this.formData.odometerstart = this.formData.odometerstart == null || this.formData.odometerstart ==
+							'' ? 0 : this.formData.odometerstart
+						this.formData.odometerend = this.formData.odometerend == null || this.formData.odometerend == '' ?
+							0 : this.formData.odometerend
+						this.formData.loadmile = this.formData.loadmile == null || this.formData.loadmile == '' ? 0 : this
+							.formData.loadmile
+
 						putOrderBillsPlansByid(this.formData).then(res => {
 							if (res.code == 200) {
 								// 保存成功弹窗提示
@@ -370,10 +425,6 @@
 			},
 			// 新增图片
 			imgUploading(event) {
-				// this.$nextTick(() => {
-				// 	this.$refs.xxxxxx111.init()
-				// })
-
 				// 当设置 multiple 为 true 时, file 为数组格式,否则为对象格式
 				let lists = [].concat(event.file)
 				let fileListLen = this[`fileList${event.name}`].length
@@ -385,21 +436,34 @@
 					})
 				})
 				for (let i = 0; i < lists.length; i++) {
+					let date = this.dateToString("yyyyMMdd");
+					let dateHHmmss = this.dateToString("yyyy-MM-dd HH:mm:ss");
+					this.formData.date = date;
 					insertTmsAttachMngs(this.formData).then(res => {
 						if (res.code == 200) {
 							let data = {
 								name: 'avatarfile',
 								filePath: lists[i].url
 							}
+							// 获取经纬度
+							let longitude = '';
+							let latitude = '';
+							// uni.getLocation({
+							// 	type: 'wgs84',
+							// 	success: function(res) {
+							// 		console.log('当前位置的经度:' + res.longitude);
+							// 		console.log('当前位置的纬度:' + res.latitude);
+							// 	}
+							// });
 							let dataForm = {
-								attachId: res.data
+								attachId: res.data,
+								longitude: longitude,
+								latitude: latitude,
+								updateDate: dateHHmmss
 							}
-
+							// 上传图片
 							pictureUploading(data, dataForm).then(res => {
-
 								let item = this[`fileList${event.name}`][fileListLen]
-								// console.log("item");
-								// console.log(item);
 								this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(
 									item, {
 										status: 'success',
@@ -413,6 +477,23 @@
 					})
 				}
 			},
+			dateToString(fmt) {
+				var date = new Date();
+				var o = {
+					"M+": date.getMonth() + 1, //月份 
+					"d+": date.getDate(), //日 
+					"H+": date.getHours(), //小时 
+					"m+": date.getMinutes(), //分 
+					"s+": date.getSeconds(), //秒 
+					"q+": Math.floor((date.getMonth() + 3) / 3), //季度 
+					"S": date.getMilliseconds() //毫秒 
+				};
+				if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+				for (var k in o)
+					if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[
+						k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+				return fmt;
+			},
 			uploadFilePromise(url) {
 
 				insertTmsAttachMngs(this.formData).then(res => {
@@ -509,17 +590,19 @@
 
 		.head-no {
 			// border-radius: 0 0 40rpx 40rpx;
-			// width: 500rpx;
+			width: 960rpx;
 			height: 100rpx;
 			padding-left: 30rpx;
 
+			color: #fff;
+
 			vertical-align: middle;
 			display: table-cell;
 
 			font-size: 34rpx;
 			font-weight: 900;
 
-			// background-color: #3c9cff;
+			background-color: #3c9cff;
 
 		}
 
@@ -548,7 +631,7 @@
 			padding-left: 20rpx;
 			margin-right: 20rpx;
 
-			font-size: 30rpx;
+			// font-size: 30rpx;
 
 			display: flex;
 			align-items: center;
@@ -588,7 +671,7 @@
 
 			// border-bottom: 2rpx solid #f0f0f0f0;
 			padding-left: 20rpx;
-			font-size: 30rpx;
+			// font-size: 30rpx;
 
 			display: flex;
 			align-items: center;
@@ -625,45 +708,25 @@
 			position: fixed;
 			bottom: calc(var(--window-bottom));
 			width: 100%;
-			height: 80rpx;
-
-			background-color: pink;
-
-			text-align: center;
-			line-height: 80rpx;
-
+			height: 130rpx;
+			background-color: white;
 
+			.row {
 
-			background-color: #f0f0f0f0;
-
-			color: #f0f0f0f0;
-			// font-weight: bold;
-			font-size: 35rpx;
-
-			.onsubmit-script {
-				width: 50%;
-				height: 100%;
-				border-left: 2rpx solid #f0f0f0f0;
-				border-right: 2rpx solid #f0f0f0f0;
-				background-color: #0b68ffff;
-				border-radius: 20rpx;
+				display: flex;
+				justify-content: space-evenly;
+				height: 130rpx;
+				align-items: center;
 
+				.button {
+					width: 300rpx;
+					// margin: 0 10%;
+				}
 			}
 
-			.claim-expense {
-				width: 50%;
-				height: 100%;
-				border-left: 2rpx solid #f0f0f0f0;
-				border-right: 2rpx solid #f0f0f0f0;
-				background-color: #0b68ffff;
-				border-radius: 20rpx;
-			}
 
 
 
-			.primary {
-				background-color: #0b68ffff;
-			}
 		}
 
 		.attention {

+ 2 - 2
pages/register.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="normal-login-container">
     <view class="logo-content align-center justify-center flex">
-      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
-      </image>
+      <!-- <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
+      </image> -->
       <text class="title">途宝报单</text>
     </view>
     <view class="login-form-content">

BIN
static/appLogo.png