Skip to content

施宇 / Warehouse

Go to a project
Commit ddb60012 by 施宇
Options

1

parent 73ebf580
Expand all
Inline Side-by-side
Showing with 233 additions and 75 deletions
.wechatide/fileCache.cfg
{"ignoreds":["node_modules/**/*","**/node_modules/**","**/.git/**",".git/**/*","**/.svn/**",".svn/**/*",".DS_Store","**/.DS_Store"],"folderInfo":{"./":{"mtimeMs":1588039958728.2603,"children":["app.js","app.json","app.wxss","project.config.json","sitemap.json"]},"pages/":{"mtimeMs":1588045516900.1838,"children":[]},"res/":{"mtimeMs":1587987929535.54,"children":[]},"res/css/":{"mtimeMs":1587468648224.7944,"children":["res/css/base.wxss"]},"res/img/":{"mtimeMs":1587693859514.1584,"children":["res/img/arrow-left.png","res/img/arrow-right.png","res/img/ck-icon-a.png","res/img/ck-icon.png","res/img/close-icon.png","res/img/kc-icon-a.png","res/img/kc-icon.png","res/img/login-img.png","res/img/login-text.png","res/img/nav-arrow-down.png","res/img/question-icon.png","res/img/search-icon.png","res/img/sh-icon-a.png","res/img/sh-icon.png","res/img/sj-icon-a.png","res/img/sj-icon.png","res/img/sz-icon-a.png","res/img/sz-icon.png","res/img/warn-icon.png"]},"utils/":{"mtimeMs":1588040145835.5574,"children":["utils/api.js","utils/axios.js","utils/md5.js","utils/util.js"]},".git/":{"mtimeMs":1588045754162.6826,"children":[]},".wechatide/":{"mtimeMs":1587519550088.0625,"children":[".wechatide/fileCache.cfg"]},"pages/home/":{"mtimeMs":1587536014892.4702,"children":["pages/home/home.js","pages/home/home.json","pages/home/home.wxml","pages/home/home.wxss"]},"pages/login/":{"mtimeMs":1587535974795.0686,"children":["pages/login/login.js","pages/login/login.json","pages/login/login.wxml","pages/login/login.wxss"]},"components/":{"mtimeMs":1587538211879.0247,"children":[]},"components/navC/":{"mtimeMs":1587538221287.4016,"children":["components/navC/navC.js","components/navC/navC.json","components/navC/navC.wxml","components/navC/navC.wxss"]},"pages/receivinggoods/":{"mtimeMs":1587538742321.587,"children":["pages/receivinggoods/receivinggoods.js","pages/receivinggoods/receivinggoods.json","pages/receivinggoods/receivinggoods.wxml","pages/receivinggoods/receivinggoods.wxss"]},"pages/upperShelf/":{"mtimeMs":1587622056930.153,"children":["pages/upperShelf/upperShelf.js","pages/upperShelf/upperShelf.json","pages/upperShelf/upperShelf.wxml","pages/upperShelf/upperShelf.wxss"]},"pages/outbound/":{"mtimeMs":1587626008346.8442,"children":["pages/outbound/outbound.js","pages/outbound/outbound.json","pages/outbound/outbound.wxml","pages/outbound/outbound.wxss"]},"pages/scanDelivery/":{"mtimeMs":1587627596586.3196,"children":["pages/scanDelivery/scanDelivery.js","pages/scanDelivery/scanDelivery.json","pages/scanDelivery/scanDelivery.wxml","pages/scanDelivery/scanDelivery.wxss"]},"pages/picking/":{"mtimeMs":1587631234329.3645,"children":["pages/picking/picking.js","pages/picking/picking.json","pages/picking/picking.wxml","pages/picking/picking.wxss"]},"pages/cardBoard/":{"mtimeMs":1587632724321.1174,"children":["pages/cardBoard/cardBoard.js","pages/cardBoard/cardBoard.json","pages/cardBoard/cardBoard.wxml","pages/cardBoard/cardBoard.wxss"]},"pages/changeWarehouse/":{"mtimeMs":1587635396534.957,"children":["pages/changeWarehouse/changeWarehouse.js","pages/changeWarehouse/changeWarehouse.json","pages/changeWarehouse/changeWarehouse.wxml","pages/changeWarehouse/changeWarehouse.wxss"]},"pages/systemSettings/":{"mtimeMs":1587637181028.4365,"children":["pages/systemSettings/systemSettings.js","pages/systemSettings/systemSettings.json","pages/systemSettings/systemSettings.wxml","pages/systemSettings/systemSettings.wxss"]},"pages/printer/":{"mtimeMs":1587637593187.5686,"children":["pages/printer/printer.js","pages/printer/printer.json","pages/printer/printer.wxml","pages/printer/printer.wxss"]},"pages/inventoryQuery/":{"mtimeMs":1587639536186.8396,"children":["pages/inventoryQuery/inventoryQuery.js","pages/inventoryQuery/inventoryQuery.json","pages/inventoryQuery/inventoryQuery.wxml","pages/inventoryQuery/inventoryQuery.wxss"]},"pages/startPage/":{"mtimeMs":1588045543126.067,"children":["pages/startPage/startPage.js","pages/startPage/startPage.json","pages/startPage/startPage.wxml","pages/startPage/startPage.wxss"]}},"cacheVersion":1} {"ignoreds":["node_modules/**/*","**/node_modules/**","**/.git/**",".git/**/*","**/.svn/**",".svn/**/*",".DS_Store","**/.DS_Store"],"folderInfo":{"./":{"mtimeMs":1588039958728.2603,"children":["app.js","app.json","app.wxss","project.config.json","sitemap.json"]},"pages/":{"mtimeMs":1588045516900.1838,"children":[]},"res/":{"mtimeMs":1587987929535.54,"children":[]},"res/css/":{"mtimeMs":1587468648224.7944,"children":["res/css/base.wxss"]},"res/img/":{"mtimeMs":1587693859514.1584,"children":["res/img/arrow-left.png","res/img/arrow-right.png","res/img/ck-icon-a.png","res/img/ck-icon.png","res/img/close-icon.png","res/img/kc-icon-a.png","res/img/kc-icon.png","res/img/login-img.png","res/img/login-text.png","res/img/nav-arrow-down.png","res/img/question-icon.png","res/img/search-icon.png","res/img/sh-icon-a.png","res/img/sh-icon.png","res/img/sj-icon-a.png","res/img/sj-icon.png","res/img/sz-icon-a.png","res/img/sz-icon.png","res/img/warn-icon.png"]},"utils/":{"mtimeMs":1588040145835.5574,"children":["utils/api.js","utils/axios.js","utils/md5.js","utils/util.js"]},".git/":{"mtimeMs":1588145892497.218,"children":[]},".wechatide/":{"mtimeMs":1587519550088.0625,"children":[".wechatide/fileCache.cfg"]},"pages/home/":{"mtimeMs":1587536014892.4702,"children":["pages/home/home.js","pages/home/home.json","pages/home/home.wxml","pages/home/home.wxss"]},"pages/login/":{"mtimeMs":1587535974795.0686,"children":["pages/login/login.js","pages/login/login.json","pages/login/login.wxml","pages/login/login.wxss"]},"components/":{"mtimeMs":1587538211879.0247,"children":[]},"components/navC/":{"mtimeMs":1587538221287.4016,"children":["components/navC/navC.js","components/navC/navC.json","components/navC/navC.wxml","components/navC/navC.wxss"]},"pages/receivinggoods/":{"mtimeMs":1587538742321.587,"children":["pages/receivinggoods/receivinggoods.js","pages/receivinggoods/receivinggoods.json","pages/receivinggoods/receivinggoods.wxml","pages/receivinggoods/receivinggoods.wxss"]},"pages/upperShelf/":{"mtimeMs":1587622056930.153,"children":["pages/upperShelf/upperShelf.js","pages/upperShelf/upperShelf.json","pages/upperShelf/upperShelf.wxml","pages/upperShelf/upperShelf.wxss"]},"pages/outbound/":{"mtimeMs":1587626008346.8442,"children":["pages/outbound/outbound.js","pages/outbound/outbound.json","pages/outbound/outbound.wxml","pages/outbound/outbound.wxss"]},"pages/scanDelivery/":{"mtimeMs":1587627596586.3196,"children":["pages/scanDelivery/scanDelivery.js","pages/scanDelivery/scanDelivery.json","pages/scanDelivery/scanDelivery.wxml","pages/scanDelivery/scanDelivery.wxss"]},"pages/picking/":{"mtimeMs":1587631234329.3645,"children":["pages/picking/picking.js","pages/picking/picking.json","pages/picking/picking.wxml","pages/picking/picking.wxss"]},"pages/cardBoard/":{"mtimeMs":1587632724321.1174,"children":["pages/cardBoard/cardBoard.js","pages/cardBoard/cardBoard.json","pages/cardBoard/cardBoard.wxml","pages/cardBoard/cardBoard.wxss"]},"pages/changeWarehouse/":{"mtimeMs":1587635396534.957,"children":["pages/changeWarehouse/changeWarehouse.js","pages/changeWarehouse/changeWarehouse.json","pages/changeWarehouse/changeWarehouse.wxml","pages/changeWarehouse/changeWarehouse.wxss"]},"pages/systemSettings/":{"mtimeMs":1587637181028.4365,"children":["pages/systemSettings/systemSettings.js","pages/systemSettings/systemSettings.json","pages/systemSettings/systemSettings.wxml","pages/systemSettings/systemSettings.wxss"]},"pages/printer/":{"mtimeMs":1587637593187.5686,"children":["pages/printer/printer.js","pages/printer/printer.json","pages/printer/printer.wxml","pages/printer/printer.wxss"]},"pages/inventoryQuery/":{"mtimeMs":1587639536186.8396,"children":["pages/inventoryQuery/inventoryQuery.js","pages/inventoryQuery/inventoryQuery.json","pages/inventoryQuery/inventoryQuery.wxml","pages/inventoryQuery/inventoryQuery.wxss"]},"pages/startPage/":{"mtimeMs":1588045543126.067,"children":["pages/startPage/startPage.js","pages/startPage/startPage.json","pages/startPage/startPage.wxml","pages/startPage/startPage.wxss"]}},"cacheVersion":1}
\ No newline at end of file \ No newline at end of file
app.json
{ {
"pages": [ "pages": [
"pages/receivinggoods/receivinggoods",
"pages/startPage/startPage", "pages/startPage/startPage",
"pages/changeWarehouse/changeWarehouse",
"pages/receivinggoods/receivinggoods",
"pages/home/home", "pages/home/home",
"pages/login/login", "pages/login/login",
"pages/inventoryQuery/inventoryQuery", "pages/inventoryQuery/inventoryQuery",
"pages/printer/printer", "pages/printer/printer",
"pages/systemSettings/systemSettings", "pages/systemSettings/systemSettings",
"pages/changeWarehouse/changeWarehouse",
"pages/cardBoard/cardBoard", "pages/cardBoard/cardBoard",
"pages/picking/picking", "pages/picking/picking",
"pages/scanDelivery/scanDelivery", "pages/scanDelivery/scanDelivery",
......
components/navC/navC.js
...@@ -14,6 +14,11 @@ Component({ ...@@ -14,6 +14,11 @@ Component({
type: String, type: String,
value: '供应链仓储管理系统' value: '供应链仓储管理系统'
}, },
store:{//仓库名称
type: String,
value: ''
}
}, },
/** /**
...@@ -21,6 +26,7 @@ Component({ ...@@ -21,6 +26,7 @@ Component({
*/ */
data: { data: {
userInfo:wx.getStorageSync('userInfo'), userInfo:wx.getStorageSync('userInfo'),
storeInfo:wx.getStorageSync('storeInfo'),
drop1:false, drop1:false,
drop2:false, drop2:false,
index:0, index:0,
...@@ -29,11 +35,15 @@ Component({ ...@@ -29,11 +35,15 @@ Component({
// 在组件实例进入页面节点树时执行 // 在组件实例进入页面节点树时执行
let me = this; let me = this;
me.judgePagePath() me.judgePagePath()
if(me.data.userInfo){ if(!me.data.userInfo){
me.triggerEvent('getInfo', me.data.userInfo.engName) this.getUserData();
return }
}; if(!me.data.storeInfo){
this.getUserData(); this.getStoreInfo();
}else{
me.triggerEvent('getInfo', me.store||me.data.storeInfo.store_name)
}
}, },
...@@ -84,9 +94,6 @@ Component({ ...@@ -84,9 +94,6 @@ Component({
drop2:false drop2:false
}) })
}, },
test:function(){
console.log(111)
},
drop1Fun:function(){ drop1Fun:function(){
this.setData({ this.setData({
drop1:true, drop1:true,
...@@ -133,7 +140,7 @@ Component({ ...@@ -133,7 +140,7 @@ Component({
data: data.userId data: data.userId
}); });
me.triggerEvent('getInfo', data.engName)
} else { } else {
wx.showToast({ wx.showToast({
...@@ -144,6 +151,31 @@ Component({ ...@@ -144,6 +151,31 @@ Component({
} }
}, false,true) }, false,true)
} },
getStoreInfo:function(){
let me = this;
getData(apis.get_store_list, 'post', {}, function(res) {
if (res.errcode === 0) {
let data = res.data;
if(data.current_store){
me.setData({
storeInfo:data.current_store
});
wx.setStorage({
key: "storeInfo",
data: data.current_store
});
me.triggerEvent('getInfo', data.current_store.store_name)
}
} else {
wx.showToast({
title: res.errmsg,
icon: 'none',
duration: 2000
});
}
}, false,true)
},
} }
}) })
components/navC/navC.wxml
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</view> </view>
</view> </view>
<view class="html-title ellipsis">{{title}}</view> <view class="html-title ellipsis">{{title}}</view>
<view class="nav-right">当前仓库：{{userInfo.engName}}</view> <view class="nav-right">当前仓库：{{store||storeInfo.store_name||'--'}}</view>
</view> </view>
<slot></slot> <slot></slot>
</view> </view>
\ No newline at end of file
pages/changeWarehouse/changeWarehouse.js
// pages/changeWarehouse/changeWarehouse.js // pages/changeWarehouse/changeWarehouse.js
import {
getData
} from '../../utils/axios.js';
import {
apis
} from '../../utils/api.js';
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
list:[],
chooseObj:"",
isShow:false
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
this.getList()
},
getList:function(){
let me = this;
getData(apis.get_store_list, 'post', {}, function(res) {
if (res.errcode === 0) {
let data = res.data;
if(data.current_store){
me.setData({
chooseObj:data.current_store
})
}
me.setData({
list:data.store_list
})
console.log(me.data.list)
} else {
wx.showToast({
title: res.errmsg,
icon: 'none',
duration: 2000
});
}
}, true,true)
},
changeIsShow:function(e){
let {type} = e.currentTarget.dataset;
let isShow = false;
isShow = (type == 1?true:false);
this.setData({
isShow:isShow
})
},
chooseStore:function(e){
let {item} = e.currentTarget.dataset;
this.setData({
isShow:false,
chooseObj:item
})
},
cancelFun:function(){
wx.navigateBack()
},
sureFun:function(){
let me = this;
let chooseObj = this.data.chooseObj;
if(!chooseObj){
wx.showToast({
title: '请选择仓库',
icon: 'none',
duration: 2000
});
return
}
let id = chooseObj['store_id'];
getData(apis.change_store, 'post', {"store_id":id}, function(res) {
if (res.errcode === 0) {
wx.showToast({
title:'操作成功',
icon: 'none',
duration: 2000,
success:function(){
// me.cancelFun();
}
});
wx.setStorage({
key: "storeInfo",
data: chooseObj
});
} else {
wx.showToast({
title: res.errmsg,
icon: 'none',
duration: 2000
});
}
}, true,true)
}, },
/** /**
......
pages/changeWarehouse/changeWarehouse.wxml
<view class="change-warehouse-view width-854px nav-view borderBox"> <nav-c store="{{chooseObj.store_name}}">
<nav-c></nav-c> <view class="change-warehouse-view width-854px nav-view borderBox" bindtap="changeIsShow" data-type="0">
<view class="change-warehouse-wrapper"> <view class="change-warehouse-wrapper">
<view class="select-view Bflex aic"> <view class="select-view Bflex aic">
<text>请选择仓库</text> <text>请选择仓库</text>
<view class="select-input borderBox"> <view class="select-input borderBox" catchtap="changeIsShow" data-type="1">
<image class="arrow-down" src="../../res/img/nav-arrow-down.png"></image> <view class="text ellipsis">{{chooseObj.store_name}}</view>
<view class="select-items"> <image class="arrow-down" src="../../res/img/nav-arrow-down.png"></image>
<view class="select-item"> <view class="select-items" wx:if="{{isShow}}">
A号仓储 <block wx:if="{{!list.length}}">
</view> <view class="select-item">
<view class="select-item"> 暂无数据
A号仓储 </view>
</view> </block>
<view class="select-item"> <block wx:else>
A号仓储 <view class="select-item" wx:for="{{list}}" wx:key="index" data-item="{{item}}" catchtap="chooseStore">
</view> {{item.store_name}}
<view class="select-item"> </view>
A号仓储 </block>
</view>
<view class="select-item">
A号仓储
</view>
<view class="select-item">
A号仓储
</view>
<view class="select-item">
A号仓储
</view>
<view class="select-item">
A号仓储
</view>
<view class="select-item">
A号仓储
</view> </view>
</view> </view>
</view> </view>
</view> <view class="btn-group Bflex">
<view class="btn-group Bflex"> <view class="btn-item btn blue-btn" catchtap="sureFun">
<view class="btn-item btn blue-btn "> 确定
确定 </view>
</view> <view class="btn-item btn disbled-btn borderBox" catchtap="cancelFun">
<view class="btn-item btn disbled-btn borderBox"> 取消
取消 </view>
</view> </view>
</view>
</view>
</view> </view>
</view> </nav-c>
\ No newline at end of file \ No newline at end of file
pages/changeWarehouse/changeWarehouse.wxss
...@@ -44,7 +44,6 @@ page { ...@@ -44,7 +44,6 @@ page {
padding:11px 0; padding:11px 0;
max-height: 208px; max-height: 208px;
overflow-y: auto; overflow-y: auto;
/* display: none; */
} }
.select-item{ .select-item{
padding:4px 23px 8px; padding:4px 23px 8px;
...@@ -62,4 +61,11 @@ page { ...@@ -62,4 +61,11 @@ page {
} }
.disbled-btn{ .disbled-btn{
margin-left: 80px; margin-left: 80px;
}
.select-input .text{
height:35px;
width:320px;
padding:0 10px;
line-height: 35px;
} }
\ No newline at end of file
pages/receivinggoods/receivinggoods.wxss
...@@ -192,13 +192,19 @@ page { ...@@ -192,13 +192,19 @@ page {
} }
.version { .version {
padding: 10px 18px; padding:0 18px;
height:40px;
font-size: 14px; font-size: 14px;
border-bottom: 1px solid #D1D1D1; border-bottom: 1px solid #D1D1D1;
} }
.zl-input{
height:100%;
width:100%;
}
.reslut { .reslut {
padding: 10px 18px; padding: 10px 18px;
height:60px;
overflow-y: auto;
} }
.form-bottom-right-bottom { .form-bottom-right-bottom {
...@@ -240,6 +246,8 @@ page { ...@@ -240,6 +246,8 @@ page {
.bottom-table-view { .bottom-table-view {
margin-top: 11px; margin-top: 11px;
padding-bottom: 10px ;
border-bottom: 1px dashed #D1D1D1;
} }
.bottom-table-data.left-table { .bottom-table-data.left-table {
...@@ -263,23 +271,25 @@ page { ...@@ -263,23 +271,25 @@ page {
word-break: break-all; word-break: break-all;
} }
.bottom-table-data .td-2, /* .bottom-table-data .td-2, */
.bottom-table-data .td-3, .bottom-table-data .td-3,
.bottom-table-data .td-4, .bottom-table-data .td-4,
.bottom-table-data .td-5 { .bottom-table-data .td-5 {
border-left: 1px solid #D1D1D1; border-left: 1px solid #D1D1D1;
} }
.bottom-table-data .td-1 { /* .bottom-table-data .td-1 {
width: 49px; width: 49px;
} } */
.left-table .td-2 { .left-table .td-2 {
width: 94px; /* width: 94px; */
width: 143px;
} }
.right-table .td-2 { .right-table .td-2 {
width: 112px; /* width: 112px; */
width:161px
} }
.bottom-table-data .td-3 { .bottom-table-data .td-3 {
...@@ -316,15 +326,40 @@ page { ...@@ -316,15 +326,40 @@ page {
margin: 0 12px; margin: 0 12px;
} }
.left-right-icon image {
.left-right-icon .sigle-check{
height: 28px; height: 28px;
width: 28px; width: 28px;
position: relative;
margin-top:10px;
} }
.left-right-icon .sigle-check:first-child{
.arrow-right { margin:0;
margin-top: 10px; }
.left-right-icon .sigle-check image {
height: 100%;
width: 100%;
position: absolute;
top:0;
left:0;
right:0;
bottom:0;
}
.sigle-check .normal{
display: block;
}
.sigle-check .active{
display: none;
}
.sigle-check:hover .normal{
display: none;
}
.sigle-check:hover .active{
display: block;
}
.body-data.active{
background-color: #F0F7FF;
} }
.all_check { .all_check {
margin-top: 6px; margin-top: 6px;
} }
......
res/img/arrow-left.png → res/img/all-check-left.png
res/img/arrow-left.png

949 Bytes | W: | H:

res/img/all-check-left.png

949 Bytes | W: | H:

res/img/arrow-left.png
res/img/all-check-left.png
res/img/arrow-left.png
res/img/all-check-left.png
  • 2-up
  • Swipe
  • Onion skin
res/img/arrow-right.png → res/img/all-check-right.png
res/img/arrow-right.png

933 Bytes | W: | H:

res/img/all-check-right.png

933 Bytes | W: | H:

res/img/arrow-right.png
res/img/all-check-right.png
res/img/arrow-right.png
res/img/all-check-right.png
  • 2-up
  • Swipe
  • Onion skin
utils/api.js
...@@ -6,4 +6,13 @@ export const apis = { ...@@ -6,4 +6,13 @@ export const apis = {
me:user_url+'/pwd/me',//获取用户信息 me:user_url+'/pwd/me',//获取用户信息
get_in_store_warehousing_sn:in_store_url+"/in_store/get_in_store_warehousing_sn",//根据入仓单号查找入库单 get_in_store_warehousing_sn:in_store_url+"/in_store/get_in_store_warehousing_sn",//根据入仓单号查找入库单
in_store_detail_list:in_store_url+'/in_store/in_store_detail_list',//获取入库单详情 in_store_detail_list:in_store_url+'/in_store/in_store_detail_list',//获取入库单详情
get_country:in_store_url+'/country/get_country',//获取国家
country_list:in_store_url+'/country/country_list',//获取国家列表
receiving_goods:in_store_url+'/in_store/receiving_goods',//收货
receiving_list:in_store_url+'/in_store/receiving_list',//收货列表
update_receiving_status:in_store_url+'/in_store/update_receiving_status',//修改收货详情状态
delete_receiving:in_store_url+'/in_store/delete_receiving',//删除收货
save_sale_task:in_store_url+'/sale_task/save_sale_task',//生成上架任务与装箱
get_store_list:in_store_url+"/store_account/get_store_list",//获取仓库列表
change_store:in_store_url+'/store_account/change_store',//变更仓库
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment