Skip to content

梁建民 / wmsMin

Go to a project
Commit 544e6d73 by liangjianmin
Options

js

parent 0f257f5c
Inline Side-by-side
Showing with 490 additions and 59 deletions
assets/css/font.css
...@@ -11,6 +11,10 @@ ...@@ -11,6 +11,10 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-jinggao1:before {
content: "\e780";
}
.icon-a-juxing12:before { .icon-a-juxing12:before {
content: "\e77f"; content: "\e77f";
} }
......
assets/css/goods/tally.scss
...@@ -118,6 +118,10 @@ ...@@ -118,6 +118,10 @@
font-size: 26rpx; font-size: 26rpx;
color: #197adb; color: #197adb;
} }
.words-text-dis{
font-size: 26rpx;
color: #404547;
}
} }
} }
} }
assets/css/goods/tallyExectionDetail.scss
.tallyExectionDetail{ .tallyExectionDetail {
padding: 24rpx;
} .base-information {
\ No newline at end of file padding: 24rpx 24rpx 0 24rpx;
background: #ffffff;
border-radius: 4rpx;
margin-bottom: 16rpx;
.top {
margin-bottom: 24rpx;
.title {
.arrow {
width: 12rpx;
height: 12rpx;
background: #197adb;
margin-right: 16rpx;
border-radius: 50%;
}
.tt {
font-size: 32rpx;
color: #1e2021;
font-weight: bold;
}
}
}
.pp {
margin-bottom: 20rpx;
&.mb24 {
margin-bottom: 24rpx;
}
.t1 {
width: 120rpx;
font-size: 24rpx;
color: #6e767a;
margin-right: 16rpx;
}
.t2 {
width: 73%;
font-size: 24rpx;
color: #404547;
}
.type {
width: 72rpx;
height: 36rpx;
border-radius: 4rpx;
border: 1px solid #197adb;
font-size: 24rpx;
color: #197adb;
margin-left: 28rpx;
}
}
.status-box {
height: 80rpx;
border-top: 1px solid #e6edf0;
.bb {
flex: 0 0 50%;
.t1 {
font-size: 24rpx;
color: #6e767a;
}
.t2 {
margin-left: 16rpx;
font-size: 24rpx;
color: #404547;
font-weight: bold;
}
}
}
}
.question-box {
background: #ffffff;
border-radius: 4rpx;
padding: 24rpx;
margin-bottom: 16rpx;
.top {
margin-bottom: 24rpx;
.title {
.arrow {
width: 12rpx;
height: 12rpx;
background: #197adb;
margin-right: 16rpx;
border-radius: 50%;
}
.tt {
font-size: 32rpx;
color: #1e2021;
font-weight: bold;
}
}
.exception-ico {
.iconfont {
font-size: 33rpx;
color: #bb3434;
}
.tt {
font-size: 24rpx;
color: #bb3434;
font-weight: bold;
margin-left: 8rpx;
}
}
}
.uni-table {
.uni-th {
height: 62rpx;
background: #f1f4f6;
border-top: 1px solid #cad9e0;
border-bottom: 1px solid #cad9e0;
text {
flex: 0 0 25%;
font-size: 22rpx;
color: #6e767a;
padding-left: 23rpx;
border-right: 1px solid #cad9e0;
&:last-child {
border-right: none;
}
}
.tc{
justify-content: center;
padding-left: 0;
}
}
.uni-tr {
height: 62rpx;
border-bottom: 1px solid #cad9e0;
.txt {
font-size: 22rpx;
color: #404547;
}
.w {
height: 100%;
flex: 0 0 25%;
padding-left: 23rpx;
border-right: 1px solid #cad9e0;
&:last-child {
border-right: none;
}
}
.tc{
justify-content: center;
padding-left: 0;
}
}
}
.show-pic{
padding-top: 24rpx;
padding-bottom: 47rpx;
border-bottom: 1px solid #E6EDF0;
.pic-title{
font-size: 24rpx;
color: #6E767A;
margin-bottom: 23rpx;
}
.list{
flex-wrap: wrap;
.box{
width: 145rpx;
height: 145rpx;
margin-right: 24rpx;
&:nth-of-type(4n){
margin-right: 0;
}
image{
width: 145rpx;
height: 145rpx;
}
}
}
}
.text-box{
padding-top: 24rpx;
.tt-box{
margin-bottom: 20rpx;
&:last-child{
margin-bottom: 0;
}
.label{
width: 120rpx;
font-size: 24rpx;
color: #6E767A;
white-space: nowrap;
}
.t1{
font-size: 24rpx;
color: #404547;
}
.t2{
font-size: 24rpx;
color: #BB3434;
}
}
}
}
.btn {
margin-top: 48rpx;
height: 88rpx;
background: #197adb;
border-radius: 4rpx;
font-size: 28rpx;
color: #ffffff;
}
}
pages/goods/tally.vue
...@@ -12,34 +12,74 @@ ...@@ -12,34 +12,74 @@
<view class="tab row verCenter"> <view class="tab row verCenter">
<view class="box row" @click="changeTab(index)" :class="{ curr: index == currentIndex }" :key="index" v-for="(item, index) in textArr"> <view class="box row" @click="changeTab(index)" :class="{ curr: index == currentIndex }" :key="index" v-for="(item, index) in textArr">
<text class="t1">{{ item }}</text> <text class="t1">{{ item }}</text>
<text class="t2">({{ total }})</text> <text class="t2" v-if="index == currentIndex">({{ total }})</text>
</view> </view>
</view> </view>
<view class="list" v-if="checkInList.length > 0"> <template v-if="currentIndex === 0">
<navigator class="box row bothSide verCenter" :url="'/pages/goods/tallyDetail?number=' + item.number" hover-class="none" v-for="(item, index) in checkInList" :key="index"> <view class="list" v-if="goodsArrangeData.length > 0 || !is_complete">
<view class="bill-number row rowCenter verCenter" :class="numberType[index] ? 'color1' : 'color2'">{{ item.number }}</view> <navigator class="box row bothSide verCenter" :url="'/pages/goods/tallyDetail?number=' + item.number" hover-class="none" v-for="(item, index) in goodsArrangeData" :key="index">
<view> <view class="bill-number row rowCenter verCenter" :class="numberType[index] ? 'color1' : 'color2'">{{ item.number }}</view>
<text class="t1">客户：{{ item.customer }}</text> <view>
<view class="text"> <text class="t1">客户：{{ item.customer }}</text>
<text class="p1">下单:</text> <view class="text">
<text class="p2 mr49">{{ item.orderDate }}</text> <text class="p1">下单:</text>
<text class="p1">登记数量:</text> <text class="p2 mr49">{{ item.orderDate }}</text>
<text class="p2">{{ item.businessPerson }}</text> <text class="p1">登记数量:</text>
</view> <text class="p2">{{ item.num }}</text>
<view class="text"> </view>
<text class="p1">备注:</text> <view class="text">
<text class="p2">INV-9500148113这张里有个是光辉的，TRM</text> <text class="p1">备注:</text>
<text class="p2">{{ item.remark }}</text>
</view>
</view> </view>
<template v-if="item.isInspOrg">
<text class="words-text">商检</text>
</template>
<template v-else>
<text class="words-text-dis">非商检</text>
</template>
</navigator>
</view>
<template v-else>
<view class="no-data column verCenter rowCenter">
<text class="iconfont icon-jinggao2"></text>
<text class="text">查找不到相关信息</text>
<text class="p">1、请输入正确的入仓号</text>
</view> </view>
<text class="words-text">{{ item.delivery }}</text> </template>
</navigator> </template>
</view> <template v-else-if="currentIndex === 1">
<template v-else> <view class="list" v-if="unusualCheckInList.length > 0 || !is_complete">
<view class="no-data column verCenter rowCenter"> <navigator class="box row bothSide verCenter" :url="'/pages/goods/tallyExectionDetail?ask_customer_problem_list_id=' + item.ask_customer_problem_list_id" hover-class="none" v-for="(item, index) in unusualCheckInList" :key="index">
<text class="iconfont icon-jinggao2"></text> <view class="bill-number row rowCenter verCenter" :class="numberType[index] ? 'color1' : 'color2'">{{ item.erp_order_sn }}</view>
<text class="text">查找不到相关信息</text> <view>
<text class="p">1、请输入正确的入仓号</text> <text class="t1">客户：{{ item.supplier_name }}</text>
<view class="text">
<text class="p1">时间:</text>
<text class="p2 mr49">{{ item.create_time_cn }}</text>
<text class="p1">问客:</text>
<text class="p2">{{ item.ask_customer_status_cn }}</text>
</view>
<view class="text">
<text class="p1">备注:</text>
<text class="p2">{{ item.unusual_remark }}</text>
</view>
</view>
<template v-if="item.is_goods_check === 1">
<text class="words-text">商检</text>
</template>
<template v-else>
<text class="words-text-dis">非商检</text>
</template>
</navigator>
</view> </view>
<template v-else>
<view class="no-data column verCenter rowCenter">
<text class="iconfont icon-jinggao2"></text>
<text class="text">查找不到相关信息</text>
<text class="p">1、请输入正确的入仓号</text>
</view>
</template>
</template> </template>
</view> </view>
</template> </template>
...@@ -51,51 +91,69 @@ export default { ...@@ -51,51 +91,69 @@ export default {
data() { data() {
return { return {
currentIndex: 0, currentIndex: 0,
date: '', is_complete: false,
datetimerange: ['', ''],
textArr: ['等待理货', '理货异常'], textArr: ['等待理货', '理货异常'],
number: '', number: '',
total: 1, total: 0,
page: 1, page: 1,
limit: 100, goodsArrangeData: [],
is_loading: false, unusualCheckInList: [],
loading: false,
checkInList: [],
numberType: [] numberType: []
}; };
}, },
onReachBottom() {
if (this.is_loading) return;
this.page++;
this.loading = true;
this.getData();
},
onShow() { onShow() {
this.getData(); if (this.currentIndex === 0) {
this.getData();
} else if (this.currentIndex === 1) {
this.getUnusualCheckInList();
}
}, },
methods: { methods: {
changeTab(index) { changeTab(index) {
this.currentIndex = index; this.currentIndex = index;
if (index === 0) {
this.getData();
} else if (index === 1) {
this.getUnusualCheckInList();
}
},
inputChange() {
if (this.currentIndex === 0) {
this.getData();
} else if (this.currentIndex === 1) {
this.getUnusualCheckInList();
}
}, },
getData() { getData() {
this.request(API.getCheckInList, 'POST', { page: this.page, limit: this.limit, number: this.number, startDate: this.datetimerange[0], endDate: this.datetimerange[1] }, this.loading).then(res => { this.request(API.getGoodsArrangeData, 'POST', { page: this.page, number: this.number }, true).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
if (res.data.length > 0) { this.is_complete = true;
this.is_loading = false; this.goodsArrangeData = res.data;
this.checkInList = res.data; this.total = res.data.length;
} else {
uni.showToast({
title: res.err_msg,
icon: 'error'
});
}
});
},
getUnusualCheckInList() {
this.request(API.getUnusualCheckInList, 'POST', { page: this.page, number: this.number }, true).then(res => {
if (res.err_code === 0) {
this.is_complete = true;
this.unusualCheckInList = res.data;
this.total = res.data.length;
//判断A单 B单 //判断A单 B单
if (res.data.length > 0) { if (res.data.length > 0) {
for (let i = 0; i < res.data.length; i++) { for (let i = 0; i < res.data.length; i++) {
if (res.data[i].number.indexOf('B')) { if (res.data[i].erp_order_sn.indexOf('B')) {
this.numberType.push(true); this.numberType.push(true);
} else { } else {
this.numberType.push(false); this.numberType.push(false);
}
} }
} }
} else {
this.is_loading = true;
} }
} else { } else {
uni.showToast({ uni.showToast({
......
pages/goods/tallyExectionDetail.vue
<template> <template>
<view class="tallyExectionDetail"></view> <view class="tallyExectionDetail">
<view class="base-information">
<view class="top row bothSide verCenter">
<view class="title row verCenter">
<text class="arrow row rowCenter verCenter"></text>
<text class="tt">基础信息</text>
</view>
</view>
<view class="pp row verCenter">
<text class="t1">入仓号：</text>
<text class="t2" style="width: auto;">A123456</text>
<text class="type row rowCenter verCenter">商检</text>
</view>
<view class="pp row verCenter">
<text class="t1">订单时间：</text>
<text class="t2">2021-11-02 15:17</text>
</view>
<view class="pp row verCenter">
<text class="t1">订单客户：</text>
<text class="t2">富开香港有限公司</text>
</view>
<view class="pp row verCenter mb24">
<text class="t1">问客时间：</text>
<text class="t2">2022-02-21 16:47</text>
</view>
<view class="status-box row verCenter bothSide">
<view class="bb row verCenter">
<text class="t1">客户状态：</text>
<text class="t2">已确认</text>
</view>
<view class="bb row verCenter">
<text class="t1">商务状态：</text>
<text class="t2">已确认</text>
</view>
</view>
</view>
<view class="question-box">
<view class="top row bothSide verCenter">
<view class="title row verCenter">
<text class="arrow row rowCenter verCenter"></text>
<text class="tt">问题类型①</text>
</view>
<view class="exception-ico row verCenter">
<text class="iconfont icon-jinggao1"></text>
<text class="tt">数量异常</text>
</view>
</view>
<view class="uni-table">
<view class="uni-th row">
<text class="row verCenter tc">序号</text>
<text class="row verCenter">规格型号</text>
<text class="row verCenter">订单数量</text>
<text class="row verCenter">实到数量</text>
</view>
<view class="uni-tr row verCenter">
<text class="txt w row verCenter tc">01</text>
<text class="txt w row verCenter">962886-1</text>
<text class="txt w row verCenter">50,000</text>
<text class="txt w row verCenter">50,000</text>
</view>
<view class="uni-tr row verCenter">
<text class="txt w row verCenter tc">01</text>
<text class="txt w row verCenter">962886-1</text>
<text class="txt w row verCenter">50,000</text>
<text class="txt w row verCenter">50,000</text>
</view>
<view class="uni-tr row verCenter">
<text class="txt w row verCenter tc">01</text>
<text class="txt w row verCenter">962886-1</text>
<text class="txt w row verCenter">50,000</text>
<text class="txt w row verCenter">50,000</text>
</view>
<view class="uni-tr row verCenter">
<text class="txt w row verCenter tc">01</text>
<text class="txt w row verCenter">962886-1</text>
<text class="txt w row verCenter">50,000</text>
<text class="txt w row verCenter">50,000</text>
</view>
</view>
<view class="show-pic">
<view class="pic-title">问题图片</view>
<view class="list row verCenter">
<view class="box"><image src="http://img.ichunt.com/images/ichunt/202203/11/cf3116f61c7d6d85f0a4a5ed90529385.png" mode="aspectFill"></image></view>
<view class="box"><image src="http://img.ichunt.com/images/ichunt/202203/11/cf3116f61c7d6d85f0a4a5ed90529385.png" mode="aspectFill"></image></view>
<view class="box"><image src="http://img.ichunt.com/images/ichunt/202203/11/cf3116f61c7d6d85f0a4a5ed90529385.png" mode="aspectFill"></image></view>
<view class="box"><image src="http://img.ichunt.com/images/ichunt/202203/11/cf3116f61c7d6d85f0a4a5ed90529385.png" mode="aspectFill"></image></view>
</view>
</view>
<view class="text-box">
<view class="tt-box row">
<text class="label">采购备注：</text>
<text class="t1">INV-9500148113这张里有个是光辉的,理货的人员记得看备注，多大200字符长度</text>
</view>
<view class="tt-box row">
<text class="label">商务回复：</text>
<text class="t2">按实物报关</text>
</view>
</view>
</view>
<view class="question-box">
<view class="top row bothSide verCenter">
<view class="title row verCenter">
<text class="arrow row rowCenter verCenter"></text>
<text class="tt">问题类型①</text>
</view>
<view class="exception-ico row verCenter">
<text class="iconfont icon-jinggao1"></text>
<text class="tt">数量异常</text>
</view>
</view>
<view class="uni-table">
<view class="uni-th row">
<text class="row verCenter tc">序号</text>
<text class="row verCenter">规格型号</text>
<text class="row verCenter">订单数量</text>
<text class="row verCenter">实到数量</text>
</view>
<view class="uni-tr row verCenter">
<text class="txt w row verCenter tc">01</text>
<text class="txt w row verCenter">962886-1</text>
<text class="txt w row verCenter">50,000</text>
<text class="txt w row verCenter">50,000</text>
</view>
<view class="uni-tr row verCenter">
<text class="txt w row verCenter tc">01</text>
<text class="txt w row verCenter">962886-1</text>
<text class="txt w row verCenter">50,000</text>
<text class="txt w row verCenter">50,000</text>
</view>
<view class="uni-tr row verCenter">
<text class="txt w row verCenter tc">01</text>
<text class="txt w row verCenter">962886-1</text>
<text class="txt w row verCenter">50,000</text>
<text class="txt w row verCenter">50,000</text>
</view>
<view class="uni-tr row verCenter">
<text class="txt w row verCenter tc">01</text>
<text class="txt w row verCenter">962886-1</text>
<text class="txt w row verCenter">50,000</text>
<text class="txt w row verCenter">50,000</text>
</view>
</view>
<view class="show-pic">
<view class="pic-title">问题图片</view>
<view class="list row verCenter">
<view class="box"><image src="http://img.ichunt.com/images/ichunt/202203/11/cf3116f61c7d6d85f0a4a5ed90529385.png" mode="aspectFill"></image></view>
<view class="box"><image src="http://img.ichunt.com/images/ichunt/202203/11/cf3116f61c7d6d85f0a4a5ed90529385.png" mode="aspectFill"></image></view>
<view class="box"><image src="http://img.ichunt.com/images/ichunt/202203/11/cf3116f61c7d6d85f0a4a5ed90529385.png" mode="aspectFill"></image></view>
<view class="box"><image src="http://img.ichunt.com/images/ichunt/202203/11/cf3116f61c7d6d85f0a4a5ed90529385.png" mode="aspectFill"></image></view>
</view>
</view>
<view class="text-box">
<view class="tt-box row">
<text class="label">采购备注：</text>
<text class="t1">INV-9500148113这张里有个是光辉的,理货的人员记得看备注，多大200字符长度</text>
</view>
<view class="tt-box row">
<text class="label">商务回复：</text>
<text class="t2">按实物报关</text>
</view>
</view>
</view>
<view class="btn row rowCenter verCenter">重新发起理货</view>
</view>
</template> </template>
<script> <script>
...@@ -16,7 +179,6 @@ export default { ...@@ -16,7 +179,6 @@ export default {
getData() { getData() {
this.request(API.getCheckInList, 'POST', {}).then(res => { this.request(API.getCheckInList, 'POST', {}).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
} else { } else {
uni.showToast({ uni.showToast({
title: res.err_msg, title: res.err_msg,
......
pages/tag/deviceList.vue
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</view> </view>
</view> </view>
<view class="list"> <view class="list">
<view class="box row verCenter bothSide" v-for="(item, index) in list" :key="index" @click="connectChange(item.name, item.deviceId, index)" :key="index"> <view class="box row verCenter bothSide" v-for="(item, index) in list" @click="connectChange(item.name, item.deviceId, index)" :key="index">
<text class="t1">{{ item.name }}</text> <text class="t1">{{ item.name }}</text>
<template v-if="textArr[index] == '已连接'"> <template v-if="textArr[index] == '已连接'">
<text class="t2 active">{{ textArr[index] }}</text> <text class="t2 active">{{ textArr[index] }}</text>
......
static/iconfont.ttf
No preview for this file type
util/api.js
...@@ -60,7 +60,11 @@ const API = { ...@@ -60,7 +60,11 @@ const API = {
/** /**
* 理货列表 * 理货列表
* */ * */
getGoodsArrangeData: API_BASE + '/supplywechatwms/getGoodsArrangeData' getGoodsArrangeData: API_BASE + '/supplywechatwms/getGoodsArrangeData',
/**
* 获取理货异常列表
* */
getUnusualCheckInList: API_BASE + '/supplywechatwms/getUnusualCheckInList'
} }
......
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