Skip to content

梁建民 / wmsApp

Go to a project
Commit be9cfb7a by LJM
Options

新增盘点

parent 3a4ade81
Expand all
Inline Side-by-side
Showing with 346 additions and 71 deletions
assets/css/stocktake/operate.scss
.picking-me { .stocktake-operate {
position: relative;
padding: 15rpx 22rpx; padding: 15rpx 22rpx;
.search-box { .search-box {
height: 60rpx; height: 60rpx;
...@@ -65,7 +66,7 @@ ...@@ -65,7 +66,7 @@
margin-bottom: 11rpx; margin-bottom: 11rpx;
} }
.label { .label {
width: 82rpx; width: 110rpx;
font-size: 16rpx; font-size: 16rpx;
color: #919399; color: #919399;
} }
...@@ -111,4 +112,183 @@ ...@@ -111,4 +112,183 @@
} }
} }
} }
.positionListCountText {
position: absolute;
top: 30rpx;
right: 30rpx;
font-size: 21rpx;
color: #1969f9;
}
}
.total {
.t1 {
font-size: 21rpx;
color: #292b33;
}
.t2 {
font-size: 21rpx;
color: #1969f9;
}
}
::v-deep .uni-drawer__content {
width: 85% !important;
}
.uni-drawer-detail {
width: 100%;
background-color: #ffffff;
padding: 22rpx 22rpx 0 22rpx;
.title {
position: relative;
.iconfont {
position: absolute;
left: 0;
top: 0;
font-size: 30rpx;
color: #292b33;
}
.text {
font-size: 23rpx;
color: #292b33;
font-weight: bold;
}
}
.field-item {
flex-wrap: wrap;
.item {
flex: 0 0 50%;
margin-bottom: 8rpx;
.label {
width: 114rpx;
font-size: 16rpx;
color: #919399;
}
.text {
font-size: 16rpx;
color: #1969f9;
margin-left: 6rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
max-width: 176rpx;
}
.tt {
font-size: 16rpx;
color: #484b59;
margin-left: 6rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
max-width: 176rpx;
}
.uni-input {
width: 80%;
height: 50rpx;
background: #ffffff;
border-radius: 10rpx;
border: 1px solid #1969f9;
text-indent: 15rpx;
font-size: 16rpx;
}
}
}
.form-input {
margin-bottom: 18rpx;
.input-title {
margin-bottom: 10rpx;
.input-title-t1 {
font-size: 16rpx;
color: #484b59;
font-weight: bold;
}
}
.input-box {
.uni-input {
height: 55rpx;
background: #ffffff;
border-radius: 10rpx;
border: 1px solid #1969f9;
text-indent: 15rpx;
font-size: 16rpx;
}
}
}
.item-tit {
font-size: 20rpx;
color: #292b33;
font-weight: bold;
margin-bottom: 18rpx;
}
.bor {
height: 1px;
background-color: #f0f0f2;
margin-bottom: 17rpx;
}
.btn {
position: absolute;
bottom: 0;
left: 0;
right: 0;
width: 100%;
.btn1 {
height: 75rpx;
background: #1969f9;
font-size: 23rpx;
color: #ffffff;
}
.btn2 {
height: 75rpx;
background: #ffe0d7;
font-size: 23rpx;
color: #ff3700;
font-weight: bold;
}
}
.uni-table {
margin-top: 20rpx;
width: 100%;
height: 100%;
overflow-y: auto;
border-top: 1px solid #f0f0f2;
border-left: 1px solid #f0f0f2;
border-right: 1px solid #f0f0f2;
.uni-tr {
.uni-td {
width: 33.3%;
height: 50rpx;
font-size: 18rpx;
color: #292b33;
border-bottom: 1px solid #f0f0f2;
border-right: 1px solid #f0f0f2;
&:last-child {
border-right: none;
}
.sn {
margin-left: 6rpx;
height: 35rpx;
.uni-input {
font-size: 18rpx;
color: #292b33;
font-weight: bold;
}
.uni-arrow {
width: 14rpx;
height: 9rpx;
background: url('https://img.ichunt.com/images/ichunt/202304/10/e4c72319ad41ce1425f71cc6ec35f111.png') no-repeat center;
background-size: contain;
margin-left: 12rpx;
}
}
}
}
}
}
.popup-content {
width: 500rpx;
height: 500rpx;
box-sizing: border-box;
padding: 20rpx;
} }
assets/css/stocktake/record.scss
.picking-record { .stocktake-record {
padding: 15rpx 22rpx; padding: 15rpx 22rpx;
.search-box { .search-box {
height: 60rpx; height: 60rpx;
...@@ -52,23 +52,6 @@ ...@@ -52,23 +52,6 @@
margin-bottom: 15rpx; margin-bottom: 15rpx;
flex-wrap: wrap; flex-wrap: wrap;
border: 1px solid transparent; border: 1px solid transparent;
.check-box-icon {
position: absolute;
right: 18rpx;
top: 17rpx;
width: 20rpx;
height: 20rpx;
background: url('https://img.ichunt.com/images/ichunt/202304/11/0bf30da3e8ce6c476c210173b5f13d51.png') no-repeat center;
background-size: contain;
display: block;
}
&.curr {
border: 1px solid #1969f9;
.check-box-icon {
background: url('https://img.ichunt.com/images/ichunt/202304/11/71a74e52e94bcf2e89f8df9817d494c6.png') no-repeat center;
background-size: contain;
}
}
.input-box { .input-box {
margin-bottom: 11rpx; margin-bottom: 11rpx;
flex: 0 0 50%; flex: 0 0 50%;
...@@ -105,17 +88,6 @@ ...@@ -105,17 +88,6 @@
font-size: 17rpx; font-size: 17rpx;
color: #1969f9; color: #1969f9;
} }
.pick_img_list {
flex-wrap: wrap;
.img_list {
width: 120rpx;
height: 120rpx;
background: #f5f5f7;
border-radius: 10rpx;
margin-right: 15rpx;
margin-bottom: 15rpx;
}
}
} }
.btn { .btn {
position: absolute; position: absolute;
...@@ -130,39 +102,117 @@ ...@@ -130,39 +102,117 @@
} }
} }
} }
.fix-btn { }
position: fixed;
bottom: 0; ::v-deep .uni-drawer__content {
width: 85% !important;
}
.uni-drawer-detail {
width: 100%; width: 100%;
background-color: #ffffff;
padding: 22rpx 22rpx 0 22rpx;
.title {
position: relative;
.iconfont {
position: absolute;
left: 0; left: 0;
z-index: 999; top: 0;
.btn1 { font-size: 30rpx;
width: 128rpx; color: #292b33;
height: 75rpx;
background: #ffffff;
border-right: 1px solid #f0f0f2;
.check-box-icon {
width: 20rpx;
height: 20rpx;
background: url('https://img.ichunt.com/images/ichunt/202304/11/0bf30da3e8ce6c476c210173b5f13d51.png') no-repeat center;
background-size: contain;
display: block;
&.curr {
background: url('https://img.ichunt.com/images/ichunt/202304/11/71a74e52e94bcf2e89f8df9817d494c6.png') no-repeat center;
background-size: contain;
} }
.text {
font-size: 23rpx;
color: #292b33;
font-weight: bold;
}
}
.field-item {
flex-wrap: wrap;
.item {
flex: 0 0 50%;
margin-bottom: 8rpx;
.label {
width: 114rpx;
font-size: 16rpx;
color: #919399;
} }
.text { .text {
margin-left: 10rpx; font-size: 16rpx;
font-size: 20rpx; color: #1969f9;
margin-left: 6rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
max-width: 176rpx;
}
.tt {
font-size: 16rpx;
color: #484b59;
margin-left: 6rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
max-width: 176rpx;
}
.uni-input {
width: 80%;
height: 50rpx;
background: #ffffff;
border-radius: 10rpx;
border: 1px solid #1969f9;
text-indent: 15rpx;
font-size: 16rpx;
}
}
}
.form-input {
margin-bottom: 18rpx;
.input-title {
margin-bottom: 10rpx;
.input-title-t1 {
font-size: 16rpx;
color: #484b59; color: #484b59;
font-weight: bold;
}
}
.input-box {
.uni-input {
height: 55rpx;
background: #ffffff;
border-radius: 10rpx;
border: 1px solid #1969f9;
text-indent: 15rpx;
font-size: 16rpx;
}
}
}
.item-tit {
font-size: 20rpx;
color: #292b33;
font-weight: bold;
margin-bottom: 18rpx;
}
.bor {
height: 1px;
background-color: #f0f0f2;
margin-bottom: 17rpx;
} }
.btn {
position: absolute;
bottom: 0;
left: 0;
right: 0;
width: 100%;
.btn1 {
height: 75rpx;
background: #1969f9;
font-size: 23rpx;
color: #ffffff;
} }
.btn2 { .btn2 {
width: calc(100% - 128rpx);
height: 75rpx; height: 75rpx;
background: #ffffff; background: #ffe0d7;
font-size: 23rpx; font-size: 23rpx;
color: #ff3700; color: #ff3700;
font-weight: bold; font-weight: bold;
......
pages.json
...@@ -329,12 +329,36 @@ ...@@ -329,12 +329,36 @@
}, { }, {
"path": "pages/stocktake/operate", "path": "pages/stocktake/operate",
"style": { "style": {
"navigationBarTitleText": "盘点操作" "navigationBarTitleText": "盘点操作",
"app-plus": {
"titleNView": {
"buttons": [{
"index": "0",
"text": "盘点记录",
"fontSize": "15px",
"color": "#1969F9",
"float": "right",
"width": "100px"
}]
}
}
} }
}, { }, {
"path": "pages/stocktake/record", "path": "pages/stocktake/record",
"style": { "style": {
"navigationBarTitleText": "盘点记录" "navigationBarTitleText": "盘点记录",
"app-plus": {
"titleNView": {
"buttons": [{
"index": "0",
"text": "首页",
"fontSize": "15px",
"color": "#1969F9",
"float": "right",
"width": "100px"
}]
}
}
} }
}], }],
"globalStyle": { "globalStyle": {
......
pages/index/index.vue
...@@ -46,10 +46,10 @@ ...@@ -46,10 +46,10 @@
<view class="box row rowCenter verCenter"><image src="/static/home/@2x(3).png"></image></view> <view class="box row rowCenter verCenter"><image src="/static/home/@2x(3).png"></image></view>
<text class="text">移位</text> <text class="text">移位</text>
</navigator> </navigator>
<navigator class="box-li column rowCenter verCenter" url="/pages/stocktake/list" hover-class="none"> <!-- <navigator class="box-li column rowCenter verCenter" url="/pages/stocktake/list" hover-class="none">
<view class="box row rowCenter verCenter"><image src="/static/home/@2x(3).png"></image></view> <view class="box row rowCenter verCenter"><image src="/static/home/@2x(3).png"></image></view>
<text class="text">盘点</text> <text class="text">盘点</text>
</navigator> </navigator> -->
<navigator class="box-li column rowCenter verCenter" url="/pages/immediatelyStockIn/index" hover-class="none"> <navigator class="box-li column rowCenter verCenter" url="/pages/immediatelyStockIn/index" hover-class="none">
<view class="box row rowCenter verCenter"><image src="/static/home/@2x(6).png"></image></view> <view class="box row rowCenter verCenter"><image src="/static/home/@2x(6).png"></image></view>
<text class="text">库存查询</text> <text class="text">库存查询</text>
......
pages/stocktake/list.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<view class="search-bar row bothSide verCenter"> <view class="search-bar row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
<text class="iconfont icon-juxing1"></text> <text class="iconfont icon-juxing1"></text>
<input class="uni-input" placeholder="请扫描盘点单号" placeholder-style="color:#919399" @input="handleInput" v-model="searchParams.stock_out_sn" /> <input class="uni-input" placeholder="请扫描盘点单号" placeholder-style="color:#919399" @input="handleInput" v-model="searchParams.stocktake_sn" />
</view> </view>
<text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text> <text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
</view> </view>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<text class="label">创建时间：</text> <text class="label">创建时间：</text>
<text class="tt">{{ item.create_time }}</text> <text class="tt">{{ item.create_time }}</text>
</view> </view>
<view class="btn-box row"><navigator class="btn row rowCenter verCenter" url="/pages/stocktake/operate">选择</navigator></view> <view class="btn-box row"><navigator class="btn row rowCenter verCenter" :url="'/pages/stocktake/operate?stocktake_id=' + item.stocktake_id + '&stocktake_sn=' + item.stocktake_sn">选择</navigator></view>
</view> </view>
</view> </view>
<!-- 无数据展示 --> <!-- 无数据展示 -->
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
array: ['盘点单号'], array: ['盘点单号'],
list: [], list: [],
searchParams: { searchParams: {
stock_out_sn: '' stocktake_sn: ''
} }
}; };
}, },
...@@ -104,7 +104,7 @@ export default { ...@@ -104,7 +104,7 @@ export default {
*/ */
clearInput() { clearInput() {
this.input_flag = false; this.input_flag = false;
this.searchParams.stock_out_sn = ''; this.searchParams.stocktake_sn = '';
this.getData(); this.getData();
}, },
/** /**
......
pages/tallyReceive/index.vue
...@@ -311,6 +311,11 @@ export default { ...@@ -311,6 +311,11 @@ export default {
this.filter_id = this.list.map(function(item) { this.filter_id = this.list.map(function(item) {
return item.stock_in_item_id; return item.stock_in_item_id;
}); });
let is_watch_arr = this.list.map(function(item) {
return item.is_watch;
});
this.is_watch = is_watch_arr.includes(1);
} else { } else {
this.filter_id = []; this.filter_id = [];
} }
......
util/api.js
const API_BASE_USER = 'http://user.liexindev.net'; //用户系统 // const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统 // const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
const API_BASE = 'http://wms.liexindev.net'; //WMS系统 // const API_BASE = 'http://wms.liexindev.net'; //WMS系统
const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统 // const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
// const API_BASE_USER = 'https://user.ichunt.net'; //用户系统 const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
// const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统 const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
// const API_BASE = 'https://wms.ichunt.net'; //WMS系统 const API_BASE = 'https://wms.ichunt.net'; //WMS系统
// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统 const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
const API = { const API = {
...@@ -286,7 +286,23 @@ const API = { ...@@ -286,7 +286,23 @@ const API = {
/** /**
* H5盘点任务列表 * H5盘点任务列表
* */ * */
getStocktakeList: API_BASE + '/api/h5/stocktake/getStocktakeList' getStocktakeList: API_BASE + '/api/h5/stocktake/getStocktakeList',
/**
* H5盘点操作列表
* */
stocktakeOperateList: API_BASE + '/api/h5/stocktake/stocktakeOperateList',
/**
* H5设置盘点数量
* */
updateStocktakeItemQty: API_BASE + '/api/h5/stocktake/updateStocktakeItemQty',
/**
* H5盘点记录
* */
getStockTakeRecord: API_BASE + '/api/h5/stocktake/getStockTakeRecord',
/**
* H5盘点库位列表统计
* */
positionListCount: API_BASE + '/api/h5/stocktake/positionListCount'
} }
......
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