Skip to content

梁建民 / wmsMin

Go to a project
Commit 873b20e9 by LJM
Options

异常理货

parent c6d5b1ec
Expand all
Inline Side-by-side
Showing with 146 additions and 42 deletions
assets/css/goods/tally.scss
.tally { .tally {
padding-top: 100rpx; padding-top: 100rpx;
padding-bottom: 50rpx;
.fix { .fix {
position: fixed; position: fixed;
top: 0; top: 0;
...@@ -118,10 +119,82 @@ ...@@ -118,10 +119,82 @@
font-size: 26rpx; font-size: 26rpx;
color: #197adb; color: #197adb;
} }
.words-text-dis{ .words-text-dis {
font-size: 26rpx; font-size: 26rpx;
color: #404547; color: #404547;
} }
} }
} }
.await_response {
padding: 0 24rpx;
.box {
margin-bottom: 16rpx;
padding: 24rpx 24rpx 24rpx 16rpx;
height: 174rpx;
background: #ffffff;
border-radius: 4rpx;
.left {
width: 91rpx;
padding: 0 24rpx;
height: 126rpx;
background: #197adb;
border-radius: 4rpx;
font-size: 22rpx;
color: #ffffff;
}
.right {
width: calc(100% - 120rpx);
.p1 {
margin-bottom: 18rpx;
.t1 {
font-size: 28rpx;
color: #1e2021;
font-weight: bold;
}
.t2 {
font-size: 26rpx;
color: #197adb;
}
.t3 {
width: 48rpx;
height: 36rpx;
border-radius: 4rpx;
border: 1rpx solid #197adb;
font-size: 24rpx;
color: #197adb;
margin-left: 16rpx;
}
}
.p2 {
margin-bottom: 8rpx;
.t1 {
font-size: 22rpx;
color: #6e767a;
margin-right: 16rpx;
}
.t2 {
font-size: 22rpx;
color: #404547;
}
}
.p3 {
.t1 {
color: #6e767a;
font-size: 22rpx;
margin-right: 16rpx;
}
.t2 {
color: #404547;
font-size: 22rpx;
}
}
}
&.curr {
.left {
background: #cad9e0;
color: #404547;
}
}
}
}
} }
assets/css/goods/tallyExectionDetail.scss
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
} }
.pp { .pp {
margin-bottom: 20rpx; margin-bottom: 20rpx;
&:last-child{ &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
&.mb24 { &.mb24 {
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
border-right: none; border-right: none;
} }
} }
.tc{ .tc {
justify-content: center; justify-content: center;
padding-left: 0; padding-left: 0;
} }
...@@ -157,57 +157,57 @@ ...@@ -157,57 +157,57 @@
border-right: none; border-right: none;
} }
} }
.tc{ .tc {
justify-content: center; justify-content: center;
padding-left: 0; padding-left: 0;
} }
} }
} }
.show-pic{ .show-pic {
padding-top: 24rpx; padding-top: 24rpx;
padding-bottom: 47rpx; padding-bottom: 47rpx;
border-bottom: 1px solid #E6EDF0; border-bottom: 1px solid #e6edf0;
.pic-title{ .pic-title {
font-size: 24rpx; font-size: 24rpx;
color: #6E767A; color: #6e767a;
margin-bottom: 23rpx; margin-bottom: 23rpx;
} }
.list{ .list {
flex-wrap: wrap; flex-wrap: wrap;
.box{ .box {
width: 145rpx; width: 145rpx;
height: 145rpx; height: 145rpx;
margin-right: 24rpx; margin-right: 24rpx;
&:nth-of-type(4n){ &:nth-of-type(4n) {
margin-right: 0; margin-right: 0;
} }
image{ image {
width: 145rpx; width: 145rpx;
height: 145rpx; height: 145rpx;
} }
} }
} }
} }
.text-box{ .text-box {
padding-top: 24rpx; padding-top: 24rpx;
.tt-box{ .tt-box {
margin-bottom: 20rpx; margin-bottom: 20rpx;
&:last-child{ &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.label{ .label {
width: 120rpx; width: 120rpx;
font-size: 24rpx; font-size: 24rpx;
color: #6E767A; color: #6e767a;
white-space: nowrap; white-space: nowrap;
} }
.t1{ .t1 {
font-size: 24rpx; font-size: 24rpx;
color: #404547; color: #404547;
} }
.t2{ .t2 {
font-size: 24rpx; font-size: 24rpx;
color: #BB3434; color: #bb3434;
} }
} }
} }
...@@ -219,5 +219,9 @@ ...@@ -219,5 +219,9 @@
border-radius: 4rpx; border-radius: 4rpx;
font-size: 28rpx; font-size: 28rpx;
color: #ffffff; color: #ffffff;
&.disabled {
background: #9ca8ad;
border-radius: 4rpx;
}
} }
} }
pages/goods/tallyExectionDetail.vue
...@@ -10,22 +10,22 @@ ...@@ -10,22 +10,22 @@
<view class="pp row verCenter"> <view class="pp row verCenter">
<text class="t1">入仓号：</text> <text class="t1">入仓号：</text>
<text class="t2" style="width: auto;">{{ customerDetail.base.erp_order_sn }}</text> <text class="t2" style="width: auto;">{{ customerDetail.base.erp_order_sn }}</text>
<text class="type row rowCenter verCenter">商检</text> <text class="type row rowCenter verCenter" v-if="customerDetail.base.is_goods_check">商检</text>
</view> </view>
<view class="pp row verCenter"> <view class="pp row verCenter">
<text class="t1">订单时间：</text> <text class="t1">跟单商务：</text>
<text class="t2">{{ customerDetail.base.order_time_cn }}</text> <text class="t2">{{ customerDetail.base.create_user_name }}</text>
</view> </view>
<view class="pp row verCenter"> <view class="pp row verCenter">
<text class="t1">订单客户：</text> <text class="t1">订单客户：</text>
<text class="t2">{{ customerDetail.base.company_name }}</text> <text class="t2">{{ customerDetail.base.company_name }}</text>
</view> </view>
<view class="pp row verCenter"> <view class="pp row verCenter">
<text class="t1">问客时间：</text> <text class="t1">发起时间：</text>
<text class="t2">{{ customerDetail.base.ask_time_cn }}</text> <text class="t2">{{ customerDetail.base.create_time }}</text>
</view> </view>
</view> </view>
<view class="question-box" v-for="(item, index) in customerDetail.detail"> <view class="question-box" v-for="(item, index) in customerDetail.detail" :key="index">
<view class="top row bothSide verCenter"> <view class="top row bothSide verCenter">
<view class="title row verCenter"> <view class="title row verCenter">
<text class="arrow row rowCenter verCenter"></text> <text class="arrow row rowCenter verCenter"></text>
...@@ -39,21 +39,21 @@ ...@@ -39,21 +39,21 @@
<view class="status-box row verCenter bothSide"> <view class="status-box row verCenter bothSide">
<view class="bb row verCenter"> <view class="bb row verCenter">
<text class="t1">客户状态：</text> <text class="t1">客户状态：</text>
<text class="t2">{{item.ask_customer_status_cn}}</text> <text class="t2">{{ item.ask_customer_status_cn }}</text>
</view> </view>
<view class="bb row verCenter"> <view class="bb row verCenter">
<text class="t1">商务状态：</text> <text class="t1">商务状态：</text>
<text class="t2">{{item.ask_customer_sw_status_cn}}</text> <text class="t2">{{ item.ask_customer_sw_status_cn }}</text>
</view> </view>
</view> </view>
<view class="uni-table"> <view class="uni-table">
<view class="uni-th row"> <view class="uni-th row">
<text class="row verCenter tc">序号</text> <text class="row verCenter tc">序号</text>
<text class="row verCenter">规格型号</text> <text class="row verCenter">规格型号</text>
<text class="row verCenter">订单{{item.ask_customer_exception_id_cn.substr(0, 2)}}</text> <text class="row verCenter">订单{{ item.ask_customer_exception_id_cn.substr(0, 2) }}</text>
<text class="row verCenter">实到{{item.ask_customer_exception_id_cn.substr(0, 2)}}</text> <text class="row verCenter">实到{{ item.ask_customer_exception_id_cn.substr(0, 2) }}</text>
</view> </view>
<view class="uni-tr row verCenter" v-for="(v, i) in item.goods_info"> <view class="uni-tr row verCenter" v-for="(v, i) in item.goods_info" :key="i">
<text class="txt w row verCenter tc">{{ i + 1 }}</text> <text class="txt w row verCenter tc">{{ i + 1 }}</text>
<text class="txt w row verCenter">{{ v.goods_type }}</text> <text class="txt w row verCenter">{{ v.goods_type }}</text>
<text class="txt w row verCenter">{{ v.order_result }}</text> <text class="txt w row verCenter">{{ v.order_result }}</text>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<view class="show-pic"> <view class="show-pic">
<view class="pic-title">问题图片</view> <view class="pic-title">问题图片</view>
<view class="list row verCenter"> <view class="list row verCenter">
<view class="box" @click="previewChange(item.upload_img.split(','), i)" v-for="(v, i) in item.upload_img.split(',')" :key="index"><image :src="v" mode="aspectFill"></image></view> <view class="box" @click="previewChange(item.upload_img.split(','), i)" v-for="(v, i) in item.upload_img.split(',')" :key="i"><image :src="v" mode="aspectFill"></image></view>
</view> </view>
</view> </view>
<view class="text-box"> <view class="text-box">
...@@ -77,7 +77,8 @@ ...@@ -77,7 +77,8 @@
</view> </view>
</view> </view>
</view> </view>
<navigator class="btn row rowCenter verCenter" :url="'/pages/goods/tallyDetail?number=' + customerDetail.base.erp_order_sn">重新发起理货</navigator> <view class="btn row rowCenter verCenter" @click="changeWatch(customerDetail.base.ask_customer_id)" v-if="customerDetail.base.is_watch == 0">核对并执行</view>
<view class="btn row rowCenter verCenter disabled" v-if="customerDetail.base.is_watch == 1">已核对</view>
</view> </view>
</template> </template>
...@@ -93,7 +94,7 @@ export default { ...@@ -93,7 +94,7 @@ export default {
}; };
}, },
onLoad(options) { onLoad(options) {
this.number = options.number; this.number = options.erp_order_sn;
}, },
onShow() { onShow() {
if (this.noexebshowFalg) { if (this.noexebshowFalg) {
...@@ -119,6 +120,25 @@ export default { ...@@ -119,6 +120,25 @@ export default {
}); });
} }
}); });
},
changeWatch(ask_customer_id) {
this.request(API.changeWatch, 'GET', { ask_customer_id: ask_customer_id }, true).then(res => {
if (res.err_code === 0) {
uni.showToast({
title: '操作成功',
icon: 'none'
});
setTimeout(() => {
this.getData();
}, 2000);
} else {
uni.showModal({
title: '提示',
content: res.err_msg,
showCancel: false
});
}
});
} }
} }
}; };
......
pages/home/index.vue
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
tips: '' tips: ''
}, },
{ {
name: '理货作业', name: '异常理货',
iconfont: 'icon-a-10cangkucangchu', iconfont: 'icon-a-10cangkucangchu',
tips: '' tips: ''
}, },
...@@ -125,11 +125,6 @@ export default { ...@@ -125,11 +125,6 @@ export default {
tips: '' tips: ''
}, },
{ {
name: '扫描盘点',
iconfont: 'icon-chakanbeizhu',
tips: ''
},
{
name: '理货确认', name: '理货确认',
iconfont: 'icon-chakanbeizhu', iconfont: 'icon-chakanbeizhu',
tips: '' tips: ''
...@@ -202,7 +197,7 @@ export default { ...@@ -202,7 +197,7 @@ export default {
uni.navigateTo({ uni.navigateTo({
url: '/pages/goods/addReceiving' url: '/pages/goods/addReceiving'
}); });
} else if (item.name == '理货作业') { } else if (item.name == '异常理货') {
uni.navigateTo({ uni.navigateTo({
url: '/pages/goods/tally' url: '/pages/goods/tally'
}); });
......
util/api.js
...@@ -192,7 +192,19 @@ const API = { ...@@ -192,7 +192,19 @@ const API = {
/** /**
* 提交理货 * 提交理货
*/ */
submitTallyGoods: API_BASE + '/supplywechatwms/submitTallyGoods' submitTallyGoods: API_BASE + '/supplywechatwms/submitTallyGoods',
/**
* 等待回复
*/
askCustomerProblemList: API_BASE + '/supplywechatwms/askCustomerProblemList',
/**
* 详情
*/
askCustomerProblemDetail: API_BASE + '/supplywechatwms/askCustomerProblemDetail',
/**
* 修改是否查看
*/
changeWatch: API_BASE + '/supplywechatwms/changeWatch'
} }
......
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