libo
/
ztb-saas-mini
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

no message

feature/v1.1
xpz2018 5 years ago
parent
223f1553ec
commit
3a086a5c3b
11 changed files with 34 additions and 21 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages/client/factory-list/index.wxml
  2. 2
      pages/client/order-list/index.wxml
  3. 5
      pages/htmls/auths/index.wxss
  4. 2
      pages/process/check-list/index.wxml
  5. 10
      pages/process/order-info/index.wxml
  6. 2
      pages/process/order-list/index.wxml
  7. 7
      pages/process/order-price/index.js
  8. 1
      pages/process/order-price/index.json
  9. 21
      pages/process/order-price/index.wxml
  10. 1
      pages/process/payment-list/index.wxml
  11. 2
      project.config.json

2
pages/client/factory-list/index.wxml
View File

@ -22,7 +22,7 @@
<text>客户名称：{{item.factoryCustomerName}}</text>
<text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">({{item.factoryCustomerMobile}})</text>
</view>
<view class="text-sm text-gray" style="margin-top:12rpx">毛重：{{item.totalWeight}}KG</view>
<view class="text-sm text-gray" style="margin-top:12rpx">毛重：{{item.totalWeight}}公斤</view>
</view>
<view class="flex flex-center" wx:if="{{item.status == 4}}">
<view class="text-df" style="color:#FA541C">待付款</view>

2
pages/client/order-list/index.wxml
View File

@ -28,7 +28,7 @@
<text>客户名称：{{item.factoryCustomerName}}</text>
<text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">({{item.factoryCustomerMobile}})</text>
</view>
<view class="text-sm text-gray" style="margin-top:12rpx">毛重：{{item.totalWeight}}KG</view>
<view class="text-sm text-gray" style="margin-top:12rpx">毛重：{{item.totalWeight}}公斤</view>
</view>
<view class="flex flex-center" wx:if="{{item.status == 4}}">
<view class="text-df" style="color:#FA541C">待付款</view>

5
pages/htmls/auths/index.wxss
View File

@ -22,5 +22,8 @@
}
.dialog-input {
padding:0rpx 16rpx;border:1rpx solid #eee;height:80rpx;margin:64rpx
padding:0rpx 16rpx;
border:1rpx solid #eee;
height:80rpx;
margin:64rpx
}

2
pages/process/check-list/index.wxml
View File

@ -22,7 +22,7 @@
<text>客户名称：{{item.factoryCustomerName}}</text>
<text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">({{item.factoryCustomerMobile}})</text>
</view>
<view class="text-sm text-gray" style="margin-top:12rpx">毛重：{{item.totalWeight}}KG</view>
<view class="text-sm text-gray" style="margin-top:12rpx">毛重：{{item.totalWeight}}公斤</view>
</view>
<view class="flex flex-center" wx:if="{{item.status == 1}}" style="height: 88rpx">
<van-button plain type="default" custom-style="height:64rpx;width:132rpx" data-id="{{item.id}}"

10
pages/process/order-info/index.wxml
View File

@ -41,25 +41,25 @@
</van-cell>
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="text-black">毛重(KG)</view>
<view class="text-black">毛重(公斤)</view>
<view class="text-gray">{{form.totalWeight}}</view>
</view>
</van-cell>
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="text-black">皮重(KG)</view>
<view class="text-black">皮重(公斤)</view>
<view class="text-gray">{{form.emptyWeight || '- -'}}</view>
</view>
</van-cell>
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="text-black">净重(KG)</view>
<view class="text-black">净重(公斤)</view>
<view class="text-gray">{{form.netWeight || '- -'}}</view>
</view>
</van-cell>
<van-cell wx:if="{{form.deductWeight}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">扣重(KG)</view>
<view class="text-black">扣重(公斤)</view>
<view class="text-gray">-{{form.deductWeight}}</view>
</view>
</van-cell>
@ -111,7 +111,7 @@
<van-index-anchor index="订单信息" />
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="text-black">单价(元/KG)</view>
<view class="text-black">单价(元/公斤)</view>
<view class="text-gray">{{formate.formateAmount(form.settleUnitPrice)}}</view>
</view>
</van-cell>

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

