From 60c459cd4c46136aaff5c2d3a999ad94ac2f1d1c Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 8 Jul 2021 09:41:27 +0800
Subject: [PATCH] css
---
pages/process/check-list/index.wxml | 28 ++++++++++-----------
pages/process/order-check/index.js | 4 +--
pages/process/order-list/index.wxml | 30 +++++++++++------------
pages/process/order-price/index.js | 4 +--
pages/process/outside-check-item/index.js | 4 +--
pages/process/outside-check/index.js | 13 +++++++---
pages/process/outside-check/index.wxml | 9 ++++---
pages/process/outside-item/index.js | 4 +--
pages/process/outside-list/index.wxml | 20 +++++++--------
9 files changed, 61 insertions(+), 55 deletions(-)
diff --git a/pages/process/check-list/index.wxml b/pages/process/check-list/index.wxml
index 55f4d20..024dcc6 100644
--- a/pages/process/check-list/index.wxml
+++ b/pages/process/check-list/index.wxml
@@ -26,7 +26,7 @@
-{{item.factoryCustomerMobile}}
- 定价
+ 待定价
待过皮重
待审核
待付款
@@ -36,24 +36,24 @@
已关闭
- 品类：
+ 品类：
{{item.productName}}
-
- 毛重(公斤)：
- {{item.totalWeight}}
+
+ 毛重(公斤)：
+ {{item.totalWeight || '- -'}}
-
- 结算重量(公斤)：
- {{item.settleWeight}}
+
+ 结算重量(公斤)：
+ {{item.settleWeight || '- -'}}
-
- 单价(元/公斤)：
- {{item.unitPrice}}
+
+ 单价(元/公斤)：
+ {{item.unitPrice || '- -'}}
-
- 结算金额(元)：
- {{item.settlePrice}}
+
+ 结算金额(元)：
+ {{item.settlePrice || '- -'}}
-{{item.factoryCustomerMobile}}
- 定价
+ 待定价
待过皮重
待审核
待付款
@@ -41,27 +41,27 @@
- 品类：
+ 品类：
{{item.productName}}
-
- 毛重(公斤)：
- {{item.totalWeight}}
+
+ 毛重(公斤)：
+ {{item.totalWeight || '- -'}}
-
- 结算重量(公斤)：
- {{item.settleWeight}}
+
+ 结算重量(公斤)：
+ {{item.settleWeight || '- -'}}
-
- 单价(元/公斤)：
- {{item.unitPrice}}
+
+ 单价(元/公斤)：
+ {{item.unitPrice || '- -'}}
-
- 结算金额(元)：
- {{item.settlePrice}}
+
+ 结算金额(元)：
+ {{item.settlePrice || '- -'}}
-
+
{
- this.setData({ safeBottom: app.globalData.safeBottom, paperList: result.data.records })
+ this.setData({ safeBottom: app.globalData.safeBottom, paperList: result.data.records, height })
}).catch(err => {
- this.setData({ safeBottom: app.globalData.safeBottom })
+ this.setData({ safeBottom: app.globalData.safeBottom, height })
util.showToast(err)
})
getSideOrderInfo({ id: options.id }).then(result => {
@@ -79,11 +82,11 @@ Scene({
const element = this.data.form.productCategoryInfos[index]
if(util.isEmpty(element.settleUnitPrice) || Number(element.settleUnitPrice) <= 0){
util.showToast('请输入第' + (index + 1) + '项废纸品类结算单价')
+ this.setData({ intoview: 'item' + index })
return
}
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
@@ -91,10 +94,12 @@ Scene({
}
if(element.highestUnitPrice && Number(element.settleUnitPrice) > Number(element.highestUnitPrice)){
util.showToast('第' + (index + 1) + '项废纸品类单价不得高于：' + element.highestUnitPrice + '元/公斤')
+ this.setData({ intoview: 'item' + index })
return
}
if(element.lowestUnitPrice && Number(element.settleUnitPrice) < Number(element.lowestUnitPrice)){
util.showToast('第' + (index + 1) + '项废纸品类单价不得低于：' + element.lowestUnitPrice + '元/公斤')
+ this.setData({ intoview: 'item' + index })
return
}
var item = { productId: element.productId, scrapPaperPurchaseOrderId: element.scrapPaperPurchaseOrderId }
diff --git a/pages/process/outside-check/index.wxml b/pages/process/outside-check/index.wxml
index aa502c4..8d8b00a 100644
--- a/pages/process/outside-check/index.wxml
+++ b/pages/process/outside-check/index.wxml
@@ -3,7 +3,7 @@
重新定价
-
+
订单信息
@@ -31,11 +31,12 @@
纸品信息
-
+
-
-
+
+
+
金额：
diff --git a/pages/process/outside-item/index.js b/pages/process/outside-item/index.js
index 2f319d2..f79bb75 100644
--- a/pages/process/outside-item/index.js
+++ b/pages/process/outside-item/index.js
@@ -59,7 +59,7 @@ Component({
this.setData({['item.netWeight']: null, ['item.estimatedAmount']: null})
}
} else if(e.currentTarget.id == 'deductPercent'){
- if(util.isEmpty(e.detail) || Number(e.detail) <= 0){
+ if(util.isEmpty(e.detail)){
this.data.item.deductWeight = null
this.data.item.deductPercent = null
} else {
@@ -67,7 +67,7 @@ Component({
}
this.statAmount()
} else if(e.currentTarget.id == 'deductWeight'){
- if(util.isEmpty(e.detail) || Number(e.detail) <= 0){
+ if(util.isEmpty(e.detail)){
this.data.item.deductWeight = null
this.data.item.deductPercent = null
} else {
diff --git a/pages/process/outside-list/index.wxml b/pages/process/outside-list/index.wxml
index 11a802b..4ceba00 100644
--- a/pages/process/outside-list/index.wxml
+++ b/pages/process/outside-list/index.wxml
@@ -41,20 +41,20 @@
- 品类：
+ 品类：
{{item.productCategoryName}}
-
- 车牌号码：
- {{item.plateNumber || ''}}
+
+ 车牌号码：
+ {{item.plateNumber || '- -'}}
-
- 结算重量(公斤)：
- {{item.settleWeight}}
+
+ 结算重量(公斤)：
+ {{item.settleWeight || '- -'}}
-
- 结算金额(元)：
- {{item.settlePrice}}
+
+ 结算金额(元)：
+ {{item.settlePrice || '- -'}}