Browse Source

1、添加页面图标

2、创建订单页面相关逻辑
master
chenxuhui 7 years ago
parent
commit
c4eef4cadc
10 changed files with 18 additions and 12 deletions
  1. BIN
      imgs/blueBtn.png
  2. BIN
      imgs/longBlueBtn.png
  3. BIN
      imgs/longWhiteBtn.png
  4. +2
    -1
      pages/login/login.js
  5. +9
    -3
      pages/order/newBill/newBill.js
  6. +2
    -2
      pages/order/newBill/newBill.wxml
  7. +2
    -2
      pages/order/order.js
  8. +1
    -1
      pages/order/order.wxml
  9. +0
    -1
      pages/order/order.wxss
  10. +2
    -2
      pages/order/query/query.wxml

BIN
imgs/blueBtn.png View File

Before After
Width: 577  |  Height: 258  |  Size: 7.9 KiB

BIN
imgs/longBlueBtn.png View File

Before After
Width: 1207  |  Height: 258  |  Size: 9.1 KiB

BIN
imgs/longWhiteBtn.png View File

Before After
Width: 1207  |  Height: 258  |  Size: 8.0 KiB

+ 2
- 1
pages/login/login.js View File

@ -57,7 +57,8 @@ function IsBindWeixinMP(phone) {
network.requestLoading(method, params, function (res) { network.requestLoading(method, params, function (res) {
// res.result = false; // res.result = false;
// 取消获取当前用户的ID值 // 取消获取当前用户的ID值
// setCurrentCustomerID();
setCurrentCustomerID();
if (res.result == true) { if (res.result == true) {
wx.switchTab({ wx.switchTab({
url: '/pages/homePage/homePage', url: '/pages/homePage/homePage',


+ 9
- 3
pages/order/newBill/newBill.js View File

@ -73,9 +73,11 @@ function GetGoodsInfo(that, dmo, detail) {
} }
function GetCustomerInfo(that, dmo) { function GetCustomerInfo(that, dmo) {
var params = [dmo.Customer_ID, ["Department_ID", "Department_Name", "Employee_ID", "Employee_Name", "AccountingUnit_ID", "AccountingUnit_Name", "TakeGoods_Type", "Address"]]
var params = [app.globalData.userID, ["Department_ID", "Department_Name", "Employee_ID", "Employee_Name", "AccountingUnit_ID", "AccountingUnit_Name", "TakeGoods_Type", "Address"]]
network.transfer_request(getCustomerInfo, params, function (res) { network.transfer_request(getCustomerInfo, params, function (res) {
var obj = JSON.parse(res.result); var obj = JSON.parse(res.result);
dmo.Customer_ID = app.globalData.userID;
dmo.Customer_Name = obj.Name;
dmo.Department_ID = obj.Department_ID; dmo.Department_ID = obj.Department_ID;
dmo.Department_Name = obj.Department_Name; dmo.Department_Name = obj.Department_Name;
dmo.Employee_ID = obj.Employee_ID; dmo.Employee_ID = obj.Employee_ID;
@ -110,13 +112,17 @@ Page({
onLoad: function (options) { onLoad: function (options) {
var that = this; var that = this;
var dmo = this.data.dmo;
setTime(that); setTime(that);
this.getUserPrifile();
this.getUserPrifile(function(res){
GetCustomerInfo(that, dmo);
});
}, },
getUserPrifile: function () {
getUserPrifile: function (succession) {
var that = this; var that = this;
network.transfer_request(getUserPrifile, [], function (res) { network.transfer_request(getUserPrifile, [], function (res) {
succession();
that.data.dmo.SaleKind_ID = res.result.Order_SaleKind_ID; that.data.dmo.SaleKind_ID = res.result.Order_SaleKind_ID;
that.data.dmo.SaleKind_Name = res.result.Order_SaleKind_Name; that.data.dmo.SaleKind_Name = res.result.Order_SaleKind_Name;
that.data.dmo.Store_ID = res.result.Order_Store_ID; that.data.dmo.Store_ID = res.result.Order_Store_ID;


+ 2
- 2
pages/order/newBill/newBill.wxml View File

@ -12,8 +12,8 @@
<view class='main-body'> <view class='main-body'>
<view class='baseitem'> <view class='baseitem'>
<text class='baseitem_key'>购货客户</text> <text class='baseitem_key'>购货客户</text>
<view class='baseitem_value' bindtap="powerDrawer" data-x='购货客户'>
{{dmo.Customer_Name?dmo.Customer_Name:"请选择客户"}}
<view class='baseitem_value'>
{{dmo.Customer_Name}}
</view> </view>
</view> </view>
<view class='horizontallineView'></view> <view class='horizontallineView'></view>


+ 2
- 2
pages/order/order.js View File

@ -16,7 +16,7 @@ function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successact
"BillState": 0, "BillState": 0,
"StartLoadTime": app.globalData.selectStartDate, "StartLoadTime": app.globalData.selectStartDate,
"EndLoadTime": app.globalData.selectEndDate, "EndLoadTime": app.globalData.selectEndDate,
"Customer_ID": app.globalData.selectCustomer_ID,
"Customer_ID": app.globalData.userID,
"PageIndex": UnCheckPageIndex, "PageIndex": UnCheckPageIndex,
"PageSize": PageSize, "PageSize": PageSize,
}]; }];
@ -57,7 +57,7 @@ function getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize) {
"BillState": 20, "BillState": 20,
"StartLoadTime": app.globalData.selectStartDate, "StartLoadTime": app.globalData.selectStartDate,
"EndLoadTime": app.globalData.selectEndDate, "EndLoadTime": app.globalData.selectEndDate,
"Customer_ID": app.globalData.selectCustomer_ID,
"Customer_ID": app.globalData.userID,
"PageIndex": CheckedPageIndex, "PageIndex": CheckedPageIndex,
"PageSize": PageSize, "PageSize": PageSize,
}]; }];


+ 1
- 1
pages/order/order.wxml View File

@ -9,7 +9,7 @@
<!-- 未审核 --> <!-- 未审核 -->
<swiper-item class="swiper-items1"> <swiper-item class="swiper-items1">
<scroll-view scroll-y="true" class='scroll-views' style='height:{{winHeight -43}}px' bindscrolltolower="unCheckedScrollLower">
<scroll-view scroll-y="true" class='scroll-views' style='height:{{winHeight -95}}px' bindscrolltolower="unCheckedScrollLower">
<view class="custmer_list_view_main" wx:for="{{unCheckDataArr}}" wx:key="item"> <view class="custmer_list_view_main" wx:for="{{unCheckDataArr}}" wx:key="item">
<view class='custmer_list_view' catchtap='itemclick' bindlongpress="longPressDelete" data-orderid='{{item.orderID}}'> <view class='custmer_list_view' catchtap='itemclick' bindlongpress="longPressDelete" data-orderid='{{item.orderID}}'>
<view class='phone_h'> <view class='phone_h'>


+ 0
- 1
pages/order/order.wxss View File

@ -42,7 +42,6 @@ page {
.scroll-views { .scroll-views {
width: 100%; width: 100%;
height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }


+ 2
- 2
pages/order/query/query.wxml View File

@ -1,8 +1,8 @@
<!--pages/orderSearch/orderSearch.wxml--> <!--pages/orderSearch/orderSearch.wxml-->
<view class='twoitem'>
<!-- <view class='twoitem'>
<text>购货客户</text> <text>购货客户</text>
<text class='item_value' bindtap="powerDrawer" data-statu="open" data-x='购货客户' data-item='{{which}}'>{{customer[customerIndex].Name}}</text> <text class='item_value' bindtap="powerDrawer" data-statu="open" data-x='购货客户' data-item='{{which}}'>{{customer[customerIndex].Name}}</text>
</view>
</view> -->
<view class='twoitem'> <view class='twoitem'>


Loading…
Cancel
Save