diff --git a/app.wxss b/app.wxss
index 2e86eec..a6cdba5 100644
--- a/app.wxss
+++ b/app.wxss
@@ -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;
+}
+
\ No newline at end of file
diff --git a/pages/storage/order-create/index.wxml b/pages/storage/order-create/index.wxml
index 3a452b1..8ee1cad 100644
--- a/pages/storage/order-create/index.wxml
+++ b/pages/storage/order-create/index.wxml
@@ -59,10 +59,10 @@
过磅信息
-
+
第一次过磅（皮重）
- {{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
+ 重量（公斤）：{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
@@ -73,13 +73,14 @@
-
+
+
第二次过磅（毛重）
重量（公斤）：{{formate.maxWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
-
+
@@ -87,6 +88,7 @@
+
净重（公斤）
diff --git a/pages/storage/order-info/index.json b/pages/storage/order-info/index.json
index df02d4b..e9a7eca 100644
--- a/pages/storage/order-info/index.json
+++ b/pages/storage/order-info/index.json
@@ -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",
diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml
index 882f4e3..af3ed4e 100644
--- a/pages/storage/order-info/index.wxml
+++ b/pages/storage/order-info/index.wxml
@@ -4,7 +4,10 @@
出货详情
-
+
+
+ {{ statusOrder(orderInfo.status) }}
+
@@ -66,13 +69,13 @@
过磅信息
-
+
第一次过磅（皮重）
- {{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
+ 重量（公斤）：{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
-
+
@@ -80,13 +83,14 @@
-
+
+
第二次过磅（毛重）
重量（公斤）：{{formate.maxWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
-
+
@@ -94,6 +98,7 @@
+
净重（公斤）
@@ -208,13 +213,13 @@
过磅信息
-
+
第一次过磅（皮重）
- {{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
+ 重量（公斤）：{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
-
+
@@ -222,13 +227,14 @@
-
+
+
第二次过磅（毛重）
重量（公斤）：{{formate.maxWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
-
+
@@ -236,6 +242,7 @@
+
净重（公斤）
diff --git a/pages/storage/order-info/index.wxss b/pages/storage/order-info/index.wxss
index c3de589..67bdb2c 100644
--- a/pages/storage/order-info/index.wxss
+++ b/pages/storage/order-info/index.wxss
@@ -1 +1,6 @@
-/* pages/storage/index/index.wxss */
\ No newline at end of file
+/* pages/storage/index/index.wxss */
+.info_status{
+ background-image: linear-gradient(90deg, #FF4D2E 6%, #FF952F 100%);
+ height:90rpx;
+ padding: 0rpx 32rpx;
+}
\ No newline at end of file
diff --git a/pages/storage/order-list/index.wxml b/pages/storage/order-list/index.wxml
index 86b7c3a..2a2b8a6 100644
--- a/pages/storage/order-list/index.wxml
+++ b/pages/storage/order-list/index.wxml
@@ -21,24 +21,20 @@
{{item.tipsTime}}
-
+
- 出货纸厂：{{item.consigneeName}}
+ {{item.consigneeName}} — {{item.plateNumber}}
-
待审核
待收款
已完成
已关闭
-
+
品类：{{item.productName}}
净重(公斤)：{{item.netWeight || ''}}
-
- 车牌号码：{{item.plateNumber}}
- 出货人：{{item.operaterName || ''}}
-
+ 出货人：{{item.operaterName || ''}}
diff --git a/pages/storage/order-settlement/index.js b/pages/storage/order-settlement/index.js
index a129f8d..bff006c 100644
--- a/pages/storage/order-settlement/index.js
+++ b/pages/storage/order-settlement/index.js
@@ -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' })
diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml
index 9d3bf5c..481d474 100644
--- a/pages/storage/order-settlement/index.wxml
+++ b/pages/storage/order-settlement/index.wxml
@@ -19,7 +19,7 @@
-
+
*
结算单价(元/吨)
@@ -32,7 +32,7 @@
-
+
@@ -103,13 +103,13 @@
过磅信息
-
+
第一次过磅（皮重）
- {{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
+ 重量（公斤）：{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
-
+
@@ -117,13 +117,14 @@
-
+
+
第二次过磅（毛重）
重量（公斤）：{{formate.maxWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}
-
+
@@ -131,6 +132,7 @@
+
净重（公斤）
diff --git a/pages/storage/pound-info/index.wxml b/pages/storage/pound-info/index.wxml
index f2f90b2..1003bca 100644
--- a/pages/storage/pound-info/index.wxml
+++ b/pages/storage/pound-info/index.wxml
@@ -4,13 +4,13 @@
磅单处理
-
+
第一次过磅（皮重）
重量（公斤）：{{formate.minWeight(form.firstWeight, form.secondWeight)}}
-
+
@@ -18,7 +18,8 @@
-
+
+
第二次过磅（毛重）
@@ -27,7 +28,7 @@
-
+
@@ -35,6 +36,7 @@
+