Skip to content

梁建民 / wmsMin

Go to a project
Commit 0b57833b by liangjianmin
Options

chore: remove deprecated pda and tally modules 

- Delete PDA module pages (exWarehouse, warehousing, selectDate)
- Delete tally module pages (goods, index, addException)
- Remove associated SCSS stylesheets for deleted pages
- Update pages.json to remove deprecated page routes
- Update home page navigation to remove references to deleted modules
- Clean up API endpoints no longer needed by removed modules
- Consolidate codebase by removing unused warehouse and inventory features
parent 17d648fe
Expand all
Inline Side-by-side
Showing with 1 additions and 1348 deletions
assets/css/pda/exWarehouse.scss deleted 100644 → 0
.ex-warehousing {
padding: 24rpx;
.uni-table-box {
::v-deep .uni-table-scroll {
height: 83vh;
}
::v-deep .uni-table {
min-width: 100% !important;
}
}
.scan {
position: fixed;
bottom: 104rpx;
left: 0;
right: 0;
width: 301rpx;
height: 86rpx;
background: #197adb;
box-shadow: 0px 9rpx 10rpx 0px rgba(0, 0, 0, 0.11);
border-radius: 43rpx;
margin: 0 auto;
.icon-juxing2 {
font-size: 48rpx;
color: #ffffff;
margin-right: 28rpx;
}
.tt {
font-size: 32rpx;
color: #ffffff;
}
}
.fix-info {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
background-color: #ffffff;
.text {
padding-left: 20rpx;
.t1 {
font-size: 24rpx;
color: #6e767a;
}
.t2 {
font-size: 26rpx;
color: #f04844;
font-weight: bold;
}
}
.btn {
width: 220rpx;
height: 88rpx;
background: #197adb;
border-radius: 4rpx;
font-size: 28rpx;
color: #ffffff;
}
}
}
::v-deep {
.checkbox {
width: 45px !important;
display: flex !important;
align-items: center;
}
.uni-table-tr {
display: flex !important;
}
.uni-table-th,
.uni-table-td {
width: 204rpx !important;
display: flex !important;
}
.uni-table-td {
border-right: 1px #ebeef5 solid;
&:last-child {
border-right: none;
}
}
.uni-swipe_text--center {
width: 640rpx !important;
display: flex;
}
uni-swipe-action {
display: flex;
uni-swipe-action-item {
width: 100%;
display: flex;
.uni-swipe {
width: 100%;
display: flex;
}
}
}
}
assets/css/pda/warehousing.scss deleted 100644 → 0
.warehousing {
padding: 24rpx;
.uni-table-box {
::v-deep .uni-table-scroll {
height: 83vh;
}
::v-deep .uni-table {
min-width: 100% !important;
}
}
.scan {
position: fixed;
bottom: 104rpx;
left: 0;
right: 0;
width: 301rpx;
height: 86rpx;
background: #197adb;
box-shadow: 0px 9rpx 10rpx 0px rgba(0, 0, 0, 0.11);
border-radius: 43rpx;
margin: 0 auto;
.icon-juxing2 {
font-size: 48rpx;
color: #ffffff;
margin-right: 28rpx;
}
.tt {
font-size: 32rpx;
color: #ffffff;
}
}
.fix-info {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
background-color: #ffffff;
.text {
padding-left: 20rpx;
.t1 {
font-size: 24rpx;
color: #6e767a;
}
.t2 {
font-size: 26rpx;
color: #f04844;
font-weight: bold;
}
}
.btn {
width: 220rpx;
height: 88rpx;
background: #197adb;
border-radius: 4rpx;
font-size: 28rpx;
color: #ffffff;
}
}
}
::v-deep {
.checkbox {
width: 45px !important;
display: flex !important;
align-items: center;
}
.uni-table-tr {
display: flex !important;
}
.uni-table-th,
.uni-table-td {
width: 204rpx !important;
display: flex !important;
}
.uni-table-td {
border-right: 1px #ebeef5 solid;
&:last-child {
border-right: none;
}
}
.uni-swipe_text--center {
width: 640rpx !important;
display: flex;
}
uni-swipe-action {
display: flex;
uni-swipe-action-item {
width: 100%;
display: flex;
.uni-swipe {
width: 100%;
display: flex;
}
}
}
}
assets/css/tally/goods.scss deleted 100644 → 0
.page-box {
padding: 15rpx 22rpx;
.search-box {
height: 60rpx;
background: #ffffff;
border-radius: 10rpx;
padding: 0 18rpx 0 0;
.sn {
width: 164rpx;
height: 35rpx;
border-right: 1px solid #f0f0f2;
.uni-input {
font-size: 28rpx;
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;
}
}
.search-bar {
width: calc(100% - 164rpx);
.icon-juxing11 {
font-size: 30rpx;
color: #919399;
margin-left: 17rpx;
margin-right: 13rpx;
}
.uni-input {
font-size: 28rpx;
color: #484b59;
}
.icon-a-juxing111 {
font-size: 30rpx;
color: #c6c7cc;
}
}
}
.total-text {
margin-top: 15rpx;
font-size: 28rpx;
color: #919399;
text-align: right;
text {
padding: 0 5rpx;
color: #1969f9;
}
}
.list {
margin-top: 15rpx;
padding-bottom: 100rpx;
.box {
position: relative;
padding: 15px 17rpx 18rpx 17rpx;
background: #ffffff;
box-shadow: 0px 3rpx 3rpx 0px rgba(198, 199, 204, 0.3);
border-radius: 10rpx;
margin-bottom: 15rpx;
flex-wrap: wrap;
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 {
margin-bottom: 11rpx;
flex: 0 0 50%;
.bor {
height: 1px;
background-color: #f0f0f2;
color: #f0f0f2;
margin-bottom: 10rpx;
}
.label {
width: 132rpx;
font-size: 28rpx;
color: #919399;
white-space: nowrap;
}
.text {
font-size: 28rpx;
color: #484b59;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.desc {
font-size: 28rpx;
color: #484b59;
word-break: break-all;
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.tt {
font-size: 28rpx;
color: #1969f9;
}
.pick_img_list {
flex-wrap: wrap;
.default {
width: 120rpx;
height: 120rpx;
background: #f5f5f7;
border-radius: 10rpx;
margin-right: 15rpx;
.iconfont {
font-size: 60rpx;
color: #c6c7cc;
}
}
.img_list {
position: relative;
width: 120rpx;
height: 120rpx;
background: #f5f5f7;
border-radius: 10rpx;
margin-right: 15rpx;
margin-bottom: 15rpx;
image {
width: 120rpx;
height: 120rpx;
}
.iconfont {
position: absolute;
right: 0;
top: 0;
font-size: 30rpx;
color: #ff3700;
z-index: 9;
}
}
}
}
.btn-box {
position: absolute;
right: 17rpx;
bottom: 13rpx;
.btn1 {
width: 80rpx;
height: 40rpx;
background: #fff;
border-radius: 8rpx;
font-size: 25rpx;
color: #f00;
border: 1px solid #f00;
margin-right: 10rpx;
}
.btn2 {
width: 100rpx;
height: 60rpx;
background: #1969f9;
border-radius: 8rpx;
font-size: 25rpx;
color: #ffffff;
}
}
.status-box {
position: absolute;
right: 10rpx;
top: 5rpx;
.staus_type_val {
font-size: 28rpx;
color: #1969f9;
border: 1px solid #f0f0f2;
width: 80rpx;
height: 80rpx;
border-radius: 50%;
margin-right: 10rpx;
}
}
}
}
.fix-btn {
position: fixed;
bottom: 0;
width: 100%;
left: 0;
z-index: 999;
.btn1 {
width: 128rpx;
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 {
margin-left: 10rpx;
font-size: 20rpx;
color: #484b59;
}
}
.btn2 {
width: 300rpx;
height: 75rpx;
background: #02a7f0;
font-size: 23rpx;
color: #ffffff;
}
.btn3 {
width: calc(100% - 428rpx);
height: 75rpx;
background: #1969f9;
font-size: 23rpx;
color: #ffffff;
}
}
}
.no-date {
padding: 30rpx 0;
.iconfont {
font-size: 180rpx;
color: #c6c7cc;
margin-bottom: 30rpx;
}
.text {
font-size: 20rpx;
color: #484b59;
}
}
::v-deep .uni-drawer__content {
width: 85% !important;
}
assets/css/tallyGoods/addException.scss deleted 100644 → 0
.page-add-exception {
margin-top: 24rpx;
padding: 0 24rpx 24rpx 24rpx;
.scanBarcode {
height: 88rpx;
background: #ffffff;
border-radius: 4rpx;
margin-bottom: 16rpx;
.iconfont {
font-size: 52rpx;
color: #197adb;
}
.tt {
margin-left: 12rpx;
font-size: 26rpx;
color: #404547;
}
}
.section {
padding: 24rpx 24rpx 0 24rpx;
background: #ffffff;
border-radius: 4rpx;
margin-bottom: 16rpx;
.warehouse {
padding-bottom: 24rpx;
border-bottom: 1px solid #e6edf0;
.t1 {
font-size: 22rpx;
color: #000;
margin-bottom: 8rpx;
}
.input-wrap {
.arrow {
width: 12rpx;
height: 12rpx;
background: #197adb;
border-radius: 50%;
margin-right: 16rpx;
}
.uni-input {
font-size: 32rpx;
color: #1e2021;
font-weight: bold;
}
}
.inspection {
width: 72rpx;
height: 36rpx;
border-radius: 4rpx;
border: 1rpx solid #197adb;
font-size: 24rpx;
color: #197adb;
}
}
.box {
height: 80rpx;
border-bottom: 1px solid #e6edf0;
&:last-child {
border-bottom: none;
}
.label {
font-size: 24rpx;
color: #6e767a;
margin-right: 27rpx;
}
.input-wrap {
width: calc(100% - 160rpx);
.text-prompt {
color: #6e767a;
font-size: 24rpx;
}
}
.input-wrap-width {
justify-content: flex-end;
.text {
font-size: 24rpx;
color: #404547;
font-weight: bold;
margin-right: 12rpx;
}
.iconfont {
font-size: 21rpx;
color: #9ca8ad;
}
.uni-input-box {
font-size: 24rpx;
color: #1e2021;
}
}
.tab {
.tab-panel {
width: 120rpx;
height: 48rpx;
background: #9ca8ad;
border-radius: 4rpx;
font-size: 24rpx;
color: #ffffff;
margin-right: 24rpx;
&:last-child {
margin-right: 0;
}
&.curr {
background: #197adb;
}
}
}
.uni-input {
font-size: 24rpx;
color: #404547;
font-weight: bold;
}
}
.upload-box {
margin-top: 24rpx;
position: relative;
z-index: 1;
.title {
margin-bottom: 24rpx;
.tt-l {
font-size: 24rpx;
color: #6e767a;
}
.tt-r {
font-size: 24rpx;
color: #404547;
}
}
.upload-list {
padding-bottom: 48rpx;
flex-wrap: wrap;
.default {
width: 144rpx;
height: 144rpx;
background-color: #f1f4f6;
border: 1rpx solid #e6edf0;
.iconfont {
font-size: 48rpx;
color: #d8d8d8;
}
}
.pic-box {
position: relative;
flex: 0 0 23%;
margin-right: 10rpx;
margin-bottom: 10rpx;
&:nth-of-type(4n) {
margin-right: 0;
}
image {
width: 144rpx;
height: 144rpx;
}
.delete {
position: absolute;
right: 10rpx;
top: -13rpx;
width: 30rpx;
height: 30rpx;
border-radius: 50%;
background-color: #bb3434;
z-index: 999;
.iconfont {
font-size: 20rpx;
color: #ffffff;
}
}
}
}
.model-upload-list {
border-top: 1rpx solid #e6edf0;
.box {
height: 80rpx;
border-bottom: 1rpx solid #e6edf0;
&:last-child {
border-bottom: none;
}
.file {
.t1 {
width: 258rpx;
color: #404547;
font-size: 24rpx;
font-weight: bold;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.t2 {
font-size: 24rpx;
color: #197adb;
margin-left: 4rpx;
margin-right: 16rpx;
}
.clear {
font-size: 24rpx;
color: #404547;
font-weight: bold;
}
}
.file-btn {
.t1 {
font-size: 24rpx;
color: #404547;
font-weight: bold;
margin-right: 12rpx;
}
.iconfont {
font-size: 21rpx;
color: #9ca8ad;
}
}
&.curr {
.file {
.t1 {
color: #197adb;
}
}
}
}
}
}
}
.btn {
position: relative;
z-index: 2;
height: 88rpx;
background: #197adb;
border-radius: 4rpx;
font-size: 28rpx;
color: #ffffff;
&.disabled {
opacity: 0.7;
}
}
}
pages.json
...@@ -10,11 +10,6 @@ ...@@ -10,11 +10,6 @@
"navigationBarTitleText": "异常理货" "navigationBarTitleText": "异常理货"
} }
}, { }, {
"path": "pages/tallyGoods/addException",
"style": {
"navigationBarTitleText": "新增异常"
}
}, {
"path": "pages/tallyGoods/exceptionSelect", "path": "pages/tallyGoods/exceptionSelect",
"style": { "style": {
"navigationBarTitleText": "选择异常类型" "navigationBarTitleText": "选择异常类型"
...@@ -135,16 +130,6 @@ ...@@ -135,16 +130,6 @@
"navigationBarTitleText": "装箱复核时序蒲" "navigationBarTitleText": "装箱复核时序蒲"
} }
}, { }, {
"path": "pages/pda/warehousing",
"style": {
"navigationBarTitleText": "深圳扫码收货"
}
}, {
"path": "pages/pda/exWarehouse",
"style": {
"navigationBarTitleText": "深圳扫码出库"
}
}, {
"path": "pages/pda/logisticsList", "path": "pages/pda/logisticsList",
"style": { "style": {
"navigationBarTitleText": "进口物流清单" "navigationBarTitleText": "进口物流清单"
...@@ -165,11 +150,6 @@ ...@@ -165,11 +150,6 @@
"navigationBarTitleText": "签到统计" "navigationBarTitleText": "签到统计"
} }
}, { }, {
"path": "pages/pda/selectDate",
"style": {
"navigationBarTitleText": "扫描管理"
}
}, {
"path": "pages/scanInventory/index", "path": "pages/scanInventory/index",
"style": { "style": {
"navigationBarTitleText": "扫描盘点" "navigationBarTitleText": "扫描盘点"
...@@ -190,23 +170,6 @@ ...@@ -190,23 +170,6 @@
"navigationBarTitleText": "手动合箱" "navigationBarTitleText": "手动合箱"
} }
}, { }, {
"path": "pages/tally/index",
"style": {
"navigationBarTitleText": "入库理货",
"app-plus": {
"titleNView": {
"buttons": [{
"index": "0",
"text": "理货记录",
"fontSize": "15px",
"color": "#1969F9",
"float": "right",
"width": "120px"
}]
}
}
}
}, {
"path": "pages/tally/fixBox", "path": "pages/tally/fixBox",
"style": { "style": {
"navigationBarTitleText": "合箱" "navigationBarTitleText": "合箱"
...@@ -227,11 +190,6 @@ ...@@ -227,11 +190,6 @@
"navigationBarTitleText": "美产商检管理" "navigationBarTitleText": "美产商检管理"
} }
}, { }, {
"path": "pages/tally/goods",
"style": {
"navigationBarTitleText": "货品查询"
}
}, {
"path": "pages/tally/goodsDetail", "path": "pages/tally/goodsDetail",
"style": { "style": {
"navigationBarTitleText": "货品详情" "navigationBarTitleText": "货品详情"
......
pages/home/index.vue
...@@ -106,16 +106,6 @@ ...@@ -106,16 +106,6 @@
tips: '' tips: ''
}, },
{ {
name: '深圳扫码收货',
iconfont: 'icon-ruku',
tips: ''
},
{
name: '深圳扫码出库',
iconfont: 'icon-cangpeitubiao_chukuhuanhuochuku',
tips: ''
},
{
name: '进口物流清单', name: '进口物流清单',
iconfont: 'icon-wuliu', iconfont: 'icon-wuliu',
tips: '' tips: ''
...@@ -134,21 +124,6 @@ ...@@ -134,21 +124,6 @@
name: '理货确认', name: '理货确认',
iconfont: 'icon-a-10cangkucangchu2', iconfont: 'icon-a-10cangkucangchu2',
tips: '' tips: ''
},
{
name: '新增异常',
iconfont: 'icon-jinggao1',
tips: ''
},
{
name: '入库理货',
iconfont: 'icon-a-10cangkucangchu4',
tips: ''
},
{
name: '货品查询',
iconfont: 'icon-huopinchaxun',
tips: ''
} }
] ]
}; };
...@@ -249,14 +224,6 @@ ...@@ -249,14 +224,6 @@
uni.navigateTo({ uni.navigateTo({
url: '/pages/goods/rePackageList' url: '/pages/goods/rePackageList'
}); });
} else if (item.name == '深圳扫码收货') {
uni.navigateTo({
url: '/pages/pda/selectDate?type=1'
});
} else if (item.name == '深圳扫码出库') {
uni.navigateTo({
url: '/pages/pda/selectDate?type=2'
});
} else if (item.name == '进口物流清单') { } else if (item.name == '进口物流清单') {
uni.navigateTo({ uni.navigateTo({
url: '/pages/pda/logisticsList' url: '/pages/pda/logisticsList'
...@@ -273,18 +240,6 @@ ...@@ -273,18 +240,6 @@
uni.navigateTo({ uni.navigateTo({
url: '/pages/tallyGoods/confirm' url: '/pages/tallyGoods/confirm'
}); });
} else if (item.name == '新增异常') {
uni.navigateTo({
url: '/pages/tallyGoods/addException'
});
} else if (item.name == '入库理货') {
uni.navigateTo({
url: '/pages/tally/index'
});
} else if (item.name == '货品查询') {
uni.navigateTo({
url: '/pages/tally/goods'
});
} else if (item.name == '异常管理') { } else if (item.name == '异常管理') {
uni.navigateTo({ uni.navigateTo({
url: '/pages/tally/abnormalManageList' url: '/pages/tally/abnormalManageList'
......
pages/pda/exWarehouse.vue deleted 100644 → 0
<template>
<view class="ex-warehousing">
<view class="uni-table-box">
<uni-table type="selection" border stripe emptyText="暂无更多数据" @selection-change="selectionChange">
<uni-tr>
<uni-th align="center">入仓号</uni-th>
<uni-th align="center">车序</uni-th>
<uni-th align="center">汇总件数</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in list" :key="index">
<uni-swipe-action ref="swipeAction">
<uni-swipe-action-item :right-options="options" @click="bindClick($event, index)" @change="swipeChange($event, index)">
<uni-td align="center">{{ item.erp_order_sn || '' }}</uni-td>
<uni-td align="center">{{ item.car_sort || '' }}</uni-td>
<uni-td align="center">{{ item.num || '' }}</uni-td>
</uni-swipe-action-item>
</uni-swipe-action>
</uni-tr>
</uni-table>
</view>
<view class="scan row rowCenter verCenter" @click="scanChange()" hover-class="none">
<text class="iconfont icon-juxing2"></text>
<text class="tt">继续扫描</text>
</view>
<view class="fix-info row bothSide verCenter">
<view class="text row verCenter">
<text class="t1">入仓号数：</text>
<text class="t2">{{ selectedIndexs.length }}</text>
</view>
<view class="btn row rowCenter verCenter" @click="szScanOutChange">出库单号确认</view>
</view>
</view>
</template>
<script>
import { API } from '@/util/api.js';
export default {
data() {
return {
options: [
{
text: '取消',
style: {
backgroundColor: '#007aff'
}
},
{
text: '删除',
style: {
backgroundColor: '#dd524d'
}
}
],
selectedIndexs: [],
erp_order_sn: '',
list: [
{
erp_order_sn: 'B154542',
car_sort: '1车次',
num: 100
},
{
erp_order_sn: 'B1542',
car_sort: '2车次',
num: 10
}
],
filterList: [],
startTime: '',
endTime: ''
};
},
onLoad(options) {
this.erp_order_sn = options.number;
this.startTime = options.startTime;
this.endTime = options.endTime;
this.getData();
},
onShow() {
this.selectedIndexs = [];
},
methods: {
bindClick(e, index) {
console.log('点击了' + (e.position === 'left' ? '左侧' : '右侧') + e.content.text + '按钮');
if (e.content.text == '删除') {
this.list.splice(index, 1);
}
},
swipeChange(e, index) {
//console.log('当前状态：' + e + '，下标：' + index);
},
selectionChange(e) {
this.selectedIndexs = e.detail.index;
this.filterList = this.selectedIndexs.map(i => this.list[i]);
},
scanChange(type) {
uni.scanCode({
success: res => {
console.log(res);
if (res.errMsg == 'scanCode:ok') {
this.erp_order_sn = res.result;
this.getData();
}
},
fail: res => {
console.log(res);
uni.showToast({
title: '扫码失败',
icon: 'error'
});
}
});
},
getData() {
this.request(API.szScanOut, 'POST', { erp_order_sn: this.erp_order_sn, is_submit: 0 }, true).then(res => {
if (res.err_code === 0) {
this.list.push({
car_sort: res.data.car_sort,
erp_order_sn: res.data.erp_order_sn,
num: res.data.num
});
} else {
this.list = [];
uni.showToast({
title: res.err_msg,
icon: 'none'
});
}
});
},
szScanOutChange() {
if (this.filterList.length <= 0) {
uni.showModal({
title: '提示',
content: '请勾选入仓号',
showCancel: false
});
return false;
}
this.request(API.szScanOut, 'POST', { list: this.filterList, is_submit: 1, erp_order_sn: this.erp_order_sn, startTime: this.startTime, endTime: this.endTime }, true).then(res => {
if (res.err_code === 0) {
uni.showToast({
title: '提交成功',
duration: 2000
});
setTimeout(() => {
uni.navigateTo({
url: '/pages/pda/logisticsList'
});
}, 2000);
} else {
uni.showModal({
title: '提示',
content: res.err_msg,
showCancel: false
});
}
});
}
}
};
</script>
<style scoped lang="scss">
@import '../../assets/css/pda/exWarehouse.scss';
</style>
pages/pda/selectDate.vue deleted 100644 → 0
<template>
<view class="logisticsList">
<view class="row seldate-box"><uni-datetime-picker type="daterange" v-model="range" @change="bindDateChange" /></view>
<view class="scan column rowCenter verCenter" @click="scanChange(type)">
<text class="iconfont icon-ruku"></text>
<text class="tt">{{ type == 1 ? '扫码收货' : '扫码出库' }}</text>
</view>
</view>
</template>
<script>
import { API } from '@/util/api.js';
export default {
data() {
return {
type: '',
range: []
};
},
onLoad(options) {
this.type = options.type;
},
methods: {
bindDateChange(e) {
this.range = e;
},
scanChange(type) {
if (this.range.length <= 0) {
uni.showModal({
title: '提示',
content: '请选择时间段',
showCancel: false
});
return false;
}
uni.scanCode({
success: res => {
console.log(res);
if (res.errMsg == 'scanCode:ok') {
if (type == 1) {
uni.navigateTo({
url: '/pages/pda/warehousing?number=' + res.result + '&startTime=' + this.range[0] + '&endTime=' + this.range[1]
});
}
if (type == 2) {
uni.navigateTo({
url: '/pages/pda/exWarehouse?number=' + res.result + '&startTime=' + this.range[0] + '&endTime=' + this.range[1]
});
}
}
},
fail: res => {
console.log(res);
uni.showToast({
title: '扫码失败',
icon: 'error'
});
}
});
}
}
};
</script>
<style scoped lang="scss">
@import '../../assets/css/pda/logisticsList.scss';
</style>
pages/pda/warehousing.vue deleted 100644 → 0
<template>
<view class="warehousing">
<view class="uni-table-box">
<uni-table type="selection" border stripe emptyText="暂无更多数据" @selection-change="selectionChange">
<uni-tr>
<uni-th align="center">入仓号</uni-th>
<uni-th align="center">车序</uni-th>
<uni-th align="center">汇总件数</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in list" :key="index">
<uni-swipe-action ref="swipeAction">
<uni-swipe-action-item :right-options="options" @click="bindClick($event, index)" @change="swipeChange($event, index)">
<uni-td align="center">{{ item.erp_order_sn || '' }}</uni-td>
<uni-td align="center">{{ item.car_sort || '' }}</uni-td>
<uni-td align="center">{{ item.num || '' }}</uni-td>
</uni-swipe-action-item>
</uni-swipe-action>
</uni-tr>
</uni-table>
</view>
<view class="scan row rowCenter verCenter" @click="scanChange()">
<text class="iconfont icon-juxing2"></text>
<text class="tt">继续扫描</text>
</view>
<view class="fix-info row bothSide verCenter">
<view class="text row verCenter">
<text class="t1">入仓号数：</text>
<text class="t2">{{ selectedIndexs.length }}</text>
</view>
<view class="btn row rowCenter verCenter" @click="szScanInChange">入库单号确认</view>
</view>
</view>
</template>
<script>
import { API } from '@/util/api.js';
export default {
data() {
return {
options: [
{
text: '取消',
style: {
backgroundColor: '#007aff'
}
},
{
text: '删除',
style: {
backgroundColor: '#dd524d'
}
}
],
selectedIndexs: [],
erp_order_sn: '',
list: [],
filterList: [],
startTime: '',
endTime: ''
};
},
onLoad(options) {
this.erp_order_sn = options.number;
this.startTime = options.startTime;
this.endTime = options.endTime;
this.getData();
},
onShow() {
this.selectedIndexs = [];
},
methods: {
bindClick(e, index) {
console.log('点击了' + (e.position === 'left' ? '左侧' : '右侧') + e.content.text + '按钮');
if (e.content.text == '删除') {
this.list.splice(index, 1);
}
},
swipeChange(e, index) {
//console.log('当前状态：' + e + '，下标：' + index);
},
selectionChange(e) {
this.selectedIndexs = e.detail.index;
this.filterList = this.selectedIndexs.map(i => this.list[i]);
},
scanChange() {
uni.scanCode({
success: res => {
console.log(res);
if (res.errMsg == 'scanCode:ok') {
this.erp_order_sn = res.result;
this.getData();
}
},
fail: res => {
console.log(res);
uni.showToast({
title: '扫码失败',
icon: 'error'
});
}
});
},
getData() {
this.request(API.szScanIn, 'POST', { erp_order_sn: this.erp_order_sn, is_submit: 0 }, true).then(res => {
if (res.err_code === 0) {
this.list.push({
car_sort: res.data.car_sort,
erp_order_sn: res.data.erp_order_sn,
num: res.data.num
});
} else {
this.list = [];
uni.showToast({
title: res.err_msg,
icon: 'none'
});
}
});
},
szScanInChange() {
if (this.filterList.length <= 0) {
uni.showModal({
title: '提示',
content: '请勾选入仓号',
showCancel: false
});
return false;
}
this.request(API.szScanIn, 'POST', { list: this.filterList, is_submit: 1, erp_order_sn: this.erp_order_sn, startTime: this.startTime, endTime: this.endTime }, true).then(res => {
if (res.err_code === 0) {
uni.showToast({
title: '提交成功',
duration: 2000
});
setTimeout(() => {
uni.navigateTo({
url: '/pages/pda/logisticsList'
});
}, 2000);
} else {
uni.showModal({
title: '提示',
content: res.err_msg,
showCancel: false
});
}
});
}
}
};
</script>
<style scoped lang="scss">
@import '../../assets/css/pda/warehousing.scss';
</style>
pages/tally/goods.vue deleted 100644 → 0
<template>
<view class="page-box">
<!-- 搜索参数 -->
<view class="search-box row bothSide verCenter">
<view class="sn row rowCenter verCenter">
<picker @change="bindPickerChange($event,1)" :value="index" :range="array">
<view class="row verCenter">
<view class="uni-input">{{ array[index] }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
</view>
<view class="search-bar row bothSide verCenter">
<view class="row verCenter" style="width: 100%;">
<text class="iconfont icon-juxing11"></text>
<input class="uni-input" placeholder="输入型号或入仓号或理货批次号查询" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.all_search" @input="handleInput" style="width: 100%;" />
</view>
<text class="iconfont icon-a-juxing111" @click="clearInput()" v-if="input_flag"></text>
</view>
</view>
<view class="total-text" v-if="list.length > 0">共<text>{{total}}</text>条数据</view>
<!-- 列表区 -->
<view class="list" v-if="list.length > 0">
<view class="box row" v-for="(item, index) in list" :key="index">
<view class="status-box row verCenter">
<view class="row" style="font-size: 24rpx;color: #1969f9;margin-right: 18rpx;" v-if="item.is_goods_check == 1">商检</view>
<template v-if="item.box_type == 0">
<view class="staus_type_val row rowCenter verCenter">{{item.box_type_cn}}</view>
</template>
<template v-else>
<view class="staus_type_val row rowCenter verCenter" style="border: 1px solid red;color: red;">{{item.box_type_cn}}</view>
</template>
</view>
<view class="input-box row verCenter curr" style="flex: 0 0 100%;">
<text class="tt" style="color: #000;font-weight: bold;">{{ item.box_sn }}</text>
<text class="text" v-if="item.sub_box_qty > 1">（{{ item.sub_box_qty }})</text>
<text class="tt" style="margin-left: 50rpx;width: 100rpx;">{{item.tally_status_cn}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">入仓号数：</text>
<text class="text">{{ item.erp_order_sn_num }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">型号数：</text>
<text class="text">{{ item.goods_type_num }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">总净重：</text>
<text class="text">{{ item.net_weight_sum }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">总毛重：</text>
<text class="text">{{ item.gross_weight }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">更新时间：</text>
<text class="text">{{ item.update_time_cn }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">更新人：</text>
<text class="text">{{ item.update_user_name }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">封箱时间：</text>
<text class="text">{{ item.close_time_cn }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">封箱人：</text>
<text class="text">{{ item.tally_user_name }}</text>
</view>
<view class="btn-box row">
<navigator class="btn2 row rowCenter verCenter" :url="'/pages/tally/goodsDetail?wsty_id='+item.wsty_id+'&box_sn='+item.box_sn+'&box_type='+item.box_type+'&tally_status='+item.tally_status">详情</navigator>
</view>
</view>
</view>
<!-- 无数据展示 -->
<view class="no-date column rowCenter verCenter" v-else>
<text class="iconfont icon-a-juxing21"></text>
<text class="text">查不到当前数据</text>
</view>
</view>
</template>
<script>
import { API } from '@/util/api.js';
import debounce from 'lodash/debounce';
export default {
data() {
return {
page: 1,
limit: 30,
list: [],
index: 0,
array: ['全量搜索'],
detail: {}, //详情
input_flag: false,
total: 0,
is_focus: true, //获取焦点动态化
hasMoreData: true, //是否分页加载
searchParams: {
all_search: ''
}
};
},
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onShow() {
this.resetChange();
if (this.searchParams.all_search) {
this.getData();
}
},
methods: {
getData() {
this.request(API.getBoxData, 'GET', { page: this.page, limit: this.limit, ...this.searchParams }, true).then(res => {
if (res.err_code === 0) {
this.total = res.data.total;
if (res.data.data.length > 0) {
this.hasMoreData = true;
this.list = this.list.concat(res.data.data);
} else {
this.hasMoreData = false;
}
} else {
uni.showToast({
title: res.err_msg,
icon: 'none'
});
}
});
},
/**
* 清空数据
*/
clearInput() {
this.resetChange();
this.searchParams.all_search = '';
this.input_flag = false;
this.clearInputAndFocus();
this.getData();
},
/**
* 全量搜索
* @param {Object} event
*/
handleInput: debounce(function(event) {
this.resetChange();
var val = event.target.value;
this.searchParams.all_search = '';
if (val) {
this.searchParams.all_search = val;
this.input_flag = true;
this.getData();
} else {
this.input_flag = false;
}
}, 500),
/**
* 重置
*/
resetChange() {
this.list = [];
this.page = 1;
},
/**
* 再次获取焦点
*/
clearInputAndFocus() {
this.input_flag = false; //关闭叉叉
this.is_focus = false;
setTimeout(() => {
this.is_focus = true;
}, 200);
},
}
};
</script>
<style scoped lang="scss">
@import '@/assets/css/tally/goods.scss';
</style>
\ No newline at end of file
util/api.js
// 环境配置：'production' 正式环境 | 'development' 测试环境 // 环境配置：'production' 正式环境 | 'development' 测试环境
var ENV = 'development'; var ENV = 'production';
// 环境配置映射 // 环境配置映射
var ENV_CONFIG = { var ENV_CONFIG = {
......
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