调整上传

api/apiList.js

@@ -31,20 +31,14 @@ export function userMobileOperation(action, data) {
   }
 }
 
-
-//获取手机验证码
-/*export function userMobileSendMessage(data) {
-	return Request(`/api/auth/app-login/{mini}/sendMessage`, data)
-}*/
 // 获取手机验证码发送
 export function userMobileSendMessage(data) {
   return Request(`/handler/sendMessage`, data);
 }
 
-
 //获取地图key
 export function getMap() {
-  return Request(`/api/query/*/action/getMap`);
+  return Request(`/api/entry/{mini}/m-action/getMap`);
 }
 //获取地图颜色
 export function getMapColor(data) {
@@ -190,13 +184,10 @@ export function getAppUpdatePodSign(data) {
   return Request( `/api/entry/{mini}/m-action/getAppUpdatePodSign`,data );
 }
 
-// 查询货量明细
-// OM模式
-export function OMOrderDetail(data) {
-  return Request(
-    `/api/entry/{mini}/m-action/biz.tm.OrderMovementLine.tm_ordermovementline_m_search.paging`,
-    data
-  );
+// 运单在途上报
+export function getOnWayReport(data) {
+ return Request( `/api/entry/{mini}/m-action/getOnWayReport`,data );
+
 }
 // OR模式
 export function OROrderDetail(data) {

components/baseComponents/bs-pageHeader-orderNo/bs-pageHeader-orderNo.vue

@@ -10,7 +10,7 @@
 	export default {
 		name: "bs-pageHeader-orderNo",
 		props: {
-			shipmentNo: {
+			shipment_no: {
 				type: String,
 				default: "" //运单号
 			},

subpkg/onWayUpload/onWayUpload.vue

@@ -61,7 +61,7 @@
 					   <view class="start-btn flex_center flex_cen flex_right" @click="onwayupload(propData)" >在途上报</view>
 					</view> -->
 					<view class="flex_cen flex_center orderItemButtonGroup">
-						<button class="flex_cen flex_center" @click="onwayupload()">在途上报</button>
+						<button class="flex_cen flex_center" @click="onwayupload(propData)">在途上报</button>
 						
 					</view>
 				</view>

subpkg/reportSign/reportSign.vue

@@ -18,22 +18,17 @@
 		</view>
 		<view class="form-content">
 			<u--form :model="formData" :rules="rules" ref="myForm" errorType='none'>
-				<u-form-item prop="eventType" required label="在途异常" labelWidth="30%">
-					<view @click="onVisible">
-						<u-input border="none" readonly inputAlign="left" placeholder="请选择上报类型"
-							placeholderClass="input-tip" :value="viewEnums[formData.eventType]" />
-					</view>
-					<u-icon slot="right" name="arrow-right" @click="onVisible" />
+				<u-form-item prop="report_explain"  label="事件内容" labelWidth="25%" borderBottom>
+					<u-input :disabledColor="'#ffffff'"  placeholder="请输入事件内容" border="none" v-model="formData.report_explain" />
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="reported-detail">
 			<!-- 备注信息 -->
-			<bs-todoRemark ref="myRemark" />
+			<bs-todoRemark ref="myRemark"  title="备注"/>
 			<!-- 上传图片 -->
 			<view class="uploader-img">
-				<bs-uploader ref="myUploadImg" :required="formData.eventType !== 'LocationReporting'"
-					uploadTitle="上传图片" />
+				<bs-uploader ref="myUploadImg" 	uploadTitle="上传图片" />
 			</view>
 	
 		</view>
@@ -49,7 +44,7 @@
 </template>
 
 <script>
-	import { reportInfo, getOptionEnum } from '../../api/apiList'
+	import { getOnWayReport } from '../../api/apiList'
 	const getUserLocation = require('../../mixins/getUserLocation')
 	export default {
 		mixins: [getUserLocation],
@@ -57,22 +52,22 @@
 		data() {
 			return {
 				formData: {
-					eventType: "", //上报类型
+					report_explain: "", //事件内容
 				},
-				rules: { 'eventType': { required: true } },
+				rules: { 'report_explain': { required: true } },
 				selectedIds: [], //运单id
 				shipment_no: "", //运单号
 				visible: false, //选择上报类型弹窗
 				optionEnums: [], // 上报类型枚举
-
 				viewEnums: {}, //仅页面显示使用
 			}
 		},
 		onLoad: function(options) {
-			this.initMap();
+			this.getUserSetting();
+			this.initMapService();
+			const data = getApp().globalData.propData;
 			this.shipment_no = data.shipment_no;
-			this.selectedIds = [data.id]
-			this.getUserSetting()
+			
 		},
 		onReady: function(options) {
 			// #ifdef H5
@@ -111,31 +106,26 @@
 			},
 			//提交数据
 			onSubmit() {
-				this.$refs.myForm.validate().then(res => {
-					const { eventType } = this.formData
 					const imgInstance = this.$refs.myUploadImg
 					const remarkInstance = this.$refs.myRemark
-					const remarks = remarkInstance.value
+					const remarks = remarkInstance.value;//备注信息
 					imgInstance.uploadImage(images => {
-						const { longitude, latitude, address, time } = this.locationInfo
-						const { viewEnums, selectedIds } = this
-						const data = {
+						const { longitude, latitude, address } = this.locationInfo
+						const baseData = {
 							"aux": {
-								"eventType": eventType,
-								"signType": viewEnums[eventType],
-								"content": remarks,
-								eventSource: 'DriverApp',
+								"report_explain": this.formData.report_explain,
+								'ship_event_code':'report',
+								"report_remark": remarks,
 								images,
 								longitude,
 								latitude,
-								address,
-								time
+								address					
 							},
 							args: {
-								"selectedIds": selectedIds
+								"row": getApp().globalData.propData
 							}
 						}
-						reportInfo('sign', data).then(res => {
+						getOnWayReport(baseData).then(res => {
 							if (res.data.messageType === 'success') {
 								uni.showToast({
 									title: '信息上报成功',
@@ -147,11 +137,6 @@
 							}
 						})
 					})
-				}).catch(errors => {
-					this.$refs.uToast.show({
-						message: '请选择上报类型',
-					})
-				})
 			},
 			//上报类型选择
 			onVisible() {
@@ -168,23 +153,6 @@
 					this.visible = true
 				}
 			},
-			getOptions() {
-				getOptionEnum('TransitType').then(res => {
-					let datas = res.data.data.datas
-					datas.map((item, index) => {
-						if (item.value === 'LocationReporting') {
-							datas.splice(index, 1)
-							datas.unshift(item)
-						}
-					})
-					let viewEnums = {}
-					datas.map(item => {
-						viewEnums[item.value] = item.label
-					})
-					this.optionEnums = datas
-					this.viewEnums = viewEnums
-				})
-			},
 			//确认选择
 			onConfirmSelect(value) {
 				this.formData.eventType = value