From c348f3687d6936ecb556928a16c5a1909c62c181 Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Thu, 22 Nov 2018 13:55:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8F=96=E8=8E=B7=E5=BE=97=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=AB=98=E5=BA=A6=E6=96=B9=E6=B3=95=EF=BC=8C=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E5=9C=A8=E5=BA=94=E7=94=A8=E5=8A=A0=E8=BD=BD=E5=A4=84?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=EF=BC=8C=E5=8A=A0=E8=BD=BD=E4=B8=80=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        | 12 +++-
 .../goodaNameChooseTemplate.js                | 67 ++++++++++++-------
 .../goodaNameChooseTemplate.wxml              | 41 ++++--------
 .../goodaNameChooseTemplate.wxss              | 25 ++++++-
 pages/guarantee/detail/detail.js              | 11 +--
 pages/guarantee/guarantee.js                  | 16 +----
 pages/guarantee/newbill/newbill.js            | 12 +---
 pages/guarantee/selectbill/selectbill.js      | 14 +---
 pages/order/detail/detail.js                  | 16 +----
 pages/order/newBill/newBill.js                | 15 +----
 pages/order/order.js                          | 11 +--
 pages/saleForecastList/Detail/Detail.js       | 16 +----
 pages/saleForecastList/newBill/newBill.js     | 16 +----
 pages/saleForecastList/saleForecastList.js    | 11 +--
 14 files changed, 100 insertions(+), 183 deletions(-)

