From c2708dd3aea6ba7cd6ebbf256738c143baf34914 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Fri, 14 May 2021 19:41:28 +0800 Subject: [PATCH] no message --- api/saas.js | 7 +- pages/process/outside-check-item/index.js | 87 +++++++++++++ pages/process/outside-check-item/index.json | 10 ++ pages/process/outside-check-item/index.wxml | 65 ++++++++++ pages/process/outside-check-item/index.wxss | 23 ++++ pages/process/outside-check/index.js | 130 ++++---------------- pages/process/outside-check/index.json | 6 +- pages/process/outside-check/index.wxml | 72 +---------- pages/process/outside-item/index.js | 10 +- pages/process/outside-item/index.wxml | 7 +- pages/process/outside-list/index.js | 7 +- pages/process/outside-list/index.wxml | 2 +- pages/process/outside-price/index.js | 58 +++++++-- pages/process/outside-price/index.wxml | 60 +++++++-- pages/process/outside-price/index.wxss | 23 +--- 15 files changed, 331 insertions(+), 236 deletions(-) create mode 100644 pages/process/outside-check-item/index.js create mode 100644 pages/process/outside-check-item/index.json create mode 100644 pages/process/outside-check-item/index.wxml create mode 100644 pages/process/outside-check-item/index.wxss diff --git a/api/saas.js b/api/saas.js index e0a01f1..eca3bf5 100644 --- a/api/saas.js +++ b/api/saas.js @@ -70,9 +70,10 @@ const getSideOrderList = (params) => mGet(`/ztb-factory/get/scrap-paper-offsite- const createSideOrder = (params) => mPost(`/ztb-factory/create/scrap-paper-offsite-receipt-order`, params, sconfig) const getSideOrderInfo = (params) => mGet(`/ztb-factory/get/scrap-paper-offsite-receipt-order-detail`, params, sconfig) const editSideOrder = (params) => mPost(`/ztb-factory/modify/scrap-paper-offsite-receipt-order`, params, sconfig) +const saveSideOrder = (params) => mPost(`/ztb-factory/save/scrap-paper-offsite-receipt-weight-note`, params, sconfig) const poundSideOrder = (params) => mPost(`/ztb-factory/submit/scrap-paper-offsite-receipt-weight-note`, params, sconfig) const priceSideOrder = (params) => mPost(`/ztb-factory/submit/scrap-paper-offsite-receipt-order-price`, params, sconfig) - +const repeatSideOrder = (params) => mPost(`/ztb-factory/submit/scrap-paper-offsite-receipt-order-price`, params, sconfig) export { sconfig, @@ -135,6 +136,8 @@ export { getSideOrderInfo, editSideOrder, getSideOrderList, + saveSideOrder, poundSideOrder, - priceSideOrder + priceSideOrder, + repeatSideOrder } \ No newline at end of file diff --git a/pages/process/outside-check-item/index.js b/pages/process/outside-check-item/index.js new file mode 100644 index 0000000..a0f03ac --- /dev/null +++ b/pages/process/outside-check-item/index.js @@ -0,0 +1,87 @@ +// pages/message/index.js +const util = require('../../../utils/util') +const math = require('../../../utils/math') + +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, + properties: { + form: { type: Object, value: null }, + item: { type: Object, value: null }, + index: { type: Number, value: 0 }, + list: { type: Array, value: [] }, + columns: { type: Array, value: [] }, + status: { type: Number, value: 0 } + }, + data: { + visible: false, + focus: 0 + }, + methods: { + showCategory: function(){ + this.setData({ visible: true }) + }, + onConfirm: function({detail}){ + var nowItem = this.data.paperList[detail.index] + for (var i = 0; i < this.data.form.productCategoryInfos.length; i++) { + if (this.data.form.productCategoryInfos[i].productId == nowItem.id){ + this.setData({ visible: false }) + util.showToast('纸品已经存在，请不要重复添加') + return + } + } + this.data.item.productId = nowItem.id + this.data.item.settleUnitPrice = nowItem.defaultUnitPrice + this.data.item.highestUnitPrice = nowItem.highestUnitPrice + this.data.item.lowestUnitPrice = nowItem.lowestUnitPrice + this.data.item.productCategoryName = detail.value + this.statAmount() + }, + onHide: function(){ + this.setData({ visible: false }) + }, + bindInput: function (e) { + this.data.item[e.currentTarget.id] = e.detail.value + if(e.currentTarget.id == 'deductPercent'){ + if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){ + this.data.item.deductWeight = null + this.data.item.deductPercent = null + } else { + this.data.item.deductWeight = math.divide(math.times(this.data.item.netWeight, Number(e.detail.value)), 100).toFixed(2) + } + this.statAmount() + } else if(e.currentTarget.id == 'deductWeight'){ + if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){ + this.data.item.deductWeight = null + this.data.item.deductPercent = null + } else { + this.data.item.deductPercent = math.times(math.divide(Number(e.detail.value), this.data.item.netWeight), 100).toFixed(2) + } + this.statAmount() + } else if(e.currentTarget.id == 'settleUnitPrice'){ + this.statAmount() + } + wx.nextTick(() => { + this.triggerEvent('change', {index: this.data.index, item: this.data.item}); + }) + }, + statAmount: function(){ + this.data.item.settleWeight = this.data.item.netWeight + if(!util.isEmpty(this.data.item.deductWeight)){ + this.data.item.settleWeight = math.minus(this.data.item.netWeight, this.data.item.deductWeight) + } + if(!util.isEmpty(this.data.item.settleUnitPrice) && Number(this.data.item.settleUnitPrice) > 0){ + this.data.item.settlePrice = math.times(this.data.item.settleWeight, this.data.item.settleUnitPrice) + } else { + this.data.item.settlePrice = null + } + this.setData({ item: this.data.item }) + }, + changeDeductType: function(e){ + this.setData({ ['item.sign']: e.currentTarget.dataset.type, focus: e.currentTarget.dataset.type }) + } + } + +}) \ No newline at end of file diff --git a/pages/process/outside-check-item/index.json b/pages/process/outside-check-item/index.json new file mode 100644 index 0000000..2951311 --- /dev/null +++ b/pages/process/outside-check-item/index.json @@ -0,0 +1,10 @@ +{ + "component": true, + "usingComponents": { + "van-cell": "/components/cell/index", + "van-checkbox": "/components/checkbox/index", + "van-picker": "/components/picker/index", + "van-popup": "/components/popup/index", + "van-uploader": "/components/uploader/index" + } +} \ No newline at end of file diff --git a/pages/process/outside-check-item/index.wxml b/pages/process/outside-check-item/index.wxml new file mode 100644 index 0000000..667b2b8 --- /dev/null +++ b/pages/process/outside-check-item/index.wxml @@ -0,0 +1,65 @@ + + + + + + * + 废纸品类{{index + 1}} + + {{item.productCategoryName || '请选择废纸品类'}} + + + + + + * + 结算单价(元/公斤) + + + + + + + 净重(公斤) + {{item.netWeight || ''}} + + + + + + + 扣重(公斤) + + + + + + + + + 扣点(%) + + + + + + + 结算重量(公斤) + {{ item.settleWeight || item.netWeight }} + + + + + 结算金额(元) + {{ item.settlePrice || '- -' }} + + + + + + \ No newline at end of file diff --git a/pages/process/outside-check-item/index.wxss b/pages/process/outside-check-item/index.wxss new file mode 100644 index 0000000..d39e71b --- /dev/null +++ b/pages/process/outside-check-item/index.wxss @@ -0,0 +1,23 @@ +/* pages/mall/shops/index.wxss */ +.item-content { + background: rgba(255, 255, 255, 1); + padding: 32rpx; +} + +.item-cate { + flex: 5; + padding: 10rpx 30rpx; + border-radius: 10rpx; + border: 1rpx solid #f3f3f3; + background-color: #f3f3f3; +} + +.cate-tag { + background-color: #e6f7ff; + border: 1rpx solid #1890ff; +} + +.transform { + transform-origin: 50% 50%; + transform: rotate(180deg); +} diff --git a/pages/process/outside-check/index.js b/pages/process/outside-check/index.js index 604e9c1..48ba901 100644 --- a/pages/process/outside-check/index.js +++ b/pages/process/outside-check/index.js @@ -1,6 +1,6 @@ // pages/process/order-check/index.js import Scene from '../../index/scene' -import { checkingOrder, getPaperList, getSideOrderInfo} from "../../../api/saas" +import { repeatSideOrder, getPaperList, getSideOrderInfo} from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const math = require('../../../utils/math') @@ -13,14 +13,8 @@ Scene({ data: { safeBottom: app.globalData.safeBottom, paperList: null, - form: { - orderPapers: [{ productId: '', productName: '', unitPrice: ''}], - appointDate: null - }, - columns: [], - focus: 0, - visible: false, - amout: 20 + form: null, + columns: [] }, /** * 生命周期函数--监听页面加载 @@ -34,7 +28,7 @@ Scene({ for (let index = 0; index < this.data.paperList.length; index++) { this.data.columns.push(this.data.paperList[index].name) } - this.setData({ safeBottom: app.globalData.safeBottom, columns: this.data.columns }) + this.setData({ safeBottom: app.globalData.safeBottom, columns: this.data.columns, paperList: this.data.paperList }) }).catch(err => { this.setData({ safeBottom: app.globalData.safeBottom }) util.showToast(err) @@ -53,116 +47,36 @@ Scene({ }) } }, - showCategory: function(){ - this.setData({ visible: true }) - }, - onConfirm: function({detail}){ - this.data.nowItem = this.data.paperList[detail.index] - this.data.form.productId = this.data.nowItem.id - this.data.form.unitPrice = this.data.nowItem.defaultUnitPrice - this.data.form.productName = detail.value - this.statAmount() - }, - onHide: function(){ - this.setData({ visible: false }) - }, - changeDeductType: function(e){ - this.setData({ ['form.sign']: e.currentTarget.dataset.type, focus: e.currentTarget.dataset.type }) - }, - bindInput: function (e) { - this.data.form[e.target.id] = e.detail.value - if(e.target.id == 'deductPercent'){ - if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){ - this.data.form.deductWeight = null - this.data.form.deductPercent = null - } else { - this.data.form.deductWeight = math.divide(math.times(this.data.form.totalWeight, Number(e.detail.value)), 100).toFixed(2) - // this.setData({ ['form.deductWeight']: math.divide(math.times(this.data.form.totalWeight, Number(e.detail.value)), 100).toFixed(3) }) - } - } else if(e.target.id == 'deductWeight'){ - if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){ - this.data.form.deductWeight = null - this.data.form.deductPercent = null - } else { - this.data.form.deductPercent = math.times(math.divide(Number(e.detail.value), this.data.form.totalWeight), 100).toFixed(2) - // this.setData({ ['form.deductPercent']: math.times(math.divide(Number(e.detail.value), this.data.form.totalWeight), 100).toFixed(2) }) + onProductChange: function({detail}){ + this.data.form.productCategoryInfos[detail.index] = detail.item + var estimatedAmount = 0 + for (let index = 0; index < this.data.form.productCategoryInfos.length; index++) { + const element = this.data.form.productCategoryInfos[index] + if(!util.isEmpty(element.settlePrice) && Number(element.settlePrice) > 0){ + estimatedAmount = math.plus(estimatedAmount, element.settlePrice) } } - this.statAmount() - }, - onChange: function(e) { - this.data.form.inspectionRemark = e.detail - }, - statAmount: function(){ - this.data.form.settleWeight = this.data.form.netWeight - if(!util.isEmpty(this.data.form.deductWeight)){ - this.data.form.settleWeight = math.minus(this.data.form.netWeight, this.data.form.deductWeight) - } - if(!util.isEmpty(this.data.form.unitPrice) && Number(this.data.form.unitPrice) > 0){ - this.data.amout = math.times(this.data.form.settleWeight, this.data.form.unitPrice) - } else { - this.data.amout = null - } - this.setData({ visible: false, form: this.data.form, amout: this.data.amout }) + this.setData({ ['form.settleTotalAmount']: estimatedAmount.toFixed(2) }) }, checkOrder: function(){ - if(util.isEmpty(this.data.form.productId) || Number(this.data.form.productId) <= 0){ - util.showToast('请选择废纸品类') - return - } - if(util.isEmpty(this.data.form.unitPrice) || Number(this.data.form.unitPrice) <= 0){ - util.showToast('请输入单价') - return - } - if(this.data.nowItem){ - if(this.data.nowItem.highestUnitPrice && Number(this.data.form.unitPrice) > Number(this.data.nowItem.highestUnitPrice)){ - util.showToast('输入单价过高，价格范围：' + this.data.nowItem.lowestUnitPrice + '元/公斤-'+ this.data.nowItem.highestUnitPrice + '元/公斤') - return - } - if(this.data.nowItem.lowestUnitPrice && Number(this.data.form.unitPrice) < Number(this.data.nowItem.lowestUnitPrice)){ - util.showToast('输入单价过低，价格范围：' + this.data.nowItem.lowestUnitPrice + '元/公斤-'+ this.data.nowItem.highestUnitPrice + '元/公斤') + var weightNoteList = [] + for (let index = 0; index < this.data.form.productCategoryInfos.length; index++) { + const element = this.data.form.productCategoryInfos[index] + if(util.isEmpty(element.settleUnitPrice) || Number(element.settleUnitPrice) <= 0){ + util.showToast('请输入第' + (index + 1) + '项废纸品类结算单价') return } + var item = {grossWeight: element.grossWeight, tareWeight: element.tareWeight,weightNoteImage: element.weightNoteImage } + item.scrapPaperPurchaseOrderId = element.scrapPaperPurchaseOrderId + weightNoteList.push(item) } - if(!util.isEmpty(this.data.form.deductWeight) && Number(this.data.form.deductWeight) >= Number(this.data.form.totalWeight)){ - util.showToast('扣重不得超过皮重') - return - } - if(!util.isEmpty(this.data.form.deductPercent) && Number(this.data.form.deductPecent) >= 100){ - util.showToast('扣点范围：0-100') - return - } - wx.showLoading({ title: '处理中', mask: true }) - var data = {id: this.data.form.id} - if(Number(this.data.form.deductWeight) > 0){ - data.deductWeight = Number(this.data.form.deductWeight) - } - if(Number(this.data.form.deductPercent) > 0){ - data.deductPercent = Number(this.data.form.deductPercent) - } - data.plateNumber = this.data.form.plateNumber - data.productId = this.data.form.productId - data.sign = this.data.form.sign - data.unitPrice = Number(this.data.form.unitPrice) - checkingOrder({ id: this.data.form.id, editOrderPriceDto: data }).then(result => { + repeatSideOrder({ id: this.data.form.id, editOrderPriceDto: data }).then(result => { wx.hideLoading() - event.emit('OrderMessage', { what: 12, desc: 'checkingOrder' }) + event.emit('OrderMessage', { what: 12, desc: 'repeatSideOrder' }) util.showBackToast('订单审核已通过') }).catch(err => { wx.hideLoading() util.showToast(err) }) - }, - viewImage: function (e) { - var imgList = [] - for (let index = 0; index < this.data.form.totalWeighingPicture.length; index++) { - var url = this.data.form.totalWeighingPicture[index].url - if(!util.isEmpty(url) && 'error' != url){ - imgList.push(url) - } - } - if(imgList.length){ - wx.previewImage({ urls: imgList, current: e.currentTarget.dataset.url }) - } } }) \ No newline at end of file diff --git a/pages/process/outside-check/index.json b/pages/process/outside-check/index.json index f20c784..acb8892 100644 --- a/pages/process/outside-check/index.json +++ b/pages/process/outside-check/index.json @@ -3,11 +3,7 @@ "van-index-anchor": "/components/index-anchor/index", "van-cell": "/components/cell/index", "van-button": "/components/button/index", - "van-checkbox": "/components/checkbox/index", - "van-loading": "/components/loading/index", - "van-image": "/components/image/index", - "van-picker": "/components/picker/index", - "van-popup": "/components/popup/index", + "outside-check-item": "/pages/process/outside-check-item/index", "submit-layout": "/components/submit-layout/index", "notification": "/pages/message/notification/index" } diff --git a/pages/process/outside-check/index.wxml b/pages/process/outside-check/index.wxml index ff64920..970cae7 100644 --- a/pages/process/outside-check/index.wxml +++ b/pages/process/outside-check/index.wxml @@ -23,80 +23,18 @@ {{form.driverName || '请选择司机'}} - - - - - - - * - 废纸品类{{index + 1}} - - {{item.productName || '请选择废纸品类'}} - - - - - - * - 结算单价(元/公斤) - - - - - - - 净重(公斤) - {{item.netWeight || ''}} - - - - - - - 扣重(公斤) - - - - - - - - - 扣点(%) - - - - - - - 结算重量(公斤) - {{form.settleWeight || '- -'}} - - - - - 结算金额(元) - {{form.settleWeight || '- -'}} - - + + + - 金额： - {{amout}} + 金额： + {{form.settleTotalAmount}} 通过审核 - - - \ No newline at end of file diff --git a/pages/process/outside-item/index.js b/pages/process/outside-item/index.js index 36cbf20..4523355 100644 --- a/pages/process/outside-item/index.js +++ b/pages/process/outside-item/index.js @@ -23,10 +23,10 @@ Component({ }, methods: { setValues: function(value){ - if(value && value.weightNoteImage){ + if(value && value.weightNoteImages){ this.data.fileList = [] - for (let index = 0; index < value.weightNoteImage.length; index++) { - this.data.fileList.push({url: value.weightNoteImage[index]}) + for (let index = 0; index < value.weightNoteImages.length; index++) { + this.data.fileList.push({url: value.weightNoteImages[index]}) } this.setData({fileList: this.data.fileList}) } @@ -54,7 +54,7 @@ Component({ this.data.item.deductWeight = null this.data.item.deductPercent = null } else { - this.data.item.deductWeight = math.divide(math.times(this.data.item.totalWeight, Number(e.detail.value)), 100).toFixed(2) + this.data.item.deductWeight = math.divide(math.times(this.data.item.netWeight, Number(e.detail.value)), 100).toFixed(2) } this.statAmount() } else if(e.currentTarget.id == 'deductWeight'){ @@ -62,7 +62,7 @@ Component({ this.data.item.deductWeight = null this.data.item.deductPercent = null } else { - this.data.item.deductPercent = math.times(math.divide(Number(e.detail.value), this.data.item.totalWeight), 100).toFixed(2) + this.data.item.deductPercent = math.times(math.divide(Number(e.detail.value), this.data.item.netWeight), 100).toFixed(2) } this.statAmount() } else if(e.currentTarget.id == 'settleUnitPrice'){ diff --git a/pages/process/outside-item/index.wxml b/pages/process/outside-item/index.wxml index 327a3d3..b072c66 100644 --- a/pages/process/outside-item/index.wxml +++ b/pages/process/outside-item/index.wxml @@ -1,4 +1,5 @@ + 废纸品类{{index + 1}} @@ -51,7 +52,7 @@ 3-6张，每图片大小限制5M - @@ -89,12 +90,12 @@ 结算重量(公斤) - {{form.settleWeight || '- -'}} + {{ item.settleWeight || item.netWeight }} 结算金额(元) - {{form.settlePrice || '- -'}} + {{ item.settlePrice || '- -' }} \ No newline at end of file diff --git a/pages/process/outside-list/index.js b/pages/process/outside-list/index.js index 3d40754..26a1e82 100644 --- a/pages/process/outside-list/index.js +++ b/pages/process/outside-list/index.js @@ -56,7 +56,12 @@ Scene({ } } event.on('OrderMessage', this, this.onEvent) - this.setData({ height: app.globalData.fragmentHeight - 90, title: this.data.title, tabIndex: this.data.tabIndex }) + this.setData({ + height: app.globalData.fragmentHeight - 90, + title: this.data.title, + tabIndex: this.data.tabIndex, + admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 + }) this.fetchOrderList() }, onEvent: function(message){ diff --git a/pages/process/outside-list/index.wxml b/pages/process/outside-list/index.wxml index 11a8d0a..ff5b95e 100644 --- a/pages/process/outside-list/index.wxml +++ b/pages/process/outside-list/index.wxml @@ -52,7 +52,7 @@ - + diff --git a/pages/process/outside-price/index.js b/pages/process/outside-price/index.js index 077dabb..766ef3f 100644 --- a/pages/process/outside-price/index.js +++ b/pages/process/outside-price/index.js @@ -1,7 +1,7 @@ // pages/process/order-check/index.js import Scene from '../../index/scene' import Dialog from '../../../components/dialog/dialog' -import { poundSideOrder, getSideOrderInfo} from "../../../api/saas" +import { poundSideOrder, getSideOrderInfo, saveSideOrder, priceSideOrder } from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const math = require('../../../utils/math') @@ -43,18 +43,31 @@ Scene({ }, onProductChange: function({detail}){ this.data.form.productCategoryInfos[detail.index] = detail.item - var netWeight = 0 + var totalNetWeight = 0 var estimatedAmount = 0 for (let index = 0; index < this.data.form.productCategoryInfos.length; index++) { const element = this.data.form.productCategoryInfos[index] - if(!util.isEmpty(element.netWeight) && Number(element.netWeight) > 0){ - netWeight = math.plus(netWeight, element.netWeight) - } - if(!util.isEmpty(element.estimatedAmount) && Number(element.estimatedAmount) > 0){ - estimatedAmount = math.plus(estimatedAmount, element.estimatedAmount) + if(this.data.form.orderStatus == 0){ + if(!util.isEmpty(element.netWeight) && Number(element.netWeight) > 0){ + totalNetWeight = math.plus(totalNetWeight, element.netWeight) + } + if(!util.isEmpty(element.estimatedAmount) && Number(element.estimatedAmount) > 0){ + estimatedAmount = math.plus(estimatedAmount, element.estimatedAmount) + } + } else { + if(!util.isEmpty(element.settleWeight) && Number(element.settleWeight) > 0){ + totalNetWeight = math.plus(totalNetWeight, element.settleWeight) + } + if(!util.isEmpty(element.settlePrice) && Number(element.settlePrice) > 0){ + estimatedAmount = math.plus(estimatedAmount, element.settlePrice) + } } } - this.setData({ ['form.netWeight']: netWeight, ['form.estimatedAmount']: estimatedAmount.toFixed(2) }) + if(this.data.form.orderStatus == 0){ + this.setData({ ['form.totalNetWeight']: totalNetWeight, ['form.estimatedAmount']: estimatedAmount.toFixed(2) }) + } else { + this.setData({ ['form.settleTotalWeight']: totalNetWeight, ['form.settleTotalAmount']: estimatedAmount.toFixed(2) }) + } }, bindInput: function (e) { this.data.param[e.currentTarget.id] = e.detail.value @@ -85,10 +98,10 @@ Scene({ } this.data.param.weightNoteList = weightNoteList wx.showLoading({ title: '处理中', mask: true }) - poundSideOrder(this.data.param).then(result => { + saveSideOrder(this.data.param).then(result => { wx.hideLoading() - util.showBackToast('保存成功') - event.emit('OrderMessage', { what: 12, desc: 'pricingOrder' }) + util.showToast('保存成功') + // event.emit('OrderMessage', { what: 12, desc: 'saveSideOrder' }) }).catch(err => { wx.hideLoading() util.showToast(err) @@ -138,7 +151,28 @@ Scene({ wx.redirectTo({url: `/pages/process/outside-check/index?id=${this.data.id}` }) }, priceForm: function(){ - + var productCategorySettleInfoDtoList = [] + for (let index = 0; index < this.data.form.productCategoryInfos.length; index++) { + const element = this.data.form.productCategoryInfos[index] + if(util.isEmpty(element.settleUnitPrice) || Number(element.settleUnitPrice) <= 0){ + util.showToast('请输入第' + (index + 1) + '项废纸品类结算单价') + return + } + var item = {deductWeight: element.deductWeight, deductPercent: element.deductPercent,productId: element.productId } + item.settleUnitPrice = element.settleUnitPrice + productCategorySettleInfoDtoList.push(item) + } + var data = {scrapPaperReceiptId: this.data.form.scrapPaperReceiptId } + data.productCategorySettleInfoDtoList = productCategorySettleInfoDtoList + wx.showLoading({ title: '处理中', mask: true }) + priceSideOrder(data).then(result => { + wx.hideLoading() + util.showBackToast('定价成功') + event.emit('OrderMessage', { what: 12, desc: 'pricingOrder' }) + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) }, checkForm: function(){ diff --git a/pages/process/outside-price/index.wxml b/pages/process/outside-price/index.wxml index 8819d39..bc4c04c 100644 --- a/pages/process/outside-price/index.wxml +++ b/pages/process/outside-price/index.wxml @@ -4,6 +4,29 @@ + + + + 待收货 + + 修改订单 + + + + 待付款 + + + + 代付审核中 + + + + 待结算 + + + + 已完成 + @@ -44,46 +67,57 @@ - + + + 结算总重量(公斤) + {{form.settleTotalWeight || '- -'}} + + + 总净重(公斤) - {{form.netWeight || ''}} + {{form.totalNetWeight || '- -'}} - + + + 结算总金额(元) + {{form.settleTotalAmount || '- -'}} + + + 预计总金额(元) - {{form.estimatedAmount || ''}} + {{form.estimatedAmount || '- -'}} - * + * 厂外皮重(公斤) + bindinput="bindInput" disabled="{{ form.orderStatus != 0}}" /> - * + * 厂外毛重(公斤) + bindinput="bindInput" disabled="{{ form.orderStatus != 0}}"/> - 取消 - 修改订单 - 保存 - 提交订单 + 取消 + 保存 + 提交订单 保存 @@ -91,7 +125,7 @@ 取消 - 确认 + 确认定价 重新定价 diff --git a/pages/process/outside-price/index.wxss b/pages/process/outside-price/index.wxss index 14a8a3a..3a7a2fb 100644 --- a/pages/process/outside-price/index.wxss +++ b/pages/process/outside-price/index.wxss @@ -1,21 +1,6 @@ /* pages/process/order-check/index.wxss */ -.cate-list { - margin: 24rpx 30rpx; - border: 1rpx solid #dcdcdc; -} - -.cate-header { - min-height: 76rpx; - background-color: #dcdcdc; - padding: 0rpx 30rpx; -} - -.cate-index { - width: 32rpx; - height: 32rpx; - line-height: 32rpx; - text-align: center; - border-radius: 5000rpx; - border: 1px solid #666666; - margin-left: 12rpx +.info_status{ + background-image: linear-gradient(90deg, #FF4D2E 6%, #FF952F 100%); + height:90rpx; + padding: 0rpx 32rpx; }