Skip to content

梁建民 / wmsMin

Go to a project
Commit b3deb8f3 by LJM
Options

异常管理

parent a21d94e6
Inline Side-by-side
Showing with 117 additions and 55 deletions
assets/css/tally/abnormalManageList.scss
...@@ -217,8 +217,8 @@ ...@@ -217,8 +217,8 @@
width: 100%; width: 100%;
justify-content: flex-end; justify-content: flex-end;
.btn1 { .btn1 {
width: 100rpx; width: 137rpx;
height: 48rpx; height: 70rpx;
background: #fff; background: #fff;
border-radius: 4rpx; border-radius: 4rpx;
font-size: 24rpx; font-size: 24rpx;
...@@ -226,8 +226,8 @@ ...@@ -226,8 +226,8 @@
border: 1px solid #999; border: 1px solid #999;
} }
.btn2 { .btn2 {
width: 100rpx; width: 137rpx;
height: 48rpx; height: 70rpx;
background: #1969f9; background: #1969f9;
border-radius: 8rpx; border-radius: 8rpx;
font-size: 25rpx; font-size: 25rpx;
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
} }
.uni-input { .uni-input {
width: 310rpx; width: 310rpx;
height: 55rpx; height: 80rpx;
background: #e6edf0; background: #e6edf0;
border-radius: 4rpx; border-radius: 4rpx;
padding-left: 20rpx; padding-left: 20rpx;
...@@ -345,8 +345,8 @@ ...@@ -345,8 +345,8 @@
font-weight: bold; font-weight: bold;
} }
.search-btn { .search-btn {
width: 120rpx; width: 170rpx;
height: 55rpx; height: 80rpx;
background: #197adb; background: #197adb;
font-size: 26rpx; font-size: 26rpx;
color: #ffffff; color: #ffffff;
......
assets/css/tally/addAbnormal.scss
.page-box { .page-box {
padding-bottom: 20rpx;
.base-information { .base-information {
padding: 0 24rpx; padding: 0 24rpx;
background: #ffffff; background: #ffffff;
...@@ -120,8 +121,8 @@ ...@@ -120,8 +121,8 @@
border-bottom: 1px solid #e6edf0; border-bottom: 1px solid #e6edf0;
.label { .label {
position: relative; position: relative;
width: 183rpx; width: 213rpx;
font-size: 24rpx; font-size: 28rpx;
color: #6e767a; color: #6e767a;
&.required:after { &.required:after {
position: absolute; position: absolute;
...@@ -133,7 +134,7 @@ ...@@ -133,7 +134,7 @@
} }
} }
.input-wrap { .input-wrap {
width: calc(100% - 183rpx); width: calc(100% - 213rpx);
.tab-panel { .tab-panel {
&:last-child { &:last-child {
margin-right: 0; margin-right: 0;
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
} }
} }
.uni-list-cell-db { .uni-list-cell-db {
width: calc(100% - 183rpx); width: calc(100% - 213rpx);
position: relative; position: relative;
.icon-sanjiaoxing1 { .icon-sanjiaoxing1 {
position: absolute; position: absolute;
...@@ -171,7 +172,7 @@ ...@@ -171,7 +172,7 @@
font-weight: bold; font-weight: bold;
} }
.uni-input-box { .uni-input-box {
width: calc(100% - 183rpx); width: calc(100% - 213rpx);
.uni-input { .uni-input {
font-size: 24rpx; font-size: 24rpx;
color: #404547; color: #404547;
...@@ -198,16 +199,16 @@ ...@@ -198,16 +199,16 @@
.title { .title {
margin-bottom: 24rpx; margin-bottom: 24rpx;
.tt-l { .tt-l {
font-size: 24rpx; font-size: 28rpx;
color: #6e767a; color: #6e767a;
} }
.tt-r { .tt-r {
font-size: 24rpx; font-size: 28rpx;
color: #404547; color: #404547;
} }
} }
.upload-list { .upload-list {
padding-bottom: 24rpx; padding-bottom: 28rpx;
border-bottom: 1px solid #e6edf0; border-bottom: 1px solid #e6edf0;
.default { .default {
width: 144rpx; width: 144rpx;
...@@ -251,7 +252,7 @@ ...@@ -251,7 +252,7 @@
padding-top: 23rpx; padding-top: 23rpx;
textarea { textarea {
height: 80rpx; height: 80rpx;
font-size: 24rpx; font-size: 28rpx;
color: #6e767a; color: #6e767a;
border-bottom: 1px solid #e6edf0; border-bottom: 1px solid #e6edf0;
} }
......
pages.json
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
}, { }, {
"path": "pages/tally/abnormalTally", "path": "pages/tally/abnormalTally",
"style": { "style": {
"navigationBarTitleText": "理货异常处理" "navigationBarTitleText": "美产商检管理"
} }
}, { }, {
"path": "pages/tally/goods", "path": "pages/tally/goods",
......
pages/tally/abnormalManageList.vue
...@@ -54,50 +54,116 @@ ...@@ -54,50 +54,116 @@
<text class="label" @click="open()">异常编码：</text> <text class="label" @click="open()">异常编码：</text>
<text class="text">{{item.abnormal_number}}</text> <text class="text">{{item.abnormal_number}}</text>
</view> </view>
<view class="input-box row verCenter" style="flex: 0 0 100%;background-color: #f1f4f6;padding: 10rpx 0;">
<template v-if="item.abnormal_type == 1"> <template v-if="item.abnormal_type == 1">
<text class="label">订单品牌：</text> <view class="input-box row verCenter" style="flex: 0 0 100%;background-color: #c6d6e0;padding: 10rpx 0;">
<text class="text">{{item.order_brand}}</text>
</template>
<template v-else-if="item.abnormal_type == 2">
<text class="label">订单型号：</text> <text class="label">订单型号：</text>
<text class="text">{{item.order_model}}</text> <text class="text">{{item.order_model}}</text>
</template> </view>
<template v-else-if="item.abnormal_type == 3"> <view class="input-box row verCenter" style="flex: 0 0 100%;background-color: #c6d6e0;padding: 10rpx 0;">
<text class="label">实物型号：</text>
<view class="text">
<rich-text :nodes="highlightDifferences(item.order_model, item.actual_model)"></rich-text>
</view>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单品牌：</text>
<text class="text">{{item.order_brand}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单产地：</text> <text class="label">订单产地：</text>
<text class="text">{{item.order_origin}}</text> <text class="text">{{item.order_origin}}</text>
</template> </view>
<template v-else-if="item.abnormal_type == 4"> <view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单数量：</text> <text class="label">订单数量：</text>
<text class="text">{{item.order_qty}}</text> <text class="text">{{item.order_qty}}</text>
</view>
</template> </template>
<template v-else-if="item.abnormal_type == 2">
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单型号：</text>
<text class="text">{{item.order_model}}</text>
</view> </view>
<view class="input-box row verCenter" style="flex: 0 0 100%;background-color: #f1f4f6;padding: 10rpx 0;"> <view class="input-box row verCenter" style="flex: 0 0 100%;background-color: #c6d6e0;padding: 10rpx 0;">
<template v-if="item.abnormal_type == 1"> <text class="label">订单品牌：</text>
<text class="text">{{item.order_brand}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;background-color: #c6d6e0;padding: 10rpx 0;">
<text class="label">实物品牌：</text> <text class="label">实物品牌：</text>
<view class="text"> <view class="text">
<rich-text :nodes="highlightDifferences(item.order_brand, item.actual_brand)"></rich-text> <rich-text :nodes="highlightDifferences(item.order_brand, item.actual_brand)"></rich-text>
</view> </view>
</template> </view>
<template v-else-if="item.abnormal_type == 2"> <view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">实物型号：</text> <text class="label">订单产地：</text>
<view class="text"> <text class="text">{{item.order_origin}}</text>
<rich-text :nodes="highlightDifferences(item.order_model, item.actual_model)"></rich-text> </view>
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单数量：</text>
<text class="text">{{item.order_qty}}</text>
</view> </view>
</template> </template>
<template v-else-if="item.abnormal_type == 3"> <template v-else-if="item.abnormal_type == 3">
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单型号：</text>
<text class="text">{{item.order_model}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单品牌：</text>
<text class="text">{{item.order_brand}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;background-color: #c6d6e0;padding: 10rpx 0;">
<text class="label">订单产地：</text>
<text class="text">{{item.order_origin}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;background-color: #c6d6e0;padding: 10rpx 0;">
<text class="label">实物产地：</text> <text class="label">实物产地：</text>
<view class="text">
<rich-text :nodes="highlightDifferences(item.order_origin, item.actual_origin)"></rich-text> <rich-text :nodes="highlightDifferences(item.order_origin, item.actual_origin)"></rich-text>
</view> </view>
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单数量：</text>
<text class="text">{{item.order_qty}}</text>
</view>
</template> </template>
<template v-else-if="item.abnormal_type == 4"> <template v-else-if="item.abnormal_type == 4">
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单型号：</text>
<text class="text">{{item.order_model}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单品牌：</text>
<text class="text">{{item.order_brand}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单产地：</text>
<text class="text">{{item.order_origin}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;background-color: #c6d6e0;padding: 10rpx 0;">
<text class="label">订单数量：</text>
<text class="text">{{item.order_qty}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;background-color: #c6d6e0;padding: 10rpx 0;">
<text class="label">实物数量：</text> <text class="label">实物数量：</text>
<view class="text">
<rich-text :nodes="highlightDifferences(item.order_qty, item.actual_qty)"></rich-text> <rich-text :nodes="highlightDifferences(item.order_qty, item.actual_qty)"></rich-text>
</view> </view>
</template> </template>
<template v-else>
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单型号：</text>
<text class="text">{{item.order_model}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单品牌：</text>
<text class="text">{{item.order_brand}}</text>
</view> </view>
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单产地：</text>
<text class="text">{{item.order_origin}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;padding: 10rpx 0;">
<text class="label">订单数量：</text>
<text class="text">{{item.order_qty}}</text>
</view>
</template>
<view class="input-box row verCenter" style="flex: 0 0 100%;"> <view class="input-box row verCenter" style="flex: 0 0 100%;">
<text class="label">异常说明：</text> <text class="label">异常说明：</text>
<text class="text" style="max-width: 500rpx;" @click="show(item.abnormal_explain)">{{item.abnormal_explain}}</text> <text class="text" style="max-width: 500rpx;" @click="show(item.abnormal_explain)">{{item.abnormal_explain}}</text>
...@@ -142,7 +208,7 @@ ...@@ -142,7 +208,7 @@
<text class="text">查不到当前数据</text> <text class="text">查不到当前数据</text>
</view> </view>
<!-- 新增异常弹窗 --> <!-- 新增异常弹窗 -->
<uni-popup ref="popup" background-color="#F1F4F6"> <uni-popup ref="popup" background-color="#c6d6e0">
<view class="popup-content"> <view class="popup-content">
<view class="section"> <view class="section">
<view class="input-box row verCenter" style="margin-bottom: 40rpx;"> <view class="input-box row verCenter" style="margin-bottom: 40rpx;">
...@@ -158,22 +224,24 @@ ...@@ -158,22 +224,24 @@
<view class="uni-th">品牌</view> <view class="uni-th">品牌</view>
<view class="uni-th">数量</view> <view class="uni-th">数量</view>
</view> </view>
<scroll-view scroll-y="true" style="max-height: 500rpx;">
<view class="uni-tr" v-for="(item,index) in orderDetailByIdList" :key="index" @click="selectedChange(2,index)" :class="{curr:orderDetailByIdIndex==index}"> <view class="uni-tr" v-for="(item,index) in orderDetailByIdList" :key="index" @click="selectedChange(2,index)" :class="{curr:orderDetailByIdIndex==index}">
<view class="uni-td">{{index+1}}</view> <view class="uni-td">{{index+1}}</view>
<view class="uni-td">{{item.model}}</view> <view class="uni-td">{{item.model}}</view>
<view class="uni-td">{{item.brand}}</view> <view class="uni-td">{{item.brand}}</view>
<view class="uni-td">{{item.qty}}</view> <view class="uni-td">{{item.qty}}</view>
</view> </view>
</scroll-view>
</view> </view>
</view> </view>
<view class="btn row bothSide"> <view class="btn row bothSide">
<view class="canel row rowCenter verCenter" @click="close()">返回</view> <view class="canel row rowCenter verCenter" @click="close()" style="height: 80rpx;">返回</view>
<view class="ok row rowCenter verCenter" @click="next()">下一步</view> <view class="ok row rowCenter verCenter" @click="next()" style="height: 80rpx;">下一步</view>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
<!-- 多个入仓号 --> <!-- 多个入仓号 -->
<uni-popup ref="popupErpSn" background-color="#F1F4F6"> <uni-popup ref="popupErpSn" background-color="#c6d6e0">
<view class="popup-content"> <view class="popup-content">
<view class="section"> <view class="section">
<view style="margin-bottom: 20rpx;"> <view style="margin-bottom: 20rpx;">
......
pages/tally/addAbnormal.vue
...@@ -50,30 +50,30 @@ ...@@ -50,30 +50,30 @@
</picker> </picker>
</view> </view>
</view> </view>
<view class="box row verCenter"> <view class="box row verCenter" v-if="index == 0 || index == 1|| index == 2|| index == 3">
<template v-if="index == 0"> <template v-if="index == 0">
<text class="label">实物品牌</text> <text class="label">实物品牌</text>
<view class="uni-input-box row verCenter bothSide"> <view class="uni-input-box row verCenter bothSide">
<input type="text" class="uni-input" placeholder="实物品牌" placeholder-style="color:#404547;font-weight:bold;" v-model="form.actual_brand" style="width: 100%;" /> <input type="text" class="uni-input" placeholder="请输入" placeholder-style="color:#404547;" v-model="form.actual_brand" style="width: 100%;" />
</view> </view>
</template> </template>
<template v-else-if="index == 1"> <template v-else-if="index == 1">
<text class="label">实物型号</text> <text class="label">实物型号</text>
<view class="uni-input-box row verCenter bothSide"> <view class="uni-input-box row verCenter bothSide">
<input type="text" class="uni-input" placeholder="实物型号" placeholder-style="color:#404547;font-weight:bold;" v-model="form.actual_model" style="width: 100%;" /> <input type="text" class="uni-input" placeholder="请输入" placeholder-style="color:#404547;" v-model="form.actual_model" style="width: 100%;" />
</view> </view>
</template> </template>
<template v-else-if="index == 2"> <template v-else-if="index == 2">
<text class="label">实物产地</text> <text class="label">实物产地</text>
<view class="uni-input-box row verCenter bothSide"> <view class="uni-input-box row verCenter bothSide">
<input type="text" class="uni-input" placeholder="实物产地" placeholder-style="color:#404547;font-weight:bold;" v-model="form.actual_origin" style="width: 100%;" /> <input type="text" class="uni-input" placeholder="请输入" placeholder-style="color:#404547;" v-model="form.actual_origin" style="width: 100%;" />
</view> </view>
</template> </template>
<template v-else-if="index == 3"> <template v-else-if="index == 3">
<text class="label">实物数量</text> <text class="label">实物数量</text>
<view class="uni-input-box row verCenter bothSide"> <view class="uni-input-box row verCenter bothSide">
<input type="text" class="uni-input" placeholder="实物数量" placeholder-style="color:#404547;font-weight:bold;" v-model="form.actual_qty" style="width: 100%;" /> <input type="text" class="uni-input" placeholder="请输入" placeholder-style="color:#404547;" v-model="form.actual_qty" style="width: 100%;" />
</view> </view>
</template> </template>
</view> </view>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<view class="title row bothSide verCenter"> <view class="title row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
<text style="color: red;">*</text> <text style="color: red;">*</text>
<text class="tt-l">异常图片上传（选填）</text> <text class="tt-l">异常图片上传</text>
</view> </view>
<text class="tt-r">{{ abnormal_pic_url.length }}/4</text> <text class="tt-r">{{ abnormal_pic_url.length }}/4</text>
</view> </view>
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<view class="default row rowCenter verCenter" @click="chooseImageChange()" v-if="abnormal_pic_url.length < 4"><text class="iconfont icon-xingzhuangjiehe"></text></view> <view class="default row rowCenter verCenter" @click="chooseImageChange()" v-if="abnormal_pic_url.length < 4"><text class="iconfont icon-xingzhuangjiehe"></text></view>
</view> </view>
<view class="textarea-box"> <view class="textarea-box">
<textarea maxlength="200" placeholder="请输入异常说明（选填）" placeholder-style="color:#6E767A;" v-model="form.abnormal_explain"></textarea> <textarea maxlength="200" placeholder="请输入异常说明" placeholder-style="color:#6E767A;" v-model="form.abnormal_explain"></textarea>
<view class="quickExpressions row"> <view class="quickExpressions row">
<view class="lable-box" @click="selectionText(item.expressions)" v-for="(item,index) in quickExpressions" :key="index">{{item.expressions}}</view> <view class="lable-box" @click="selectionText(item.expressions)" v-for="(item,index) in quickExpressions" :key="index">{{item.expressions}}</view>
</view> </view>
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
data() { data() {
return { return {
noexebshowFalg: true, //控制是否会触发生命周期 noexebshowFalg: true, //控制是否会触发生命周期
array: ['品牌异常', '型号异常', '产地异常', '数量异常'], array: ['品牌异常', '型号异常', '产地异常', '数量异常', '标签异常', '其他异常'],
index: 0, index: 0,
salesman: '', salesman: '',
orderDetailByIdIndex: '', orderDetailByIdIndex: '',
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
getQuickExpressions() { getQuickExpressions() {
this.request(API.getQuickExpressions, 'GET', { abnormal_type: this.form.abnormal_type }, false).then(res => { this.request(API.getQuickExpressions, 'GET', { abnormal_type: this.form.abnormal_type }, false).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
this.quickExpressions.list = res.data; this.quickExpressions = res.data.list;
} else { } else {
uni.showToast({ uni.showToast({
title: res.err_msg, title: res.err_msg,
...@@ -338,13 +338,6 @@ ...@@ -338,13 +338,6 @@
}); });
return false; return false;
} }
if (!this.form.actual_model && !this.form.actual_brand && !this.form.actual_qty && this.form.actual_origin) {
uni.showToast({
title: '请填写实物',
icon: 'none'
});
return false;
}
if (this.form.is_business_processing === '') { if (this.form.is_business_processing === '') {
uni.showToast({ uni.showToast({
title: '请选择是否需要业务处理', title: '请选择是否需要业务处理',
......
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