新建特价申请template

pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js

@@ -3,21 +3,19 @@
 var network = require("../../../utils/net.js");
 const app = getApp();
 var dateTimePicker = require('../../../utils/dateTimePicker.js');
+var timechage = require("../../../utils/dateTimeUtil.js")
+
 Page({
 
-  /**
-   * 页面的初始数据
-   */
   data: {
     currentTab: 0,
     winHeight: app.globalData.winHeight,
-    winWidth: 0,
-    detaileList: [1, 1, 3, 4, 5, 6, 7, 7, 4, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 4, 7, 7, 7],
+
+    starTime: timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'),
+    endTime: timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'),
 
     dateTimeArray: null,
     dateTime: null,
-    dateTimeArray1: null,
-    dateTime1: null,
     startYear: 2018,
     endYear: 2030,
     // 用户数组
@@ -26,9 +24,24 @@ Page({
     goodsNameArr:[],
   },
 
-  changeDateTime1(e) {
+  // 存货特价开始时间
+  bindStartTimeChange: function (e) {
     this.setData({
-      dateTime1: e.detail.value
+      starTime: e.detail.value,
+    })
+  },
+
+  // 存货特价结束时间
+  bindEndTimeChange: function (e) {
+    this.setData({
+      endTime: e.detail.value,
+    })
+  },
+
+  // 基本信息日期
+  changeDateTime(e) {
+    this.setData({
+      dateTime: e.detail.value
     });
 
   },
@@ -74,17 +87,34 @@ Page({
    * 存货明细保存按钮 点击新建单据 内部做逻辑判断 存储值是否都已经加载
    */
   creatNewSpecialOrder:function (){
-    let year = this.data.dateTimeArray1[0][this.data.dateTime1[0]]
-    let month = this.data.dateTimeArray1[1][this.data.dateTime1[1]]
-    let date = this.data.dateTimeArray1[2][this.data.dateTime1[2]]
-    let hour = this.data.dateTimeArray1[3][this.data.dateTime1[3]]
-    let minu = this.data.dateTimeArray1[4][this.data.dateTime1[4]]
+    let year = this.data.dateTimeArray[0][this.data.dateTime[0]]
+    let month = this.data.dateTimeArray[1][this.data.dateTime[1]]
+    let date = this.data.dateTimeArray[2][this.data.dateTime[2]]
+    let hour = this.data.dateTimeArray[3][this.data.dateTime[3]]
+    let minu = this.data.dateTimeArray[4][this.data.dateTime[4]]
 
     let stringTime = year + "/" + month + "/" + date + " " + hour + ":" + minu + ":00"
     let timestamp2 = Date.parse(new Date(stringTime));
+    // 基本信息时间转换
     let update = "/Date(" + timestamp2 + "+0800)/";
+
+    //应该是从存货数组中获取对应的时间 
+
+    // 存货明细起止时间转换
+    let guaranteeDate = timechage.formatymdERTDate(this.data.starTime);
+    let payDate = timechage.formatymdERTDate(this.data.endTime);
+
   },
 
+  // 删除客户明细
+  deleteCustomerItem: function () {
+
+  },
+
+  // 删除存货明细
+  deleteGoodsItem:function(){
+
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -98,8 +128,6 @@ Page({
     this.setData({
       dateTimeArray: obj1.dateTimeArray,
       dateTime: obj1.dateTime,
-      dateTimeArray1: obj1.dateTimeArray,
-      dateTime1: obj1.dateTime
     });
   },
 
@@ -122,39 +150,36 @@ Page({
     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 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);
+        // 原单价
+        var infoprice = goodsArr[i].Price;
+        if (infoprice == null){
+          infoprice ="请输入原单价";
         }
+        // 特价
+        var policyPrice ="请输入特价价格";
+        // 开始时间
+        var infoStartTime ="请选择开始时间";
+        // 结束时间
+        var infoEndTime = "请选择结束时间";
+        // 申请数量
+        var infoNum = "请输入申请数量";
 
         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,
+          SaleGoods_ID: Number(id),
+          Price: infoprice,
+          applicationPrice: policyPrice,
+          applicationStartTime: infoStartTime,
+          applicationEndTime: infoEndTime,
+          applicationNum: infoNum,
         }
         backGoodsArr.push(goodsNameObj)
+        console.log(backGoodsArr);
+
       }
 
       this.setData({

pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml

@@ -19,9 +19,9 @@
 
       <view class='baseitem'>
         <text class='baseitem_key'>日期</text>
-        <picker class='baseitem_value' mode="multiSelector" value="{{dateTime1}}" bindchange="changeDateTime1" range="{{dateTimeArray1}}">
+        <picker class='baseitem_value' mode="multiSelector" value="{{dateTime}}" bindchange="changeDateTime" range="{{dateTimeArray}}">
           <view>
-            {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}}
+            {{dateTimeArray[0][dateTime[0]]}}-{{dateTimeArray[1][dateTime[1]]}}-{{dateTimeArray[2][dateTime[2]]}} {{dateTimeArray[3][dateTime[3]]}}:{{dateTimeArray[4][dateTime[4]]}}
           </view>
         </picker>
         <!-- <view class='baseitem_value'>
@@ -78,10 +78,10 @@
   <!-- 存货详细 -->
   <swiper-item class="swiper-items3">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views'>
-    
+
       <view class='detaileListContainer'>
-        <block wx:for="{{goodsNameArr}}" wx:key="item" wx:for-index="idx">
-          <template is="goodsInfoTemplate" data="{{item}}" data="{{idx}}" />
+        <block wx:for="{{goodsNameArr}}" wx:for-item="item" wx:for-index="idx">
+          <template is="goodsInfoTemplate" data="{{item,idx}}"/>
         </block>
       </view>
 
@@ -106,14 +106,14 @@
 </swiper>
 
 <template name="customerInfoTemplate">
-<view class='listNumberView'>
-    客户明细：{{idx}}
+  <view class='listNumberView'>
+    客户明细：{{idx+1}}
   </view>
 
   <view class='baseitem'>
     <text class='baseitem_key'>名称</text>
     <view class='baseitem_value'>
-      {{customerName}}基本信息
+      {{item.Name}}
     </view>
   </view>
   <view class='horizontallineView'></view>
@@ -126,7 +126,7 @@
   </view>
   <view class='horizontallineView'></view>
 
-  <view class='delete' catchtap='deleteItem' data-idx='{{idx}}'>删除</view>
+  <view class='delete' catchtap='deleteCustomerItem' data-idx='{{idx}}'>删除</view>
   <view class='horizontallineView'></view>
 
 </template>
@@ -134,13 +134,13 @@
 
 <template name="goodsInfoTemplate">
   <view class='listNumberView'>
-    存货明细：{{idx}}
+    存货明细：{{idx+1}}
   </view>
 
   <view class='baseitem'>
     <text class='baseitem_key'>存货名称</text>
     <view class='baseitem_value'>
-      单据明细{{customerName}}
+      {{item.Goods_Name}}
     </view>
   </view>
   <view class='horizontallineView'></view>
@@ -148,7 +148,7 @@
   <view class='baseitem'>
     <text class='baseitem_key'>原单价</text>
     <view class='baseitem_value'>
-      {{customerName}}
+      {{item.Price}}
     </view>
   </view>
   <view class='horizontallineView'></view>
@@ -156,36 +156,43 @@
   <view class='baseitem'>
     <text class='baseitem_key'>特价</text>
     <view class='baseitem_value'>
-      {{customerName}}
+    <input class='inputItem' style='text' value='{{item.applicationPrice}}' bindinput='getInputValue' data-index='{{idx}}' data-datastyle='goodsname'>
+    </input>
     </view>
   </view>
   <view class='horizontallineView'></view>
 
   <view class='baseitem'>
     <text class='baseitem_key'>开始时间</text>
-    <view class='baseitem_value'>
-      {{customerName}}
+    <picker class='timePicker' mode="date" value="{{starTime}}" start="2018-01-01" end="2037-12-31" bindchange="bindStartTimeChange">
+        <view class='baseitem_value'>
+      {{item.applicationStartTime}}
     </view>
+    </picker>
   </view>
   <view class='horizontallineView'></view>
 
-    <view class='baseitem'>
+  <view class='baseitem'>
     <text class='baseitem_key'>结束时间</text>
-    <view class='baseitem_value'>
-      {{customerName}}
+     <picker class='timePicker' mode="date" value="{{endTime}}" start="2018-01-01" end="2037-12-31" bindchange="bindEndTimeChange">
+       <view class='baseitem_value'>
+      {{item.applicationEndTime}}
     </view>
+    </picker>
   </view>
   <view class='horizontallineView'></view>
 
-    <view class='baseitem'>
+  <view class='baseitem'>
     <text class='baseitem_key'>申请数量</text>
     <view class='baseitem_value'>
-      {{customerName}}
+      <input class='inputItem' style='text' value='{{item.applicationNum}}' bindinput='getInputValue' data-index='{{idx}}' data-datastyle='goodsname'>
+    </input>
+     
     </view>
   </view>
   <view class='horizontallineView'></view>
 
-  <view class='delete' catchtap='deleteItem' data-idx='{{idx}}'>删除</view>
+  <view class='delete' catchtap='deleteGoodsItem' data-idx='{{idx}}'>删除</view>
   <view class='horizontallineView'></view>
 
 </template>

pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss

@@ -31,6 +31,7 @@ page {
   font-size: 30rpx;
   color: #777;
 }
+
 .on {
   background-color:#2E8CF5 ; 
   color: white;
@@ -41,12 +42,7 @@ page {
   display: block;
   overflow: hidden;
 }
-.swiper-items1{
-  height: 100%;
-}
-.swiper-items2{
-  height: 100%;
-}
+
 .backGroundContainer{
   background: #fff;
 }
@@ -82,6 +78,73 @@ page {
   height: 100%;
 }
 
+.totalNumView{
+  width: 100%;
+  height: 300rpx;
+  background-color: #fff;
+}
+
+.totalTopView{
+  height: 200rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.delete {
+  width: 100%;
+  padding-top: 20rpx;
+  padding-bottom: 20rpx;
+  color: red;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  background: #fff;
+  font-size: 30rpx;
+}
+
+.moneyKeyView{
+  width: 100%;
+  color: #666;
+  font-size: 30rpx;
+  margin-top: 30rpx;
+  text-align: center;
+}
+
+.moneyValueView{
+  width: 100%;
+  color: #F68C38;
+  font-size: 30px;
+  margin-top: 0rpx;
+  text-align: center;
+}
+
+.totalBottomView{
+  width: 100%;
+  height: 100rpx;
+  border-bottom:  0.1px solid #dbdbdb; 
+  border-top:  0.1px solid #dbdbdb;
+  display: flex;
+  flex-direction: row;
+  background-color: #fff;
+  justify-content: space-around;
+}
+
+.verticallineView{
+  margin-top: 20rpx;
+  height: 60rpx;
+  width: 2rpx;
+  background-color: #dbdbdb;
+}
+
+.bottomTextView{
+  line-height: 100rpx;
+  justify-content: space-between;
+  font-size: 30rpx;
+  color: black;
+}
+
 .detaileListContainer {
   display: flex;
   flex-direction: column;
@@ -146,16 +209,3 @@ page {
   color: white;
   font-size: 20px;
 }
-
-.delete {
-  width: 100%;
-  padding-top: 20rpx;
-  padding-bottom: 20rpx;
-  color: red;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  background: #fff;
-  font-size: 30rpx;
-}

utils/dateTimeUtil.js

@@ -1,7 +1,10 @@
-function formatymdERTDate(str){
+function formatymdERTDate(str) {
   return "/Date(" + Date.parse(new Date(str.replace(/\-/g, "/") + " 00:00:00")) + "+0800)/"
 }
 
+function getERTDate() {
+  return "/Date(" + Date.parse(new Date()) + "+0800)/"
+}
 
 function formatNumber(n) {
   n = n.toString()
@@ -18,7 +21,7 @@ function formatTimeTwo(number, format) {
   var formateArr = ['Y', 'M', 'D', 'h', 'm', 's'];
   var returnArr = [];
 
-  var date = new Date(number*1);
+  var date = new Date(number * 1);
   returnArr.push(date.getFullYear());
   returnArr.push(formatNumber(date.getMonth() + 1));
   returnArr.push(formatNumber(date.getDate()));
@@ -35,5 +38,6 @@ function formatTimeTwo(number, format) {
 
 module.exports = {
   formatTimeTwo: formatTimeTwo,
-  formatymdERTDate: formatymdERTDate
+  formatymdERTDate: formatymdERTDate,
+  getERTDate: getERTDate
 }