diff --git a/app.json b/app.json
index cf5abbf..54ebabf 100644
--- a/app.json
+++ b/app.json
@@ -18,7 +18,9 @@
"pages/guarantee/selectbill/selectbill",
"pages/guarantee/detailshow/detailshow",
"pages/goodaNameChooseTemplate/goodaNameChooseTemplate",
- "pages/customerChooseTemplate/customerChooseTemplate"
+ "pages/customerChooseTemplate/customerChooseTemplate",
+ "pages/specialOrderApplication/specialOrderApplication",
+ "pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/pages/guarantee/guarantee.js b/pages/guarantee/guarantee.js
index a33de85..fbb9a84 100644
--- a/pages/guarantee/guarantee.js
+++ b/pages/guarantee/guarantee.js
@@ -7,10 +7,11 @@ var PageSizeN = 10
var PageIndexY = 0
var PageSizeY = 10
-function getListN(that, PageIndex, PageSize) {
+function getListN(that, PageIndex, PageSize, successation) {
let method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/BusinessGuaranteeRpc/GetList';
let params = [0,PageIndex, PageSize];
network.transfer_request(method, params, function (res) {
+ successation();
that.setData({
arrayNN:res.result
})
@@ -81,8 +82,9 @@ Page({
*/
onLoad: function (options) {
var that = this;
- getListN(that, PageIndexN, PageSizeN)
- getListY(that, PageIndexY, PageSizeY)
+ getListN(that, PageIndexN, PageSizeN, function (res){
+ getListY(that, PageIndexY, PageSizeY);
+ })
},
/**
diff --git a/pages/homePage/homePage.js b/pages/homePage/homePage.js
index 8ac255f..3517d72 100644
--- a/pages/homePage/homePage.js
+++ b/pages/homePage/homePage.js
@@ -33,7 +33,7 @@ Page({
break;
// 特价申请
case "3":
- transferURL = '/pages/orderList/orderList';
+ transferURL = '/pages/specialOrderApplication/specialOrderApplication';
break;
// 销售出库
case "4":
diff --git a/pages/homePage/homePage.wxss b/pages/homePage/homePage.wxss
index 693b4e5..3d95c25 100644
--- a/pages/homePage/homePage.wxss
+++ b/pages/homePage/homePage.wxss
@@ -2,6 +2,7 @@
page{
background:#EAF1F8;
+ height: 100%;
}
.imageContainer{
diff --git a/pages/saleForecastList/newBill/newBill.js b/pages/saleForecastList/newBill/newBill.js
index 6ae81e2..f3dfae8 100644
--- a/pages/saleForecastList/newBill/newBill.js
+++ b/pages/saleForecastList/newBill/newBill.js
@@ -228,6 +228,14 @@ Page({
},
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+ app.globalData.goodsNameArray = [];
+ app.globalData.customerArray = [];
+ },
+
/**
* 滑动切换tab
*/
diff --git a/pages/saleForecastList/saleForecastList.js b/pages/saleForecastList/saleForecastList.js
index 6ca6466..e829a97 100644
--- a/pages/saleForecastList/saleForecastList.js
+++ b/pages/saleForecastList/saleForecastList.js
@@ -9,7 +9,7 @@ var getList = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/SaleForecastRpc/GetL
// 未审核订单列表
-function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize) {
+function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successaction) {
let getArr = [];
let method = getList;
let params = [{
@@ -18,8 +18,9 @@ function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize) {
"PageIndex": UnCheckPageIndex,
"PageSize": UnCheckPageSize,
}];
- // let params = [false, UnCheckPageIndex, UnCheckPageSize];
+
network.transfer_request(method, params, function (res) {
+ successaction();
var array = res.result;
if (array.length <= 0) {
wx.showToast({
@@ -161,8 +162,10 @@ Page({
var that = this;
UnCheckPageIndex = 0;
CheckedPageIndex = 0;
- getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize);
- getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize);
+ getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, function (res){
+ getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize);
+
+ });
},
/**
diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js
new file mode 100644
index 0000000..cd7f1ef
--- /dev/null
+++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js
@@ -0,0 +1,176 @@
+// pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js
+
+var network = require("../../../utils/net.js");
+const app = getApp();
+var dateTimePicker = require('../../../utils/dateTimePicker.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],
+
+ dateTimeArray: null,
+ dateTime: null,
+ dateTimeArray1: null,
+ dateTime1: null,
+ startYear: 2018,
+ endYear: 2030,
+ // 用户数组
+ customerArr:[],
+ // 存货数组
+ goodsNameArr:[],
+ },
+
+ changeDateTime1(e) {
+ this.setData({
+ dateTime1: e.detail.value
+ });
+
+ },
+
+ // 添加客户
+ addCustomer: function(){
+ wx.navigateTo({
+ url: '../../customerChooseTemplate/customerChooseTemplate',
+ })
+ },
+
+ // 添加存货
+ addGoodsName: function(){
+ wx.navigateTo({
+ url: '../../goodaNameChooseTemplate/goodaNameChooseTemplate',
+ })
+ },
+
+ /**
+ * 滑动切换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
+ })
+ }
+ },
+
+ /**
+ * 存货明细保存按钮 点击新建单据 内部做逻辑判断 存储值是否都已经加载
+ */
+ 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 stringTime = year + "/" + month + "/" + date + " " + hour + ":" + minu + ":00"
+ let timestamp2 = Date.parse(new Date(stringTime));
+ let update = "/Date(" + timestamp2 + "+0800)/";
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ // 获取完整的年月日 时分秒，以及默认显示的数组
+ var obj1 = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear);
+ // 精确到分的处理，将数组的秒去掉
+ var lastArray = obj1.dateTimeArray.pop();
+ var lastTime = obj1.dateTime.pop();
+
+ this.setData({
+ dateTimeArray: obj1.dateTimeArray,
+ dateTime: obj1.dateTime,
+ dateTimeArray1: obj1.dateTimeArray,
+ dateTime1: obj1.dateTime
+ });
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+ var that = this;
+
+ // 返回的用户只能是一条，所以index只能为0
+ var currentCustomerArr = app.globalData.customerArray;
+ if (currentCustomerArr.length > 0) {
+ this.setData({
+ customerArr: currentCustomerArr,
+ })
+ }
+
+ // 获取存货 加载完成后计算价格政策
+ 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)
+ }
+
+ this.setData({
+ goodsNameArr: backGoodsArr,
+ })
+ }
+
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+ app.globalData.goodsNameArray = [];
+ app.globalData.customerArray = [];
+ },
+
+})
\ No newline at end of file
diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.json b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.json
new file mode 100644
index 0000000..087e695
--- /dev/null
+++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.json
@@ -0,0 +1,5 @@
+{
+ "navigationBarBackgroundColor": "white",
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "特价申请新建"
+}
\ No newline at end of file
diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml
new file mode 100644
index 0000000..fbf74d5
--- /dev/null
+++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml
@@ -0,0 +1,191 @@
+
+
+ 基本信息
+ 客户明细
+ 存货明细
+
+
+
+
+
+
+
+ 名称
+
+ {{customerName}}基本信息
+
+
+
+
+
+ 日期
+
+
+ {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}}
+
+
+
+
+
+
+
+ 会计单位
+
+ {{customerName}}
+
+
+
+
+
+ 销售部门
+
+ {{customerName}}
+
+
+
+
+
+ 摘要
+
+ {{customerName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加客户
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加存货
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+ 客户明细：{{idx}}
+
+
+
+ 名称
+
+ {{customerName}}基本信息
+
+
+
+
+
+ 客户类型
+
+ {{customerName}}
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+ 存货明细：{{idx}}
+
+
+
+ 存货名称
+
+ 单据明细{{customerName}}
+
+
+
+
+
+ 原单价
+
+ {{customerName}}
+
+
+
+
+
+ 特价
+
+ {{customerName}}
+
+
+
+
+
+ 开始时间
+
+ {{customerName}}
+
+
+
+
+
+ 结束时间
+
+ {{customerName}}
+
+
+
+
+
+ 申请数量
+
+ {{customerName}}
+
+
+
+
+ 删除
+
+
+
\ No newline at end of file
diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss
new file mode 100644
index 0000000..3af3678
--- /dev/null
+++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss
@@ -0,0 +1,161 @@
+/* pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.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-second{
+ height: 100%;
+ width: 50%;
+ font-size: 30rpx;
+ color: #777;
+ border-left: 1px solid#2E8CF5;
+ border-right: 1px solid#2E8CF5;
+}
+
+.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%;
+}
+
+.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;
+}
+
+.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;
+}
\ No newline at end of file
diff --git a/pages/specialOrderApplication/specialOrderApplication.js b/pages/specialOrderApplication/specialOrderApplication.js
new file mode 100644
index 0000000..5178e11
--- /dev/null
+++ b/pages/specialOrderApplication/specialOrderApplication.js
@@ -0,0 +1,91 @@
+// pages/specialOrderApplication/specialOrderApplication.js
+
+var app = getApp()
+
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ winHeight: app.globalData.winHeight,
+ unCheckDataArr: [1, 2, 3, 4, 5, 6, 6, 8, 1, 2, 3, 4, 5, 6, 6, 8, 1, 2, 3, 4, 5, 6, 6, 8, 1, 2, 3, 4, 5, 6, 6, 8],
+ },
+
+ // 新建特价申请
+ creatNew:function(){
+ wx.navigateTo({
+ url: 'creatNewSpecialOrder/creatNewSpecialOrder',
+ })
+ },
+
+ // 按搜索条件查询
+ goToSearch:function(){
+
+ },
+
+ // 页面滚动到顶
+ cscrollViewScrollUpper: function (){
+
+ },
+
+ // 页面滚动到底
+ scrollViewScrollLower: function (){
+
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/specialOrderApplication/specialOrderApplication.json b/pages/specialOrderApplication/specialOrderApplication.json
new file mode 100644
index 0000000..b73d2b8
--- /dev/null
+++ b/pages/specialOrderApplication/specialOrderApplication.json
@@ -0,0 +1,3 @@
+{
+ "navigationBarTitleText": "特价申请"
+}
\ No newline at end of file
diff --git a/pages/specialOrderApplication/specialOrderApplication.wxml b/pages/specialOrderApplication/specialOrderApplication.wxml
new file mode 100644
index 0000000..6395b7c
--- /dev/null
+++ b/pages/specialOrderApplication/specialOrderApplication.wxml
@@ -0,0 +1,36 @@
+
+
+
+ 选择搜索条件
+ 新建
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.orderID}}审核状态
+
+
+ {{item.workFlowState}}招远72号店
+
+
+
+
+ {{item.Customer_Name}}单号：32364
+
+
+ {{item.time}}未审核
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/specialOrderApplication/specialOrderApplication.wxss b/pages/specialOrderApplication/specialOrderApplication.wxss
new file mode 100644
index 0000000..4bfa221
--- /dev/null
+++ b/pages/specialOrderApplication/specialOrderApplication.wxss
@@ -0,0 +1,103 @@
+/* pages/specialOrderApplication/specialOrderApplication.wxss */
+page {
+ background:#EAF1F8;
+}
+
+.searchView{
+ margin: 20rpx 20rpx;
+ height: 30px;
+ display: flex;
+ flex-direction: row;
+}
+
+.imput_goodsName{
+ border: 1rpx solid rgb(236, 231, 231);
+ color:rgb(202, 202, 202);
+ height: 30px;
+ width: 85%;
+ border-radius: 10rpx;
+ background-color: #fff;
+ text-align: center;
+ line-height: 30px;
+}
+
+.storageView{
+ height: 100%;
+ padding-top: 10rpx;
+ width: 15%;
+ color: orange;
+ text-align: center;
+ justify-content: center;
+ font-size: 20px;
+}
+
+.pageContainer {
+ margin-top: 10px;
+ width: 100%;
+ display: block;
+ overflow: hidden;
+}
+
+.scroll-views {
+ height: 100%;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+}
+
+.listContainer{
+ background-color: #fff;
+}
+
+.listItem{
+ display: flex;
+ flex-direction: column;
+ padding: 20rpx 20rpx;
+ 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;
+}
\ No newline at end of file
diff --git a/utils/net.js b/utils/net.js
index 3cd06d0..39e8696 100644
--- a/utils/net.js
+++ b/utils/net.js
@@ -106,7 +106,7 @@ function transfer_request(method, params, successaction) {
if (res.data.error != null) {
if (res.data.error.code == 401) {
wx.request({
- url: app.globalData.transferUrl,
+ url: app.globalData.tranferBaseUrl,
data: {
"DecryptCookie": app.globalData.cookie,
"CustomerId": app.globalData.globalCustomerID,