Browse Source

no message

feature/v2.3
xpz2018 4 years ago
parent
commit
a4ef5673d7
7 changed files with 24 additions and 13 deletions
  1. 11
      pages/home/factory-info/index.js
  2. 2
      pages/process/order-info/index.wxml
  3. 2
      pages/process/order-list/index.wxml
  4. 2
      pages/process/outside-check-item/index.wxml
  5. 2
      pages/process/outside-info/index.wxml
  6. 2
      pages/process/outside-item/index.wxml
  7. 16
      pages/storage/order-info/index.wxml

11
pages/home/factory-info/index.js

@ -36,6 +36,17 @@ Scene({
var data = {settlePriceType: Number(this.data.settlePriceType), settleType: Number(this.data.settleType) } var data = {settlePriceType: Number(this.data.settlePriceType), settleType: Number(this.data.settleType) }
configFactory(data).then(result => { configFactory(data).then(result => {
wx.hideLoading() wx.hideLoading()
for (let mIndex = app.userInfo.enterpriseInfos.length - 1; mIndex >= 0; mIndex--) {
const element = app.userInfo.enterpriseInfos[mIndex]
for (let nIndex = element.factoryInfos.length - 1; nIndex >= 0; nIndex--) {
const item = element.factoryInfos[nIndex]
if(item.factoryId == app.userInfo.factoryId){
item.settlePriceType = Number(this.data.settlePriceType)
item.settleType = Number(this.data.settleType)
break
}
}
}
app.userInfo.factory.settlePriceType = Number(this.data.settlePriceType) app.userInfo.factory.settlePriceType = Number(this.data.settlePriceType)
app.userInfo.factory.settleType = Number(this.data.settleType) app.userInfo.factory.settleType = Number(this.data.settleType)
util.showBackToast('保存成功') util.showBackToast('保存成功')

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

@ -160,7 +160,7 @@
<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">{{formate.formateAmount(form.settlePrice, 2) || '- -'}}</view>
<view class="text-gray">{{formate.formateAmount(form.adjustedPrice, 2) || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>

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

@ -58,7 +58,7 @@
</view> </view>
<view class="flex flex-justify" style="margin-top:12rpx"> <view class="flex flex-justify" style="margin-top:12rpx">
<view class="text-sm text-black" style="margin-left:80rpx">结算金额(元):</view> <view class="text-sm text-black" style="margin-left:80rpx">结算金额(元):</view>
<view class="text-sm text-black">{{item.settlePrice || '- -'}}</view>
<view class="text-sm text-black">{{item.adjustedPrice || '- -'}}</view>
</view> </view>
<image class="item-icon" src="/assets/image/icon-finish.png" wx:if="{{item.status == 5}}"></image> <image class="item-icon" src="/assets/image/icon-finish.png" wx:if="{{item.status == 5}}"></image>
<image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.status == 6}}"></image> <image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.status == 6}}"></image>

2
pages/process/outside-check-item/index.wxml

@ -74,7 +74,7 @@
<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.settlePrice ? 'text-black' : 'text-gray'}}">{{ item.settlePrice || '- -' }}</view>
<view class="{{item.adjustedPrice ? 'text-black' : 'text-gray'}}">{{ item.adjustedPrice || '- -' }}</view>
</view> </view>
</van-cell> </van-cell>

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

@ -191,7 +191,7 @@
<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">{{item.settlePrice || '- -'}}</view>
<view class="text-gray">{{item.adjustedPrice || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
</view> </view>

2
pages/process/outside-item/index.wxml

@ -105,6 +105,6 @@
<van-cell wx:if="{{status == 1}}"> <van-cell wx:if="{{status == 1}}">
<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.settlePrice ? 'text-black' : 'text-gray'}}">{{ item.settlePrice || '- -' }}</view>
<view class="{{item.adjustedPrice ? 'text-black' : 'text-gray'}}">{{ item.adjustedPrice || '- -' }}</view>
</view> </view>
</van-cell> </van-cell>

16
pages/storage/order-info/index.wxml

@ -165,31 +165,31 @@
<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.settlePrice}}</view>
<view class="text-gray">{{ form.adjustedPrice}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell wx:if="{{form.settlePrice}}">
<van-cell wx:if="{{form.proxyPaySurcharge}}">
<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.settlePrice}}</view> <view class="text-gray">{{ form.settlePrice}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell wx:if="{{form.settlePrice}}">
<van-cell wx:if="{{form.freight}}">
<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.settlePrice}}</view>
<view class="text-gray">{{ form.freight}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell wx:if="{{form.settlePrice}}">
<van-cell wx:if="{{form.otherFee}}">
<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.settlePrice}}</view>
<view class="text-gray">{{ form.otherFee}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell wx:if="{{form.settlePrice}}">
<van-cell wx:if="{{form.subsidy}}">
<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.settlePrice}}</view>
<view class="text-gray">{{ form.subsidy}}</view>
</view> </view>
</van-cell> </van-cell>
<view class="bg-white" style="padding: 20rpx 32rpx" wx:if="{{fileList.length}}"> <view class="bg-white" style="padding: 20rpx 32rpx" wx:if="{{fileList.length}}">

Loading…
Cancel
Save