diff --git a/common/api.js b/common/api.js index 3153f05..954fe3a 100644 --- a/common/api.js +++ b/common/api.js @@ -150,6 +150,8 @@ module.exports = (vm) => { modifyGoods: params => vm.$u.http.post( freightAPI + '/freightOrder/maModifyGoods', params), // 更改货物信息 adjustAmount: params => vm.$u.http.post( freightAPI + '/freightOrder/maAdjustAmount', params), // 更改运费 modifyReceiptAttachment: params => vm.$u.http.post( freightAdmin + '/woss/freightOrder/modifyReceiptAttachment', params), // 修改回单附件 + modifyDepartureWeightAttachment: params => vm.$u.http.post( freightAPI + '/freightOrder/modifyReceiptAttachment', params), // 修改装车磅单 + modifyArrivalWeightAttachment: params => vm.$u.http.post( freightAPI + '/freightOrder/modifyReceiptAttachment', params), // 修改卸车磅单 count: params => vm.$u.http.post( freightAPI + '/freightOrder/count', params), // 状态数量 getDetail: params => vm.$u.http.get( freightAPI + '/freightOrder/getDetail', {params}), // 订单详情 checkDepartureTime: params => vm.$u.http.get( freightAPI + '/freightOrder/checkDepartureTime', params), // 校验选择的运单发车时间是否一致 @@ -175,6 +177,7 @@ module.exports = (vm) => { count: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/count', {params}), getDetail: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/getDetail', {params}), add: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/add', data,{custom: {toast:true}}), + addOrder: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/addOrder', data,{custom: {toast:true}}), modify: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/modify', data), complete: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/complete', data), cancel: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancel', data), diff --git a/iconfont/iconfont.css b/iconfont/iconfont.css index 53d5f74..ac9cec1 100644 --- a/iconfont/iconfont.css +++ b/iconfont/iconfont.css @@ -370,9 +370,58 @@ content: "\e722"; } -.icon-radio-no:before { +.icon-secure:before { content: "\e723"; } -.icon-radio-chose:before { + +.icon-kanban1:before { content: "\e724"; } + +.icon-kanban2:before { + content: "\e725"; +} + +.icon-kanban3:before { + content: "\e726"; +} + +.icon-sign:before { + content: "\e727"; +} +.icon-bulk-order:before { + content: "\e728"; +} +.icon-customer:before { + content: "\e731"; +} +.icon-loadtime:before { + content: "\e733"; +} +.icon-quotation:before { + content: "\e735"; +} +.icon-cartype:before { + content: "\e730"; +} +.icon-car-inviter:before { + content: "\e734"; +} +.icon-location:before { + content: "\e732"; +} +.icon-star-fill:before { + content: "\e736"; +} +.icon-radio-chose:before { + content: "\e739"; +} +.icon-radio-no:before { + content: "\e740"; +} +.icon-switch-vertical:before { + content: "\e741"; +} +.icon-pay-rmb:before { + content: "\e741"; +} diff --git a/iconfont/iconfont.ttf b/iconfont/iconfont.ttf index 8eae219..9f7f873 100644 Binary files a/iconfont/iconfont.ttf and b/iconfont/iconfont.ttf differ diff --git a/pages/goodSource/card.vue b/pages/goodSource/card.vue index 7ecbad0..6b1afa7 100644 --- a/pages/goodSource/card.vue +++ b/pages/goodSource/card.vue @@ -1,5 +1,5 @@ @@ -37,13 +40,11 @@ - - - {{ form.code }} - - - - + + + + + {{ form.code }} @@ -57,7 +58,7 @@ - /{{ form.vehicleLicenseNum }} + {{ form.vehicleLicenseNum }} /{{ form.trailerLicenseNum }} @@ -65,16 +66,31 @@ {{ form.biddingWeight || '--' }}吨 - 总运费：{{ form.paidAmount }} - + 总运费：{{ form.paidAmount }}元 + + 取消 + 成交指派 + - + + + + @@ -83,13 +99,18 @@ diff --git a/pages/me/index.vue b/pages/me/index.vue index 1c635ff..bf32a91 100644 --- a/pages/me/index.vue +++ b/pages/me/index.vue @@ -46,7 +46,16 @@ - + + + + + + + + {{ form.weightUnitPrice }}元/吨 + + @@ -185,6 +196,7 @@ export default { components: { UTextarea, PopupPlatenumber, payee }, data() { return { + eventCode: '', loading: false, showModal: '', showModal2: '', @@ -221,6 +233,10 @@ export default { allowDriverSeeFreightAmountNode: '', waypoints: [{}, {}], remark: '', + priceType: '', + weightUnitPrice: '', + goodsSourceCode: '', + goodsSourceBiddingCode: '', }, payeeModel: {}, driverObj: {}, //司机信息 @@ -246,21 +262,27 @@ export default { }, }, onLoad(option) { - if (option.code) { - this.initData(option.code); - } // 从抢单来的数据 if (option.eventCode) { + this.eventCode = option.eventCode; + uni.setNavigationBarTitle({ title: '确定指派' }); const eventChannel = this.getOpenerEventChannel(); eventChannel.on('get-item', detail => { - this.setFormValue(detail); + this.setFormValue(detail, ['priceType', 'weightUnitPrice', 'goodsSourceCode', 'goodsSourceBiddingCode', 'loadTime', 'paidAmount']); + this.getAllowDriverSeeFreightAmount(); + this.clipboard(`手机号：${detail.driverMobile || ''}车牌：${detail.vehicleLicenseNum || ''}车挂：${detail.trailerLicenseNum || ''}`); + this.computedService(); }); + } else { + if (option.code) { + this.initData(option.code); + } + this.initConfig(); } - this.initConfig(); }, methods: { - setFormValue(detail) { - ['goodsName', 'waypoints', 'allowDriverSeeFreightAmountNode', 'projectCode', 'projectName', 'remark', 'goodsPiece', 'goodsWeight', 'goodsVolume'].forEach(key => { + setFormValue(detail, moreList = []) { + ['goodsName', 'waypoints', 'allowDriverSeeFreightAmountNode', 'projectCode', 'projectName', 'remark', 'goodsPiece', 'goodsWeight', 'goodsVolume', ...moreList].forEach(key => { this.form[key] = detail[key]; }); if (detail.vehicleLicenseNum) { @@ -355,10 +377,7 @@ export default { this.clipboard(this.content2); }, initConfig() { - uni.$u.api.freightOrder.currentFreight({}).then(en => { - this.currentFreight = en?.result || {}; - this.form.allowDriverSeeFreightAmountNode = this.currentFreight.allowDriverSeeFreightAmountNode; - }); + this.getAllowDriverSeeFreightAmount(); uni.$u.api.filter.projectCode({}).then(res => { if (res.success && res.result && res.result.length === 1) { this.form.projectCode = res.result[0].code; @@ -366,6 +385,12 @@ export default { } }); }, + getAllowDriverSeeFreightAmount() { + uni.$u.api.freightOrder.currentFreight({}).then(en => { + this.currentFreight = en?.result || {}; + this.form.allowDriverSeeFreightAmountNode = this.currentFreight.allowDriverSeeFreightAmountNode; + }); + }, initData(code) { uni.$u.api.freightOrder.getDetail({ code }).then(res => { let detail = res.result || {}; @@ -567,6 +592,12 @@ export default { computedService() { uni.$u.debounce(this.getServiceAmountInfo, 500); }, + computedPaid() { + if (this.eventCode) { + this.form.paidAmount = Number(Number(this.form.goodsWeight) * Number(this.form.weightUnitPrice)).toFixed(2); + this.computedService(); + } + }, getServiceAmountInfo() { const { paidAmount = '', oilAmount = '', deliveryAmount = '', prepaidAmount = '', balancePaymentAmount = '', goodsName = '', goodsValue = '' } = this.form; let params = { @@ -600,8 +631,8 @@ export default { if (this.loading) return; this.loading = true; let totalAmount = Number(this.form.paidAmount || 0) + Number(this.form.serviceAmount || 0) + Number(this.form.securityServiceAmount || 0); - uni.$u.api.freightOrder - .add({ ...this.form, totalAmount, payeeId: this.payeeModel.driverId }) + let addFun = this.eventCode ? uni.$u.api.freightGoodsSourceV2.addOrder : uni.$u.api.freightOrder.add; + addFun({ ...this.form, totalAmount, payeeId: this.payeeModel.driverId }) .then(res => { if (res.success) { this.form = {}; diff --git a/pages/order/detail.vue b/pages/order/detail.vue index e920b78..c998536 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -98,10 +98,37 @@ - + + + 装车磅单 + + + + + + + + + 卸车磅单 + + + + + + + + + 计价方式 + + + + ({{ item.weightUnitPrice }}元/吨) + + + @@ -406,9 +433,9 @@ export default { }, }); }, - toUploadReceipt() { + toUploadReceipt(type = '') { uni.navigateTo({ - url: '/pages/order/upload-receipt?code=' + this.item.code, + url: `/pages/order/upload-receipt?code=${this.item.code}&type=${type}`, events: { refreshData: () => { this.initData(this.item.code); diff --git a/pages/order/filter.vue b/pages/order/filter.vue index ec8a1c5..7516f79 100644 --- a/pages/order/filter.vue +++ b/pages/order/filter.vue @@ -49,7 +49,7 @@