From 1d7f14d4cc69da76afcc9ec2799e43ec3fae9b3b Mon Sep 17 00:00:00 2001 From: chenxuhui Date: Mon, 26 Nov 2018 11:09:55 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A2=84=E6=8A=A5=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=EF=BC=8C=E5=88=9B=E5=BB=BA=E5=AE=A2=E6=88=B7=E5=8F=AA=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=BD=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?=202=E3=80=81=E7=89=B9=E4=BB=B7=E7=94=B3=E8=AF=B7=E9=80=89?= =?UTF-8?q?=E5=8F=96=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerChooseTemplate.js | 1 + pages/guarantee/detail/detail.wxss | 51 ++++++++++--------- .../creatNewSpecialOrder.js | 44 ++++++++++++++++ .../creatNewSpecialOrder.wxml | 6 +-- .../specialOrderApplication.js | 2 +- 5 files changed, 75 insertions(+), 29 deletions(-) diff --git a/pages/customerChooseTemplate/customerChooseTemplate.js b/pages/customerChooseTemplate/customerChooseTemplate.js index 3f6aaa2..9ecf4ff 100644 --- a/pages/customerChooseTemplate/customerChooseTemplate.js +++ b/pages/customerChooseTemplate/customerChooseTemplate.js @@ -41,6 +41,7 @@ Page({ // 多选框数值变化 checkboxValueChange: function (e) { + // 新建预报页面只允许选取一位客户 if (fromPage == "newForecast" && e.detail.value.length > 0) { this.setData({ checkBoxArray: e.detail.value, diff --git a/pages/guarantee/detail/detail.wxss b/pages/guarantee/detail/detail.wxss index 0377fbe..cb5d6d5 100644 --- a/pages/guarantee/detail/detail.wxss +++ b/pages/guarantee/detail/detail.wxss @@ -117,27 +117,9 @@ 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; @@ -149,22 +131,43 @@ page { 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; font: 20px "microsoft yahei"; text-align: center; border-top: 1px solid #e8e8ea; - color: #3cc51f; + color: #2788f8; +} + +.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); -} +} \ No newline at end of file diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js index 07a8d28..3bd9820 100644 --- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js +++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js @@ -5,6 +5,45 @@ const app = getApp(); var dateTimePicker = require('../../../utils/dateTimePicker.js'); var timechage = require("../../../utils/dateTimeUtil.js") +var getDept = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetDepartment"; +var getSaleKind = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetSaleKind" + +function GetSaleKind(that, v) { + let method = getSaleKind; + let params = [{ + "InputValue": v, + "PageIndex": 0, + "PageSize": 100 + }]; + network.transfer_request(method, params, function (res) { + that.setData({ + currency: res.result, + saletype: res.result + }) + }) + that.setData({ + which: "销售类型" + }) +} + +function GetDepartment(that, inputValue) { + let method = getDept; + let params = [{ + "InputValue": inputValue, + "PageIndex": 0, + "PageSize": 100 + }]; + network.transfer_request(method, params, function (res) { + that.setData({ + currency: res.result, + department: res.result + }) + }) + that.setData({ + which: "部门" + }) +} + function GetAccountingUnit(that, inputValue) { let method = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetAccountingUnit"; let params = [{ @@ -63,6 +102,11 @@ Page({ addrs: "", }, + // 添加地址 + getAddrs: function (e) { + this.data.addrs = e.detail.value; + }, + // 存货特价开始时间 bindStartTimeChange: function (e) { var itemIndex = e.currentTarget.dataset.index; diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml index 05fc24f..bd9f253 100644 --- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml +++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml @@ -10,15 +10,13 @@ - - - + diff --git a/pages/specialOrderApplication/specialOrderApplication.js b/pages/specialOrderApplication/specialOrderApplication.js index 5178e11..e25def1 100644 --- a/pages/specialOrderApplication/specialOrderApplication.js +++ b/pages/specialOrderApplication/specialOrderApplication.js @@ -9,7 +9,7 @@ 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], + unCheckDataArr: [1, 2, 3, 4, 5, ], }, // 新建特价申请