diff --git a/app.js b/app.js
index 9e7258d..b0427db 100644
--- a/app.js
+++ b/app.js
@@ -1,10 +1,18 @@
 //app.js
 App({
-  onLaunch: function() {
-    
+  onShow: function() {
+    var that = this;
+    wx.getSystemInfo({
+      success: function (res) {
+        that.globalData.winWidth = res.windowWidth;
+        that.globalData.winHeight = res.windowHeight;
+      }
+    });
   },
 
   globalData: {
+    winHeight: 0,
+    winWidth: 0,
     phoneNum: "",
     openID: "",
     appName: "WeChat",
diff --git a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js
index 5c71778..aa9c9fa 100644
--- a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js
+++ b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js
@@ -1,19 +1,40 @@
 // 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,
-    winHeight: 0,
-    winWidth: 0,
-    unCheckDataArr:[1,2,3,4,5,6,7,8,9,1],
+    customerCollectionArray:[],
+    customerArray:[],
+    unCheckDataArr: [1, 2, 3, 4, 5, 6, 7, 8, 9, 1],
+  },
+
+  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
+      })
+    })
   },
   /**
-     * 滑动切换tab
-     */
-  bindChange: function (e) {
+   * 滑动切换tab
+   */
+  bindChange: function(e) {
     var that = this;
     that.setData({
       currentTab: e.detail.current
@@ -23,7 +44,7 @@ Page({
   /**
    * 点击tab切换
    */
-  swichNav: function (e) {
+  swichNav: function(e) {
     var that = this;
     if (this.data.currentTab === e.target.dataset.current) {
       return false;
@@ -36,64 +57,58 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
     var that = this;
-    wx.getSystemInfo({
-      success: function (res) {
-        that.setData({
-          winWidth: res.windowWidth,
-          winHeight: res.windowHeight
-        });
-      }
-    });
+    this.GetCustomer();
+    
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
+  onReady: function() {
 
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
+  onShow: function() {
 
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {
+  onHide: function() {
 
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {
+  onUnload: function() {
 
   },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
 
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
 
   },
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
 
   }
 })
\ No newline at end of file
diff --git a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml
index eea9bc2..1881308 100644
--- a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml
+++ b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml
@@ -13,9 +13,11 @@
       <view class='storageView'>收藏</view>
     </view>
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views' bindscrolltoupper="unCheckedScrollUpper" bindscrolltolower="unCheckedScrollLower">
-      <block wx:for="{{unCheckDataArr}}" wx:for-item="item">
-        <template is="outStoreOrderTemplate" data="{{item}}" />
+    <view class='listBackGroundView'>
+      <block wx:for="{{customerArray}}" wx:key="item" wx:for-index="idx">
+        <template is="customerChoiceTemplate" data="{{item}}" />
       </block>
+      </view>
     </scroll-view>
     <view class='addGoodsName' catchtap='addGoodsName'>添加存货明细</view>
 
@@ -23,37 +25,20 @@
   <!-- 收藏夹 -->
   <swiper-item class="swiper-items2">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views' bindscrolltoupper="checkedScrollUpper" bindscrolltolower="CheckedScrollLower">
-      <block wx:for="{{checkedDataArr}}" wx:for-item="item">
-        <template is="outStoreOrderTemplate" data="{{item}}" />
-      </block>
+      <checkbox-group bindchange="checkboxChange">
+        <block wx:for="{{checkedDataArr}}" wx:for-item="item">
+          <template is="customerChoiceTemplate" data="{{item}}" />
+        </block>
+      </checkbox-group>
     </scroll-view>
   </swiper-item>
 </swiper>
 
 
-<template name="outStoreOrderTemplate">
+<template name="customerChoiceTemplate">
   <view class='listItem' catchtap='transToOrderDetail' data-detailitemid='{{item.orderID}}' data-detailitemstate='{{item.orderState}}'>
-    <!-- <view class='orderID'>
-      <text class='goodsIDText'>NO：{{item.orderID}}</text>
-    </view> -->
-    <view class='bottomView'>
-      <!-- <view class='goodsNum'>
-        <text class='goodsNumText'>{{item.Customer_Name}}</text>
-      </view> -->
-      <view class='goodsNum'>
-        <text class='goodsIDText'>NO：{{item.orderID}}</text>
-      </view>
-      <view class='goodsMoney'>
-        <text class='goodsMoneyText'>流程状态：{{item.workFlowState}}</text>
-      </view>
-    </view>
-    <view class='bottomView'>
-      <view class='goodsNum'>
-        <text class='goodsNumText'>{{item.Customer_Name}}</text>
-      </view>
-      <view class='goodsMoney'>
-        <text class='goodsMoneyText'>发货日期：{{item.time}}</text>
-      </view>
-    </view>
+    <view class='itemClass'>你大吉大利看见噶说；{{item.name}}</view>
+    <checkbox value="{{item.ID}}" checked="{{item.checked}}" />
   </view>
+  <view class='horizontallineView'></view>
 </template>
\ No newline at end of file
diff --git a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxss b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxss
index b737f13..cdd78e9 100644
--- a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxss
+++ b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxss
@@ -1,6 +1,6 @@
 /* pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxss */
 page{
-  background:#EAF1F8;
+  background:#EFEFF6;
   height: 100%;
 }
 
@@ -73,12 +73,33 @@ page{
 }
 
 .scroll-views {
-  height: calc(100% - 80px);
+  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%;
diff --git a/pages/guarantee/detail/detail.js b/pages/guarantee/detail/detail.js
index 942df46..b97f62c 100644
--- a/pages/guarantee/detail/detail.js
+++ b/pages/guarantee/detail/detail.js
@@ -180,7 +180,7 @@ Page({
     allBillMoney: 0,
     array: [],
     showView: false,
-    winHeight: 0
+    winHeight: app.globalData.winHeight,
   },
 
   /**
@@ -194,15 +194,6 @@ Page({
       title: '业务担保单No.' + ID,
     })
     load(that, ID)
-    wx.getSystemInfo({
-
-      success: function(res) {
-        that.setData({
-          winHeight: res.windowHeight
-        });
-      }
-
-    });
   },
 
   /**
diff --git a/pages/guarantee/guarantee.js b/pages/guarantee/guarantee.js
index ae78560..a33de85 100644
--- a/pages/guarantee/guarantee.js
+++ b/pages/guarantee/guarantee.js
@@ -1,4 +1,5 @@
 // pages/guarantee/guarantee.js
+var app = getApp();
 var network = require("../../utils/net.js")
 var timechage = require("../../utils/dateTimeUtil.js")
 var PageIndexN = 0
@@ -65,8 +66,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    winWidth: 0,
-    winHeight: 0,
+    winHeight: app.globalData.winHeight,
     // tab切换
     currentTab: 0,
 
@@ -81,18 +81,6 @@ Page({
    */
   onLoad: function (options) {
     var that = this;
-    /**
-     * 获取系统信息
-     */
-    wx.getSystemInfo({
-      success: function (res) {
-        that.setData({
-          winWidth: res.windowWidth,
-          winHeight: res.windowHeight
-        });
-      }
-    });
-
     getListN(that, PageIndexN, PageSizeN)
     getListY(that, PageIndexY, PageSizeY)
   },
diff --git a/pages/guarantee/newbill/newbill.js b/pages/guarantee/newbill/newbill.js
index 5ee0a03..53ab5b6 100644
--- a/pages/guarantee/newbill/newbill.js
+++ b/pages/guarantee/newbill/newbill.js
@@ -94,7 +94,7 @@ Page({
     requestMoney: 0,
     allBillMoney: 0,
     array: [],
-    winHeight: 0
+    winHeight: app.globalData.winHeight,
   },
 
   /**
@@ -111,16 +111,6 @@ Page({
         Name: app.globalData.department_Name
       }],
     })
-    var that = this
-    wx.getSystemInfo({
-
-      success: function(res) {
-        that.setData({
-          winHeight: res.windowHeight
-        });
-      }
-
-    });
   },
 
   /**
diff --git a/pages/guarantee/selectbill/selectbill.js b/pages/guarantee/selectbill/selectbill.js
index e68d916..280326b 100644
--- a/pages/guarantee/selectbill/selectbill.js
+++ b/pages/guarantee/selectbill/selectbill.js
@@ -76,8 +76,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    winWidth: 0,
-    winHeight: 0,
+    winHeight: app.globalData.winHeight,
     // tab切换
     currentTab: 0,
     arrayOut:[],
@@ -95,17 +94,6 @@ Page({
   onLoad: function (options) {
     customerid = Number(options.customerid)
     var that = this;
-    /**
-     * 获取系统信息
-     */
-    wx.getSystemInfo({
-      success: function (res) {
-        that.setData({
-          winWidth: res.windowWidth,
-          winHeight: res.windowHeight
-        });
-      }
-    });
     getBillForDetail777(that, customerid)
     getBillForDetail792(that, customerid)
     getBillForDetail776(that, customerid)
diff --git a/pages/order/detail/detail.js b/pages/order/detail/detail.js
index d26c2dc..52d2d0b 100644
--- a/pages/order/detail/detail.js
+++ b/pages/order/detail/detail.js
@@ -130,7 +130,7 @@ Page({
      */
     which: "",
     winWidth: 0,
-    winHeight: 0,
+    winHeight: app.globalData.winHeight,
     // tab切换
     currentTab: 0,
     obj: [],
@@ -237,20 +237,6 @@ Page({
       setTime(that)
 
     })
-
-    /**
-     * 获取系统信息
-     */
-    wx.getSystemInfo({
-
-      success: function (res) {
-        that.setData({
-          winWidth: res.windowWidth,
-          winHeight: res.windowHeight
-        });
-      }
-
-    });
   },
 
   /**
diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index 8565e6a..e38f7f4 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -106,7 +106,7 @@ Page({
      */
     which: "",
     winWidth: 0,
-    winHeight: 0,
+    winHeight: app.globalData.winHeight,
     // tab切换
     currentTab: 0,
     obj: [],
@@ -146,7 +146,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-    var that = this;
 
     // 获取完整的年月日 时分秒，以及默认显示的数组
     var obj1 = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear);
@@ -160,19 +159,7 @@ Page({
       dateTimeArray1: obj1.dateTimeArray,
       dateTime1: obj1.dateTime
     });
-    /**
-     * 获取系统信息
-     */
-    wx.getSystemInfo({
 
-      success: function(res) {
-        that.setData({
-          winWidth: res.windowWidth,
-          winHeight: res.windowHeight
-        });
-      }
-
-    });
   },
 
   /**
diff --git a/pages/order/order.js b/pages/order/order.js
index 9c993a5..f812bbc 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -61,7 +61,7 @@ Page({
     arry: [],
     scrollTop: 0,
     scrollHeight: 0,
-    winHeight: 0
+    winHeight: app.globalData.winHeight,
   },
 
   /**
@@ -85,14 +85,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-    var that = this;
-    wx.getSystemInfo({
-      success: function (res) {
-        that.setData({ 
-          winHeight: res.windowHeight
-        });
-      }
-    });
+    
   },
 
   /**
diff --git a/pages/saleForecastList/Detail/Detail.js b/pages/saleForecastList/Detail/Detail.js
index 62e7b08..0bdaa5d 100644
--- a/pages/saleForecastList/Detail/Detail.js
+++ b/pages/saleForecastList/Detail/Detail.js
@@ -130,7 +130,7 @@ Page({
      */
     which: "",
     winWidth: 0,
-    winHeight: 0,
+    winHeight: app.globalData.winHeight,
     // tab切换
     currentTab: 0,
     obj: [],
@@ -237,20 +237,6 @@ Page({
       setTime(that)
 
     })
-
-    /**
-     * 获取系统信息
-     */
-    wx.getSystemInfo({
-
-      success: function (res) {
-        that.setData({
-          winWidth: res.windowWidth,
-          winHeight: res.windowHeight
-        });
-      }
-
-    });
   },
 
   /**
diff --git a/pages/saleForecastList/newBill/newBill.js b/pages/saleForecastList/newBill/newBill.js
index 1bc0850..8cd7d08 100644
--- a/pages/saleForecastList/newBill/newBill.js
+++ b/pages/saleForecastList/newBill/newBill.js
@@ -113,7 +113,7 @@ Page({
      */
     which: "",
     winWidth: 0,
-    winHeight: 0,
+    winHeight: app.globalData.winHeight,
     // tab切换
     currentTab: 0,
     obj: [],
@@ -167,19 +167,7 @@ Page({
       dateTimeArray1: obj1.dateTimeArray,
       dateTime1: obj1.dateTime
     });
-    /**
-     * 获取系统信息
-     */
-    wx.getSystemInfo({
-
-      success: function(res) {
-        that.setData({
-          winWidth: res.windowWidth,
-          winHeight: res.windowHeight
-        });
-      }
-
-    });
+  
   },
 
   /**
diff --git a/pages/saleForecastList/saleForecastList.js b/pages/saleForecastList/saleForecastList.js
index 544cf3b..6ca6466 100644
--- a/pages/saleForecastList/saleForecastList.js
+++ b/pages/saleForecastList/saleForecastList.js
@@ -96,8 +96,7 @@ Page({
     checkedDataArr: [],
     unCheckDataArr: [],
     currentTab: 0,
-    winHeight: 0,
-    winWidth: 0, 
+    winHeight: app.globalData.winHeight,
     Customer_ID: null,
   },
 
@@ -160,14 +159,6 @@ Page({
       Customer_ID: app.globalData.selectCustomer_ID,
     })
     var that = this;
-    wx.getSystemInfo({
-      success: function (res) {
-        that.setData({
-          winWidth: res.windowWidth,
-          winHeight: res.windowHeight
-        });
-      }
-    });
     UnCheckPageIndex = 0;
     CheckedPageIndex = 0;
     getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize);