Browse Source

no message

feature/v1.5
xpz2018 4 years ago
parent
commit
d3949f93fc
12 changed files with 112 additions and 100 deletions
  1. 7
      pages/login/index.js
  2. 2
      pages/process/order-info/index.wxml
  3. 4
      pages/process/outside-add/index.js
  4. 7
      pages/process/outside-check-item/index.js
  5. 56
      pages/process/outside-check/index.js
  6. 1
      pages/process/outside-check/index.json
  7. 3
      pages/process/outside-check/index.wxml
  8. 7
      pages/process/outside-info/index.js
  9. 5
      pages/process/outside-info/index.json
  10. 112
      pages/process/outside-info/index.wxml
  11. 4
      pages/process/outside-price/index.js
  12. 4
      pages/process/outside-price/index.wxml

7
pages/login/index.js

@ -124,14 +124,15 @@ Page({
} }
} else if(app.userInfo.factoryId){ } else if(app.userInfo.factoryId){
if(!result.data.isSaasPerssion){ if(!result.data.isSaasPerssion){
Dialog.alert({ title: '温馨提示', message: '您的打包站还在授权中,请耐心等待,或者联系相关客服人员' }).then(() => {
Dialog.alert({ title: '温馨提示', message: '您的打包站还在授权中,请耐心等待,或者联系相关客服人员' }).then(() => {
}) })
return return
} }
headerFactoryId(app.userInfo.factoryId) headerFactoryId(app.userInfo.factoryId)
wx.redirectTo({ url: '/pages/index/index' }) wx.redirectTo({ url: '/pages/index/index' })
} else { } else {
wx.redirectTo({ url: '/pages/client/index/index' })
Dialog.alert({ title: '温馨提示', message: '还没有您所属的打包站,请耐心等待,或者联系相关客服人员' }).then(() => {
})
} }
}).catch(err => { }).catch(err => {
wx.hideLoading() wx.hideLoading()
@ -333,7 +334,7 @@ Page({
wx.hideLoading() wx.hideLoading()
this.setData({loging: false}) this.setData({loging: false})
Dialog.alert({ title: '温馨提示', message: '您的申请已经提交,待管理员审核通过之后在进行登录。' }).then(() => { Dialog.alert({ title: '温馨提示', message: '您的申请已经提交,待管理员审核通过之后在进行登录。' }).then(() => {
wx.redirectTo({ url: '/pages/index/index' })
// wx.redirectTo({ url: '/pages/index/index' })
}) })
}).catch(error => { }).catch(error => {
wx.hideLoading() wx.hideLoading()

2
pages/process/order-info/index.wxml

@ -166,7 +166,7 @@
<van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder" wx:if="{{form.status == 42}}">客户结算</van-button> <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder" wx:if="{{form.status == 42}}">客户结算</van-button>
</view> </view>
<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx" wx:if="{{form && (form.status == 3 || form.status == 4)}}">
<view style="border-radius: 50rpx;position:fixed;bottom:160rpx;right:50rpx" wx:if="{{form && (form.status == 3 || form.status == 4)}}">
<van-button round type="info" bind:click="printOrder" custom-style="width: 100rpx;height: 100rpx;"> <van-button round type="info" bind:click="printOrder" custom-style="width: 100rpx;height: 100rpx;">
<van-icon name="printer" size="30px"/> <van-icon name="printer" size="30px"/>
</van-button> </van-button>

4
pages/process/outside-add/index.js

@ -197,11 +197,11 @@ Scene({
} }
} }
if(element.highestUnitPrice && Number(element.unitPrice) > Number(element.highestUnitPrice)){ if(element.highestUnitPrice && Number(element.unitPrice) > Number(element.highestUnitPrice)){
util.showToast('第' + (index + 1) + '项废纸品类单价过高,价格范围:' + element.lowestUnitPrice + '元/公斤-'+ element.highestUnitPrice + '元/公斤')
util.showToast('第' + (index + 1) + '项废纸品类单价不得高于:' + element.highestUnitPrice + '元/公斤')
return return
} }
if(element.lowestUnitPrice && Number(element.unitPrice) < Number(element.lowestUnitPrice)){ if(element.lowestUnitPrice && Number(element.unitPrice) < Number(element.lowestUnitPrice)){
util.showToast('第' + (index + 1) + '项废纸品类单价过低,价格范围:' + element.lowestUnitPrice + '元/公斤-'+ element.highestUnitPrice + '元/公斤')
util.showToast('第' + (index + 1) + '项废纸品类单价不得低于:' + element.lowestUnitPrice + '元/公斤')
return return
} }
} }

7
pages/process/outside-check-item/index.js

@ -24,7 +24,7 @@ Component({
this.setData({ visible: true }) this.setData({ visible: true })
}, },
onConfirm: function({detail}){ onConfirm: function({detail}){
var nowItem = this.data.paperList[detail.index]
var nowItem = this.data.list[detail.index]
for (var i = 0; i < this.data.form.productCategoryInfos.length; i++) { for (var i = 0; i < this.data.form.productCategoryInfos.length; i++) {
if (this.data.form.productCategoryInfos[i].productId == nowItem.id){ if (this.data.form.productCategoryInfos[i].productId == nowItem.id){
this.setData({ visible: false }) this.setData({ visible: false })
@ -38,6 +38,9 @@ Component({
this.data.item.lowestUnitPrice = nowItem.lowestUnitPrice this.data.item.lowestUnitPrice = nowItem.lowestUnitPrice
this.data.item.productCategoryName = detail.value this.data.item.productCategoryName = detail.value
this.statAmount() this.statAmount()
wx.nextTick(() => {
this.triggerEvent('change', {index: this.data.index, item: this.data.item});
})
}, },
onHide: function(){ onHide: function(){
this.setData({ visible: false }) this.setData({ visible: false })
@ -77,7 +80,7 @@ Component({
} else { } else {
this.data.item.settlePrice = null this.data.item.settlePrice = null
} }
this.setData({ item: this.data.item })
this.setData({ item: this.data.item, visible: false })
}, },
changeDeductType: function(e){ changeDeductType: function(e){
this.setData({ ['item.sign']: e.currentTarget.dataset.type, focus: e.currentTarget.dataset.type }) this.setData({ ['item.sign']: e.currentTarget.dataset.type, focus: e.currentTarget.dataset.type })

56
pages/process/outside-check/index.js

@ -1,5 +1,6 @@
// pages/process/order-check/index.js // pages/process/order-check/index.js
import Scene from '../../index/scene' import Scene from '../../index/scene'
import Dialog from '../../../components/dialog/dialog'
import { repeatSideOrder, getPaperList, getSideOrderInfo} from "../../../api/saas" import { repeatSideOrder, getPaperList, getSideOrderInfo} from "../../../api/saas"
const event = require('../../../utils/event') const event = require('../../../utils/event')
const util = require('../../../utils/util') const util = require('../../../utils/util')
@ -34,13 +35,14 @@ Scene({
util.showToast(err) util.showToast(err)
}) })
getSideOrderInfo({ id: options.id }).then(result => { getSideOrderInfo({ id: options.id }).then(result => {
wx.hideLoading()
result.data.sign = 1
if(Number(result.data.deductPercent) <= 0){
result.data.deductPercent = null
result.data.settleTotalAmount = 0
for (let index = 0; index < result.data.productCategoryInfos.length; index++) {
const element = result.data.productCategoryInfos[index]
element.settlePrice = math.times(element.settleWeight, element.settleUnitPrice)
result.data.settleTotalAmount = math.plus(result.data.settleTotalAmount, element.settlePrice)
} }
this.data.amout = math.times(result.data.settleWeight, result.data.unitPrice)
this.setData({ form: result.data, amout: this.data.amout })
this.setData({ form: result.data })
wx.hideLoading()
}).catch(err => { }).catch(err => {
wx.hideLoading() wx.hideLoading()
util.showToast(err) util.showToast(err)
@ -58,6 +60,25 @@ Scene({
} }
this.setData({ ['form.settleTotalAmount']: estimatedAmount.toFixed(2) }) this.setData({ ['form.settleTotalAmount']: estimatedAmount.toFixed(2) })
}, },
checkForm: function(){
if(this.data.form.grossWeight) {
this.checkOrder()
} else {
var message = '此订单没有厂内毛重数据,按照正常流程请刷卡过磅,获取厂内毛重数据,如果已经无法获取,请仔细查验纸品,确定没有问题后,进行审核。'
Dialog.confirm({ title: '温馨提示', message, confirmButtonText: '确定审核' }).then(() => {
this.checkOrder()
})
}
},
findCateById: function(productId){
for (let index = 0; index < this.data.paperList.length; index++) {
const element = this.data.paperList[index]
if(element.id == productId){
return element
}
}
return null
},
checkOrder: function(){ checkOrder: function(){
var weightNoteList = [] var weightNoteList = []
for (let index = 0; index < this.data.form.productCategoryInfos.length; index++) { for (let index = 0; index < this.data.form.productCategoryInfos.length; index++) {
@ -66,10 +87,29 @@ Scene({
util.showToast('请输入第' + (index + 1) + '项废纸品类结算单价') util.showToast('请输入第' + (index + 1) + '项废纸品类结算单价')
return return
} }
var item = {grossWeight: element.grossWeight, tareWeight: element.tareWeight,weightNoteImage: element.weightNoteImage }
item.scrapPaperPurchaseOrderId = element.scrapPaperPurchaseOrderId
if(!util.isEmpty(this.data.form.scrapPaperReceiptId)){
var cate = this.findCateById(element.productId)
console.log(cate)
if(cate){
element.highestUnitPrice = cate.highestUnitPrice
element.lowestUnitPrice = cate.lowestUnitPrice
}
}
if(element.highestUnitPrice && Number(element.settleUnitPrice) > Number(element.highestUnitPrice)){
util.showToast('第' + (index + 1) + '项废纸品类单价不得高于:' + element.highestUnitPrice + '元/公斤')
return
}
if(element.lowestUnitPrice && Number(element.settleUnitPrice) < Number(element.lowestUnitPrice)){
util.showToast('第' + (index + 1) + '项废纸品类单价不得低于:' + element.lowestUnitPrice + '元/公斤')
return
}
var item = { productId: element.productId, scrapPaperPurchaseOrderId: element.scrapPaperPurchaseOrderId }
item.deductWeight = element.deductWeight
item.deductPercent = element.deductPercent
item.settleUnitPrice = element.settleUnitPrice
weightNoteList.push(item) weightNoteList.push(item)
} }
var data = {scrapPaperReceiptId: this.data.form.scrapPaperReceiptId, weightNoteList }
repeatSideOrder({ id: this.data.form.id, editOrderPriceDto: data }).then(result => { repeatSideOrder({ id: this.data.form.id, editOrderPriceDto: data }).then(result => {
wx.hideLoading() wx.hideLoading()
event.emit('OrderMessage', { what: 12, desc: 'repeatSideOrder' }) event.emit('OrderMessage', { what: 12, desc: 'repeatSideOrder' })

1
pages/process/outside-check/index.json

@ -3,6 +3,7 @@
"van-index-anchor": "/components/index-anchor/index", "van-index-anchor": "/components/index-anchor/index",
"van-cell": "/components/cell/index", "van-cell": "/components/cell/index",
"van-button": "/components/button/index", "van-button": "/components/button/index",
"van-dialog": "/components/dialog/index",
"outside-check-item": "/pages/process/outside-check-item/index", "outside-check-item": "/pages/process/outside-check-item/index",
"submit-layout": "/components/submit-layout/index", "submit-layout": "/components/submit-layout/index",
"notification": "/pages/message/notification/index" "notification": "/pages/message/notification/index"

3
pages/process/outside-check/index.wxml

@ -34,7 +34,8 @@
<text class="text-lg" wx:if="{{form.settleTotalAmount}}">金额:</text> <text class="text-lg" wx:if="{{form.settleTotalAmount}}">金额:</text>
<text class="text-xxl text-price text-red" wx:if="{{form.settleTotalAmount}}">{{form.settleTotalAmount}}</text> <text class="text-xxl text-price text-red" wx:if="{{form.settleTotalAmount}}">{{form.settleTotalAmount}}</text>
</view> </view>
<van-button type="info" custom-style="height:88rpx;width:300rpx" bind:click="checkOrder">通过审核</van-button>
<van-button type="info" custom-style="height:88rpx;width:300rpx" bind:click="checkForm">通过审核</van-button>
</submit-layout> </submit-layout>
<van-dialog id="van-dialog" />
<notification id="qn-notification"/> <notification id="qn-notification"/>

7
pages/process/outside-info/index.js

@ -23,6 +23,13 @@ Scene({
wx.showLoading({ title: '正在获取', mask: true }) wx.showLoading({ title: '正在获取', mask: true })
getSideOrderInfo({id: options.id}).then(result => { getSideOrderInfo({id: options.id}).then(result => {
wx.hideLoading() wx.hideLoading()
for (let index = 0; index < result.data.productCategoryInfos.length; index++) {
const element = result.data.productCategoryInfos[index]
element.fileList = []
for (let k = 0; k < element.weightNoteImages.length; k++) {
element.fileList.push({url: element.weightNoteImages[k]})
}
}
this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 }) this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 })
}).catch(err => { }).catch(err => {
wx.hideLoading() wx.hideLoading()

5
pages/process/outside-info/index.json

@ -4,12 +4,7 @@
"van-cell": "/components/cell/index", "van-cell": "/components/cell/index",
"van-icon": "/components/icon/index", "van-icon": "/components/icon/index",
"van-button": "/components/button/index", "van-button": "/components/button/index",
"van-checkbox": "/components/checkbox/index",
"van-loading": "/components/loading/index",
"van-image": "/components/image/index",
"van-field": "/components/field/index",
"van-dialog": "/components/dialog/index", "van-dialog": "/components/dialog/index",
"van-switch": "/components/switch/index",
"van-uploader": "/components/uploader/index", "van-uploader": "/components/uploader/index",
"submit-layout": "/components/submit-layout/index", "submit-layout": "/components/submit-layout/index",
"notification": "/pages/message/notification/index" "notification": "/pages/message/notification/index"

112
pages/process/outside-info/index.wxml

@ -8,170 +8,132 @@
<van-cell clickable center> <van-cell clickable center>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">客户姓名</view> <view class="text-black">客户姓名</view>
<view class="{{form.factoryCustomerName ? 'text-black' : 'text-gray'}}">{{form.factoryCustomerName || '请选择客户'}}</view>
<view class="text-gray">{{form.factoryCustomerName || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell clickable center> <van-cell clickable center>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">车牌号码</view> <view class="text-black">车牌号码</view>
<view class="{{form.plateNumber ? 'text-black' : 'text-gray'}}">{{form.plateNumber || '请输入车牌号码'}}</view>
<view class="text-gray">{{form.plateNumber || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell clickable center> <van-cell clickable center>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">司机</view> <view class="text-black">司机</view>
<view class="{{form.driverName ? 'text-black' : 'text-gray'}}">{{form.driverName || '请选择司机'}}</view>
<view class="text-gray">{{form.driverName || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell clickable center wx:if="{{form.operatorName}}"> <van-cell clickable center wx:if="{{form.operatorName}}">
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">操作员</view> <view class="text-black">操作员</view>
<view class="{{form.operatorName ? 'text-black' : 'text-gray'}}">{{form.operatorName || '请选择操作员'}}</view>
<view class="text-gray">{{form.operatorName || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell clickable center wx:if="{{form.appointDate}}">
<van-cell clickable center wx:if="{{form.predictDeliveryToFactoryTime}}">
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">预计到厂时间</view> <view class="text-black">预计到厂时间</view>
<view class="{{form.appointDate ? 'text-black' : 'text-gray'}}">{{form.appointDate || '请选择预计到厂时间'}}</view>
<view class="text-gray">{{form.predictDeliveryToFactoryTime}}</view>
</view> </view>
</van-cell> </van-cell>
<van-field label="辅助设备" type="textarea" disabled input-align="right" placeholder="请输入辅助设备" autosize border="{{ false }}" />
<van-field label="辅助设备" type="textarea" disabled input-align="right" value="{{ form.equipmentRemark }}" autosize border="{{ false }}" />
<van-index-anchor index="纸品信息" /> <van-index-anchor index="纸品信息" />
<view wx:for="{{form.productCategoryInfos}}" wx:key="index"> <view wx:for="{{form.productCategoryInfos}}" wx:key="index">
<view style="height:16rpx" wx:if="{{index != 0 }}"></view>
<van-cell clickable center> <van-cell clickable center>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">废纸品类{{index + 1}}</view> <view class="text-black">废纸品类{{index + 1}}</view>
<view class="{{item.productName ? 'text-black' : 'text-gray'}}">{{item.productName || '请选择废纸品类'}}</view>
<view class="text-gray">{{item.productCategoryName || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">预估单价(元/公斤)</view>
<view class="{{item.unitPrice ? 'text-black' : 'text-gray'}}">{{item.unitPrice || '请输入单价'}}</view>
<view class="text-black">结算单价(元/公斤)</view>
<view class="text-gray">{{item.settleUnitPrice || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black">
<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
<text>毛重(公斤)</text>
</view>
<input id="totalWeight" data-index="{{index}}" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"
placeholder="请输入毛重" value="{{item.unitPrice || ''}}" bindinput="bindInput" />
<view class="text-black">毛重(公斤)</view>
<view class="text-gray">{{item.grossWeight || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black">
<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
<text>皮重(公斤)</text>
</view>
<input id="emptyWeight" data-index="{{index}}" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"
placeholder="请输入皮重" value="{{item.unitPrice || ''}}" bindinput="bindInput" />
<view class="text-black">皮重(公斤)</view>
<view class="text-gray">{{item.tareWeight || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">净重(公斤)</view> <view class="text-black">净重(公斤)</view>
<view class="{{item.netWeight ? 'text-black' : 'text-gray'}}">{{item.netWeight || ''}}</view>
<view class="text-gray">{{item.netWeight || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell>
<!-- <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">预估金额(元)</view> <view class="text-black">预估金额(元)</view>
<view class="{{item.price ? 'text-black' : 'text-gray'}}">{{item.price || ''}}</view> <view class="{{item.price ? 'text-black' : 'text-gray'}}">{{item.price || ''}}</view>
</view> </view>
</van-cell>
</van-cell> -->
<view class="bg-white" style="padding: 24rpx 32rpx 20rpx 32rpx"> <view class="bg-white" style="padding: 24rpx 32rpx 20rpx 32rpx">
<view class="flex flex-justify" style="padding-bottom: 24rpx"> <view class="flex flex-justify" style="padding-bottom: 24rpx">
<view class="flex flex-center text-black">
<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
<text>过磅凭证</text>
</view>
<text class="text-gray">最多3张,每图片大小限制5M</text>
<view class="flex flex-center text-black">过磅凭证</view>
</view> </view>
<van-uploader name="{{index}}" file-list="{{ item.fileList }}" multiple max-count="6" max-size="{{1024 * 1024 * 5}}" bind:file-change="fileChange" />
<van-uploader file-list="{{ item.fileList }}" deletable="{{false}}" show-upload="{{false}}" />
</view> </view>
<van-cell>
<van-cell wx:if="{{item.deductWeight}}">
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black">
<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
<text>结算单价(元/公斤)</text>
</view>
<input id="emptyWeight" data-index="{{index}}" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"
placeholder="请输入结算单价" value="{{item.unitPrice || ''}}" bindinput="bindInput" />
<view class="text-black">扣重(公斤)</view>
<view class="text-gray">{{item.deductWeight}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell>
<van-cell wx:if="{{item.deductPercent}}">
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black" data-type="1" bindtap="changeDeductType">
<van-checkbox value="{{ item.sign == 1 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣重(公斤)</text>
</view>
<input id="deductWeight" type="digit" disabled="{{item.sign == 2}}" focus="{{focus == 1}}"
placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣重重量"
value="{{item.deductWeight || ''}}" bindinput="bindInput" data-type="1" bindtap="changeDeductType" />
</view>
</van-cell>
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black" data-type="2" bindtap="changeDeductType">
<van-checkbox value="{{ item.sign == 2 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣点(%)</text>
</view>
<input id="deductPercent" type="digit" disabled="{{form.sign == 1}}" focus="{{focus == 2}}"
placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣点比例"
value="{{form.deductPercent}}" bindinput="bindInput" data-type="2" bindtap="changeDeductType" />
<view class="text-black">扣点(%)</view>
<view class="text-gray">{{item.deductPercent}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">结算重量(公斤)</view> <view class="text-black">结算重量(公斤)</view>
<view class="text-gray">{{form.settleWeight || '- -'}}</view>
<view class="text-gray">{{item.settleWeight || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">结算金额(元)</view> <view class="text-black">结算金额(元)</view>
<view class="text-gray">{{form.settleWeight || '- -'}}</view>
<view class="text-gray">{{item.settlePrice || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
</view> </view>
<van-index-anchor index="汇总信息" /> <van-index-anchor index="汇总信息" />
<van-cell clickable center> <van-cell clickable center>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">总重(公斤)</view>
<view class="{{form.driverName ? 'text-black' : 'text-gray'}}">{{form.driverName || '请选择司机'}}</view>
<view class="text-black">结算总重(公斤)</view>
<view class="text-gray">{{form.totalNetWeight || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell clickable center> <van-cell clickable center>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">预计总金额(元)</view>
<view class="{{form.driverName ? 'text-black' : 'text-gray'}}">{{form.driverName || '请选择司机'}}</view>
<view class="text-black">结算总金额(元)</view>
<view class="text-gray">{{form.totalSettleWeight || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black">
<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
<text>厂外皮重(公斤)</text>
</view>
<input id="emptyWeight" data-index="{{index}}" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"
placeholder="请输入厂外皮重" value="{{item.unitPrice || ''}}" bindinput="bindInput" />
<view class="flex flex-center text-black">厂外皮重(公斤)</view>
<view class="text-gray">{{form.offsiteTareWeight || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black">
<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
<text>厂外毛重(公斤)</text>
</view>
<input id="emptyWeight" data-index="{{index}}" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"
placeholder="请输入厂外毛重" value="{{item.unitPrice || ''}}" bindinput="bindInput" />
<view class="flex flex-center text-black">厂外毛重(公斤)</view>
<view class="text-gray">{{form.offsiteGrossWeight || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
</view> </view>
<submit-layout wx:if="{{form && admin && form.orderStatus == 3}}"> <submit-layout wx:if="{{form && admin && form.orderStatus == 3}}">
<van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="checkForm">重新定价</van-button> <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="checkForm">重新定价</van-button>
<van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="submitForm">审核通过</van-button> <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="submitForm">审核通过</van-button>

4
pages/process/outside-price/index.js

@ -159,7 +159,9 @@ Scene({
util.showToast('请输入第' + (index + 1) + '项废纸品类结算单价') util.showToast('请输入第' + (index + 1) + '项废纸品类结算单价')
return return
} }
var item = {deductWeight: element.deductWeight, deductPercent: element.deductPercent,productId: element.productId }
var item = { productId: element.productId, scrapPaperPurchaseOrderId: element.scrapPaperPurchaseOrderId }
item.deductWeight = element.deductWeight
item.deductPercent = element.deductPercent
item.settleUnitPrice = element.settleUnitPrice item.settleUnitPrice = element.settleUnitPrice
productCategorySettleInfoDtoList.push(item) productCategorySettleInfoDtoList.push(item)
} }

4
pages/process/outside-price/index.wxml

@ -35,10 +35,10 @@
<view class="{{form.driverName ? 'text-black' : 'text-gray'}}">{{form.driverName || '请选择司机'}}</view> <view class="{{form.driverName ? 'text-black' : 'text-gray'}}">{{form.driverName || '请选择司机'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell clickable center wx:if="{{form.operatorName}}">
<van-cell clickable center wx:if="{{form.predictDeliveryToFactoryTime}}">
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">操作员</view> <view class="text-black">操作员</view>
<view class="{{form.operatorName ? 'text-black' : 'text-gray'}}">{{form.operatorName || '请选择操作员'}}</view>
<view class="{{form.predictDeliveryToFactoryTime ? 'text-black' : 'text-gray'}}">{{form.predictDeliveryToFactoryTime}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell clickable center wx:if="{{form.appointDate}}"> <van-cell clickable center wx:if="{{form.appointDate}}">

Loading…
Cancel
Save