途宝报单新需求2

pages/particulars/claimExpense/index.vue

@@ -11,16 +11,24 @@
 			</view>
 			<view class="head-no-addr">
 				<view>
-					<text>{{formData.loadAddr}}</text>
+					<text v-if="formData.loadFactory">{{formData.loadFactory}}</text>
+					<text v-else>{{formData.loadAddr}}</text>
 				</view>
 				<!-- <span class="icon iconfont" style="font-size: 100rpx; color: #fcbd71; height: 80rpx;">&#xe6fb;</span> -->
 				<view><text>【到】</text></view>
 				<view>
-					<text>{{formData.unLoadAddr}}</text>
+					<text v-if="formData.unLoadFactory">{{formData.unLoadFactory}}</text>
+					<text v-else>{{formData.unLoadAddr}}</text>
 				</view>
 			</view>
 		</u-sticky>
 		<view class="striping"></view>
+		
+		<!-- 审核意见 -->
+		<view style="margin: 20rpx;" v-if="formData.audit2Desc">
+			<text style="color: #3c9cff; margin-right: 20rpx; margin-left: 50rpx;">审 核 意 见</text>
+			<text style="border-bottom: 2rpx dotted #000;">{{formData.audit2Desc}}</text>
+		</view>
 
 		<u-tabs :list="tabs" @change="change" :activeStyle="{
 				width: '180rpx',
@@ -46,11 +54,22 @@
 						<!-- <text class="key">ETC金额</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
 							@input="checkUnLoadetc" v-model="formData.loadetc" /> -->
-						<text class="key">公司加油(升)</text>
-						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
+						<text class="key" style="width: 45%;">公司加油(升)</text>
+						<input class="value" style="width: calc(45% - 80rpx);" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
 							@input="checkUnOilhomeQty" v-model="formData.oilhomeQty" />
+							
+							
+							<view style="margin-left: 10rpx; width: 80rpx; height: 60rpx; position: relative; background-color: #3c9cff; border-radius: 80rpx">
+								<u-upload :sizeType="['compressed']"
+									@afterRead="imgUploading($event, '公司加油')" @delete="deletePic" name="1" multiple :disabled="disabled"
+									:previewFullImage="true">
+									<uni-icons type="camera" style="position: absolute; top: 6rpx; left: 16rpx;" color="#fff" size="24"/>
+								</u-upload>
+							</view>
+							
+							
 					</view>
-					<view class="data">
+					<view class="data" style="width: 40%;">
 						<text class="key">现金过路费</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
 							@input="checkUnLoadtoll" v-model="formData.loadtoll" />
@@ -82,11 +101,19 @@
 				</view>
 				<view class="box">
 					<view class="data">
-						<text class="key">升&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;数</text>
-						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled || formData.gasstation1 == '' || formData.gasstation1 == null" type="digit"
+						<text class="key" style="width: 45%;">升&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;数</text>
+						<input class="value" style="width: calc(45% - 80rpx);" selection-start="0" selection-end="9999" :disabled="disabled || formData.gasstation1 == '' || formData.gasstation1 == null" type="digit"
 							@input="checkUnOilappoint1Qty" placeholder-style="font-size:24rpx" placeholder="请输入升数" v-model="formData.oilappoint1Qty" />
+							
+							<view style="margin-left: 10rpx; width: 80rpx; height: 60rpx; position: relative; background-color: #3c9cff; border-radius: 80rpx">
+								<u-upload :sizeType="['compressed']"
+									@afterRead="imgUploading($event, '定点加油1')" @delete="deletePic" name="1" multiple :disabled="disabled"
+									:previewFullImage="true">
+									<uni-icons type="camera" style="position: absolute; top: 6rpx; left: 16rpx;" color="#fff" size="24"/>
+								</u-upload>
+							</view>
 					</view>
