diff --git a/pages/home/index/index.js b/pages/home/index/index.js index 9dbc697..182fad0 100644 --- a/pages/home/index/index.js +++ b/pages/home/index/index.js @@ -17,6 +17,7 @@ Component({ data: { height: app.globalData.safeFragmentHeight, firstShow: false, + isAdmin: false, userInfo: null, avatarUrl: '/assets/image/ygImg.png', creditInfo: { availableCreditLine: 0, creditLine: 0, usedCreditLine: 0.00 } @@ -58,6 +59,7 @@ Component({ avatarUrl: util.isEmpty(app.userInfo.avatarUrl) ? '/assets/image/ygImg.png' : app.userInfo.avatarUrl, userInfo: app.userInfo, userName: nickname, + isAdmin: app.userInfo.type.indexOf('ADMIN') >= 0, height: app.globalData.safeFragmentHeight - 100 }) }, diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml index c3418a7..fb61f49 100644 --- a/pages/home/index/index.wxml +++ b/pages/home/index/index.wxml @@ -49,7 +49,7 @@ - + 员工管理 diff --git a/pages/storage/order-create/index.js b/pages/storage/order-create/index.js index 39dc46d..f95e867 100644 --- a/pages/storage/order-create/index.js +++ b/pages/storage/order-create/index.js @@ -104,6 +104,9 @@ Scene({ this.setData({ visible: true }) } }, + onHide: function() { + this.setData({ visible: false }) + }, onConfirm: function({detail}){ this.data.nowItem = this.data.paperList[detail.index] this.data.form.productId = this.data.nowItem.id diff --git a/pages/storage/order-list/index.wxml b/pages/storage/order-list/index.wxml index efcc31c..19ffee5 100644 --- a/pages/storage/order-list/index.wxml +++ b/pages/storage/order-list/index.wxml @@ -16,16 +16,20 @@ {{loading? '正在加载' : '暂无数据'}} - + {{item.tipsTime}} - + - 出货纸厂:{{item.consigneeName}} + 出货纸厂:{{item.consigneeName}} - {{statusOrder(item.status)}} + + 待审核 + 待收款 + 已完成 + 已关闭 品类:{{item.productName}} diff --git a/pages/storage/order-settlement/index.js b/pages/storage/order-settlement/index.js index 1c2a8c1..6cda1e5 100644 --- a/pages/storage/order-settlement/index.js +++ b/pages/storage/order-settlement/index.js @@ -96,6 +96,9 @@ Scene({ this.setData({ visible: true }) } }, + onHide: function() { + this.setData({ visible: false }) + }, onConfirm: function({detail}){ this.data.nowItem = this.data.paperList[detail.index] this.data.form.categoryId = this.data.nowItem.id