@ -28,7 +28,7 @@
<text>客户名称：{{item.factoryCustomerName}}</text>
<text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">({{item.factoryCustomerMobile}})</text>
</view>
<view class="text-sm text-gray" style="margin-top:12rpx">毛重：{{item.totalWeight}}KG</view>
<view class="text-sm text-gray" style="margin-top:12rpx">毛重：{{item.totalWeight}}公斤</view>
</view>
<view class="flex flex-center" wx:if="{{item.status == 1}}" style="height: 88rpx">
<van-button plain type="default" custom-style="height:64rpx;width:132rpx" data-id="{{item.id}}"

7
pages/process/order-price/index.js
View File

@ -87,6 +87,9 @@ Page({
}
}
},
onChange: function(e) {
this.data.form.remark = e.detail
},
paddingOrder: function(){
this.setData({ ['form.isWithoutTare']: !this.data.form.isWithoutTare })
},
@ -114,11 +117,11 @@ Page({
}
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 + '元/KG-'+ this.data.nowItem.highestUnitPrice + '元/KG')
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 + '元/KG-'+ this.data.nowItem.highestUnitPrice + '元/KG')
util.showToast('输入单价过低，价格范围：' + this.data.nowItem.lowestUnitPrice + '元/公斤-'+ this.data.nowItem.highestUnitPrice + '元/公斤')
return
}
}

1
pages/process/order-price/index.json
View File

@ -9,6 +9,7 @@
"van-picker": "/components/picker/index",
"van-popup": "/components/popup/index",
"van-dialog": "/components/dialog/index",
"van-field": "/components/field/index",
"vehicle-keyboard": "/components/vehicle-keyboard/index"
}
}

21
pages/process/order-price/index.wxml
View File

@ -30,7 +30,7 @@
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="text-black">
<text>单价(元/KG)</text>
<text>单价(元/公斤)</text>
<text class="text-red text-xl">*</text>
</view>
<input id="unitPrice" type="number" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"
@ -41,9 +41,11 @@
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black" data-type="1" bindtap="changeDeductType">
<van-checkbox value="{{ form.sign == 1 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣重(KG)</text>
<text style="margin-left:8rpx">扣重(公斤)</text>
</view>
<input id="deductWeight" type="digit" disabled="{{form.sign == 2}}" focus="{{focus == 1}}" placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣重重量" value="{{form.deductWeight}}" bindinput="bindInput" data-type="1" bindtap="changeDeductType"/>
<input id="deductWeight" type="digit" disabled="{{form.sign == 2}}" focus="{{focus == 1}}"
placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣重重量"
value="{{form.deductWeight}}" bindinput="bindInput" data-type="1" bindtap="changeDeductType" />
</view>
</van-cell>
<van-cell>
@ -52,7 +54,9 @@
<van-checkbox value="{{ form.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"/>
<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>
</van-cell>
<van-cell bind:click="paddingOrder">
@ -64,10 +68,11 @@
</view>
</view>
</van-cell>
<van-field label="备注" type="textarea" input-align="right" placeholder="请输入备注" autosize border="{{ false }}" />
<van-index-anchor index="过磅信息" />
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="text-black">毛重(KG)</view>
<view class="text-black">毛重(公斤)</view>
<view class="text-gray">{{form.totalWeight}}</view>
</view>
</van-cell>
@ -86,9 +91,11 @@
</van-cell>
</view>
<view style="height:{{136 + safeBottom}}rpx;"></view>
<view class="cu-bar bg-white foot" style="height:{{120 + safeBottom}}rpx;padding:0rpx 32rpx {{safeBottom}}rpx 32rpx;" wx:if="{{form}}">
<view class="cu-bar bg-white foot" style="height:{{120 + safeBottom}}rpx;padding:0rpx 32rpx {{safeBottom}}rpx 32rpx;"
wx:if="{{form}}">
<van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrder">取消</van-button>
<van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="priceOrder">提交</van-button>
<van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="priceOrder">提交
</van-button>
</view>
<van-dialog id="van-dialog" />

1
pages/process/payment-list/index.wxml
View File

@ -29,7 +29,6 @@
</view>
<view class="text-sm text-gray" style="margin-top:12rpx">
<text>废纸品类：{{item.productName}}</text>
<!-- <text style="margin-left:36rpx">毛重：{{item.totalWeight}}KG</text> -->
<text style="margin-left:36rpx">金额：{{formate.formateAmount(item.settlePrice)}}元</text>
</view>
</view>

2
project.config.json
View File

@ -13,7 +13,7 @@
"newFeature": false,
"coverView": true,
"nodeModules": true,
"autoAudits": false,
"autoAudits": true,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": true,

Write Preview
Loading…
Cancel
Save