diff --git a/pages/storage/pound-info/index.wxml b/pages/storage/pound-info/index.wxml
index 822ab74..31d4a59 100644
--- a/pages/storage/pound-info/index.wxml
+++ b/pages/storage/pound-info/index.wxml
@@ -62,7 +62,7 @@
- 删除
+ 取消磅单
关联出货单
diff --git a/pages/storage/pound-list/index.js b/pages/storage/pound-list/index.js
index bef4b54..647f7aa 100644
--- a/pages/storage/pound-list/index.js
+++ b/pages/storage/pound-list/index.js
@@ -1,7 +1,7 @@
// pages/process/order-list/index.js
import Scene from '../../index/scene'
import Dialog from '../../../components/dialog/dialog'
-import { getPoundList } from "../../../api/saas"
+import { getPoundList, deletePound } from "../../../api/saas"
const event = require('../../../utils/event')
const util = require('../../../utils/util')
const app = getApp()
@@ -92,7 +92,7 @@ Scene({
cancelOrder: function(e){
Dialog.confirm({ title: '温馨提示', message: '确定取消该订单?' }).then(() => {
wx.showLoading({ title: '正在获取', mask: true })
- cancelOrder(e.currentTarget.dataset.id).then(result => {
+ deletePound({id: e.currentTarget.dataset.id}).then(result => {
wx.hideLoading()
util.showToast('订单已经删除')
this.onRefreshList()
@@ -106,6 +106,9 @@ Scene({
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
wx.navigateTo({ url: `/pages/storage/pound-info/index?id=${item.id}` })
},
+ submitForm: function(e){
+ wx.navigateTo({ url: `/pages/storage/order-create/index?id=${e.currentTarget.dataset.id}` })
+ },
onUnload: function(){
event.remove('OrderMessage', this)
}
diff --git a/pages/storage/pound-list/index.json b/pages/storage/pound-list/index.json
index 9e3d13c..3cdb59e 100644
--- a/pages/storage/pound-list/index.json
+++ b/pages/storage/pound-list/index.json
@@ -2,6 +2,7 @@
"usingComponents": {
"refresh-view": "/components/refresh-view/index",
"van-button": "/components/button/index",
+ "van-icon": "/components/icon/index",
"van-cell": "/components/cell/index",
"van-divider": "/components/divider/index",
"van-loading": "/components/loading/index",
diff --git a/pages/storage/pound-list/index.wxml b/pages/storage/pound-list/index.wxml
index ca0c6b5..075a9e3 100644
--- a/pages/storage/pound-list/index.wxml
+++ b/pages/storage/pound-list/index.wxml
@@ -17,18 +17,35 @@
{{item.tipsTime}}
+
-
- 磅单编号:{{item.id}}
-
- 过磅中
- 已过磅
+
+
+
+
+ 磅单编号:{{item.id}}
+
+ 过磅中
+ 已过磅
- 皮重(公斤):{{formate.minWeight(item.firstWeight, item.secondWeight)}}
- 毛重(公斤):{{formate.maxWeight(item.firstWeight, item.secondWeight)}}
- 净重(公斤):{{item.netWeight || '- -'}}
+ 皮重(公斤):
+ {{formate.minWeight(item.firstWeight, item.secondWeight)}}
+
+
+ 毛重(公斤):
+ {{formate.maxWeight(item.firstWeight, item.secondWeight)}}
+
+
+ 净重(公斤):
+ {{item.netWeight}}
+
+
+ 取消磅单
+ 关联出货单
diff --git a/pages/storage/pound-list/index.wxss b/pages/storage/pound-list/index.wxss
index bc19567..42787bf 100644
--- a/pages/storage/pound-list/index.wxss
+++ b/pages/storage/pound-list/index.wxss
@@ -1,7 +1,6 @@
/* pages/process/order-list/index.wxss */
.item-content{
padding: 20rpx 32rpx 20rpx 0rpx;
- border-bottom:1rpx solid #f3f3f3;
margin-left:32rpx;
align-items: flex-start;
}
\ No newline at end of file