diff --git a/app.js b/app.js
index 1e4fa17..6874b02 100644
--- a/app.js
+++ b/app.js
@@ -11,6 +11,7 @@ App({
},
globalData: {
+ customerArray:[],
goodsNameArray:[],
winHeight: 0,
winWidth: 0,
diff --git a/app.json b/app.json
index d213c60..cf5abbf 100644
--- a/app.json
+++ b/app.json
@@ -17,7 +17,8 @@
"pages/guarantee/newbill/newbill",
"pages/guarantee/selectbill/selectbill",
"pages/guarantee/detailshow/detailshow",
- "pages/goodaNameChooseTemplate/goodaNameChooseTemplate"
+ "pages/goodaNameChooseTemplate/goodaNameChooseTemplate",
+ "pages/customerChooseTemplate/customerChooseTemplate"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/pages/customerChooseTemplate/customerChooseTemplate.js b/pages/customerChooseTemplate/customerChooseTemplate.js
new file mode 100644
index 0000000..acb55e7
--- /dev/null
+++ b/pages/customerChooseTemplate/customerChooseTemplate.js
@@ -0,0 +1,94 @@
+// pages/customerChooseTemplate/customerChooseTemplate.js
+// pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js
+var app = getApp()
+var network = require("../../utils/net.js")
+var dateTimePicker = require('../../utils/dateTimePicker.js');
+var utilll = require('../../utils/util.js');
+
+var getAccountingUnit = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetAccountingUnit";
+var getCustomer = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetCustomer";
+
+Page({
+
+ data: {
+ winHeight: app.globalData.winHeight,
+ currentTab: 0,
+ collectionArray: [],
+ customerArray: [],
+ checkBoxArray: [],
+ },
+
+ GetCustomer: function(inputValue) {
+ var that =this;
+ let method = getCustomer;
+ let params = [{
+ "InputValue": inputValue,
+ "PageIndex": 0,
+ "PageSize": 100
+ }];
+ network.transfer_request(method, params, function(res) {
+ that.setData({
+ customerArray: res.result
+ })
+ })
+ },
+
+ // 多选框数值变化
+ checkboxValueChange: function (e) {
+ this.setData({
+ checkBoxArray: e.detail.value,
+ })
+ },
+
+ // 点击添加存货明细按钮 存数据进入global
+ addCustomerName: function () {
+ let choseCheck = []
+ // 对比原有数组和选中的数组 存在，将数组包含的其他值也取出加载
+ for (var i = 0; i < this.data.customerArray.length; i++) {
+ for (var j = 0; j < this.data.checkBoxArray.length; j++) {
+ if (Number(this.data.customerArray[i].ID) == this.data.checkBoxArray[j]) {
+ choseCheck.push(this.data.customerArray[i])
+ }
+ }
+ }
+ app.globalData.customerArray = choseCheck;
+ wx.navigateBack({
+ delta: 1,
+ })
+ },
+
+ /**
+ * 滑动切换tab
+ */
+ bindChange: function (e) {
+ var that = this;
+ that.setData({
+ currentTab: e.detail.current
+ });
+
+ },
+
+ /**
+ * 点击tab切换
+ */
+ swichNav: function (e) {
+ var that = this;
+ if (this.data.currentTab === e.target.dataset.current) {
+ return false;
+ } else {
+ that.setData({
+ currentTab: e.target.dataset.current
+ })
+ }
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ this.GetCustomer();
+
+ },
+
+})
\ No newline at end of file
diff --git a/pages/customerChooseTemplate/customerChooseTemplate.json b/pages/customerChooseTemplate/customerChooseTemplate.json
new file mode 100644
index 0000000..6577af6
--- /dev/null
+++ b/pages/customerChooseTemplate/customerChooseTemplate.json
@@ -0,0 +1,5 @@
+{
+ "navigationBarBackgroundColor": "white",
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "客户列表"
+}
\ No newline at end of file
diff --git a/pages/customerChooseTemplate/customerChooseTemplate.wxml b/pages/customerChooseTemplate/customerChooseTemplate.wxml
new file mode 100644
index 0000000..8251764
--- /dev/null
+++ b/pages/customerChooseTemplate/customerChooseTemplate.wxml
@@ -0,0 +1,47 @@
+
+
+
+ 全部
+ 收藏夹
+
+
+
+
+
+
+
+ 收藏
+
+
+
+
+
+
+
+
+
+
+
+ 添加存货明细
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.Name}}
+
+
+
+
\ No newline at end of file
diff --git a/pages/customerChooseTemplate/customerChooseTemplate.wxss b/pages/customerChooseTemplate/customerChooseTemplate.wxss
new file mode 100644
index 0000000..8185917
--- /dev/null
+++ b/pages/customerChooseTemplate/customerChooseTemplate.wxss
@@ -0,0 +1,115 @@
+/* pages/customerChooseTemplate/customerChooseTemplate.wxss */
+
+/* pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxss */
+page{
+ background:#EFEFF6;
+ height: 100%;
+}
+
+.swiper-tab {
+ width: 100%;
+ height: 45px;
+ top: 0;
+ text-align: center;
+ line-height: 45px;
+ background: white;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-around;
+ border-top: 2rpx solid #ece7e7;
+ border-bottom: 0.2rpx solid rgb(236, 231, 231);
+}
+
+.swiper-tab-list {
+ font-size: 30rpx;
+ width: 25%;
+ color: #777;
+}
+
+.on {
+ border-bottom: 1.5px solid #2E8CF5 ;
+ color: #2E8CF5;
+}
+
+.swiper-box {
+ margin-top: 3px;
+ display: block;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+}
+
+.swiper-items1 {
+ height: 100%;
+}
+
+.swiper-items2 {
+ height: 100%;
+}
+
+.searchView{
+ margin: 10rpx 10rpx;
+ height: 30px;
+ display: flex;
+ flex-direction: row;
+}
+
+.imput_goodsName{
+ border: 1rpx solid rgb(236, 231, 231);
+ height: 100%;
+ width: 85%;
+ border-radius: 10rpx;
+ background-color: #fff;
+ text-align: center;
+ padding-top: 5rpx;
+}
+
+.storageView{
+ height: 100%;
+ padding-top: 10rpx;
+ width: 15%;
+ color: orange;
+ text-align: center;
+ justify-content: center;
+ font-size: 20px;
+}
+
+.scroll-views {
+ margin-top: 25rpx;
+ height: calc(100% - 97px);
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+}
+
+.listBackGroundView{
+ background-color: #fff;
+}
+
+.listItem{
+ height: 80rpx;
+ display: flex;
+ padding: 10rpx 20rpx;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.horizontallineView {
+ height: 1rpx;
+ background-color: #dbdbdb;
+ margin-left: 20rpx;
+ margin-right: 0rpx;
+}
+
+.addGoodsName{
+ height: 45px;
+ width: 100%;
+ background-color: #fff;
+ color: #2E8CF5;
+ font-size: 20px;
+ text-align: center;
+ line-height: 45px;
+ position: fixed;
+ bottom: 0rpx;
+}
\ No newline at end of file
diff --git a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js
index 004ff43..7d79607 100644
--- a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js
+++ b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js
@@ -12,7 +12,7 @@ Page({
data: {
winHeight: app.globalData.winHeight,
currentTab: 0,
- CollectionArray:[],
+ collectionArray:[],
goodsArray:[],
checkBoxArray:[],
},
diff --git a/pages/saleForecastList/newBill/newBill.js b/pages/saleForecastList/newBill/newBill.js
index eb48bb7..b06d15c 100644
--- a/pages/saleForecastList/newBill/newBill.js
+++ b/pages/saleForecastList/newBill/newBill.js
@@ -29,21 +29,24 @@ function GetAccountingUnit(that, inputValue) {
}
function GetCustomer(that, inputValue) {
- let method = getCustomer;
- let params = [{
- "InputValue": inputValue,
- "PageIndex": 0,
- "PageSize": 100
- }];
- network.transfer_request(method, params, function(res) {
- that.setData({
- currency: res.result,
- customer: res.result
- })
- })
- that.setData({
- which: "购货客户"
+ wx.navigateTo({
+ url: '../../customerChooseTemplate/customerChooseTemplate',
})
+ // let method = getCustomer;
+ // let params = [{
+ // "InputValue": inputValue,
+ // "PageIndex": 0,
+ // "PageSize": 100
+ // }];
+ // network.transfer_request(method, params, function(res) {
+ // that.setData({
+ // currency: res.result,
+ // customer: res.result
+ // })
+ // })
+ // that.setData({
+ // which: "购货客户"
+ // })
}
function GetDepartment(that, inputValue) {
@@ -167,7 +170,15 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
- console.log(app.globalData.goodsNameArray);
+ console.log(app.globalData.customerArray);
+ var customerArr = app.globalData.customerArray;
+ if (customerArr.length > 0){
+ this.setData({
+ customer: customerArr,
+ customerIndex:0,
+ })
+ }
+
var goodsArr = app.globalData.goodsNameArray;
if (goodsArr.length > 0) {
let backGoodsArr = [];
@@ -230,19 +241,12 @@ Page({
content: '请先选择客户及会计单位',
})
}
-
-
- // let newobj = {
- // Goods_Name: "请选择存货"
- // };
-
- // this.data.obj.push(newobj)
-
- // let aaa = this.data.obj;
+ },
- // this.setData({
- // obj: aaa,
- // })
+ getCustomerItem: function(){
+ wx.navigateTo({
+ url: '../../customerChooseTemplate/customerChooseTemplate',
+ })
},
deleteItem: function(e) {
diff --git a/pages/saleForecastList/newBill/newBill.wxml b/pages/saleForecastList/newBill/newBill.wxml
index 6bd3fe7..1575d61 100644
--- a/pages/saleForecastList/newBill/newBill.wxml
+++ b/pages/saleForecastList/newBill/newBill.wxml
@@ -11,7 +11,7 @@
购货客户
-
+
{{customer[customerIndex].Name}}