Browse Source

1、添加销售出库列表页面

2、添加销售出库详情页面
master
chenxuhui 7 years ago
parent
commit
631a017cdc
12 changed files with 810 additions and 14 deletions
  1. +10
    -0
      app.js
  2. +3
    -1
      app.json
  3. +1
    -1
      pages/homePage/homePage.js
  4. +20
    -12
      pages/orderList/orderDetail/orderDetail.wxml
  5. +178
    -0
      pages/saleOutStore/saleOutStore.js
  6. +5
    -0
      pages/saleOutStore/saleOutStore.json
  7. +53
    -0
      pages/saleOutStore/saleOutStore.wxml
  8. +102
    -0
      pages/saleOutStore/saleOutStore.wxss
  9. +66
    -0
      pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.js
  10. +5
    -0
      pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.json
  11. +176
    -0
      pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxml
  12. +191
    -0
      pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxss

+ 10
- 0
app.js View File

@ -3,6 +3,14 @@ var app = getApp();
App({
onShow: function (options) {
var that = this;
wx.getSystemInfo({
success: function (res) {
that.globalData.winWidth = res.windowWidth;
that.globalData.winHeight = res.windowHeight;
}
});
var extraData = null;
//options.referrerInfo.extraData = { orderID: 33 };
// 判断是否点击其他小程序分享进入
@ -13,6 +21,8 @@ App({
},
globalData: {
winHeight: 0,
winWidth: 0,
UserName:"",
shareOrderID: 0,
OpenId: "",


+ 3
- 1
app.json View File

@ -9,7 +9,9 @@
"pages/myCars/myCars",
"pages/myCars/carsDetail/carsDetail",
"pages/myCars/creatNewCar/creatNewCar",
"pages/message/messageDetail/messageDetail"
"pages/message/messageDetail/messageDetail",
"pages/saleOutStore/saleOutStore",
"pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail"
],
"window": {
"backgroundTextStyle": "light",


+ 1
- 1
pages/homePage/homePage.js View File

@ -25,7 +25,7 @@ Page({
break;
// 销售出库
case "3":
transferURL = '/pages/orderList/orderList';
transferURL = '/pages/saleOutStore/saleOutStore';
break;
}


+ 20
- 12
pages/orderList/orderDetail/orderDetail.wxml View File

@ -97,20 +97,20 @@
<swiper-item class="swiper-items2">
<scroll-view scroll-x="false" scroll-y="true" class='scroll-views'>
<view class='totalNumView'>
<!-- <view class='totalNumView'>
<view class='totalTopView'>
<view class='moneyKeyView'>总金额</view>
<view class='moneyValueView'>{{totalMoney}}¥200000</view>
</view>
</view> -->
<view class='totalBottomView'>
<view class='bottomTextView'>
<text class='lightGray'>主数量:</text>{{orderInfo.UnitNumber}}</view>
<view class='verticallineView'></view>
<view class='bottomTextView'>
<text class='lightGray'>辅数量:</text>222{{orderInfo.SecondNumber}}
<text class='lightGray'>辅数量:</text>{{orderInfo.SecondNumber}}
</view>
</view>
</view>
<!-- </view> -->
<view class='detaileListContainer'>
<block wx:for="{{orderInfo.Details}}" wx:key="item" wx:for-index="idx">
@ -135,35 +135,43 @@
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>报价数量</text>
<text class='baseitem_key'>辅单位</text>
<view class='baseitem_value'>
{{item}}
{{item.SecondUnit}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>数量</text>
<text class='baseitem_key'>报价数量</text>
<view class='baseitem_value'>
单据明细{{customerName}}
{{item.UnitNumber}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>政策单价</text>
<text class='baseitem_key'>辅数量</text>
<view class='baseitem_value'>
单据明细{{customerName}}
{{item.SecondNumber}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='groupTwo'>
<view class='baseitem'>
<text class='baseitem_key'>确认数量</text>
<view class='baseitem_value'>
{{item.ConfirmNumber}}
</view>
</view>
<view class='horizontallineView'></view>
<!-- <view class='groupTwo'>
<view class='listItem'>
<text class='lightGray'>单价:</text>{{item.DeliveryDate}}</view>
<view class='listItem'>
<text class='lightGray'>金额:</text>{{item.ProduceRequest}}</view>
</view>
<view class='horizontallineView'></view>
<view class='horizontallineView'></view> -->
</template>

+ 178
- 0
pages/saleOutStore/saleOutStore.js View File

@ -0,0 +1,178 @@
// pages/saleOutStore/saleOutStore.js
const app = getApp();
var network = require("../../utils/net.js");
var timechage = require("../../utils/dateTimeUtil.js");
var PageSize = 10
var UnCheckPageIndex = 0
var CheckedPageIndex = 0
var getListPath = '/MainSystem/B3MiniProgramRpc/XuRpcs/Driver/SaleOutStoreRpc/GetList'
// 未审核订单列表
function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successaction) {
let getArr = [];
let method = getListPath;
let params = [true, UnCheckPageIndex, PageSize];
network.transfer_request(method, params, function (res) {
successaction();
var array = res.result;
if (array.length <= 0) {
wx.showToast({
title: '无数据更新',
})
UnCheckPageIndex = UnCheckPageIndex - 1;
return;
}
for (var i = 0; i < array.length; i++) {
var dmo = {
orderState: true,
ID: array[i].ID,
Employee_Name: array[i].Employee_Name,
TotalNumber: array[i].TotalNumber,
Customer_Name: array[i].Customer_Name,
LoadTime: timechage.formatTimeTwo(array[i].LoadTime.substring(6, 19), 'Y/M/D'),
Address: array[i].Address,
}
getArr.push(dmo);
}
let arrLast = that.data.unCheckDataArr.concat(getArr);
that.setData({
unCheckDataArr: arrLast,
})
})
}
// 已审核订单列表
function getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize) {
let getArr = [];
let method = getListPath;
let params = [true, UnCheckPageIndex, PageSize];
network.transfer_request(method, params, function (res) {
var array = res.result;
if (array.length <= 0) {
wx.showToast({
title: '无数据更新',
})
CheckedPageIndex = CheckedPageIndex - 1;
return;
}
for (var i = 0; i < array.length; i++) {
var dmo = {
//添加单据状态的传递,在详情页面判断此值,进行是否允许提交的操作
orderState: true,
ID: array[i].ID,
Employee_Name: array[i].Employee_Name,
TotalNumber: array[i].TotalNumber,
Customer_Name: array[i].Customer_Name,
LoadTime: timechage.formatTimeTwo(array[i].LoadTime.substring(6, 19), 'Y/M/D'),
Address: array[i].Address,
}
getArr.push(dmo);
}
let arrLast = that.data.checkedDataArr.concat(getArr);
that.setData({
checkedDataArr: arrLast,
})
})
}
Page({
data: {
checkedDataArr: [],
unCheckDataArr: [],
winHeight: app.globalData.winHeight,
currentTab: 0,
},
/**
* 滑动切换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
})
}
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
this.setData({
checkedDataArr: [1],
unCheckDataArr: [],
})
var that = this;
UnCheckPageIndex = 0;
CheckedPageIndex = 0;
getUnCheckOrderList(that, UnCheckPageIndex, PageSize, function (res) {
getCheckedOrderList(that, CheckedPageIndex, PageSize);
});
},
//未审核订单滑动到底部加载
unCheckedScrollLower: function (event) {
var that = this;
UnCheckPageIndex = UnCheckPageIndex + 1;
getUnCheckOrderList(that, UnCheckPageIndex, PageSize, function (res) {
});
},
//已审核订单滑动到底部加载
checkedScrollLower: function (event) {
var that = this;
CheckedPageIndex = CheckedPageIndex + 1;
getCheckedOrderList(that, CheckedPageIndex, PageSize);
},
// 进入订单详情
transToOrderDetail: function (e) {
wx.navigateTo({
url: 'saleOutStoreDetail/saleOutStoreDetail?id=' + e.currentTarget.dataset.detailitemid,
})
},
// 长按删除一条单据
longPressDelete: function (event) {
var that = this;
var itemID = event.currentTarget.dataset.detailitemid;
wx.showModal({
title: '提示',
content: '确定要删除' + itemID + '号单据吗?',
success: function (res) {
if (res.confirm) {
var params = [itemID];
network.transfer_request(deleteItem, params, function (res) {
wx.showToast({
title: '操作成功',
})
that.onShow();
})
} else if (res.cancel) {
console.log('点击取消了');
return false;
}
}
})
},
})

+ 5
- 0
pages/saleOutStore/saleOutStore.json View File

@ -0,0 +1,5 @@
{
"navigationBarBackgroundColor": "white",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "出库列表"
}

+ 53
- 0
pages/saleOutStore/saleOutStore.wxml View File

@ -0,0 +1,53 @@
<!--pages/saleOutStore/saleOutStore.wxml-->
<view class="swiper-tab">
<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" style='height:{{winHeight -55}}px' duration="300" bindchange="bindChange">
<!-- 未审核 -->
<swiper-item class="swiper-items1">
<scroll-view scroll-y="true" class='scroll-views' bindscrolltolower="unCheckedScrollLower">
<block wx:for="{{unCheckDataArr}}" wx:for-item="item" wx:key="item">
<template is="outStoreOrderTemplate" data="{{item}}"/>
</block>
</scroll-view>
</swiper-item>
<swiper-item class="swiper-items2">
<scroll-view scroll-y="true" class='scroll-views' bindscrolltolower="checkedScrollLower">
<block wx:for="{{checkedDataArr}}" wx:for-item="item" wx:key="item">
<template is="outStoreOrderTemplate" data="{{item}}"/>
</block>
</scroll-view>
</swiper-item>
</swiper>
<template name="outStoreOrderTemplate">
<view class='listContainer'>
<view class='listItem' catchtap='transToOrderDetail' data-detailitemid='{{item.ID}}'>
<view class='topView'>
<view class='goodsNum'>
<text class='goodsIDText'>{{item.Customer_Name}}</text>
</view>
<view class='goodsMoney'>
<text class='goodsIDText'>业务员:{{item.Employee_Name}}</text>
</view>
</view>
<view class='bottomView'>
<view class='goodsNum'>
<text class='goodsNumText'>数量:{{item.TotalNumber}}</text>
</view>
<view class='goodsMoney'>
<text class='goodsMoneyText'>日期:{{item.LoadTime}}</text>
</view>
</view>
</view>
<view class='horizontallineView'></view>
</view>
</template>

+ 102
- 0
pages/saleOutStore/saleOutStore.wxss View File

@ -0,0 +1,102 @@
/* pages/saleOutStore/saleOutStore.wxss */
page {
background:#EAF1F8;
height: calc(100%-10px);
}
.swiper-tab {
/* height: 30px; */
margin: 10px 20px;
text-align: center;
line-height: 30px;
background: white;
display: flex;
flex-direction: row;
border-radius: 5px;
border: 1px solid#2E8CF5;
overflow: hidden;
}
.swiper-tab-list {
height: 100%;
width: 50%;
font-size: 30rpx;
color: #777;
}
.on {
background-color:#2E8CF5 ;
color: white;
}
.swiper-box {
width: 100%;
display: block;
overflow: hidden;
}
.scroll-views {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
}
.listContainer{
background-color: #fff;
}
.listItem{
display: flex;
flex-direction: column;
padding: 20rpx 20rpx;
/* border-bottom: 1rpx solid #ddd; */
background: white;
}
.horizontallineView {
height: 1rpx;
background-color: #dbdbdb;
margin-left: 20rpx;
margin-right: 0rpx;
}
.topView{
height: 50%;
width: 100%;
display: flex;
flex-direction: row;
}
.bottomView{
margin-top: 10rpx;
height: 50%;
width: 100%;
display: flex;
flex-direction: row;
}
.goodsNum{
height: 100%;
width: 50%;
}
.goodsMoney{
height: 100%;
width: 50%;
text-align: right;
}
.goodsIDText{
font-size: 16px;
}
.goodsNumText{
font-size: 14px;
color: #666;
}
.goodsMoneyText{
font-size: 14px;
color: #666;
}

+ 66
- 0
pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.js View File

@ -0,0 +1,66 @@
// pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.js
const app = getApp();
var network = require("../../../utils/net.js");
var timechage = require("../../../utils/dateTimeUtil.js");
var LoadOrder = '/MainSystem/B3MiniProgramRpc/XuRpcs/Driver/SaleOutStoreRpc/LoadSaleOutStore'
Page({
data: {
currentTab: 0,
winHeight: 0,
orderInfo: {},
},
onLoad: function (options) {
var that = this;
let ID = Number(options.id);
wx.getSystemInfo({
success: function (res) {
that.setData({
winWidth: res.windowWidth,
winHeight: res.windowHeight
});
}
});
var method = LoadOrder;
var params = [ID];
network.transfer_request(method, params, function (res) {
res.result.LoadTime = timechage.formatTimeTwo(res.result.LoadTime.substring(6, 19), 'Y-M-D h:m');
res.result.OrderDate = timechage.formatTimeTwo(res.result.OrderDate.substring(6, 19), 'Y-M-D h:m');
that.setData({
orderInfo: res.result,
})
})
},
// 点击输入的确认数量
getConfirmNumber:function(e){
},
/**
* 滑动切换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
})
}
},
})

+ 5
- 0
pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.json View File

@ -0,0 +1,5 @@
{
"navigationBarBackgroundColor": "white",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "出库单详情"
}

+ 176
- 0
pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxml View File

@ -0,0 +1,176 @@
<!--pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxml-->
<view class="swiper-tab">
<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 - 55}}px" bindchange="bindChange">
<!-- 基本信息 -->
<swiper-item class="swiper-items1">
<view class='backGroundContainer'>
<view class='baseitem'>
<text class='baseitem_key'>订货时间</text>
<view class='baseitem_value'>
{{orderInfo.LoadTime}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>提货时间</text>
<view class='baseitem_value'>
{{orderInfo.OrderDate}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>会计单位</text>
<view class='baseitem_value'>
{{orderInfo.AccountingUnit_Name}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>购货客户</text>
<view class='baseitem_value'>
{{orderInfo.Customer_Name}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>销售部门</text>
<view class='baseitem_value'>
{{orderInfo.Department_Name}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>送货地址</text>
<view class='baseitem_value'>
{{orderInfo.Address}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>运输车辆</text>
<view class='baseitem_value'>
{{orderInfo.Car_Name}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>司机</text>
<view class='baseitem_value'>
{{orderInfo.Driver_Name}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>联系方式</text>
<view class='baseitem_value'>
{{orderInfo.Driver_Telephone}}
</view>
</view>
<view class='horizontallineView'></view>
</view>
<!-- <view class='imageView' catchtap='saveCarsChange'>
<image class='currentImage' src="/imgs/blueBtn.png">
<view class='btnTextView'>
<text class='btnText'>保存</text>
</view>
</image>
</view> -->
</swiper-item>
<!-- 订单详细 -->
<swiper-item class="swiper-items2">
<scroll-view scroll-x="false" scroll-y="true" class='scroll-views'>
<!-- <view class='totalNumView'>
<view class='totalTopView'>
<view class='moneyKeyView'>总金额</view>
<view class='moneyValueView'>{{totalMoney}}¥200000</view>
</view> -->
<view class='totalBottomView'>
<view class='bottomTextView'>
<text class='lightGray'>主数量:</text>{{orderInfo.UnitNumber}}</view>
<view class='verticallineView'></view>
<view class='bottomTextView'>
<text class='lightGray'>辅数量:</text>{{orderInfo.SecondNumber}}
</view>
</view>
<!-- </view> -->
<view class='detaileListContainer'>
<block wx:for="{{orderInfo.Details}}" wx:key="item" wx:for-index="idx">
<template is="detailInfoTemplate" data="{{item}}" data="{{idx}}" />
</block>
</view>
</scroll-view>
</swiper-item>
</swiper>
<template name="detailInfoTemplate">
<view class='listNumberView'>
存货明细:{{idx}}
</view>
<view class='baseitem'>
<text class='baseitem_key'>存货名称</text>
<view class='baseitem_value'>
{{item.Goods_Name}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>辅单位</text>
<view class='baseitem_value'>
{{item.SecondUnit}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>报价数量</text>
<view class='baseitem_value'>
{{item.UnitNumber}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>辅数量</text>
<view class='baseitem_value'>
{{item.SecondNumber}}
</view>
</view>
<view class='horizontallineView'></view>
<!-- <view class='baseitem'>
<text class='baseitem_key'>确认数量</text>
<view class='baseitem_value'>
<input class='inputItem' bindinput='getConfirmNumber' placeholder='请输入确认收货数量' value="{{item.ConfirmNumber}}" data-item='ConfirmNumber'></input>
</view>
</view>
<view class='horizontallineView'></view> -->
<!-- <view class='groupTwo'>
<view class='listItem'>
<text class='lightGray'>单价:</text>{{item.DeliveryDate}}</view>
<view class='listItem'>
<text class='lightGray'>金额:</text>{{item.ProduceRequest}}</view>
</view>
<view class='horizontallineView'></view> -->
</template>

+ 191
- 0
pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxss View File

@ -0,0 +1,191 @@
/* pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxss */
page {
background:#EAF1F8;
height: calc(100%-10px);
}
.swiper-tab {
margin: 10px 20px;
text-align: center;
line-height: 30px;
background: white;
display: flex;
flex-direction: row;
border-radius: 5px;
border: 1px solid#2E8CF5;
overflow: hidden;
}
.swiper-tab-list {
height: 100%;
width: 50%;
font-size: 30rpx;
color: #777;
}
.on {
background-color:#2E8CF5 ;
color: white;
}
.swiper-box {
width: 100%;
display: block;
overflow: hidden;
}
.swiper-items1{
height: 100%;
}
.swiper-items2{
height: 100%;
}
.backGroundContainer{
background: #fff;
}
.baseitem {
height: 60rpx;
/* border-bottom: 0.1px solid #dbdbdb; */
display: flex;
flex-direction: row;
align-items: center;
padding: 20rpx 20rpx;
font-size: 30rpx;
}
.baseitem_key {
color: #666;
width: 40%;
}
.baseitem_value {
color: rgb(48, 48, 48);
width: 60%;
text-align: right;
}
.horizontallineView {
height: 1rpx;
background-color: #dbdbdb;
margin-left: 20rpx;
margin-right: 0rpx;
}
.scroll-views{
height: 100%;
}
.totalNumView{
width: 100%;
height: 300rpx;
background-color: #fff;
}
.totalTopView{
height: 200rpx;
display: flex;
flex-direction: column;
align-items: center;
}
.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;
background-color: #fff;
}
.listNumberView {
height: 40rpx;
background-color:#EAF1F8;
padding-left:20rpx;
padding-top: 30rpx;
padding-bottom: 10rpx;
font-size: 27rpx;
color: #666;
}
.listItem {
height: 60rpx;
line-height: 60rpx;
padding: 20rpx 20rpx;
justify-content: space-between;
font-size: 16px;
color: black;
}
.groupTwo{
display: flex;
flex-direction: row;
justify-content: space-around;
background-color: #fff;
}
.lightGray{
font-size: 30rpx;
color: #666;
}
.imageView {
height: 80px;
width: 100%;
margin-top: 20rpx;
position: relative;
align-items: center;
justify-content: center;
box-sizing: content-box;
}
.currentImage {
width: 100%;
height: 100%;
}
.btnTextView {
position: absolute;
width: 100%;
top:0;
line-height: 65px;
text-align: center;
}
.btnText {
color: white;
font-size: 20px;
}

Loading…
Cancel
Save