-					<view class="data">
+					<view class="data" style="width: 40%;">
 						<text class="key">金&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;额</text>
 
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled || formData.gasstation1 == '' || formData.gasstation1 == null" type="digit"
@@ -105,11 +132,20 @@
 				</view>
 				<view class="box">
 					<view class="data">
-						<text class="key">升&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;数</text>
-						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled || formData.gasstation2 == '' || formData.gasstation2 == null" type="digit"
+						<text class="key" style="width: 45%;">升&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;数</text>
+						<input class="value" style="width: calc(45% - 80rpx);" selection-start="0" selection-end="9999" :disabled="disabled || formData.gasstation2 == '' || formData.gasstation2 == null" type="digit"
 							@input="checkUnOilappoint2Qty" placeholder-style="font-size:24rpx" placeholder="请输入升数" v-model="formData.oilappoint2Qty" />
+							
+							<view style="margin-left: 10rpx; width: 80rpx; height: 60rpx; position: relative; background-color: #3c9cff; border-radius: 80rpx">
+								<u-upload :sizeType="['compressed']"
+									@afterRead="imgUploading($event, '定点加油2')" @delete="deletePic" name="1" multiple :disabled="disabled"
+									:previewFullImage="true">
+									<uni-icons type="camera" style="position: absolute; top: 6rpx; left: 16rpx;" color="#fff" size="24"/>
+								</u-upload>
+							</view>
+							
 					</view>
-					<view class="data">
+					<view class="data" style="width: 40%;">
 						<text class="key">金&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;额</text>
 
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled || formData.gasstation2 == '' || formData.gasstation2 == null" type="digit"
@@ -128,11 +164,20 @@
 				</view>
 				<view class="box">
 					<view class="data">
-						<text class="key">升&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;数</text>
-						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled || formData.gasstation3 == '' || formData.gasstation3 == null" type="digit"
+						<text class="key" style="width: 45%;">升&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;数</text>
+						<input class="value" style="width: calc(45% - 80rpx);" selection-start="0" selection-end="9999" :disabled="disabled || formData.gasstation3 == '' || formData.gasstation3 == null" type="digit"
 							@input="checkUnOilappoint3Qty" placeholder-style="font-size:24rpx" placeholder="请输入升数" v-model="formData.oilappoint3Qty" />
+							
+							<view style="margin-left: 10rpx; width: 80rpx; height: 60rpx; position: relative; background-color: #3c9cff; border-radius: 80rpx">
+								<u-upload :sizeType="['compressed']"
+									@afterRead="imgUploading($event, '定点加油3')" @delete="deletePic" name="1" multiple :disabled="disabled"
+									:previewFullImage="true">
+									<uni-icons type="camera" style="position: absolute; top: 6rpx; left: 16rpx;" color="#fff" size="24"/>
+								</u-upload>
+							</view>
+							
 					</view>
-					<view class="data">
+					<view class="data" style="width: 40%;">
 						<text class="key">金&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;额</text>
 
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled || formData.gasstation3 == '' || formData.gasstation3 == null" type="digit"
@@ -142,11 +187,20 @@
 
 				<view class="box">
 					<view class="data">
-						<text class="key">现金加油(升)</text>
-						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
+						<text class="key" style="width: 45%;">现金加油(升)</text>
+						<input class="value" style="width: calc(45% - 80rpx);" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
 							@input="checkUnOilcash1Qty" v-model="formData.oilcash1Qty" />
+							
+							<view style="margin-left: 10rpx; width: 80rpx; height: 60rpx; position: relative; background-color: #3c9cff; border-radius: 80rpx">
+								<u-upload :sizeType="['compressed']"
+									@afterRead="imgUploading($event, '现金加油')" @delete="deletePic" name="1" multiple :disabled="disabled"
+									:previewFullImage="true">
+									<uni-icons type="camera" style="position: absolute; top: 6rpx; left: 16rpx;" color="#fff" size="24"/>
+								</u-upload>
+							</view>
+							
 					</view>
