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

ui

feature/v1.6
xpz2018 4 years ago
parent
126bd8228b
commit
588fcd24f0
9 changed files with 71 additions and 43 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      app.wxss
  2. 10
      pages/storage/order-create/index.wxml
  3. 2
      pages/storage/order-info/index.json
  4. 29
      pages/storage/order-info/index.wxml
  5. 7
      pages/storage/order-info/index.wxss
  6. 12
      pages/storage/order-list/index.wxml
  7. 21
      pages/storage/order-settlement/index.js
  8. 16
      pages/storage/order-settlement/index.wxml
  9. 10
      pages/storage/pound-info/index.wxml

7
app.wxss
View File

@ -1,5 +1,6 @@
@import "colorui/main.wxss";
@import "colorui/icon.wxss";
@import 'components/common/index.wxss';
/**app.wxss**/
.scrollPage {
@ -60,4 +61,10 @@
z-index: 60;
}
page {
font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica,
Segoe UI, Arial, Roboto, 'PingFang SC', 'miui', 'Hiragino Sans GB', 'Microsoft Yahei',
sans-serif;
}

10
pages/storage/order-create/index.wxml
View File

@ -59,10 +59,10 @@
<view style="height:24rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
<view class="text-black text-sg text-bold" style="margin-left: 12rpx">过磅信息</view>
</view>
<van-cell wx:if="{{poundInfo.firstWeight}}">
<van-cell wx:if="{{poundInfo.firstWeight}}" border="{{false}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">第一次过磅（皮重）</view>
<view class="text-gray">{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
<view class="text-gray">重量（公斤）：{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
</view>
</van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
@ -73,13 +73,14 @@
</view>
</van-image>
</view>
<van-cell wx:if="{{poundInfo.secondWeight}}">
<view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx" wx:if="{{poundInfo.secondWeight}}"></view>
<van-cell wx:if="{{poundInfo.secondWeight}}" border="{{false}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">第二次过磅（毛重）</view>
<view class="text-gray">重量（公斤）：{{formate.maxWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
</view>
</van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<view class="bg-white flex flex-justify" style="padding:0rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage">
<view class="image-load" slot="loading">
@ -87,6 +88,7 @@
</view>
</van-image>
</view>
<view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx"></view>
<van-cell wx:if="{{poundInfo.netWeight}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">净重（公斤）</view>

2
pages/storage/order-info/index.json
View File

@ -1,12 +1,10 @@
{
"usingComponents": {
"van-index-anchor": "/components/index-anchor/index",
"van-cell": "/components/cell/index",
"van-field": "/components/field/index",
"van-loading": "/components/loading/index",
"van-image": "/components/image/index",
"van-button": "/components/button/index",
"van-notice-bar": "/components/notice-bar/index",
"van-dialog": "/components/dialog/index",
"van-collapse": "/components/collapse/index",
"van-collapse-item": "/components/collapse-item/index",

29
pages/storage/order-info/index.wxml
View File

@ -4,7 +4,10 @@
<view slot="content">出货详情</view>
</cu-custom>
<van-notice-bar color="#1989fa" background="#008AFF" left-icon="info-o" text="{{ statusOrder(orderInfo.status) }}" wx:if="{{orderInfo}}"/>
<view class="flex flex-center info_status" style="justify-content: flex-start;" wx:if="{{orderInfo}}">
<image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
<view class="text-white text-sg" style="margin-left:12rpx">{{ statusOrder(orderInfo.status) }}</view>
</view>
<view wx:if="{{orderInfo.status == 0 || orderInfo.status == 1 || orderInfo.status == 3}}">
<view wx:if="{{orderInfo}}">
<view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
@ -66,13 +69,13 @@
<view style="height:24rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
<view class="text-black text-sg text-bold" style="margin-left: 12rpx">过磅信息</view>
</view>
<van-cell wx:if="{{poundInfo.firstWeight}}">
<van-cell wx:if="{{poundInfo.firstWeight}}" border="{{false}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">第一次过磅（皮重）</view>
<view class="text-gray">{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
<view class="text-gray">重量（公斤）：{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
</view>
</van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
<view class="bg-white flex flex-justify" style="padding:0rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" bind:click="viewImage">
<view class="image-load" slot="loading">
@ -80,13 +83,14 @@
</view>
</van-image>
</view>
<van-cell wx:if="{{poundInfo.secondWeight}}">
<view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx" wx:if="{{poundInfo.secondWeight}}"></view>
<van-cell wx:if="{{poundInfo.secondWeight}}" border="{{false}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">第二次过磅（毛重）</view>
<view class="text-gray">重量（公斤）：{{formate.maxWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
</view>
</van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<view class="bg-white flex flex-justify" style="padding:0rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage">
<view class="image-load" slot="loading">
@ -94,6 +98,7 @@
</view>
</van-image>
</view>
<view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx"></view>
<van-cell wx:if="{{poundInfo.netWeight}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">净重（公斤）</view>
@ -208,13 +213,13 @@
<view style="height:24rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
<view class="text-black text-sg text-bold" style="margin-left: 12rpx">过磅信息</view>
</view>
<van-cell wx:if="{{poundInfo.firstWeight}}">
<van-cell wx:if="{{poundInfo.firstWeight}}" border="{{false}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">第一次过磅（皮重）</view>
<view class="text-gray">{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
<view class="text-gray">重量（公斤）：{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
</view>
</van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
<view class="bg-white flex flex-justify" style="padding:0rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" bind:click="viewImage">
<view class="image-load" slot="loading">
@ -222,13 +227,14 @@
</view>
</van-image>
</view>
<van-cell wx:if="{{poundInfo.secondWeight}}">
<view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx" wx:if="{{poundInfo.secondWeight}}"></view>
<van-cell wx:if="{{poundInfo.secondWeight}}" border="{{false}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">第二次过磅（毛重）</view>
<view class="text-gray">重量（公斤）：{{formate.maxWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
</view>
</van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<view class="bg-white flex flex-justify" style="padding:0rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage">
<view class="image-load" slot="loading">
@ -236,6 +242,7 @@
</view>
</van-image>
</view>
<view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx"></view>
<van-cell wx:if="{{poundInfo.netWeight}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">净重（公斤）</view>

7
pages/storage/order-info/index.wxss
View File

@ -1 +1,6 @@
/* pages/storage/index/index.wxss */
/* pages/storage/index/index.wxss */
.info_status{
background-image: linear-gradient(90deg, #FF4D2E 6%, #FF952F 100%);
height:90rpx;
padding: 0rpx 32rpx;
}

12
pages/storage/order-list/index.wxml
View File

@ -21,24 +21,20 @@
<text class="text-sg" style="line-height:64rpx;padding-left:32rpx">{{item.tipsTime}}</text>
</view>
<view class="bg-white" style="border-bottom:1rpx solid #f3f3f3" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
<view class="flex flex-justify" style="padding:24rpx 32rpx;border-bottom:2rpx solid #f3f3f3">
<view class="flex flex-justify" style="padding:24rpx 32rpx 0rpx 32rpx;">
<view class="flex">
<text class="text-blue text-sg text-bold">出货纸厂：{{item.consigneeName}}</text>
<text class="text-black text-sg text-bold">{{item.consigneeName}} — {{item.plateNumber}}</text>
</view>
<!-- <text class="text-bold">{{statusOrder(item.status)}}</text> -->
<view class="text-df" style="color:#FA541C" wx:if="{{item.status == 0}}">待审核</view>
<view class="text-df" style="color:#FBBD08" wx:elif="{{item.status == 1}}">待收款</view>
<view class="text-df" style="color:#028A00" wx:elif="{{item.status == 2}}">已完成</view>
<view class="text-df" style="color:#CCCCCC" wx:elif="{{item.status == 3}}">已关闭</view>
</view>
<view class="flex flex-justify" style="padding:0rpx 32rpx;margin-top:16rpx">
<view class="flex flex-justify text-gray" style="padding:0rpx 32rpx;margin-top:16rpx">
<text>品类：{{item.productName}}</text>
<text>净重(公斤)：{{item.netWeight || ''}}</text>
</view>
<view class="flex flex-justify" style="padding:0rpx 32rpx 24rpx 32rpx;margin-top:16rpx">
<text>车牌号码：{{item.plateNumber}}</text>
<text>出货人：{{item.operaterName || ''}}</text>
</view>
<view class="text-gray" style="padding:0rpx 32rpx 24rpx 32rpx;margin-top:16rpx">出货人：{{item.operaterName || ''}}</view>
</view>
</view>
</view>

21
pages/storage/order-settlement/index.js
View File

@ -102,7 +102,8 @@ Scene({
onConfirm: function({detail}){
this.data.nowItem = this.data.paperList[detail.index]
this.data.form.categoryId = this.data.nowItem.id
this.setData({ visible: false, ['form.categoryName']: detail.value })
var price = math.times(this.data.nowItem.defaultUnitPrice, 1000)
this.setData({ visible: false, ['form.categoryName']: detail.value, ['form.settleUnitPrice']: price })
},
bindInput: function (e) {
this.data.form[e.target.id] = Number(e.detail)
@ -169,17 +170,25 @@ Scene({
util.showToast('请输入结算单价')
return
}
this.data.form.settleUnitPrice = math.divide(this.data.form.settleUnitPrice, 1000)
if(util.isEmpty(this.data.form.netWeight) || Number(this.data.form.netWeight) <= 0){
util.showToast('请输入净重')
return
}
this.data.form.netWeight = math.times(this.data.form.netWeight, 1000)
if(util.isEmpty(this.data.form.settleWeight) || Number(this.data.form.settleWeight) <= 0){
util.showToast('请输入结算重量')
return
}
this.data.form.settleWeight = math.times(this.data.form.settleWeight, 1000)
var params = { id: this.data.form.id, categoryId: this.data.form.categoryId }
params.otherFee = this.data.form.otherFee
params.unitPrice = this.data.form.unitPrice
params.estimatedAmount = this.data.form.estimatedAmount
params.deductPercent = this.data.form.deductPercent
params.factoryId = this.data.form.factoryId
params.settleUnitPrice = math.divide(this.data.form.settleUnitPrice, 1000)
params.settlePrice = this.data.form.settlePrice
params.netWeight = math.times(this.data.form.netWeight, 1000)
params.settleWeight = math.times(this.data.form.settleWeight, 1000)
wx.showLoading({ title: '正在处理', mask: true })
var weightNoteImageUrls = []
for (let index = 0; index < this.data.fileList.length; index++) {
@ -189,9 +198,9 @@ Scene({
}
}
if(weightNoteImageUrls.length){
this.data.form.weightNoteImageUrls = weightNoteImageUrls
params.weightNoteImageUrls = weightNoteImageUrls
}
receiptOutOrder(this.data.form).then(result => {
receiptOutOrder(params).then(result => {
wx.hideLoading()
util.showBackToast('处理成功')
event.emit('OrderMessage', { what: 21, desc: 'cancelOrder' })

16
pages/storage/order-settlement/index.wxml
View File

@ -19,7 +19,7 @@
</view>
</van-cell>
<van-field id="settleUnitPrice" value="{{ form.settleUnitPrice || '' }}" type="digit" placeholder="请输入结算单价" clearable input-align="right" bind:change="bindInput">
<view slot="label" class="flex text-black" style="width:200rpx">
<view slot="label" class="flex text-black" style="width:240rpx">
<view class="text-red text-xl" style="line-height: 10px; padding-top: 12px">*</view>
<text>结算单价(元/吨)</text>
</view>
@ -32,7 +32,7 @@
</van-field>
<van-field id="deductPercent" value="{{ form.deductPercent || '' }}" label="扣点(%)" maxlength="4" type="digit" placeholder="请输入扣点" clearable input-align="right" bind:change="bindInput"></van-field>
<van-field id="settleWeight" value="{{ form.settleWeight || '' }}" label="结算重量(吨)" maxlength="8" type="digit" placeholder="请输入结算重量" clearable input-align="right" bind:change="bindInput"></van-field>
<van-field id="otherFee" value="{{ form.otherFee || '' }}" label="其他费用(吨)" maxlength="8" type="digit" placeholder="请输入其他费用" clearable input-align="right" bind:change="bindInput"></van-field>
<van-field id="otherFee" value="{{ form.otherFee || '' }}" label="其他费用(元)" maxlength="8" type="digit" placeholder="请输入其他费用" clearable input-align="right" bind:change="bindInput"></van-field>
<van-field id="settlePrice" value="{{ form.settlePrice || '' }}" label="结算金额(元)" maxlength="8" type="digit" placeholder="请输入结算金额" clearable input-align="right" bind:change="bindInput"></van-field>
<view class="bg-white" style="padding: 24rpx 32rpx 20rpx 32rpx">
@ -103,13 +103,13 @@
<view style="height:24rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
<view class="text-black text-sg text-bold" style="margin-left: 12rpx">过磅信息</view>
</view>
<van-cell wx:if="{{poundInfo.firstWeight}}">
<van-cell wx:if="{{poundInfo.firstWeight}}" border="{{false}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">第一次过磅（皮重）</view>
<view class="text-gray">{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
<view class="text-gray">重量（公斤）：{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
</view>
</van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
<view class="bg-white flex flex-justify" style="padding:0rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" bind:click="viewImage">
<view class="image-load" slot="loading">
@ -117,13 +117,14 @@
</view>
</van-image>
</view>
<van-cell wx:if="{{poundInfo.secondWeight}}">
<view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx" wx:if="{{poundInfo.secondWeight}}"></view>
<van-cell wx:if="{{poundInfo.secondWeight}}" border="{{false}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">第二次过磅（毛重）</view>
<view class="text-gray">重量（公斤）：{{formate.maxWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
</view>
</van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<view class="bg-white flex flex-justify" style="padding:0rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage">
<view class="image-load" slot="loading">
@ -131,6 +132,7 @@
</view>
</van-image>
</view>
<view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx"></view>
<van-cell wx:if="{{poundInfo.netWeight}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">净重（公斤）</view>

10
pages/storage/pound-info/index.wxml
View File

@ -4,13 +4,13 @@
<view slot="content">磅单处理</view>
</cu-custom>
<van-cell wx:if="{{form.firstWeight}}">
<van-cell wx:if="{{form.firstWeight}}" border="{{false}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">第一次过磅（皮重）</view>
<view class="text-gray">重量（公斤）：{{formate.minWeight(form.firstWeight, form.secondWeight)}}</view>
</view>
</van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{form.emptyWeighingPicture.length}}">
<view class="bg-white flex flex-justify" style="padding:0rpx 32rpx" wx:if="{{form.emptyWeighingPicture.length}}">
<van-image wx:for="{{form.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" bind:click="viewImage">
<view class="image-load" slot="loading">
@ -18,7 +18,8 @@
</view>
</van-image>
</view>
<van-cell wx:if="{{form.secondWeight}}">
<view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx" wx:if="{{form.secondWeight}}"></view>
<van-cell wx:if="{{form.secondWeight}}" border="{{false}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">第二次过磅（毛重）</view>
<view class="text-gray flex flex-justify">
@ -27,7 +28,7 @@
</view>
</view>
</van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{form.totalWeighingPicture.length}}">
<view class="bg-white flex flex-justify" style="padding:0rpx 32rpx" wx:if="{{form.totalWeighingPicture.length}}">
<van-image wx:for="{{form.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage">
<view class="image-load" slot="loading">
@ -35,6 +36,7 @@
</view>
</van-image>
</view>
<view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx"></view>
<!-- <view class="bg-white flex justify-end" style="padding-right:32rpx" wx:if="{{form.secondWeight}}">
<van-button plain type="info" size="small" bind:click="repeatForm">重新过磅</van-button>
</view> -->

Write Preview
Loading…
Cancel
Save