From 0ba04d912c6e6a241106f045c5eee0eb179e5c9f Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Fri, 25 Jun 2021 14:59:23 +0800 Subject: [PATCH] v2.2.0 --- api/saas.js | 10 ++-- .../order-detail/item-car-info/index.json | 3 +- pages/home/customer-list/index.js | 6 +-- pages/index/index.js | 9 ++-- pages/process/order-logger/index.js | 31 +++++++++++ pages/process/order-logger/index.json | 7 +++ pages/process/order-logger/index.wxml | 10 ++++ pages/process/order-logger/index.wxss | 1 + pages/process/outside-add/index.js | 15 +++--- pages/process/outside-add/index.json | 1 - pages/process/outside-add/index.wxml | 5 +- pages/process/outside-info/index.js | 14 ++++- pages/process/outside-info/index.wxml | 52 ++++++++++++------- pages/process/outside-item/index.wxml | 3 +- pages/process/outside-price/index.js | 43 +++++++++++---- pages/process/outside-price/index.wxml | 11 ++++ pages/setting/vehicle-detial/index.js | 3 +- pages/setting/vehicle-list/index.js | 47 +++++++++++++---- pages/setting/vehicle-list/index.json | 2 + pages/setting/vehicle-list/index.wxml | 17 ++++-- utils/util.js | 6 +-- 21 files changed, 212 insertions(+), 84 deletions(-) create mode 100644 pages/process/order-logger/index.js create mode 100644 pages/process/order-logger/index.json create mode 100644 pages/process/order-logger/index.wxml create mode 100644 pages/process/order-logger/index.wxss diff --git a/api/saas.js b/api/saas.js index c43de95..b66b71a 100644 --- a/api/saas.js +++ b/api/saas.js @@ -52,11 +52,11 @@ const getChanelList = (params) => mGet(`/ztb-factory/factorydeliverychannel/get/ const saveChanel = (params) => mPost(`/ztb-factory/factorydeliverychannel/save/factory-delivery-channel`, params, sconfig) const getCardList = (params) => mGet(`/ztb-factory/get/self-factory/card-list`, params, sconfig) const removeCardNop = (cardNo) => mPost(`/ztb-factory/remove/not-bind-card/${cardNo}`, null, sconfig) -const getCarList = (params) => mGet(`/ztb-factory/factory/get/factory-car-list`, params, sconfig) -const getCarInfo = (id) => mGet(`/ztb-factory/factory/get/factory-car/${id}`, null, sconfig) -const editCar = (params) => mPost(`/ztb-factory/factory/edit/factory-car`, params, sconfig) -const saveCar = (params) => mPost(`/ztb-factory/factory/save/factory-car`, params, sconfig) -const deleteCar = (id) => mPost(`/ztb-factory/factory/delete/factory-car/${id}`, null, sconfig) +const getCarList = (params) => mGet(`/ztb-factory/get/factory-car-list`, params, sconfig) +const getCarInfo = (id) => mGet(`/ztb-factory/get/factory-car/${id}`, null, sconfig) +const editCar = (params) => mPost(`/ztb-factory/edit/factory-car`, params, sconfig) +const saveCar = (params) => mPost(`/ztb-factory/save/factory-car`, params, sconfig) +const deleteCar = (id) => mPost(`/ztb-factory/delete/factory-car/${id}`, null, sconfig) const getPoundList = () => mGet(`/ztb-factory/get/self-factory-weight-note-list`, null, sconfig) const getPoundInfo = (id) => mGet(`/ztb-factory/get/weight-note-detail/${id}`, null, sconfig) diff --git a/pages/agent/order-detail/item-car-info/index.json b/pages/agent/order-detail/item-car-info/index.json index 1bb80c1..b9fb8c5 100644 --- a/pages/agent/order-detail/item-car-info/index.json +++ b/pages/agent/order-detail/item-car-info/index.json @@ -4,5 +4,6 @@ "van-collapse": "/components/collapse/index", "van-collapse-item": "/components/collapse-item/index", "van-steps": "/components/steps/index", - "van-step": "/components/step/index"} + "van-step": "/components/step/index" + } } \ No newline at end of file diff --git a/pages/home/customer-list/index.js b/pages/home/customer-list/index.js index 167f6f2..a1e8b37 100644 --- a/pages/home/customer-list/index.js +++ b/pages/home/customer-list/index.js @@ -65,11 +65,7 @@ Scene({ let nowList = `orderList[${this.data.orderList.length}]` var num = this.data.form.pageNum var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total - if(this.data.form.pageNum == 1){ - this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) - } else { - this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) - } + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) } else { this.setData({ finished: true, requesting: false, loading: false }) } diff --git a/pages/index/index.js b/pages/index/index.js index 8aa398b..4328906 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -3,6 +3,7 @@ import Scene from './scene' import { sconfig, getMessageList } from "../../api/saas" import { headerFactoryId } from "../../api/user" const event = require('../../utils/event') +const util = require('../../utils/util') const storage = require('../../utils/storage') const app = getApp() @@ -133,16 +134,12 @@ Scene({ onPopupChange: function({detail}){ this.setData({zIndex: detail}) }, - showFactoryList: function(){ + showFactoryList: util.throttle(function(){ if(!this.data.arrow){ return } this.setData({ visible: !this.data.visible, mActiveIndex: this.data.popIndex }) - // if (this.data.tabIndex == 0) { - // var pageView = this.selectComponent('#' + this.data.tabList[this.data.tabIndex].value) - // pageView.onClose() - // } - }, + }), onHide: function(){ this.setData({ visible: false }) }, diff --git a/pages/process/order-logger/index.js b/pages/process/order-logger/index.js new file mode 100644 index 0000000..d96bbfb --- /dev/null +++ b/pages/process/order-logger/index.js @@ -0,0 +1,31 @@ +// pages/process/order-check/index.js +import Scene from '../../index/scene' +import { getFactoryOrderInfo } from "../../../api/saas" +const util = require('../../../utils/util') + +Scene({ + /** + * 页面的初始数据 + */ + data: { + form: null + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + if(options.orderId){ + this.fetchOrderInfo(options.orderId) + } + }, + fetchOrderInfo(orderId){ + wx.showLoading({ title: '正在获取', mask: true }) + getFactoryOrderInfo(orderId).then(result => { + wx.hideLoading() + this.setData({ form: result.data }) + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + } +}) \ No newline at end of file diff --git a/pages/process/order-logger/index.json b/pages/process/order-logger/index.json new file mode 100644 index 0000000..14f7177 --- /dev/null +++ b/pages/process/order-logger/index.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "van-steps": "/components/steps/index", + "van-step": "/components/step/index", + "notification": "/pages/message/notification/index" + } +} \ No newline at end of file diff --git a/pages/process/order-logger/index.wxml b/pages/process/order-logger/index.wxml new file mode 100644 index 0000000..16fd0f0 --- /dev/null +++ b/pages/process/order-logger/index.wxml @@ -0,0 +1,10 @@ + + + 订单日志 + + + + + + + \ No newline at end of file diff --git a/pages/process/order-logger/index.wxss b/pages/process/order-logger/index.wxss new file mode 100644 index 0000000..a9edfdb --- /dev/null +++ b/pages/process/order-logger/index.wxss @@ -0,0 +1 @@ +/* pages/process/order-check/index.wxss */ \ No newline at end of file diff --git a/pages/process/outside-add/index.js b/pages/process/outside-add/index.js index 8050a9f..cfd3baf 100644 --- a/pages/process/outside-add/index.js +++ b/pages/process/outside-add/index.js @@ -11,7 +11,6 @@ Scene({ * 页面的初始数据 */ data: { - safeBottom: app.globalData.safeBottom, paperList: null, form: { productCategoryInfos: [{ productId: '', productCategoryName: '', unitPrice: ''}], @@ -49,12 +48,10 @@ Scene({ for (let index = 0; index < this.data.paperList.length; index++) { this.data.column1.push(this.data.paperList[index].name) } - this.setData({ safeBottom: app.globalData.safeBottom }) if(!options.id){ wx.hideLoading() } }).catch(err => { - this.setData({ safeBottom: app.globalData.safeBottom }) util.showToast(err) if(!options.id){ wx.hideLoading() @@ -96,13 +93,13 @@ Scene({ wx.navigateTo({url: `/pages/home/employee/index?type=1`, events}) }, showPlate: function (e) { - this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard') - this.keyboard.show(this.data.form.plateNumber, 0) - }, - onPlatenumber: function({detail}){ - if(detail && detail.plateNumber){ - this.setData({ ['form.plateNumber']: detail.plateNumber }) + var that = this + var events = {} + events.onCallback = function(data){ + that.data.form.driverId = data.detail.driverId + that.setData({ ['form.plateNumber']: data.detail.plateNumber, ['form.driverName']: data.detail.driverName }) } + wx.navigateTo({url: `/pages/setting/vehicle-list/index?type=1`, events}) }, showCategory: function(e){ if(e.currentTarget.dataset.index >= 0){ diff --git a/pages/process/outside-add/index.json b/pages/process/outside-add/index.json index 684c471..a73efa7 100644 --- a/pages/process/outside-add/index.json +++ b/pages/process/outside-add/index.json @@ -12,7 +12,6 @@ "van-dialog": "/components/dialog/index", "van-field": "/components/field/index", "van-switch": "/components/switch/index", - "vehicle-keyboard": "/components/vehicle-keyboard/index", "submit-layout": "/components/submit-layout/index", "notification": "/pages/message/notification/index" } diff --git a/pages/process/outside-add/index.wxml b/pages/process/outside-add/index.wxml index 91e985b..325aacb 100644 --- a/pages/process/outside-add/index.wxml +++ b/pages/process/outside-add/index.wxml @@ -16,13 +16,13 @@ {{form.factoryCustomerName || '请选择客户'}} - + * 车牌号码 - {{form.plateNumber || '请输入车牌号码'}} + {{form.plateNumber || '请选择车辆'}} @@ -92,7 +92,6 @@ - diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js index 24a1cbb..9f3900b 100644 --- a/pages/process/outside-info/index.js +++ b/pages/process/outside-info/index.js @@ -14,7 +14,8 @@ Scene({ data: { agent: 0, id: null, - form: null + form: null, + imageList: [] }, /** * 生命周期函数--监听页面加载 @@ -54,12 +55,21 @@ Scene({ result.data.settleTotalWeight = math.plus(result.data.settleTotalWeight, element.settleWeight) } } - this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0, agent: this.data.agent }) + var imageList = [] + if(result.data.orderImageList && result.data.orderImageList.length){ + for (let index = 0; index < result.data.orderImageList.length; index++) { + imageList.push({url: result.data.orderImageList[index]}) + } + } + this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0, agent: this.data.agent, imageList }) }).catch(err => { wx.hideLoading() util.showToast(err) }) }, + orderLogger: function(){ + wx.navigateTo({url: `/pages/process/order-logger/index?type=1&orderId=${this.data.id}` }) + }, printOrderInfo: function(){ wx.showLoading({ title: '正在处理', mask: true }) printOrder({id: this.data.id, printType: 2}).then(result => { diff --git a/pages/process/outside-info/index.wxml b/pages/process/outside-info/index.wxml index f418a01..9a331f2 100644 --- a/pages/process/outside-info/index.wxml +++ b/pages/process/outside-info/index.wxml @@ -14,25 +14,30 @@ 重新定价 - - - 待付款 - - - - 代付审核中 - - - - 待结算 - - - - 已完成 - - - - 已取消 + + + + 待付款 + + + + 代付审核中 + + + + 待结算 + + + + 已完成 + + + 已取消 + + + 查看订单日志 + + @@ -102,6 +107,13 @@ {{form.onsideAndOffsiteDifferences || '- -'}} + + + 订单凭证 + + + + @@ -145,7 +157,7 @@ {{item.price || ''}} --> - + 过磅凭证 diff --git a/pages/process/outside-item/index.wxml b/pages/process/outside-item/index.wxml index 3fe2a13..f1bf26e 100644 --- a/pages/process/outside-item/index.wxml +++ b/pages/process/outside-item/index.wxml @@ -39,10 +39,9 @@ - * 过磅凭证 - 3-6张，每张图片大小限制5M + 非必须，6张以内，每张图片大小限制5M diff --git a/pages/process/outside-price/index.js b/pages/process/outside-price/index.js index 96733a5..4bb10f3 100644 --- a/pages/process/outside-price/index.js +++ b/pages/process/outside-price/index.js @@ -20,6 +20,7 @@ Scene({ offsiteGrossWeight: null, offsiteTareWeight: null, }, + imageList: [], intoview: '' }, /** @@ -38,7 +39,13 @@ Scene({ this.data.param.offsiteGrossWeight = result.data.offsiteGrossWeight this.data.param.offsiteTareWeight = result.data.offsiteTareWeight var height = app.globalData.fragmentHeight - app.globalData.safeBottom - 120 - this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0, height }) + var imageList = [] + if(result.data.orderImageList && result.data.orderImageList.length){ + for (let index = 0; index < result.data.orderImageList.length; index++) { + imageList.push({url: result.data.orderImageList[index]}) + } + } + this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0, height, imageList }) }).catch(err => { wx.hideLoading() util.showToast(err) @@ -102,6 +109,7 @@ Scene({ } this.data.param.scrapPaperReceiptId = this.data.form.scrapPaperReceiptId this.data.param.weightNoteList = weightNoteList + this.data.param.orderImageList = this.data.form.orderImageList wx.showLoading({ title: '处理中', mask: true }) saveSideOrder(this.data.param).then(result => { wx.hideLoading() @@ -112,6 +120,14 @@ Scene({ util.showToast(err) }) }, + fileChange: function({detail}){ + this.data.imageList = detail.fileList + var imageUrls = [] + for (let index = 0; index < this.data.imageList.length; index++) { + imageUrls.push(this.data.imageList[index].url) + } + this.data.form.orderImageList = imageUrls + }, submitForm: function(){ var weightNoteList = [] for (let index = 0; index < this.data.form.productCategoryInfos.length; index++) { @@ -120,18 +136,14 @@ Scene({ util.showToast('请输入第' + (index + 1) + '项废纸品类净重') return } - // if(util.isEmpty(element.tareWeight) || Number(element.tareWeight) < 0){ - // util.showToast('请输入第' + (index + 1) + '项废纸品类皮重') + // if(util.isEmpty(element.weightNoteImages)){ + // util.showToast('请上传第' + (index + 1) + '项废纸品类过磅凭证') + // return + // } + // if(element.weightNoteImages.length < 3){ + // util.showToast('每个品类过磅凭证图片必须3张以上') // return // } - if(util.isEmpty(element.weightNoteImages)){ - util.showToast('请上传第' + (index + 1) + '项废纸品类过磅凭证') - return - } - if(element.weightNoteImages.length < 3){ - util.showToast('每个品类过磅凭证图片必须3张以上') - return - } var item = {grossWeight: element.grossWeight, tareWeight: element.tareWeight,weightNoteImage: element.weightNoteImages } item.netWeight = element.netWeight item.scrapPaperPurchaseOrderId = element.scrapPaperPurchaseOrderId @@ -147,8 +159,17 @@ Scene({ util.showToast('请输入厂外毛重') return } + if(util.isEmpty(this.data.form.orderImageList)){ + util.showToast('请上传订单凭证') + return + } + if(this.data.form.orderImageList.length < 3){ + util.showToast('订单凭证图片必须3张或者3张以上') + return + } this.data.param.scrapPaperReceiptId = this.data.form.scrapPaperReceiptId this.data.param.weightNoteList = weightNoteList + this.data.param.orderImageList = this.data.form.orderImageList wx.showLoading({ title: '处理中', mask: true }) poundSideOrder(this.data.param).then(result => { wx.hideLoading() diff --git a/pages/process/outside-price/index.wxml b/pages/process/outside-price/index.wxml index e0e06bc..85de018 100644 --- a/pages/process/outside-price/index.wxml +++ b/pages/process/outside-price/index.wxml @@ -130,6 +130,17 @@ 厂外毛重(公斤) + + + + * + 订单凭证 + + 3-9张以内，每张图片大小限制5M + + + diff --git a/pages/setting/vehicle-detial/index.js b/pages/setting/vehicle-detial/index.js index b551c2f..7f0d65f 100644 --- a/pages/setting/vehicle-detial/index.js +++ b/pages/setting/vehicle-detial/index.js @@ -39,6 +39,7 @@ Scene({ events.onCallback = function(data){ if (data.what == 121) { that.data.form.driverId = data.detail.enterpriseMemberId + that.data.form.driverMobile = data.detail.mobile that.setData({ ['form.driverName']: data.detail.enterpriseMemberName }) } } @@ -51,7 +52,7 @@ Scene({ } }, deleteForm: function(e){ - Dialog.confirm({ title: '温馨提示', message: '确定删除该纸品？' }).then(() => { + Dialog.confirm({ title: '温馨提示', message: '确定删除该车辆信息？' }).then(() => { wx.showLoading({ title: '正在处理', mask: true }) deleteCar(this.data.form.id).then(result => { wx.hideLoading() diff --git a/pages/setting/vehicle-list/index.js b/pages/setting/vehicle-list/index.js index 9e797aa..d4824bc 100644 --- a/pages/setting/vehicle-list/index.js +++ b/pages/setting/vehicle-list/index.js @@ -1,6 +1,7 @@ // pages/process/order-list/index.js import Scene from '../../index/scene' -import { getCarList } from "../../../api/saas" +import Dialog from '../../../components/dialog/dialog' +import { getCarList, deleteCar } from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() @@ -8,13 +9,14 @@ const app = getApp() Scene({ // * 页面的初始数据 data: { + type: 0, height: app.globalData.fragmentHeight, loading: true, requesting: false, finished: false, - top: 0, orderList: [], form: { + plateNumber: '', pageNum: 1, pageSize: 15 }, @@ -23,8 +25,11 @@ Scene({ }, // * 生命周期函数--监听页面加载 onLoad: function (options) { + if(options.type){ + this.data.type = Number(options.type) + } event.on('OrderMessage', this, this.onEvent) - this.setData({ height: app.globalData.fragmentHeight }) + this.setData({ height: app.globalData.fragmentHeight - 100 }) this.fetchOrderList() }, onEvent: function(message){ @@ -34,6 +39,12 @@ Scene({ this.setData({ [`orderList[${this.data.page}][${this.data.index}]`]: message.detail }) } }, + onChange: function({detail}) { + this.data.form.plateNumber = detail + }, + onSearch: function(){ + this.onRefreshList() + }, onRefreshList: function () { if (this.data.requesting) { return @@ -52,11 +63,7 @@ Scene({ let nowList = `orderList[${this.data.orderList.length}]` var num = this.data.form.pageNum var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total - if(this.data.form.pageNum == 1){ - this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, top: 0, requesting: false, loading: false }) - } else { - this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) - } + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) } else { this.setData({ finished: true, requesting: false, loading: false }) } @@ -72,12 +79,32 @@ Scene({ if(e.currentTarget.dataset.page >= 0){ this.data.page = e.currentTarget.dataset.page this.data.index = e.currentTarget.dataset.index - var item = this.data.orderList[this.data.page][ this.data.index] - wx.navigateTo({ url: `/pages/setting/vehicle-detial/index?id=${item.id}` }) + var item = this.data.orderList[this.data.page][this.data.index] + if(this.data.type == 1){ + const channel = this.getOpenerEventChannel() + channel.emit('onCallback', { what: 140, detail: item }) + wx.navigateBack() + } else { + wx.navigateTo({ url: `/pages/setting/vehicle-detial/index?id=${item.id}` }) + } } else { wx.navigateTo({ url: `/pages/setting/vehicle-detial/index` }) } }, + deleteForm: function(e){ + var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] + Dialog.confirm({ title: '温馨提示', message: '确定删除该车辆信息？' }).then(() => { + wx.showLoading({ title: '正在处理', mask: true }) + deleteCar(item.id).then(result => { + wx.hideLoading() + this.onRefreshList() + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + }).catch(err => { + }) + }, onUnload: function(){ event.remove('OrderMessage', this) } diff --git a/pages/setting/vehicle-list/index.json b/pages/setting/vehicle-list/index.json index c8031fb..3c551c9 100644 --- a/pages/setting/vehicle-list/index.json +++ b/pages/setting/vehicle-list/index.json @@ -1,10 +1,12 @@ { "usingComponents": { + "van-search": "/components/search/index", "refresh-view": "/components/refresh-view/index", "van-button": "/components/button/index", "van-cell": "/components/cell/index", "van-divider": "/components/divider/index", "van-loading": "/components/loading/index", + "van-dialog": "/components/dialog/index", "notification": "/pages/message/notification/index" } } \ No newline at end of file diff --git a/pages/setting/vehicle-list/index.wxml b/pages/setting/vehicle-list/index.wxml index ebba2dc..2954bd5 100644 --- a/pages/setting/vehicle-list/index.wxml +++ b/pages/setting/vehicle-list/index.wxml @@ -3,6 +3,9 @@ 车辆管理 + + 搜索 + @@ -12,12 +15,15 @@ {{loading? '正在加载' : '暂无数据'}} - - - 车牌号你：{{item.plateNumber}} - - 司机：{{item.driverName}}({{item.mobile}}) + + + + 车牌号你：{{item.plateNumber}} + + 司机：{{item.driverName}}({{item.driverMobile}}) + + 删除 @@ -32,4 +38,5 @@ + diff --git a/utils/util.js b/utils/util.js index c02c1cd..bbbfbf2 100644 --- a/utils/util.js +++ b/utils/util.js @@ -206,11 +206,11 @@ function substring(string, length){ } /*函数节流*/ function throttle(fn, interval) { - var enterTime = 0//触发的时间 - interval = interval || 300 //间隔时间，如果interval不传，则默认300ms + var enterTime = 0 //触发的时间 + var gap = interval || 300//间隔时间，如果interval不传，则默认300ms return function() { var backTime = Date.now()//第一次函数return即触发的时间 - if (backTime - enterTime > interval) { + if (backTime - enterTime > gap) { fn.apply(this, arguments) enterTime = backTime//赋值给第一次触发的时间，这样就保存了第二次触发的时间 }