优化

pages/customerChooseTemplate/customerChooseTemplate.js

@@ -4,6 +4,7 @@ var app = getApp()
 var network = require("../../utils/net.js")
 var dateTimePicker = require('../../utils/dateTimePicker.js');
 var utilll = require('../../utils/util.js');
+var fromPage = '';
 
 var getAccountingUnit = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetAccountingUnit";
 var getCustomer = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetCustomer";
@@ -40,6 +41,13 @@ Page({
 
   // 多选框数值变化
   checkboxValueChange: function (e) {
+    if (fromPage == "newForecast" && e.detail.value.length > 0) {
+      this.setData({
+        checkBoxArray: e.detail.value,
+      })
+      this.addCustomerName();
+    }
+
     this.setData({
       checkBoxArray: e.detail.value,
     })
@@ -91,7 +99,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    fromPage = options.fromePage;
     this.GetCustomer();
 
   },

pages/customerChooseTemplate/customerChooseTemplate.wxml

@@ -14,7 +14,7 @@
       </view>
 
     </scroll-view>
-    <view class='addGoodsName' catchtap='addCustomerName'>添加存货明细</view>
+    <view class='addGoodsName' catchtap='addCustomerName'>添加客户</view>
 
   </swiper-item>
 </swiper>

pages/saleForecastList/newBill/newBill.js

@@ -28,27 +28,6 @@ function GetAccountingUnit(that, inputValue) {
   })
 }
 
-function GetCustomer(that, inputValue) {
-  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) {
   let method = getDept;
   let params = [{
@@ -228,6 +207,30 @@ Page({
 
   },
 
+  // 原有请求客户的方法，已经废弃
+  GetCustomer: function() {
+    wx.navigateTo({
+      url: '../../customerChooseTemplate/customerChooseTemplate?fromePage=newForecast',
+    })
+    // 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: "购货客户"
+    // })
+  },
+
+
+
   /**
    * 生命周期函数--监听页面卸载
    */
@@ -288,7 +291,7 @@ Page({
   // 添加购货客户 跳转客户选择页面
   getCustomerItem: function() {
     wx.navigateTo({
-      url: '../../customerChooseTemplate/customerChooseTemplate',
+      url: '../../customerChooseTemplate/customerChooseTemplate?fromePage=newForecast',
     })
   },
 

pages/saleForecastList/newBill/newBill.json

@@ -1,3 +1,5 @@
 {
+    "navigationBarBackgroundColor": "white",
+    "navigationBarTextStyle": "black",
     "navigationBarTitleText": "预报新建"
 }

pages/saleForecastList/newBill/newBill.wxml

@@ -1,9 +1,9 @@
 <view class="swiper-tab">
-  <view class="swiper-tab-list tab1 {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">基本信息</view>
-  <view class="swiper-tab-list tab2 {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">预报详细</view>
+  <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">基本信息</view>
+  <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">预报详细</view>
 </view>
 
-<swiper current="{{currentTab}}" class="swiper-box" duration="300" style="height:{{winHeight - 31}}px" bindchange="bindChange">
+<swiper current="{{currentTab}}" class="swiper-box" duration="300" style="height:{{winHeight - 55}}px" bindchange="bindChange">
 
   <!-- 基本信息 -->
   <swiper-item class="swiper-items1">

pages/saleForecastList/newBill/newBill.wxss

@@ -1,29 +1,31 @@
 /* pages/saleForecastList/saleForecastCreatNew/saleForecastCreatNew.wxss */
 page {
   background: rgb(240, 239, 245);
+  height: calc(100%-10px);
 }
-
 .swiper-tab {
-  width: 100%;
+  /* height: 30px; */
+  margin: 10px 20px;
   text-align: center;
-  line-height: 45px;
+  line-height: 30px;
   background: white;
   display: flex;
   flex-direction: row;
-  justify-content: space-around;
-  border-bottom: 0.2rpx solid rgb(223, 218, 218);
+  border-radius: 5px;
+  border: 1px solid#2E8CF5;
+  overflow: hidden;
 }
 
 .swiper-tab-list {
+  height: 100%;
+  width: 50%;
   font-size: 30rpx;
-  width: 25%;
   color: #777;
 }
 
-
 .on {
-  color: #2788f8;
-  border-bottom: 2rpx solid #2788f8;
+  background-color:#2E8CF5 ; 
+  color: white;
 }
 
 .swiper-box {

pages/saleForecastList/query/query.wxss

@@ -37,39 +37,32 @@ page {
   overflow: hidden;
 }
 
-.drawer_box {
-  width: 650rpx;
-  overflow: hidden;
-  position: fixed;
-  top: 50%;
-  left: 0;
-  z-index: 1001;
-  background: #fafafa;
-  margin: -150px 50rpx 0 50rpx;
-  border-radius: 3px;
-}
-
-
-.top {
-  height: 20%;
-  justify-content: center;
-  align-items: center;
-}
-
 .sousuo {
-  margin-right: 10%;
-  margin-left: 10%;
+  /* margin-right: 10%;
+  margin-left: 10%; */
   text-align: center;
   background: #d6d8da;
   height: 40px;
   font-size: 28rpx;
 }
 
+
 .drawer_content {
   height: 500rpx;
   overflow-y: scroll; /*超出父盒子高度可滚动*/
 }
 
+.drawer_box {
+  width: 650rpx;
+  overflow: hidden;
+  position: fixed;
+  top: 50%;
+  left: 0;
+  z-index: 1001;
+  background: #fafafa;
+  margin: -150px 50rpx 0 50rpx;
+  border-radius: 3px;
+}
 
 .btn_ok {
   padding: 10px;
@@ -79,15 +72,23 @@ page {
   color: #2E8CF5;
 }
 
+.top {
+  height: 20%;
+  justify-content: center;
+  align-items: center;
+}
 
 .grid1 {
   width: 100%;
   border-bottom: 1px solid #c3c3c3;
-  padding-top: 5px;
-  padding-bottom: 10px;
+  /* padding-top: 5px;
+  padding-bottom: 10px; */
+  padding-top: 16rpx;
+  padding-bottom: 16rpx;
+  text-align: center;
 }
 
 .text3 {
   font-size: 18px;
   color: rgb(48, 48, 48);
-}
+}

pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js

@@ -94,7 +94,7 @@ Page({
   // 添加客户
   addCustomer: function(){
     wx.navigateTo({
-      url: '../../customerChooseTemplate/customerChooseTemplate',
+      url: '../../customerChooseTemplate/customerChooseTemplate?fromePage=specialOrder',
     })
   },