BWPB3
/
WxXuSaleCustomerRole
9
0
Fork 0
Code Issues 0 Pull Requests 0 Activity
Browse Source

1、创建销售订单相关页面 

2、登录页面取消获取当前客户ID接口
3、派车页面优化
master
chenxuhui 7 years ago
parent
233f8a9c0a
commit
2470fbc10d
12 changed files with 1212 additions and 1608 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -0
      app.json
  2. +5
    -3
      pages/homePage/homePage.js
  3. +2
    -2
      pages/homePage/homePage.wxml
  4. +2
    -4
      pages/login/login.js
  5. +415
    -690
      pages/order/detail/detail.js
  6. +99
    -125
      pages/order/detail/detail.wxml
  7. +63
    -9
      pages/order/detail/detail.wxss
  8. +380
    -589
      pages/order/newBill/newBill.js
  9. +143
    -151
      pages/order/newBill/newBill.wxml
  10. +85
    -29
      pages/order/newBill/newBill.wxss
  11. +2
    -2
      pages/sendCargo/sendCargo.wxml
  12. +12
    -4
      pages/sendCargo/sendCargo.wxss

+ 4
- 0
app.json View File

@ -2,6 +2,10 @@
"pages": [ "pages": [
"pages/login/login", "pages/login/login",
"pages/homePage/homePage", "pages/homePage/homePage",
"pages/order/order",
"pages/order/detail/detail",
"pages/order/newBill/newBill",
"pages/order/query/query",
"pages/saleForecastList/saleForecastList", "pages/saleForecastList/saleForecastList",
"pages/saleForecastList/Detail/Detail", "pages/saleForecastList/Detail/Detail",
"pages/saleForecastList/query/query", "pages/saleForecastList/query/query",


+ 5
- 3
pages/homePage/homePage.js View File

@ -37,13 +37,13 @@ Page({
var btnID = event.currentTarget.dataset.itemid; var btnID = event.currentTarget.dataset.itemid;
var transferURL = ''; var transferURL = '';
switch (btnID) { switch (btnID) {
// 找司机
// 预报
case "1": case "1":
transferURL = '/pages/saleForecastList/saleForecastList'; transferURL = '/pages/saleForecastList/saleForecastList';
break; break;
// 对账单
// 订单
case "2": case "2":
transferURL = '/pages/statementOfAccount/statementOfAccount';
transferURL = '/pages/order/order';
break; break;
// 客户找车 // 客户找车
case "3": case "3":
@ -57,9 +57,11 @@ Page({
case "5": case "5":
transferURL = '/pages/guarantee/guarantee'; transferURL = '/pages/guarantee/guarantee';
break; break;
// 客户对账
case "6": case "6":
transferURL = '/pages/statementOfAccount/statementOfAccount'; transferURL = '/pages/statementOfAccount/statementOfAccount';
break; break;
// 欠款单
case "7": case "7":
transferURL = '/pages/debitNoteList/debitNoteList'; transferURL = '/pages/debitNoteList/debitNoteList';
break; break;


+ 2
- 2
pages/homePage/homePage.wxml View File

@ -17,11 +17,11 @@
<!-- <view class="ico" catchtap='transBtnClicked' data-itemid='1'> <!-- <view class="ico" catchtap='transBtnClicked' data-itemid='1'>
<image src="/imgs/saleForecast.png"></image> <image src="/imgs/saleForecast.png"></image>
<text class='text'>销售预报</text> <text class='text'>销售预报</text>
</view>
</view> -->
<view class="ico" catchtap='transBtnClicked' data-itemid='2'> <view class="ico" catchtap='transBtnClicked' data-itemid='2'>
<image src="/imgs/orderList.png"></image> <image src="/imgs/orderList.png"></image>
<text class='text'>销售订单</text> <text class='text'>销售订单</text>
</view> -->
</view>
<view class="ico" catchtap='transBtnClicked' data-itemid='3'> <view class="ico" catchtap='transBtnClicked' data-itemid='3'>
<image src="/imgs/findDriver.png"></image> <image src="/imgs/findDriver.png"></image>
<text class='text'>客户找车</text> <text class='text'>客户找车</text>


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

@ -56,8 +56,8 @@ function IsBindWeixinMP(phone) {
let params = [phone]; let params = [phone];
network.requestLoading(method, params, function (res) { network.requestLoading(method, params, function (res) {
// res.result = false; // res.result = false;
setCurrentCustomerID();
// 取消获取当前用户的ID值
// setCurrentCustomerID();
if (res.result == true) { if (res.result == true) {
wx.switchTab({ wx.switchTab({
url: '/pages/homePage/homePage', url: '/pages/homePage/homePage',
@ -77,9 +77,7 @@ function setCurrentCustomerID (){
let method = getCurrentID; let method = getCurrentID;
let params = []; let params = [];
network.transfer_request(method, params, function (res) { network.transfer_request(method, params, function (res) {
// res.result = false;
app.globalData.userID = res.result; app.globalData.userID = res.result;
console.log(res.result);
}) })
} }


+ 415
- 690
pages/order/detail/detail.js
File diff suppressed because it is too large
View File


+ 99
- 125
pages/order/detail/detail.wxml View File

@ -12,11 +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>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseCustomer' value='{{customerIndex}}' range-key="name" range='{{customer}}'>
<text>{{customer[customerIndex].name}}</text>
</picker> -->
<view class='baseitem_value' data-x='购货客户' data-item='{{which}}'>
{{customer[customerIndex].Name}}
<view class='baseitem_value' data-x='购货客户'>
{{dmo.Customer_Name?dmo.Customer_Name:"请选择客户"}}
</view> </view>
</view> </view>
<view class='horizontallineView'></view> <view class='horizontallineView'></view>
@ -24,7 +21,7 @@
<view class='baseitem'> <view class='baseitem'>
<text class='baseitem_key'>发货时间</text> <text class='baseitem_key'>发货时间</text>
<picker class='baseitem_value' mode="multiSelector" value="{{dateTime1}}" bindchange="changeDateTime1" range="{{dateTimeArray1}}">
<picker class='baseitem_value' mode="multiSelector" value="{{dmo.LoadTime}}" bindchange="changeDateTime1" range="{{dateTimeArray1}}">
<view class="tui-picker-detail"> <view class="tui-picker-detail">
{{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}} {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}}
</view> </view>
@ -34,66 +31,48 @@
<view class='baseitem'> <view class='baseitem'>
<text class='baseitem_key'>会计单位</text> <text class='baseitem_key'>会计单位</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseUnit' value='{{isUnit}}' range-key="Name" range='{{unit}}'>
<text>{{unit[isUnit].Name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='会计部门' data-item='{{which}}'>
{{unit[isUnit].Name}}
<view class='baseitem_value' bindtap="powerDrawer" data-x='会计部门'>
{{dmo.AccountingUnit_Name?dmo.AccountingUnit_Name:"请选择会计单位"}}
</view> </view>
</view> </view>
<view class='horizontallineView'></view> <view class='horizontallineView'></view>
<view class='baseitem'> <view class='baseitem'>
<text class='baseitem_key'>销售部门</text> <text class='baseitem_key'>销售部门</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseDepartment' value='{{departmentIndex}}' range-key="name" range='{{department}}'>
<text>{{department[departmentIndex].name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='部门' data-item='{{which}}'>
{{department[departmentIndex].Name}}
<view class='baseitem_value' bindtap="powerDrawer" data-x='部门'>
{{dmo.Department_Name?dmo.Department_Name:"请选择销售部门"}}
</view> </view>
</view> </view>
<view class='horizontallineView'></view> <view class='horizontallineView'></view>
<view class='baseitem'>
<view class='baseitem'>
<text class='baseitem_key'>业务员</text> <text class='baseitem_key'>业务员</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseSaletype' value='{{saletypeIndex}}' range-key="name" range='{{saletype}}'>
<text>{{saletype[saletypeIndex].name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='业务员' data-item='{{which}}'>
{{employee[empIndex].Name}}
<view class='baseitem_value' bindtap="powerDrawer" data-x='业务员'>
{{dmo.Employee_Name?dmo.Employee_Name:"请选择业务员"}}
</view> </view>
</view> </view>
<view class='horizontallineView'></view> <view class='horizontallineView'></view>
<view class='baseitem'>
<view class='baseitem'>
<text class='baseitem_key'>仓库</text> <text class='baseitem_key'>仓库</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseSaletype' value='{{saletypeIndex}}' range-key="name" range='{{saletype}}'>
<text>{{saletype[saletypeIndex].name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='仓库' data-item='{{which}}'>
{{store[storeIndex].Name}}
<view class='baseitem_value' bindtap="powerDrawer" data-x='仓库'>
{{dmo.Store_Name?dmo.Store_Name:"请选择仓库"}}
</view> </view>
</view> </view>
<view class='horizontallineView'></view> <view class='horizontallineView'></view>
<view class='baseitem'> <view class='baseitem'>
<text class='baseitem_key'>销售类型</text> <text class='baseitem_key'>销售类型</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseSaletype' value='{{saletypeIndex}}' range-key="name" range='{{saletype}}'>
<text>{{saletype[saletypeIndex].name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='销售类型' data-item='{{which}}'>
{{saletype[saletypeIndex].Name}}
<view class='baseitem_value' bindtap="powerDrawer" data-x='销售类型'>
{{dmo.SaleKind_Name?dmo.SaleKind_Name:"请选择销售类型"}}
</view> </view>
</view> </view>
<view class='horizontallineView'></view> <view class='horizontallineView'></view>
<view class='baseitem'>
<view class='baseitem'>
<text class='baseitem_key'>配送方式</text> <text class='baseitem_key'>配送方式</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseSaletype' value='{{saletypeIndex}}' range-key="name" range='{{saletype}}'>
<text>{{saletype[saletypeIndex].name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='配送方式' data-item='{{which}}'>
{{takeGoodsType[takeGoodsTypeIndex].Name}}
<view class='baseitem_value' bindtap="powerDrawer" data-x='配送方式'>
{{dmo.TakeGoods_Type?dmo.TakeGoods_Type:"请选择配送方式"}}
</view> </view>
</view> </view>
<view class='horizontallineView'></view> <view class='horizontallineView'></view>
@ -101,115 +80,110 @@
<view class='baseitem'> <view class='baseitem'>
<text class='baseitem_key'>送货地址</text> <text class='baseitem_key'>送货地址</text>
<input class='baseitem_value' bindinput='getAddrs' placeholder='请输入送货地址' placeholder-style='color:rgb(202, 202, 202)' value="{{addrs}}"></input>
<input class='baseitem_value' bindinput='getAddrs' placeholder='请输入送货地址' placeholder-style='color:rgb(202, 202, 202)' value="{{dmo.DeliverAddress}}"></input>
</view> </view>
<view class='horizontallineView'></view> <view class='horizontallineView'></view>
<view class='baseitem'> <view class='baseitem'>
<text class='baseitem_key'>摘要</text> <text class='baseitem_key'>摘要</text>
<input class='baseitem_value' bindinput='getRemark' value="{{remark}}"></input>
<input class='baseitem_value' bindinput='getRemark' placeholder='请输入摘要信息' value="{{dmo.Remark}}"></input>
</view> </view>
<view class='horizontallineView'></view> <view class='horizontallineView'></view>
<!-- <button class='submit' catchtap='submitForm'>保存</button> -->
<!-- <view class='baseitem'>
<text class='baseitem_key' space="emsp">摘 要</text>
<input class='baseitem_value' bindinput='getRemark' placeholder='请输入摘要' placeholder-style='color:rgb(202, 202, 202)'></input>
</view> -->
</view> </view>
</scroll-view> </scroll-view>
<view class="drawer_screen" bindtap="powerDrawer" data-item='{{which}}' data-statu="close" wx:if="{{showModalStatus}}"></view>
<!--content-->
<!--使用animation属性指定需要执行的动画-->
<view animation="{{animationData}}" data-item='{{which}}' class="drawer_box" wx:if="{{showModalStatus}}">
<!--drawer content-->
<view class='top' data-item='{{which}}'>
<input data-item='{{which}}' class="sousuo" bindinput="select" placeholder='请输入搜索'>
</input>
</view>
<view class="drawer_content">
<block wx:for="{{currency}}" wx:key="item" wx:for-index="idx">
<view class="grid1" data-item='{{which}}' catchtap='itemclick' data-idx='{{idx}}' data-ID="{{item.ID}}" data-Name='{{item.Name}}'>
<text class='text3'>{{item.Name}}</text>
</view>
</block>
</view>
<view class="btn_ok" bindtap="powerDrawer" data-statu="close">取消</view>
</view>
</swiper-item> </swiper-item>
<!-- 订单详细 --> <!-- 订单详细 -->
<swiper-item class="swiper-items2"> <swiper-item class="swiper-items2">
<scroll-view scroll-x="false" scroll-y="true" class='scroll-views'> <scroll-view scroll-x="false" scroll-y="true" class='scroll-views'>
<!-- <view class='main-body'> -->
<block wx:for="{{obj}}" wx:key="item" wx:for-index="idx">
<!-- <template is="fodder" data="{{...item}}"></template> -->
<view class='itemView'>
<view class='baseitem'>
<text class='baseitem_key2'>存货名称</text>
<view class='baseitem_value2' bindtap="powerDrawer1" data-statu="open" data-idx='{{idx}}'>
{{obj[idx].Goods_Name}}
</view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key1'>报货数量</text>
<input class='baseitem_value1' bindinput='getGoodsNum' placeholder='请输入报货数量' type='digit' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{obj[idx].goodsNum}}'></input>
<block wx:for="{{dmo.Details}}" wx:key="item" wx:for-index="idx">
<view class='itemView'>
<view class='baseitem'>
<text class='baseitem_key'>存货名称</text>
<view class='baseitem_value'>
{{item.Goods_Name}}
</view> </view>
<view class='horizontallineView'></view>
<!-- <view class='baseitem_value' bindtap="powerDrawer" data-idx='{{idx}}' data-x='存货'>
{{item.Goods_Name?item.Goods_Name:"请选择存货"}}
</view> -->
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>报货数量</text>
<input class='baseitem_value' bindinput='getGoodsNum' placeholder='请输入报货数量' type='digit' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{item.UnitNum}}'></input>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key1' space='ensp'>辅 数 量</text>
<input class='baseitem_value1' bindinput='getSecondNum' placeholder='请输入辅数量' type='digit' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{obj[idx].goodsSecondNum}}'></input>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key1' space='emsp'>单 价</text>
<input class='baseitem_value1' type='digit' bindinput='getPrice' placeholder='请输入单价' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{obj[idx].Price}}'></input>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key' space='ensp'>辅 数 量</text>
<input class='baseitem_value' bindinput='getSecondNum' placeholder='请输入辅数量' type='digit' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{item.SecondNumber}}'></input>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key1'>政策单价</text>
<text class='baseitem_value1' data-idx='{{idx}}'>{{obj[idx].PolicyPrice}}</text>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key' space='emsp'>单 价</text>
<input class='baseitem_value' type='digit' bindinput='getPrice' placeholder='请输入单价' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{item.Price}}'></input>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>政策单价</text>
<text class='baseitem_value' data-idx='{{idx}}'>{{item.PolicyPrice}}</text>
</view> </view>
<view class='delete' catchtap='deleteItem' data-idx='{{idx}}'>删除</view>
<view class='horizontallineView'></view>
</block>
<view class='add' catchtap='add'>
<image class="ico" src="/imgs/tianjia.png"></image>
</view> </view>
<!-- </view> -->
<view class='delete' catchtap='deleteItem' data-idx='{{idx}}'>删除</view>
<!-- <template name='fodder'>
</template> -->
<button class='submit' catchtap='submitForm'>保存</button>
</scroll-view>
</block>
<!-- <view class='add' catchtap='add'>
<image class="ico" src="/imgs/tianjia.png"></image>
</view> -->
<view class="drawer_screen" bindtap="powerDrawer1" data-statu="close" wx:if="{{showModalStatus1}}"></view>
<!--content-->
<!--使用animation属性指定需要执行的动画-->
<view animation="{{animationData}}" class="drawer_box" wx:if="{{showModalStatus1}}">
<!--drawer content-->
<view class='top'>
<input input class="sousuo" bindinput="select1" placeholder='请输入搜索'>
</input>
</view>
<view class="drawer_content">
<block wx:for="{{goods}}" wx:key="item">
<view class="grid1" catchtap='itemclick1' data-idx='{{idx}}' data-Name='{{item.Goods_Name}}' data-policyprice='{{item.PolicyPrice}}' data-data='{{item}}'>
<text class='text3'>{{item.Goods_Name}}</text>
<view class='imageView' catchtap='add'>
<image class='currentImage' src="/imgs/longWhiteBtn.png">
<view class='btnTextView'>
<text class='blueAddText'>添加存货</text>
</view> </view>
</block>
</image>
</view> </view>
<view class="btn_ok" bindtap="powerDrawer1" data-statu="close">取消</view>
</view>
<view class='bottomGroupView'>
<view class='imageViewNoMargin' catchtap='moreBtnClick'>
<image class='currentImage' src="/imgs/blueBtn.png">
<view class='btnTextView'>
<text class='btnText'>更多</text>
</view>
</image>
</view>
<view class='imageViewNoMargin' catchtap='submitForm'>
<image class='currentImage' src="/imgs/blueBtn.png">
<view class='btnTextView'>
<text class='btnText'>保存</text>
</view>
</image>
</view>
</view>
<!-- <button class='submit' catchtap='submitForm' wx:if="{{dmo.BillState=='未审核'}}">保存</button> -->
</scroll-view>
</swiper-item> </swiper-item>
</swiper>
</swiper>
<view class="drawer_screen" catchtap="powerDrawer" data-statu="open" wx:if="{{showModalStatus}}"></view>
<view animation="{{animationData}}" class="drawer_box" wx:if="{{showModalStatus}}">
<view class='top'>
<input class="sousuo" bindinput="select" placeholder='请输入搜索'>
</input>
</view>
<view class="drawer_content">
<block wx:for="{{currency}}" wx:key="item" wx:for-index="idx">
<view class="grid1" catchtap='itemclick' data-item='{{item}}'>
<text class='text3'>{{item.Name}}</text>
</view>
</block>
</view>
<view class="btn_ok" catchtap="dialogClose">取消</view>
</view>

+ 63
- 9
pages/order/detail/detail.wxss View File

@ -1,7 +1,7 @@
/* pages/orderinfo/orderinfo.wxss */ /* pages/orderinfo/orderinfo.wxss */
page { page {
background:#EAF1F8;
background: #eaf1f8;
height: calc(100%-10px); height: calc(100%-10px);
} }
@ -26,7 +26,7 @@ page {
} }
.on { .on {
background-color:#2E8CF5 ;
background-color: #2e8cf5;
color: white; color: white;
} }
@ -51,15 +51,14 @@ page {
} }
.baseitem { .baseitem {
height: 60rpx;
background: #fff;
height: 60rpx;
background: #fff;
/* border-bottom: 0.1px solid #dbdbdb; */ /* border-bottom: 0.1px solid #dbdbdb; */
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
padding: 20rpx 20rpx; padding: 20rpx 20rpx;
font-size: 30rpx; font-size: 30rpx;
} }
.horizontallineView { .horizontallineView {
@ -80,6 +79,7 @@ page {
/* margin-left: 20rpx; /* margin-left: 20rpx;
margin-right: 20rpx; */ margin-right: 20rpx; */
width: 70%; width: 70%;
height: 100%;
text-align: right; text-align: right;
} }
@ -111,7 +111,6 @@ page {
text-align: right; text-align: right;
} }
.add { .add {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -150,9 +149,8 @@ page {
background-color: #fff; background-color: #fff;
} }
.main-body{
background-color: #fff;
.main-body {
background-color: #fff;
} }
.submit { .submit {
@ -230,3 +228,59 @@ page {
font-size: 18px; font-size: 18px;
color: rgb(48, 48, 48); color: rgb(48, 48, 48);
} }
.imageView {
height: 80px;
width: 100%;
margin-top: 20rpx;
position: relative;
align-items: center;
justify-content: center;
box-sizing: content-box;
}
.imageViewNoMargin{
height: 80px;
width: 100%;
margin-top: -10rpx;
position: relative;
align-items: center;
justify-content: center;
box-sizing: content-box;
}
.currentImage {
width: 100%;
height: 100%;
}
.bottomGroupView{
margin-top: -10rpx;
width: 100%;
height: 80px;
display: flex;
flex-direction: row;
}
.btnTextView {
position: absolute;
width: 100%;
top:0;
line-height: 65px;
text-align: center;
}
.btnText {
color: white;
font-size: 20px;
}
.goodsNameImageToTopFar{
height: calc(100% - 180px);
background:#EAF1F8;
}
.blueAddText{
color: #2689f8;
font-size: 20px;
}

+ 380
- 589
pages/order/newBill/newBill.js
File diff suppressed because it is too large
View File


+ 143
- 151
pages/order/newBill/newBill.wxml View File

@ -1,4 +1,5 @@
<!--pages/saleforecast/saleforecast.wxml-->
<!--pages/orderinfo/orderinfo.wxml-->
<view class="swiper-tab"> <view class="swiper-tab">
<view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">基本信息</view> <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 class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">订单明细</view>
@ -8,194 +9,185 @@
<!-- 基本信息 --> <!-- 基本信息 -->
<swiper-item class="swiper-items1"> <swiper-item class="swiper-items1">
<scroll-view scroll-x="false" scroll-y="true" class='scroll-views'> <scroll-view scroll-x="false" scroll-y="true" class='scroll-views'>
<view class='baseitem'>
<text class='baseitem_key'>购货客户</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseCustomer' value='{{customerIndex}}' range-key="name" range='{{customer}}'>
<text>{{customer[customerIndex].name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='购货客户' data-item='{{which}}'>
{{customer[customerIndex].Name}}
</view>
</view>
<view class='baseitem'>
<text class='baseitem_key'>发货时间</text>
<picker class='baseitem_value' mode="multiSelector" value="{{dateTime1}}" bindchange="changeDateTime1" range="{{dateTimeArray1}}">
<view class="tui-picker-detail">
{{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}}
<view class='main-body'>
<view class='baseitem'>
<text class='baseitem_key'>购货客户</text>
<view class='baseitem_value' bindtap="powerDrawer" data-x='购货客户'>
{{dmo.Customer_Name?dmo.Customer_Name:"请选择客户"}}
</view> </view>
</picker>
</view>
<view class='baseitem'>
<text class='baseitem_key'>会计单位</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseUnit' value='{{isUnit}}' range-key="Name" range='{{unit}}'>
<text>{{unit[isUnit].Name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='会计部门' data-item='{{which}}'>
{{unit[isUnit].Name}}
</view> </view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>发货时间</text>
<picker class='baseitem_value' mode="multiSelector" value="{{dmo.LoadTime}}" bindchange="changeDateTime1" range="{{dateTimeArray1}}">
<view class="tui-picker-detail">
{{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}}
</view>
</picker>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>销售部门</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseDepartment' value='{{departmentIndex}}' range-key="name" range='{{department}}'>
<text>{{department[departmentIndex].name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='部门' data-item='{{which}}'>
{{department[departmentIndex].Name}}
<view class='baseitem'>
<text class='baseitem_key'>会计单位</text>
<view class='baseitem_value' catchtap="powerDrawer" data-x='会计部门'>
{{dmo.AccountingUnit_Name?dmo.AccountingUnit_Name:"请选择会计单位"}}
</view>
</view> </view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>业务员</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseSaletype' value='{{saletypeIndex}}' range-key="name" range='{{saletype}}'>
<text>{{saletype[saletypeIndex].name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='业务员' data-item='{{which}}'>
{{employee[empIndex].Name}}
<view class='baseitem'>
<text class='baseitem_key'>销售部门</text>
<view class='baseitem_value' catchtap="powerDrawer" data-x='部门'>
{{dmo.Department_Name?dmo.Department_Name:"请选择销售部门"}}
</view>
</view> </view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>仓库</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseSaletype' value='{{saletypeIndex}}' range-key="name" range='{{saletype}}'>
<text>{{saletype[saletypeIndex].name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='仓库' data-item='{{which}}'>
{{store[storeIndex].Name}}
<view class='baseitem'>
<text class='baseitem_key'>业务员</text>
<view class='baseitem_value' catchtap="powerDrawer" data-x='业务员'>
{{dmo.Employee_Name?dmo.Employee_Name:"请选择业务员"}}
</view>
</view> </view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>销售类型</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseSaletype' value='{{saletypeIndex}}' range-key="name" range='{{saletype}}'>
<text>{{saletype[saletypeIndex].name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='销售类型' data-item='{{which}}'>
{{saletype[saletypeIndex].Name}}
<view class='baseitem'>
<text class='baseitem_key'>仓库</text>
<view class='baseitem_value' catchtap="powerDrawer" data-x='仓库'>
{{dmo.Store_Name?dmo.Store_Name:"请选择仓库"}}
</view>
</view> </view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>配送方式</text>
<!-- <picker class='baseitem_value' mode='selector' bindchange='choseSaletype' value='{{saletypeIndex}}' range-key="name" range='{{saletype}}'>
<text>{{saletype[saletypeIndex].name}}</text>
</picker> -->
<view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='配送方式' data-item='{{which}}'>
{{takeGoodsType[takeGoodsTypeIndex].Name}}
<view class='baseitem'>
<text class='baseitem_key'>销售类型</text>
<view class='baseitem_value' catchtap="powerDrawer" data-x='销售类型'>
{{dmo.SaleKind_Name?dmo.SaleKind_Name:"请选择销售类型"}}
</view>
</view> </view>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key'>送货地址</text>
<input class='baseitem_value' bindinput='getAddrs' placeholder='请输入送货地址' placeholder-style='color:rgb(202, 202, 202)'></input>
</view>
<view class='baseitem'>
<text class='baseitem_key'>摘要</text>
<input class='baseitem_value' bindinput='getRemark'></input>
</view>
<view class='baseitem'>
<text class='baseitem_key'>配送方式</text>
<view class='baseitem_value' catchtap="powerDrawer" data-x='配送方式'>
{{dmo.TakeGoods_Type?dmo.TakeGoods_Type:"请选择配送方式"}}
</view>
</view>
<view class='horizontallineView'></view>
<!-- <view class='baseitem'>
<text class='baseitem_key' space="emsp">摘 要</text>
<input class='baseitem_value' bindinput='getRemark' placeholder='请输入摘要' placeholder-style='color:rgb(202, 202, 202)'></input>
</view> -->
<!-- <button class='submit' catchtap='submitForm'>提交</button> -->
</scroll-view>
<view class='baseitem'>
<text class='baseitem_key'>送货地址</text>
<input class='baseitem_value' bindinput='getAddrs' placeholder='请输入送货地址' placeholder-style='color:rgb(202, 202, 202)' value="{{dmo.DeliverAddress}}"></input>
</view>
<view class='horizontallineView'></view>
<view class="drawer_screen" bindtap="powerDrawer" data-item='{{which}}' data-statu="close" wx:if="{{showModalStatus}}"></view>
<!--content-->
<!--使用animation属性指定需要执行的动画-->
<view animation="{{animationData}}" data-item='{{which}}' class="drawer_box" wx:if="{{showModalStatus}}">
<!--drawer content-->
<view class='top' data-item='{{which}}'>
<input data-item='{{which}}' class="sousuo" bindinput="select" placeholder='请输入搜索'>
</input>
</view>
<view class="drawer_content">
<block wx:for="{{currency}}" wx:key="item" wx:for-index="idx">
<view class="grid1" data-item='{{which}}' catchtap='itemclick' data-idx='{{idx}}' data-ID="{{item.ID}}" data-Name='{{item.Name}}'>
<text class='text3'>{{item.Name}}</text>
</view>
</block>
<view class='baseitem'>
<text class='baseitem_key'>摘要</text>
<input class='baseitem_value' bindinput='getRemark' placeholder='请输入摘要信息' placeholder-style='color:rgb(202, 202, 202)' value="{{dmo.Remark}}"></input>
</view>
<view class='horizontallineView'></view>
</view> </view>
<view class="btn_ok" bindtap="powerDrawer" data-statu="close">取消</view>
</view>
</scroll-view>
</swiper-item> </swiper-item>
<!-- 订单详细 --> <!-- 订单详细 -->
<swiper-item class="swiper-items2"> <swiper-item class="swiper-items2">
<scroll-view scroll-x="false" scroll-y="true" class='scroll-views'> <scroll-view scroll-x="false" scroll-y="true" class='scroll-views'>
<view class='main-body'>
<block wx:for="{{obj}}" wx:key="item" wx:for-index="idx">
<!-- <template is="fodder" data="{{...item}}"></template> -->
<view class="main-body {{dmo.Details.length > 0 ? '' : 'goodsNameImageToTopFar'}}">
<block wx:for="{{dmo.Details}}" wx:key="item" wx:for-index="idx">
<view class='itemView'> <view class='itemView'>
<view class='baseitem'> <view class='baseitem'>
<text class='baseitem_key2'>存货名称</text>
<view class='baseitem_value2' bindtap="powerDrawer1" data-statu="open" data-idx='{{idx}}'>
{{obj[idx].Goods_Name}}
<text class='baseitem_key'>存货名称</text>
<view class='baseitem_value'>
{{item.Goods_Name}}
</view> </view>
</view> </view>
<view class='twogroup'>
<view class='baseitem'>
<text class='baseitem_key1'>报货数量</text>
<input class='baseitem_value1' bindinput='getGoodsNum' placeholder='请输入报货数量' type='digit' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{obj[idx].goodsNum}}'></input>
<!-- <view class='baseitem_value' bindtap="powerDrawer" data-idx='{{idx}}' data-x='存货'>
{{item.Goods_Name?item.Goods_Name:"请选择存货"}}
</view> </view>
</view> -->
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key1' space='ensp'>辅 数 量</text>
<input class='baseitem_value1' bindinput='getSecondNum' placeholder='请输入辅数量' type='digit' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{obj[idx].goodsSecondNum}}'></input>
</view>
<view class='baseitem'>
<text class='baseitem_key'>报货数量</text>
<input class='baseitem_value' bindinput='getGoodsNum' placeholder='请输入报货数量' type='digit' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{item.UnitNum}}'></input>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key' space='ensp'>辅 数 量</text>
<input class='baseitem_value' bindinput='getSecondNum' placeholder='请输入辅数量' type='digit' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{item.SecondNumber}}'></input>
</view> </view>
<view class='horizontallineView'></view>
<view class='twogroup'>
<view class='baseitem'>
<text class='baseitem_key1' space='emsp'>单 价</text>
<input class='baseitem_value1' type='digit' bindinput='getPrice' placeholder='请输入单价' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{obj[idx].Price}}'></input>
</view>
<view class='baseitem'>
<text class='baseitem_key' space='emsp'>单 价</text>
<input class='baseitem_value' type='digit' bindinput='getPrice' placeholder='请输入单价' placeholder-style='color:rgb(202, 202, 202)' data-idx='{{idx}}' value='{{item.Price}}'></input>
</view>
<view class='horizontallineView'></view>
<view class='baseitem'>
<text class='baseitem_key1'>政策单价</text>
<text class='baseitem_value1' data-idx='{{idx}}'>{{obj[idx].PolicyPrice}}</text>
</view>
<view class='baseitem'>
<text class='baseitem_key'>政策单价</text>
<text class='baseitem_value' data-idx='{{idx}}'>{{item.PolicyPrice}}</text>
</view> </view>
<view class='delete' catchtap='deleteItem' data-idx='{{idx}}'>删除</view>
<view class='horizontallineView'></view>
</view> </view>
</block>
<view class='add' catchtap='add'>
<image class="ico" src="/imgs/tianjia.png"></image>
</view>
</view>
<view class='delete' catchtap='deleteItem' data-idx='{{idx}}'>删除</view>
<!-- <template name='fodder'>
</template> -->
<button class='submit' catchtap='submitForm'>提交</button>
</scroll-view>
</block>
<view class="drawer_screen" bindtap="powerDrawer1" data-statu="close" wx:if="{{showModalStatus1}}"></view>
<!--content-->
<!--使用animation属性指定需要执行的动画-->
<view animation="{{animationData}}" class="drawer_box" wx:if="{{showModalStatus1}}">
<!--drawer content-->
<view class='top'>
<input input class="sousuo" bindinput="select1" placeholder='请输入搜索'>
</input>
</view> </view>
<view class="drawer_content">
<block wx:for="{{goods}}" wx:key="item">
<view class="grid1" catchtap='itemclick1' data-idx='{{idx}}' data-Name='{{item.Goods_Name}}' data-policyprice='{{item.PolicyPrice}}' data-data='{{item}}'>
<text class='text3'>{{item.Goods_Name}}</text>
<!-- <view class='add' catchtap='add'>
<image class="ico" src="/imgs/tianjia.png"></image>
</view> -->
<!-- <button class='submit' catchtap='submitForm'>保存</button> -->
<view class='imageView' catchtap='add'>
<image class='currentImage' src="/imgs/longWhiteBtn.png">
<view class='btnTextView'>
<text class='blueAddText'>添加存货</text>
</view> </view>
</block>
</image>
</view>
<view class='bottomGroupView'>
<view class='imageViewNoMargin' catchtap='moreBtnClick'>
<image class='currentImage' src="/imgs/blueBtn.png">
<view class='btnTextView'>
<text class='btnText'>更多</text>
</view>
</image>
</view>
<view class='imageViewNoMargin' catchtap='submitForm'>
<image class='currentImage' src="/imgs/blueBtn.png">
<view class='btnTextView'>
<text class='btnText'>保存</text>
</view>
</image>
</view>
</view> </view>
<view class="btn_ok" bindtap="powerDrawer1" data-statu="close">取消</view>
</view>
</scroll-view>
</swiper-item> </swiper-item>
</swiper>
</swiper>
<view class="drawer_screen" catchtap="powerDrawer" data-statu="open" wx:if="{{showModalStatus}}"></view>
<view animation="{{animationData}}" class="drawer_box" wx:if="{{showModalStatus}}">
<view class='top'>
<input class="sousuo" bindinput="select" placeholder='请输入搜索'>
</input>
</view>
<view class="drawer_content">
<block wx:for="{{currency}}" wx:key="item" wx:for-index="idx">
<view class="grid1" catchtap='itemclick' data-item='{{item}}'>
<text class='text3'>{{item.Name}}</text>
</view>
</block>
</view>
<view class="btn_ok" catchtap="dialogClose">取消</view>
</view>

+ 85
- 29
pages/order/newBill/newBill.wxss View File

@ -1,7 +1,7 @@
/* pages/saleforecast/saleforecast.wxss */
/* pages/orderinfo/orderinfo.wxss */
page { page {
background:#EAF1F8;
background: #eaf1f8;
height: calc(100%-10px); height: calc(100%-10px);
} }
@ -26,7 +26,7 @@ page {
} }
.on { .on {
background-color:#2E8CF5 ;
background-color: #2e8cf5;
color: white; color: white;
} }
@ -51,68 +51,67 @@ page {
} }
.baseitem { .baseitem {
height: 60rpx;
background: #fff; background: #fff;
width: 100%;
border-bottom: 0.1px solid #dbdbdb;
/* border-bottom: 0.1px solid #dbdbdb; */
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
padding-top: 20rpx;
padding-bottom: 20rpx;
padding: 20rpx 20rpx;
font-size: 30rpx; font-size: 30rpx;
} }
.horizontallineView {
height: 1rpx;
background-color: #dbdbdb;
margin-left: 20rpx;
margin-right: 0rpx;
}
.baseitem_key { .baseitem_key {
color: #666; color: #666;
width: 40%;
margin-left: 20rpx;
width: 30%;
/* margin-left: 20rpx; */
} }
.baseitem_value { .baseitem_value {
color: rgb(48, 48, 48); color: rgb(48, 48, 48);
margin-left: 20rpx;
margin-right: 20rpx;
width: 160%;
/* margin-left: 20rpx;
margin-right: 20rpx; */
width: 70%;
height: 100%;
text-align: right; text-align: right;
} }
.baseitem_key2 { .baseitem_key2 {
color: #666; color: #666;
width: 40%;
margin-left: 20rpx;
width: 30%;
/* margin-left: 20rpx; */
} }
.baseitem_value2 { .baseitem_value2 {
color: rgb(48, 48, 48); color: rgb(48, 48, 48);
margin-left: 20rpx;
margin-right: 20rpx;
width: 160%;
/* margin-left: 20rpx;
margin-right: 20rpx; */
width: 70%;
text-align: right; text-align: right;
} }
.baseitem_key1 { .baseitem_key1 {
color: #666; color: #666;
width: 100%;
width: 30%;
margin-left: 20rpx; margin-left: 20rpx;
} }
.baseitem_value1 { .baseitem_value1 {
color: rgb(48, 48, 48); color: rgb(48, 48, 48);
margin-left: 20rpx;
margin-right: 20rpx;
width: 100%;
/* margin-left: 20rpx;
margin-right: 20rpx; */
width: 70%;
text-align: right; text-align: right;
} }
::-webkit-scrollbar {
width: 0;
height: 0;
color: transparent;
}
.add { .add {
display: flex;
flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-left: none; border-left: none;
@ -145,6 +144,7 @@ page {
.itemView { .itemView {
margin-top: 20rpx; margin-top: 20rpx;
background-color: #fff;
} }
.submit { .submit {
@ -222,3 +222,59 @@ page {
font-size: 18px; font-size: 18px;
color: rgb(48, 48, 48); color: rgb(48, 48, 48);
} }
.imageView {
height: 80px;
width: 100%;
margin-top: 20rpx;
position: relative;
align-items: center;
justify-content: center;
box-sizing: content-box;
}
.imageViewNoMargin{
height: 80px;
width: 100%;
margin-top: -10rpx;
position: relative;
align-items: center;
justify-content: center;
box-sizing: content-box;
}
.currentImage {
width: 100%;
height: 100%;
}
.bottomGroupView{
margin-top: -10rpx;
width: 100%;
height: 80px;
display: flex;
flex-direction: row;
}
.btnTextView {
position: absolute;
width: 100%;
top:0;
line-height: 65px;
text-align: center;
}
.btnText {
color: white;
font-size: 20px;
}
.goodsNameImageToTopFar{
height: calc(100% - 180px);
background:#EAF1F8;
}
.blueAddText{
color: #2689f8;
font-size: 20px;
}

+ 2
- 2
pages/sendCargo/sendCargo.wxml View File

@ -10,7 +10,7 @@
<template name="outStoreOrderTemplate"> <template name="outStoreOrderTemplate">
<view class='listItem' catchtap='sendTheDetails' data-Id="{{item.ID}}" data-Date="{{item.Date}}"> <view class='listItem' catchtap='sendTheDetails' data-Id="{{item.ID}}" data-Date="{{item.Date}}">
<view class='bottomView'> <view class='bottomView'>
<view class='goodsNum'>
<view class='goodsName'>
<text class='goodsIDText'>{{item. <text class='goodsIDText'>{{item.
Customer_Name}}</text> Customer_Name}}</text>
</view> </view>
@ -24,7 +24,7 @@ Customer_Name}}</text>
<text class='goodsNumText'>NO.{{item. <text class='goodsNumText'>NO.{{item.
ID}}</text> ID}}</text>
</view> </view>
<view class='goodsMoney'>
<view class='goodsDate'>
<text class='goodsMoneyText'>出库日期：{{item. <text class='goodsMoneyText'>出库日期：{{item.
LoadTime}}</text> LoadTime}}</text>
</view> </view>


+ 12
- 4
pages/sendCargo/sendCargo.wxss View File

@ -42,16 +42,24 @@ page {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.goodsNum{
.goodsName{
height: 100%; height: 100%;
width: 30%;
width: 60%;
} }
.goodsMoney{ .goodsMoney{
height: 100%; height: 100%;
width: 70%;
width: 40%;
text-align: right;
}
.goodsNum{
height: 100%;
width: 40%;
}
.goodsDate{
height: 100%;
width: 60%;
text-align: right; text-align: right;
} }
.goodsIDText{ .goodsIDText{
font-size: 16px; font-size: 16px;
} }


Write Preview
Loading…
Cancel
Save