diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js
index 33180ad..6c0401b 100644
--- a/pages/process/order-info/index.js
+++ b/pages/process/order-info/index.js
@@ -72,7 +72,7 @@ Scene({
this.setData({ ['form.isDefault']: detail ? 1 : 0 })
},
printOrder: function(){
- wx.showLoading({ title: '正在获取', mask: true })
+ wx.showLoading({ title: '正在处理', mask: true })
printOrder({id: this.data.form.id}).then(result => {
wx.hideLoading()
util.showToast('即将打印,请稍后')
diff --git a/pages/process/outside-check-item/index.js b/pages/process/outside-check-item/index.js
index d785afa..f89f57b 100644
--- a/pages/process/outside-check-item/index.js
+++ b/pages/process/outside-check-item/index.js
@@ -46,21 +46,21 @@ Component({
this.setData({ visible: false })
},
bindInput: function (e) {
- this.data.item[e.currentTarget.id] = e.detail.value
+ this.data.item[e.currentTarget.id] = e.detail
if(e.currentTarget.id == 'deductPercent'){
- if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){
+ if(util.isEmpty(e.detail) || Number(e.detail) <= 0){
this.data.item.deductWeight = null
this.data.item.deductPercent = null
} else {
- this.data.item.deductWeight = math.divide(math.times(this.data.item.netWeight, Number(e.detail.value)), 100).toFixed(2)
+ this.data.item.deductWeight = math.divide(math.times(this.data.item.netWeight, Number(e.detail)), 100).toFixed(2)
}
this.statAmount()
} else if(e.currentTarget.id == 'deductWeight'){
- if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){
+ if(util.isEmpty(e.detail) || Number(e.detail) <= 0){
this.data.item.deductWeight = null
this.data.item.deductPercent = null
} else {
- this.data.item.deductPercent = math.times(math.divide(Number(e.detail.value), this.data.item.netWeight), 100).toFixed(2)
+ this.data.item.deductPercent = math.times(math.divide(Number(e.detail), this.data.item.netWeight), 100).toFixed(2)
}
this.statAmount()
} else if(e.currentTarget.id == 'settleUnitPrice'){
diff --git a/pages/process/outside-check-item/index.json b/pages/process/outside-check-item/index.json
index 2951311..fefd4a8 100644
--- a/pages/process/outside-check-item/index.json
+++ b/pages/process/outside-check-item/index.json
@@ -2,6 +2,7 @@
"component": true,
"usingComponents": {
"van-cell": "/components/cell/index",
+ "van-field": "/components/field/index",
"van-checkbox": "/components/checkbox/index",
"van-picker": "/components/picker/index",
"van-popup": "/components/popup/index",
diff --git a/pages/process/outside-check-item/index.wxml b/pages/process/outside-check-item/index.wxml
index 667b2b8..e4badad 100644
--- a/pages/process/outside-check-item/index.wxml
+++ b/pages/process/outside-check-item/index.wxml
@@ -1,6 +1,6 @@
-
+
*
@@ -9,7 +9,7 @@
{{item.productCategoryName || '请选择废纸品类'}}
-
+
+
+
+ *
+ 结算单价(元/公斤)
+
+
净重(公斤)
{{item.netWeight || ''}}
-
+
+
+
+
+ 扣重(公斤)
+
+
+
+
+
+
+ 扣点(%)
+
+
结算重量(公斤)
diff --git a/pages/process/outside-check/index.js b/pages/process/outside-check/index.js
index ac91535..48f3873 100644
--- a/pages/process/outside-check/index.js
+++ b/pages/process/outside-check/index.js
@@ -64,7 +64,7 @@ Scene({
if(this.data.form.onsideGrossWeight) {
this.checkOrder()
} else {
- var message = '此订单没有厂内毛重数据,按照正常流程请刷卡过磅,获取厂内毛重数据,如果已经无法获取,请仔细查验纸品,确定没有问题后,进行审核。'
+ var message = '此订单没有厂内毛重数据,按照正常流程请刷卡过磅,获取厂内毛重数据,如果已经无法获取,请仔细查验纸品和相关数据,确定没有问题后,进行审核。'
Dialog.confirm({ title: '温馨提示', message, confirmButtonText: '确定审核' }).then(() => {
this.checkOrder()
})
diff --git a/pages/process/outside-check/index.wxml b/pages/process/outside-check/index.wxml
index 4f792ac..7531073 100644
--- a/pages/process/outside-check/index.wxml
+++ b/pages/process/outside-check/index.wxml
@@ -35,7 +35,7 @@
-
+
金额:
diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js
index d8df2be..d7292b4 100644
--- a/pages/process/outside-info/index.js
+++ b/pages/process/outside-info/index.js
@@ -58,7 +58,7 @@ Scene({
})
},
printOrder: function(){
- wx.showLoading({ title: '正在获取', mask: true })
+ wx.showLoading({ title: '正在处理', mask: true })
printOrder({id: this.data.id}).then(result => {
wx.hideLoading()
util.showToast('即将打印,请稍后')
diff --git a/pages/process/outside-info/index.wxml b/pages/process/outside-info/index.wxml
index 984e3dd..4cd2518 100644
--- a/pages/process/outside-info/index.wxml
+++ b/pages/process/outside-info/index.wxml
@@ -1,4 +1,5 @@
+
厂外收货
@@ -186,7 +187,7 @@
结算总金额(元)
- {{form.settleTotalAmount || '- -'}}
+ {{formate.formateAmount(form.settleTotalAmount, 2)}}
@@ -194,14 +195,14 @@
金额:
- {{form.settleTotalAmount}}
+ {{formate.formateAmount(form.settleTotalAmount, 2)}}
通过审核
金额:
- {{form.settleTotalAmount}}
+ {{formate.formateAmount(form.settleTotalAmount, 2)}}
进行支付
客户结算
diff --git a/pages/process/outside-item/index.wxml b/pages/process/outside-item/index.wxml
index 81672db..748aaf8 100644
--- a/pages/process/outside-item/index.wxml
+++ b/pages/process/outside-item/index.wxml
@@ -78,7 +78,7 @@
-->
-
+
*
结算单价(元/公斤)
diff --git a/pages/process/outside-price/index.wxml b/pages/process/outside-price/index.wxml
index 1ecdb38..73587ac 100644
--- a/pages/process/outside-price/index.wxml
+++ b/pages/process/outside-price/index.wxml
@@ -108,8 +108,8 @@
-->
-
- *
+
+ *
厂外皮重(公斤)
@@ -124,8 +124,8 @@
bindinput="bindInput" disabled="{{ form.orderStatus != 0}}"/>
-->
-
-
+
+
*
厂外毛重(公斤)
diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml
index accee71..1b8dcf7 100644
--- a/pages/process/payment/index.wxml
+++ b/pages/process/payment/index.wxml
@@ -69,7 +69,7 @@
- {{orderStatus == 42 ? '付款' : '结算'}}
+ {{orderStatus == 42 ? '结算' : '付款'}}
diff --git a/pages/storage/order-info/index.js b/pages/storage/order-info/index.js
index 8a20365..60fa2fd 100644
--- a/pages/storage/order-info/index.js
+++ b/pages/storage/order-info/index.js
@@ -1,7 +1,7 @@
// pages/storage/index/index.js
import Scene from '../../index/scene'
import Dialog from '../../../components/dialog/dialog'
-import { getOutOrderInfo, auditOutOrder } from "../../../api/saas"
+import { getOutOrderInfo, auditOutOrder, printOrder } from "../../../api/saas"
const util = require('../../../utils/util')
const event = require('../../../utils/event')
const app = getApp()
@@ -88,8 +88,15 @@ Scene({
})
}
},
- printOrder: function(){
-
+ printOrderInfo: function(){
+ wx.showLoading({ title: '正在处理', mask: true })
+ printOrder({id: this.data.id, type: 2 }).then(result => {
+ wx.hideLoading()
+ util.showToast('即将打印,请稍后')
+ }).catch(err => {
+ wx.hideLoading()
+ util.showToast(err)
+ })
},
onChange: function({detail}) {
this.setData({ activeNames: detail })
diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml
index af3ed4e..f46885d 100644
--- a/pages/storage/order-info/index.wxml
+++ b/pages/storage/order-info/index.wxml
@@ -267,7 +267,7 @@
-
+