From a5a751a7a49d14ec3abb80681646f5176159f3dc Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 20 Apr 2021 10:55:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=B4=A7=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/home/customer-info/index.wxml | 6 ++--
pages/home/employee-info/index.js | 6 ++++
pages/home/employee-info/index.wxml | 8 +++---
pages/home/employee/index.js | 27 +++++++++---------
pages/message/card-list/index.wxml | 2 +-
pages/process/index/index.js | 5 ++--
pages/storage/order-create/index.js | 2 +-
pages/storage/pound-list/index.js | 1 -
pages/storage/pound-list/index.wxml | 44 +++++++----------------------
9 files changed, 40 insertions(+), 61 deletions(-)
diff --git a/pages/home/customer-info/index.wxml b/pages/home/customer-info/index.wxml
index 35c8e2b..f432ae1 100644
--- a/pages/home/customer-info/index.wxml
+++ b/pages/home/customer-info/index.wxml
@@ -18,14 +18,14 @@
- 选择客户进行替换
+ 选择客户进行绑定
- 确认待绑
+ 确认绑定
邀请注册纸通宝
- 保存
+ 确认绑定
{
+ this.chooseMember()
+ })
}
getRoleList().then(result => {
this.setData({ roleList: result.data.records })
@@ -75,6 +78,9 @@ Scene({
if(!util.isEmpty(this.data.form.joinAt)){
this.data.form.joinAt = this.data.form.joinAt.substring(0, 10)
}
+ if(!Array.isArray(this.data.form.enterpriseRoleIds)){
+ this.data.form.enterpriseRoleIds = [this.data.form.enterpriseRoleIds]
+ }
editEmploye(this.data.form).then(result => {
wx.hideLoading()
util.showBackToast('修改成功')
diff --git a/pages/home/employee-info/index.wxml b/pages/home/employee-info/index.wxml
index 413d78e..9aaff0a 100644
--- a/pages/home/employee-info/index.wxml
+++ b/pages/home/employee-info/index.wxml
@@ -2,12 +2,12 @@
员工资料
-
+
-
+
-
+
员工状态：
@@ -22,7 +22,7 @@
- 选择员工进行替换
+ 选择员工进行绑定
保存
diff --git a/pages/home/employee/index.js b/pages/home/employee/index.js
index 644b1a1..782853d 100644
--- a/pages/home/employee/index.js
+++ b/pages/home/employee/index.js
@@ -70,20 +70,19 @@ Scene({
channel.emit('onCallback', { what: 121, detail: item })
wx.navigateBack()
} else {
- // wx.navigateTo({
- // url: `/pages/home/employee-info/index?id=${item.enterpriseMemberId}`,
- // events: {
- // onCallback: (data) => {
- // if (data.what == 120) {
- // that.fetchMemberList()
- // }
- // }
- // },
- // success: function(res) {
- // res.eventChannel.emit('onParam', item)
- // }
- // })
- wx.navigateTo({ url: `/pages/home/employee-info/index?cardNo=00874574123` })
+ wx.navigateTo({
+ url: `/pages/home/employee-info/index?id=${item.enterpriseMemberId}`,
+ events: {
+ onCallback: (data) => {
+ if (data.what == 120) {
+ that.fetchMemberList()
+ }
+ }
+ },
+ success: function(res) {
+ res.eventChannel.emit('onParam', item)
+ }
+ })
}
},
agreeItem: function(e){
diff --git a/pages/message/card-list/index.wxml b/pages/message/card-list/index.wxml
index 2f07d10..07edd75 100644
--- a/pages/message/card-list/index.wxml
+++ b/pages/message/card-list/index.wxml
@@ -12,7 +12,7 @@
{{loading? '正在加载' : '暂无消息'}}
-
+
diff --git a/pages/process/index/index.js b/pages/process/index/index.js
index e101eca..03f07e0 100644
--- a/pages/process/index/index.js
+++ b/pages/process/index/index.js
@@ -95,9 +95,8 @@ Component({
},
outList: function(e){
if(e.currentTarget.dataset.status == 1){
- // wx.navigateTo({ url: '/pages/storage/pound-info/index?id=579730676195135488' })
- // wx.navigateTo({ url: '/pages/storage/order-info/index?id=579730676195135488' })
- wx.navigateTo({ url: '/pages/storage/order-settlement/index?id=579730676195135488' })
+ // wx.navigateTo({ url: '/pages/storage/order-settlement/index?id=579730676195135488' })
+ wx.navigateTo({ url: '/pages/storage/pound-list/index' })
} else if(e.currentTarget.dataset.status == 2){
wx.navigateTo({ url: '/pages/storage/order-list/index?status=1' })
} else if(e.currentTarget.dataset.status == 3){
diff --git a/pages/storage/order-create/index.js b/pages/storage/order-create/index.js
index 70d9ed0..240b131 100644
--- a/pages/storage/order-create/index.js
+++ b/pages/storage/order-create/index.js
@@ -90,7 +90,7 @@ Scene({
this.setData({ visible: false, ['form.productName']: detail.value })
},
onChange: function({detail}) {
- this.setData({ activeNames: detail });
+ this.setData({ activeNames: detail })
},
submitForm: function(){
if(util.isEmpty(this.data.form.factoryName)){
diff --git a/pages/storage/pound-list/index.js b/pages/storage/pound-list/index.js
index f110422..83a36f3 100644
--- a/pages/storage/pound-list/index.js
+++ b/pages/storage/pound-list/index.js
@@ -21,7 +21,6 @@ Scene({
pageNum: 1,
pageSize: 10
},
- title: '全部',
lastTime: null
},
// * 生命周期函数--监听页面加载
diff --git a/pages/storage/pound-list/index.wxml b/pages/storage/pound-list/index.wxml
index 0ddedf8..6f253bc 100644
--- a/pages/storage/pound-list/index.wxml
+++ b/pages/storage/pound-list/index.wxml
@@ -1,6 +1,6 @@
- {{title}}
+ 磅单列表
@@ -17,41 +17,17 @@
{{item.tipsTime}}
-
-
-
- 客户名称：{{item.factoryCustomerName}}
- ({{item.factoryCustomerMobile}})
-
- 毛重：{{item.totalWeight}}公斤
-
- 品类：{{item.productName}}
- 毛重：{{item.totalWeight}}公斤
-
-
- 品类：{{item.productName}}
- 金额：{{item.settlePrice}}元
-
+
+ 磅单编号：{{item.factoryCustomerName}}
+
+ 过磅中
+ 已过磅
-
-
-
- 客户名称：{{item.factoryCustomerName}}
- ({{item.factoryCustomerMobile}})
-
-
- 待付款
- 代付中
- 待结算
- 已完成
-
-
-
- 品类：{{item.productName}}
- 重量：{{item.settleWeight}}公斤
- 金额：{{item.settlePrice}}元
-
+
+ 毛重：{{item.productName}}公斤
+ 皮重：{{item.settleWeight}}公斤
+ 净重：{{item.netWeight}}公斤