-					<view class="data">
+					<view class="data" style="width: 40%;">
 						<text class="key">加油金额</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
 							@input="checkUnOilcash1Amt" v-model="formData.oilcash1Amt" />
@@ -156,11 +210,20 @@
 
 				<view class="box">
 					<view class="data">
-						<text class="key">油卡加油(升)</text>
-						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
+						<text class="key" style="width: 45%;">油卡加油(升)</text>
+						<input class="value" style="width: calc(45% - 80rpx);" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
 							@input="checkUnOilcardQty" v-model="formData.oilcardQty" />
+							
+							<view style="margin-left: 10rpx; width: 80rpx; height: 60rpx; position: relative; background-color: #3c9cff; border-radius: 80rpx">
+								<u-upload :sizeType="['compressed']"
+									@afterRead="imgUploading($event, '油卡加油')" @delete="deletePic" name="1" multiple :disabled="disabled"
+									:previewFullImage="true">
+									<uni-icons type="camera" style="position: absolute; top: 6rpx; left: 16rpx;" color="#fff" size="24"/>
+								</u-upload>
+							</view>
+							
 					</view>
-					<view class="data">
+					<view class="data" style="width: 40%;">
 						<text class="key">加油金额</text>
 						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"	
 							@input="checkUnOilcardAmt" v-model="formData.oilcardAmt" />
@@ -1425,7 +1488,7 @@
 				})
 			},
 			// 新增图片
