zhongtianhaoyuan 3 years ago
parent
commit
46644c7307

+ 5 - 0
pages/mine/manageVehicles/addVehicle.vue

@@ -24,6 +24,11 @@
 				<u-picker :show="carModel" :columns="carModelColumns" :closeOnClickOverlay='true' @close='carModelClose'
 				<u-picker :show="carModel" :columns="carModelColumns" :closeOnClickOverlay='true' @close='carModelClose'
 					@cancel='carModelClose' @confirm='confirmCarModel'  @change="changeCarModel"></u-picker>
 					@cancel='carModelClose' @confirm='confirmCarModel'  @change="changeCarModel"></u-picker>
 			</view>
 			</view>
+			<view class="flex row">
+				<view class="left-text">车辆所属车主</view>
+				<u--input placeholder="输入车主姓名" inputAlign='left' border="none" v-model="dataDetails.owner">
+				</u--input>
+			</view>
 			<view class="flex row">
 			<view class="flex row">
 				<view class="left-text">总质量(千克)</view>
 				<view class="left-text">总质量(千克)</view>
 				<u--input placeholder="输入总质量" inputAlign='left' border="none" v-model="dataDetails.carTotalWeight">
 				<u--input placeholder="输入总质量" inputAlign='left' border="none" v-model="dataDetails.carTotalWeight">

+ 5 - 0
pages/mine/manageVehicles/editVehicle.vue

@@ -24,6 +24,11 @@
 				<u-picker :show="carModel" :columns="carModelColumns" :closeOnClickOverlay='true' @close='carModelClose'
 				<u-picker :show="carModel" :columns="carModelColumns" :closeOnClickOverlay='true' @close='carModelClose'
 					@cancel='carModelClose' @change="changeCarModel" @confirm='confirmCarModel($event)'></u-picker>
 					@cancel='carModelClose' @change="changeCarModel" @confirm='confirmCarModel($event)'></u-picker>
 			</view>
 			</view>
+			<view class="flex row">
+				<view class="left-text">车辆所属车主</view>
+				<u--input placeholder="输入车主姓名" inputAlign='left' border="none" v-model="dataDetails.owner">
+				</u--input>
+			</view>
 			<view class="flex row">
 			<view class="flex row">
 				<view class="left-text">总质量(千克)</view>
 				<view class="left-text">总质量(千克)</view>
 				<u--input placeholder="输入总质量" inputAlign='left' border="none" v-model="dataDetails.carTotalWeight">
 				<u--input placeholder="输入总质量" inputAlign='left' border="none" v-model="dataDetails.carTotalWeight">

+ 46 - 34
pages/order/orderDetails.vue

@@ -17,7 +17,7 @@
 			<!-- flex flex-space-between -->
 			<!-- flex flex-space-between -->
 			<view class="item2">
 			<view class="item2">
 				<u-button class="btn" text="查看合同" @click="lookContract"></u-button>
 				<u-button class="btn" text="查看合同" @click="lookContract"></u-button>
-				<!-- <u-button class="btn" text="签订合同" @click="signContract" ></u-button> -->
+				<u-button class="btn" text="签订合同" @click="signContract" ></u-button>
 			     <u-button class="btn" text="签订合同" @click="signContract" v-if="dataObj.cargoOwnerStatus=='未装车'&&dataObj.driverContract!='1'"></u-button>
 			     <u-button class="btn" text="签订合同" @click="signContract" v-if="dataObj.cargoOwnerStatus=='未装车'&&dataObj.driverContract!='1'"></u-button>
 				<u-button class="btn" text="终止" @click="stop"  v-if="dataObj.orderStatus=='待货主确认'||dataObj.orderStatus=='未装车'"></u-button>
 				<u-button class="btn" text="终止" @click="stop"  v-if="dataObj.orderStatus=='待货主确认'||dataObj.orderStatus=='未装车'"></u-button>
 				<!-- <u-button class="btn" text="联系客服"  @click="$helper.contactCustomerService"></u-button> -->
 				<!-- <u-button class="btn" text="联系客服"  @click="$helper.contactCustomerService"></u-button> -->
@@ -244,39 +244,51 @@
 		},
 		},
 		methods: {
 		methods: {
 			lookContract(){
 			lookContract(){
-				this.$request.baseRequest('get', '/orderInfo/setPdf', {
-					}).then(res => {
-						if (res.code == 200) {
-							this.contractSrc = res.data
-							uni.downloadFile({
-							  url: res.data,
-							  success: function (res) {
-							    var filePath = res.tempFilePath;
-							    uni.openDocument({
-							      filePath: filePath,
-							      showMenu: true,
-							      success: function (res) {
-							        console.log('打开文档成功');
-							      }
-							    });
-							  }
-							});
-							// this.$refs.uToast.show({
-							// 	type: 'success',
-							// 	message: "提交成功",
-							// 	complete() {
-							// 		that.upCallback({
-							// 			size: 10,
-							// 			num: 1
-							// 		})
-							// 	}
-							// })
-				
-						}
-					})
-					.catch(res => {
-						uni.$u.toast(res.message);
-					});
+				uni.downloadFile({
+				  url: this.dataObj.driverContractUrl,
+				  success: function (res) {
+				    var filePath = res.tempFilePath;
+				    uni.openDocument({
+				      filePath: filePath,
+				      showMenu: true,
+				      success: function (res) {
+				        console.log('打开文档成功');
+				      }
+				    });
+				  }
+				});
+				// this.$request.baseRequest('get', '/orderInfo/setPdf', {
+				// 	}).then(res => {
+				// 		if (res.code == 200) {
+				// 			this.contractSrc = res.data
+				// 			uni.downloadFile({
+				// 			  url: res.data,
+				// 			  success: function (res) {
+				// 			    var filePath = res.tempFilePath;
+				// 			    uni.openDocument({
+				// 			      filePath: filePath,
+				// 			      showMenu: true,
+				// 			      success: function (res) {
+				// 			        console.log('打开文档成功');
+				// 			      }
+				// 			    });
+				// 			  }
+				// 			});
+				// 			// this.$refs.uToast.show({
+				// 			// 	type: 'success',
+				// 			// 	message: "提交成功",
+				// 			// 	complete() {
+				// 			// 		that.upCallback({
+				// 			// 			size: 10,
+				// 			// 			num: 1
+				// 			// 		})
+				// 			// 	}
+				// 			// })
+				// 		}
+				// 	})
+				// 	.catch(res => {
+				// 		uni.$u.toast(res.message);
+				// 	});
 			},
 			},
 			signContract() {
 			signContract() {
 				// this.lookAlert = true
 				// this.lookAlert = true