diff --git a/pages/allot/detail/index.js b/pages/allot/detail/index.js
index 58a1774..662e0a4 100644
--- a/pages/allot/detail/index.js
+++ b/pages/allot/detail/index.js
@@ -5,10 +5,11 @@ Page({
imgUrl:_.config.imgUrl,
photos:[],//异常报备
note:'',
- isShowReport:false,
+ isShowReport:false,//是否显示报备异常弹窗
+ isShowTransfer:false,//是否显示确认弹窗
transport:[],//请上传运输单
- id:'',
- tran_id:'',
+ id:'',//查看id
+ tran_id:'',//操作ID
},
onLoad: function (options) {
for (let key in options) {
@@ -45,10 +46,10 @@ Page({
},
//选择图片
- chooseImg() {
+ chooseImg(e) {
let that = this
wx.chooseImage({
- count: 10 - this.data.photos.length, // 默认10
+ count: e.currentTarget.dataset.amount - this.data.photos.length, // 默认10
sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
success(res1) {
@@ -89,8 +90,8 @@ Page({
let imgdata = JSON.parse(res.data)
let list = []
list.push({
- img:imgdata.data.url,
- img_url:imgdata.data.full_url,
+ value:imgdata.data.url,
+ src:imgdata.data.full_url,
})
that.setData({
photos: that.data.photos.concat(list),
@@ -116,7 +117,7 @@ Page({
})
},
- //显示短信弹框
+ //显示报备异常弹框
optShowReport(e){
this.setData({
isShowReport:!this.data.isShowReport,
@@ -126,6 +127,17 @@ Page({
})
},
+ //显示确认弹框
+ optShowTransfer(e){
+ this.setData({
+ isShowTransfer:!this.data.isShowTransfer,
+ photos:[],
+ mileage:'',
+ optType:e.currentTarget.dataset.type?e.currentTarget.dataset.type:'',
+ optid:e.currentTarget.dataset.id?e.currentTarget.dataset.id:'',
+ })
+ },
+
//拨打电话
call(e) {
wx.makePhoneCall({
@@ -156,48 +168,94 @@ Page({
current:transportImg[0],
urls:transportImg,
})
+ }else if(e.currentTarget.dataset.type=='start_mileage'){
+ let start_mileage = []
+ this.data.info.transport.start_mileage.imgs.forEach(item => {
+ start_mileage.push(item.src)
+ })
+ wx.previewImage({
+ current:start_mileage[0],
+ urls:start_mileage,
+ })
+ }else if(e.currentTarget.dataset.type=='end_mileage'){
+ let end_mileage = []
+ this.data.info.transport.end_mileage.imgs.forEach(item => {
+ end_mileage.push(item.src)
+ })
+ wx.previewImage({
+ current:end_mileage[0],
+ urls:end_mileage,
+ })
}
+
},
//确认发车/接车
- putAppTransfer(e) {
+ putAppTransfer() {
let that = this
- let params = {};
- params['id'] = e.currentTarget.dataset.id;
- _.apiQuery.putAppTransfer(params).then(res => {
+ if (that.data.mileage == ''){
+ wx.showToast({
+ title: '请填定里程数',
+ icon: 'none'
+ })
+ }else if(that.data.photos.length==0){
+ wx.showToast({
+ title: '请拍照上传',
+ icon: 'none'
+ })
+ }else{
that.setData({
- submitFlag: false,
+ submitFlag: true,
})
- //刷新列表页
- let pages = getCurrentPages();
- let prevPage = null; //上一个页面
- if (pages.length >= 2) {
- prevPage = pages[pages.length - 2]; //上一个页面
- if(prevPage.route == 'pages/allot/list/index'){
- prevPage.onPullDownRefresh()
- }
+ let params = {};
+ params['id'] = that.data.optid;
+ if(that.data.optType==2){
+ let start_mileage = that.data.info.transport.start_mileage?that.data.info.transport.start_mileage:{}
+ start_mileage.value = that.data.mileage
+ start_mileage.imgs = that.data.photos
+ params['start_mileage'] = start_mileage;
+ }else if(that.data.optType==3){
+ let end_mileage = that.data.info.transport.end_mileage?that.data.info.transport.end_mileage:{}
+ end_mileage.value = that.data.mileage
+ end_mileage.imgs = that.data.photos
+ params['end_mileage'] = end_mileage;
}
+ _.apiQuery.putAppTransfer(params).then(res => {
- wx.showModal({
- title: '操作成功',
- content: '',
- confirmText: "返回",
- confirmColor: "#36afa2",
- showCancel:false,
- success(res) {
- if (res.confirm) {
- wx.navigateBack({
- delta: 1
- })
+ let pages = getCurrentPages();
+ let prevPage = null; //上一个页面
+ if (pages.length >= 2) {
+ prevPage = pages[pages.length - 2]; //上一个页面
+ if(prevPage.route == 'pages/allot/list/index'){
+ prevPage.onPullDownRefresh()
}
}
- })
- }).catch(res=>{
- that.setData({
- submitFlag: false,
- })
- });
+
+ that.setData({
+ submitFlag: false,
+ isShowTransfer: false,
+ })
+ wx.showModal({
+ title: '操作成功',
+ content: '',
+ confirmText: "返回",
+ confirmColor: "#36afa2",
+ showCancel:false,
+ success(res) {
+ if (res.confirm) {
+ wx.navigateBack({
+ delta: 1
+ })
+ }
+ }
+ })
+ }).catch(res=>{
+ that.setData({
+ submitFlag: false,
+ })
+ });
+ }
},
//报备异常
@@ -223,7 +281,7 @@ Page({
if(that.data.photos.length > 0){
let imgs = []
that.data.photos.forEach(item => {
- imgs.push(item.img)
+ imgs.push(item.value)
})
params['imgs'] = imgs;
}
diff --git a/pages/allot/detail/index.wxml b/pages/allot/detail/index.wxml
index ddcd904..3fc3294 100644
--- a/pages/allot/detail/index.wxml
+++ b/pages/allot/detail/index.wxml
@@ -38,8 +38,9 @@
-
- 请上传运输单
+
+ 请上传运输单
+ 请上传运输单
@@ -65,6 +66,33 @@
+
+
+ 发车信息
+
+ {{info.transport.start_mileage.title}}：{{info.transport.start_mileage.value}}{{info.transport.start_mileage.tag}}
+
+
+
+ {{info.transport.start_mileage.imgs.length}}张
+
+
+
+
+
+
+ 接车信息
+
+ {{info.transport.end_mileage.title}}：{{info.transport.end_mileage.value}}{{info.transport.end_mileage.tag}}
+
+
+
+ {{info.transport.end_mileage.imgs.length}}张
+
+
+
+
+
请仔细检查车辆外观与随车物品是否正常，如有异常点击下方报备异常。
@@ -75,8 +103,8 @@
-
-
+
+
@@ -91,23 +119,23 @@
-
+
-
+
拍照上传
-
+
拍照上传
-
+
拍照上传
@@ -115,13 +143,13 @@
-
+
拍照上传
-
+
拍照上传
@@ -129,7 +157,7 @@
-
+
拍照上传
@@ -147,4 +175,39 @@
+
+
+
+
+
+ 发车信息
+ 接车信息
+
+
+
+ km
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 拍照上传
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file