-			imgUploading(event) {
+			imgUploading(event, nameType) {
 				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
 				let fileListLen = this[`fileList${event.name}`].length
@@ -1440,7 +1503,9 @@
 					let date = this.dateToString("yyyyMMdd");
 					let dateHHmmss = this.dateToString("yyyy-MM-dd HH:mm:ss");
 					this.formData.date = date;
-					insertTmsAttachMngs(this.formData).then(res => {
+					let reqData = this.formData
+					reqData.attachdesc = nameType
+					insertTmsAttachMngs(reqData).then(res => {
 						if (res.code == 200) {
 							uni.compressImage({
 							  src: lists[i].url,
@@ -1799,7 +1864,7 @@
 	}
 
 	.box-box {
-		padding-left: 30rpx;
+		// padding-left: 30rpx;
 		padding-right: 30rpx;
 	}
 
@@ -1927,7 +1992,7 @@
 			align-items: center;
 
 			.data {
-				width: 50%;
+				width: 60%;
 				display: flex;
 				align-items: center;
 

pages/particulars/index.vue

@@ -2,7 +2,6 @@
 	<view class="content">
 		<u-sticky>
 			<view class="head-no">
-				<!-- <text>订单号: {{formData.orderNo}}</text> -->
 				<view>
 					<text>{{ formData.carRegNo == null ? '' : formData.carRegNo }}</text>
 				</view>
@@ -12,48 +11,41 @@
 			</view>
 			<view class="head-no-addr">
 				<view>
-					<text>{{formData.loadAddr}}</text>
+					<text v-if="formData.loadFactory">{{formData.loadFactory}}</text>
+					<text v-else>{{formData.loadAddr}}</text>
 				</view>
-				<!-- <span class="icon iconfont" style="font-size: 100rpx; color: #fcbd71; height: 80rpx;">&#xe6fb;</span> -->
 				<view><text>【到】</text></view>
 				<view>
-					<text>{{formData.unLoadAddr}}</text>
+					<text v-if="formData.unLoadFactory">{{formData.unLoadFactory}}</text>
+					<text v-else>{{formData.unLoadAddr}}</text>
 				</view>
 			</view>
 		</u-sticky>
 		<u-sticky>
 		</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>
-		</view> -->
-
-		<!-- <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-two">
 					<!-- <text style="color: red;">*</text> -->
 					<text class="key">装车吨位</text>
-					<input class="value-two" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
+					<input class="value-two" style="width: calc(100% - 24% - 80rpx);" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
 						@input="checkLoadQty" v-model="formData.loadQty" />
+						
+						
+						
+					<view style="width: 80rpx; height: 60rpx; position: relative; background-color: #3c9cff; border-radius: 80rpx">
+						<u-upload :sizeType="['compressed']"
+							@afterRead="imgUploading($event, '装车吨位')" :disabled="disabled" @delete="deletePic" name="1" multiple :previewFullImage="true"
+							>
+							<uni-icons type="camera" style="position: absolute; top: 6rpx; left: 16rpx;" color="#fff" size="24"/>
+						</u-upload>
+					</view>
+					
+					
+					
 				</view>
 
 				<view class="box-two">
@@ -65,8 +57,16 @@
 
 				<view class="box-two">
 					<text class="key">卸车吨位</text>
-					<input class="value-two" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
+					<input class="value-two" style="width: calc(100% - 24% - 80rpx);" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
 						@input="checkUnLoadQty" v-model="formData.unLoadQty" />
+						
+						<view style="width: 80rpx; height: 60rpx; position: relative; background-color: #3c9cff; border-radius: 80rpx">
+							<u-upload :sizeType="['compressed']"
+								@afterRead="imgUploading($event, '卸车吨位')" :disabled="disabled" @delete="deletePic" name="1" multiple :previewFullImage="true"
+								>
+								<uni-icons type="camera" style="position: absolute; top: 6rpx; left: 16rpx;" color="#fff" size="24"/>
+							</u-upload>
+						</view>
 				</view>
 
 				<view class="box-two">
@@ -75,58 +75,11 @@
 						:hide-second="true" :disabled="disabled" v-model="formData.unLoadDateString" :border="false"></uni-datetime-picker>
 						<view class="today" @click="today('XC')"><text>今天</text></view>
 				</view>
-
-				<!-- <view class="box">
-					<view class="data">
-						<text class="key">空载起点</text>
-						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							v-model="formData.emptyaddr1" />
-					</view>
-					<view class="data">
-						<text class="key">空车里程</text>
-						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled" type="digit"
-							v-model="formData.odometerstart" />
-					</view>
-				</view>
-
-				<view class="box">
-					<view class="data">
-						<text class="key">空载终点</text>
-						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled"
-							v-model="formData.emptyaddr2" />
-					</view>
-					<view class="data">
-						<text class="key">空车里程</text>
-						<input class="value" selection-start="0" selection-end="9999" :disabled="disabled" 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" type="digit"
-						@input="checkUnLoadmile" v-model="formData.loadmile" />
-				</view> -->
-				<!-- ORDER BILLS PLANS -->
-				<!-- @change="checkboxChange" -->
 				<u-checkbox-group v-model="detour" style="margin-left: 20rpx;" placement="column">
 					<u-checkbox :customStyle="{marginBottom: '8px'}" @change="checkboxChange" :disabled="disabled" key="1" label="行程绕路" name="行程绕路">
 					</u-checkbox>
 				</u-checkbox-group>
 				<view v-if="detour.length > 0">
-					<!-- <view class="box-two">
-						<view style="width: 48%; display: flex;">
-							<text class="key" style="width: 200rpx;">绕路里程空</text>
-							<input class="value-two" style="width: 200rpx;" selection-start="0" selection-end="9999" :disabled="disabled"
-								@input="checkUnDetourEmptyMile" v-model="formData.detourEmptyMile" />
-						</view>
-						<view style="width: 4%; height: 200rpx;"></view>
-						<view  style="width: 48%; display: flex;">
-							<text class="key" style="width: 200rpx; margin: 0 10rpx;">绕路里程重</text>
-							<input class="value-two" style="width: 200rpx;" selection-start="0" selection-end="9999" :disabled="disabled"
-								@input="checkUnDetourLoadMile" v-model="formData.detourLoadMile" />
-						</view>
-					</view> -->
 					<view class="box-two">
 						<text class="key" style="width: 300rpx;">绕路里程空(公里)</text>
 						<input class="value-two" selection-start="0" selection-end="9999" :disabled="disabled"
@@ -167,48 +120,9 @@
 
 			<view class="attention">
 				<view style="color: red;"><text>注意事项：</text></view>
-				<!-- <text class="text-grey1">请查看</text>
-				<text @click="attention()" class="text-blue">注意事项</text> -->
 				{{this.formData.remarks ? this.formData.remarks:''}}
 			</view>
 		</view>
-		<!-- <view v-if="isTabs == '订单信息'">
-			<view class="box-two textAlign">
-				<text class="key">货物名称</text>
-				<text class="value">{{formData.goodsCName == null ? "" : formData.goodsCName}}</text>
-			</view>
-			<view class="box-two textAlign">
-				<text class="key">装车地点</text>
-				<text class="value">{{formData.loadAddr == null ? "" : formData.loadAddr}}</text>
-			</view>
-			<view class="box-two textAlign">
-				<text class="key">装车厂家</text>
-				<text class="value">{{formData.loadFactory == null ? "" : formData.loadFactory}}</text>
-			</view>
-			<view class="box-two textAlign">
-				<text class="key">联系人电话</text>
-				<text
-					class="value">{{formData.loadAttn == null ? "" : formData.loadAttn}}&nbsp;{{formData.loadAttnTel == null ? "" : formData.loadAttnTel}}</text>
-			</view>
-			<view class="box-two textAlign">
-				<text class="key">卸车地点</text>
-				<text class="value">{{formData.unLoadAddr == null ? "" : formData.unLoadAddr}}</text>
-			</view>
-			<view class="box-two textAlign">
-				<text class="key">卸车厂家</text>
-				<text class="value">{{formData.unLoadFactory == null ? "" : formData.unLoadFactory}}</text>
-			</view>
-			<view class="box-two textAlign">
-				<text class="key">联系人电话</text>
-				<text
-					class="value">{{formData.unLoadAttn == null ? "" : formData.unLoadAttn}}&nbsp;{{formData.unLoadAttnTel == null ? "" : formData.unLoadAttnTel}}</text>
-			</view>
-
-			<view class="attention">
-				<text class="text-grey1">请查看</text>
-				<text @click="attention()" class="text-blue">注意事项</text>
-			</view>
-		</view> -->
 
 		<view class="cushion">
 		</view>
@@ -232,21 +146,6 @@
 				</view>
 			</view>
 		</view>
-
-
-		<!-- <view class="bottom" style="z-index: 4;">
-			<view class="row">
-				<view class="button">
-					<u-button iconColor="#3c9cff" shape="circle" type="primary" :disabled="disabled"
-						@click="disabledClick" text="保存数据"></u-button>
-				</view>
-				<view class="button">
-					<u-button iconColor="#3c9cff" shape="circle" type="primary" :disabled="disabled" @click=""
-						@click="submitAudits" text="提交里程"></u-button>
-				</view>
-			</view>
-		</view> -->
-
 		<!-- 遮盖罩 -->
 		<u-loading-page :loading="loading" style="z-index: 999;"></u-loading-page>
 		<!-- 消息提示 -->
@@ -821,7 +720,7 @@
 				})
 			},
 			// 新增图片
-			imgUploading(event) {
+			imgUploading(event, nameType) {
 				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
 				let fileListLen = this[`fileList${event.name}`].length
@@ -836,7 +735,9 @@
 					let date = this.dateToString("yyyyMMdd");
 					let dateHHmmss = this.dateToString("yyyy-MM-dd HH:mm:ss");
 					this.formData.date = date;
-					insertTmsAttachMngs(this.formData).then(res => {
+					let reqData = this.formData
+					reqData.attachdesc = nameType
+					insertTmsAttachMngs(reqData).then(res => {
 						if (res.code == 200) {
 							uni.compressImage({
 							  src: lists[i].url,