1、特价申请，存货和客户选择返回数据值的相关判断

2、特价申请详情页面创建

app.json

@@ -22,7 +22,8 @@
     "pages/specialOrderApplication/specialOrderApplication",
     "pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder",
     "pages/outStore/outStore",
-    "pages/outStore/outStoreDetail/outStoreDetail"
+    "pages/outStore/outStoreDetail/outStoreDetail",
+    "pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail"
   ],
   "window": {
     "backgroundTextStyle": "light",

pages/customerChooseTemplate/customerChooseTemplate.js

@@ -1,5 +1,5 @@
 // pages/customerChooseTemplate/customerChooseTemplate.js
-// pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js
+
 var app = getApp()
 var network = require("../../utils/net.js")
 var dateTimePicker = require('../../utils/dateTimePicker.js');
@@ -56,6 +56,7 @@ Page({
 
   // 点击添加存货明细按钮 存数据进入global
   addCustomerName: function () {
+
     let choseCheck = []
     // 对比原有数组和选中的数组 存在，将数组包含的其他值也取出加载
     for (var i = 0; i < this.data.customerArray.length; i++) {
@@ -66,9 +67,17 @@ Page({
       }
     }
     app.globalData.customerArray = choseCheck;
+    var pages = getCurrentPages();
+    var currPage = pages[pages.length - 1];  //当前页面
+    var prevPage = pages[pages.length - 2];  //上一个页面
+    //直接调用上一个页面对象的setData()方法，把数据存到上一个页面中去
+    prevPage.setData({
+      backPage: "customerChoosePage",
+    });
     wx.navigateBack({
-      delta: 1,
+      delta: 1
     })
+
   },
 
   /**

pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js

@@ -163,6 +163,15 @@ Page({
       }
     }
     app.globalData.goodsNameArray = choseCheck;
+
+    var pages = getCurrentPages();
+    var currPage = pages[pages.length - 1];  //当前页面
+    var prevPage = pages[pages.length - 2];  //上一个页面
+    //直接调用上一个页面对象的setData()方法，把数据存到上一个页面中去
+    prevPage.setData({
+      backPage: "goodsNameChoosePage",
+    });
+
     wx.navigateBack({
       delta: 1,
     })

pages/saleForecastList/newBill/newBill.js

@@ -88,6 +88,10 @@ Page({
   data: {
     which: "",
     winHeight: app.globalData.winHeight,
+
+    // 从哪个页面返回当前页面
+    backPage: "",
+
     // tab切换
     currentTab: 0,
     // 存货数组
@@ -151,58 +155,62 @@ Page({
   onShow: function() {
     var that = this;
 
-    // 返回的用户只能是一条，所以index只能为0
-    var customerArr = app.globalData.customerArray;
-    if (customerArr.length > 0) {
-      this.setData({
-        customer: customerArr,
-        customerIndex: 0,
-      })
+    if (that.data.backPage == "customerChoosePage") {
+      // 返回的用户只能是一条，所以index只能为0
+      var customerArr = app.globalData.customerArray;
+      if (customerArr.length > 0) {
+        that.setData({
+          customer: customerArr,
+          customerIndex: 0,
+        })
+      }
     }
 
-    // 获取存货 加载完成后计算价格政策
-    var goodsArr = app.globalData.goodsNameArray;
-    if (goodsArr.length > 0) {
-      let backGoodsArr = [];
-      for (var i = 0; i < goodsArr.length; i++) {
-
-        var name = goodsArr[i].Goods_Name;
-        var id = goodsArr[i].SaleGoods_ID;
-        var pp = goodsArr[i].PolicyPrice;
-        var price = goodsArr[i].Price;
-        var mainUnitRatio = goodsArr[i].Goods_MainUnitRatio;
-        var secondUnitRatio = goodsArr[i].Goods_SecondUnitRatio;
-        var unitConvertDirection = goodsArr[i].Goods_UnitConvertDirection;
-        var rightRatio = goodsArr[i].RightRatio;
-        var leftRatio = goodsArr[i].LeftRatio;
-
-        if (pp == null){
-          pp =Number(0);
-        }
-        if (rightRatio == null) {
-          rightRatio = Number(1);
-        }
-        if (leftRatio == null) {
-          leftRatio = Number(1);
+    if (that.data.backPage == "goodsNameChoosePage") {
+      // 获取存货 加载完成后计算价格政策
+      var goodsArr = app.globalData.goodsNameArray;
+      if (goodsArr.length > 0) {
+        let backGoodsArr = [];
+        for (var i = 0; i < goodsArr.length; i++) {
+
+          var name = goodsArr[i].Goods_Name;
+          var id = goodsArr[i].SaleGoods_ID;
+          var pp = goodsArr[i].PolicyPrice;
+          var price = goodsArr[i].Price;
+          var mainUnitRatio = goodsArr[i].Goods_MainUnitRatio;
+          var secondUnitRatio = goodsArr[i].Goods_SecondUnitRatio;
+          var unitConvertDirection = goodsArr[i].Goods_UnitConvertDirection;
+          var rightRatio = goodsArr[i].RightRatio;
+          var leftRatio = goodsArr[i].LeftRatio;
+
+          if (pp == null) {
+            pp = Number(0);
+          }
+          if (rightRatio == null) {
+            rightRatio = Number(1);
+          }
+          if (leftRatio == null) {
+            leftRatio = Number(1);
+          }
+
+          let goodsNameObj = {
+            Goods_MainUnitRatio: Number(mainUnitRatio),
+            Goods_SecondUnitRatio: Number(secondUnitRatio),
+            SaleGoods_ID: Number(id),
+            Goods_Name: name,
+            Price: Number(price),
+            PolicyPrice: Number(pp),
+            Goods_UnitConvertDirection: Number(unitConvertDirection),
+            RightRatio: rightRatio,
+            LeftRatio: leftRatio,
+          }
+          backGoodsArr.push(goodsNameObj)
         }
 
-        let goodsNameObj = {
-          Goods_MainUnitRatio: Number(mainUnitRatio),
-          Goods_SecondUnitRatio: Number(secondUnitRatio),
-          SaleGoods_ID: Number(id),
-          Goods_Name: name,
-          Price: Number(price),
-          PolicyPrice: Number(pp),
-          Goods_UnitConvertDirection: Number(unitConvertDirection),
-          RightRatio: rightRatio,
-          LeftRatio: leftRatio,
-        }
-        backGoodsArr.push(goodsNameObj)
+        that.setData({
+          obj: backGoodsArr,
+        })
       }
-
-      this.setData({
-        obj: backGoodsArr,
-      })
     }
 
   },
@@ -234,7 +242,7 @@ Page({
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {
+  onUnload: function() {
     app.globalData.goodsNameArray = [];
     app.globalData.customerArray = [];
   },

pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js

@@ -68,8 +68,8 @@ Page({
     currentTab: 0,
     winHeight: app.globalData.winHeight,
 
-    starTime: timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'),
-    endTime: timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'),
+    // 从哪个页面返回当前页面
+    backPage: "",
 
     dateTimeArray: null,
     dateTime: null,
@@ -107,26 +107,28 @@ Page({
     this.data.addrs = e.detail.value;
   },
 
-  // 存货特价开始时间
-  bindStartTimeChange: function (e) {
-    var itemIndex = e.currentTarget.dataset.index; 
-    var array = this.data.goodsNameArr;
-    array[itemIndex]["applicationStartTime"]= e.detail.value,
-    this.setData({
-      goodsNameArr: array,
-    })
-  },
-
-  // 存货特价结束时间
-  bindEndTimeChange: function (e) {
+  // 获取输入框值进行保存
+  getInputValue:function (e){
+    var style = e.currentTarget.dataset.datastyle
     var itemIndex = e.currentTarget.dataset.index;
     var array = this.data.goodsNameArr;
-    array[itemIndex]["applicationEndTime"] = e.detail.value,
+    array[itemIndex][style] = e.detail.value,
       this.setData({
         goodsNameArr: array,
       })
   },
 
+  // 获取存货时间变化进行保存
+  bindTimeChange: function (e) {
+    var style = e.currentTarget.dataset.datastyle
+    var itemIndex = e.currentTarget.dataset.index; 
+    var array = this.data.goodsNameArr;
+    array[itemIndex][style]= e.detail.value,
+    this.setData({
+      goodsNameArr: array,
+    })
+  },
+
   // 基本信息日期
   changeDateTime(e) {
     this.setData({
@@ -308,57 +310,60 @@ Page({
   onShow: function () {
     var that = this;
 
-    // 返回的用户只能是一条，所以index只能为0
-    var currentCustomerArr = app.globalData.customerArray;
-    if (currentCustomerArr.length > 0) {
-      this.setData({
-        customerArr: currentCustomerArr,
-      })
-    }
+    if (this.data.backPage == "customerChoosePage"){
+      // 返回的用户只能是一条，所以index只能为0
+      var currentCustomerArr = app.globalData.customerArray;
+      if (currentCustomerArr.length > 0) {
+        this.setData({
+          customerArr: currentCustomerArr,
+        })
+      }
+    } 
+
+    if (this.data.backPage == "goodsNameChoosePage") {
+      // 获取存货 加载完成后计算价格政策
+      var goodsArr = app.globalData.goodsNameArray;
+      if (goodsArr.length > 0) {
+        let backGoodsArr = [];
+        for (var i = 0; i < goodsArr.length; i++) {
+          // 存货名称
+          var name = goodsArr[i].Goods_Name;
+          // 存货ID
+          var id = goodsArr[i].SaleGoods_ID;
+          // 原单价
+          var infoprice = goodsArr[i].Price;
+          if (infoprice == null) {
+            infoprice = "";
+          }
+          // 特价
+          var policyPrice = "";
+          // 开始时间
+          var infoStartTime = timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D');
+          // 结束时间
+          var infoEndTime = timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D');
+          // 申请数量
+          var infoNum = "";
+
+          let goodsNameObj = {
+            Goods_Name: name,
+            SaleGoods_ID: Number(id),
+            Price: infoprice,
+            applicationPrice: policyPrice,
+            applicationStartTime: infoStartTime,
+            applicationEndTime: infoEndTime,
+            applicationNum: infoNum,
+          }
+          backGoodsArr.push(goodsNameObj)
 
-    // 获取存货 加载完成后计算价格政策
-    var goodsArr = app.globalData.goodsNameArray;
-    if (goodsArr.length > 0) {
-      let backGoodsArr = [];
-      for (var i = 0; i < goodsArr.length; i++) {
-        // 存货名称
-        var name = goodsArr[i].Goods_Name;
-        // 存货ID
-        var id = goodsArr[i].SaleGoods_ID;
-        // 原单价
-        var infoprice = goodsArr[i].Price;
-        if (infoprice == null){
-          infoprice ="";
-        }
-        // 特价
-        var policyPrice ="";
-        // 开始时间
-        var infoStartTime = timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D');
-        // 结束时间
-        var infoEndTime = timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D');
-        // 申请数量
-        var infoNum = "";
-
-        let goodsNameObj = {
-          Goods_Name: name,
-          SaleGoods_ID: Number(id),
-          Price: infoprice,
-          applicationPrice: policyPrice,
-          applicationStartTime: infoStartTime,
-          applicationEndTime: infoEndTime,
-          applicationNum: infoNum,
         }
-        backGoodsArr.push(goodsNameObj)
-        console.log(backGoodsArr);
 
+        this.setData({
+          goodsNameArr: backGoodsArr,
+        })
       }
 
-      this.setData({
-        goodsNameArr: backGoodsArr,
-      })
     }
 
-
   },
 
   /**

pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml

@@ -168,7 +168,7 @@
   <view class='baseitem'>
     <text class='baseitem_key'>原单价</text>
     <view class='baseitem_value'>
-      <input class='inputItem' style='text' value='{{item.Price}}' placeholder='请输入原单价价格' placeholder-style='color:rgb(202, 202, 202)'  bindinput='getInputValue' data-index='{{idx}}' data-datastyle='goodsname'>
+      <input class='inputItem' type='digit' value='{{item.Price}}' placeholder='请输入原单价价格' placeholder-style='color:rgb(202, 202, 202)'  bindinput='getInputValue' data-index='{{idx}}' data-datastyle='Price'>
       </input>
     </view>
   </view>
@@ -177,7 +177,7 @@
   <view class='baseitem'>
     <text class='baseitem_key'>特价</text>
     <view class='baseitem_value'>
-      <input class='inputItem' style='text' value='{{item.applicationPrice}}' placeholder='请输入申请特价价格' placeholder-style='color:rgb(202, 202, 202)'  bindinput='getInputValue' data-index='{{idx}}' data-datastyle='goodsname'>
+      <input class='inputItem' type='digit' value='{{item.applicationPrice}}' placeholder='请输入申请特价价格' placeholder-style='color:rgb(202, 202, 202)'  bindinput='getInputValue' data-index='{{idx}}' data-datastyle='applicationPrice'>
       </input>
     </view>
   </view>
@@ -185,7 +185,7 @@
 
   <view class='baseitem'>
     <text class='baseitem_key'>开始时间</text>
-    <picker class='baseitem_value' mode="date" value="{{starTime}}" start="2018-01-01" end="2037-12-31" bindchange="bindStartTimeChange" data-index='{{idx}}'>
+    <picker class='baseitem_value' mode="date" start="2018-01-01" end="2037-12-31" bindchange="bindTimeChange" data-index='{{idx}}' data-datastyle='applicationStartTime'>
       <view>
         {{item.applicationStartTime}}
       </view>
@@ -195,7 +195,7 @@
 
   <view class='baseitem'>
     <text class='baseitem_key'>结束时间</text>
-    <picker class='baseitem_value' mode="date" value="{{endTime}}" start="2018-01-01" end="2037-12-31" bindchange="bindEndTimeChange" data-index='{{idx}}'>
+    <picker class='baseitem_value' mode="date" start="2018-01-01" end="2037-12-31" bindchange="bindTimeChange" data-index='{{idx}}' data-datastyle='applicationEndTime'>
       <view>
         {{item.applicationEndTime}}
       </view>
@@ -206,7 +206,7 @@
   <view class='baseitem'>
     <text class='baseitem_key'>申请数量</text>
     <view class='baseitem_value'>
-      <input class='inputItem' placeholder='请输入申请数量' placeholder-style='color:rgb(202, 202, 202)' style='text' value='{{item.applicationNum}}' bindinput='getInputValue' data-index='{{idx}}' data-datastyle='goodsname'>
+      <input class='inputItem' placeholder='请输入申请数量' placeholder-style='color:rgb(202, 202, 202)' type='digit' value='{{item.applicationNum}}' bindinput='getInputValue' data-index='{{idx}}' data-datastyle='applicationNum'>
       </input>
     </view>
   </view>

pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.js

@@ -0,0 +1,66 @@
+// pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.json

@@ -0,0 +1 @@
+{}

pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml

@@ -0,0 +1,2 @@
+<!--pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml-->
+<text>pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml</text>

pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxss

@@ -0,0 +1 @@
+/* pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxss */