Skip to content

梁建民 / wmsMin

Go to a project
Commit 797ac886 by LJM
Options

css

parent 0b8cae18
Inline Side-by-side
Showing with 56 additions and 40 deletions
assets/css/goods/tallyExectionDetail.scss
.tallyExectionDetail { .tallyExectionDetail {
padding: 24rpx; padding: 24rpx;
.base-information { .base-information {
padding: 24rpx; padding: 24rpx 24rpx 0 24rpx;
background: #ffffff; background: #ffffff;
border-radius: 4rpx; border-radius: 4rpx;
margin-bottom: 16rpx; margin-bottom: 16rpx;
...@@ -66,6 +66,12 @@ ...@@ -66,6 +66,12 @@
color: #404547; color: #404547;
font-weight: bold; font-weight: bold;
} }
.t3 {
font-size: 24rpx;
color: #197adb;
font-weight: bold;
margin-left: 16rpx;
}
} }
} }
} }
...@@ -127,7 +133,7 @@ ...@@ -127,7 +133,7 @@
border-top: 1px solid #cad9e0; border-top: 1px solid #cad9e0;
border-bottom: 1px solid #cad9e0; border-bottom: 1px solid #cad9e0;
text { text {
flex: 0 0 25%; flex: 0 0 20%;
font-size: 22rpx; font-size: 22rpx;
color: #6e767a; color: #6e767a;
padding-left: 23rpx; padding-left: 23rpx;
...@@ -149,10 +155,16 @@ ...@@ -149,10 +155,16 @@
color: #404547; color: #404547;
letter-spacing: normal; letter-spacing: normal;
word-break: break-all; word-break: break-all;
&.desc {
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
} }
.w { .w {
height: 100%; height: 100%;
flex: 0 0 25%; flex: 0 0 20%;
padding-left: 23rpx; padding-left: 23rpx;
border-right: 1px solid #cad9e0; border-right: 1px solid #cad9e0;
&:last-child { &:last-child {
...@@ -161,6 +173,7 @@ ...@@ -161,6 +173,7 @@
} }
.tc { .tc {
justify-content: center; justify-content: center;
text-align: center;
padding-left: 0; padding-left: 0;
} }
} }
......
pages/goods/tally.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</view> </view>
</view> </view>
<view class="await_response"> <view class="await_response">
<navigator class="box row bothSide verCenter" :url="'/pages/goods/tallyExectionDetail?erp_order_sn=' + item.erp_order_sn" v-for="(item, index) in list" :key="index" v-if="list.length > 0" :class="{ curr: item.store_execute_status == 2 }"> <navigator class="box row bothSide verCenter" :url="'/pages/goods/tallyExectionDetail?ask_customer_problem_list_id=' + item.ask_customer_problem_list_id" v-for="(item, index) in list" :key="index" v-if="list.length > 0" :class="{ curr: item.store_execute_status == 2 }">
<view class="left row rowCenter verCenter">{{ item.ask_customer_exception_id_cn }}</view> <view class="left row rowCenter verCenter">{{ item.ask_customer_exception_id_cn }}</view>
<view class="right"> <view class="right">
<view class="p1 row bothSide verCenter"> <view class="p1 row bothSide verCenter">
......
pages/goods/tallyExectionDetail.vue
...@@ -9,76 +9,78 @@ ...@@ -9,76 +9,78 @@
</view> </view>
<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.erp_order_sn }}</text>
<text class="type row rowCenter verCenter" v-if="customerDetail.base.is_goods_check">商检</text> <text class="type row rowCenter verCenter" v-if="customerDetail.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.create_user_name }}</text> <text class="t2">{{ customerDetail.bussiness_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.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.create_time }}</text> <text class="t2">{{ customerDetail.create_time_cn }}</text>
</view>
<view class="status-box row verCenter bothSide">
<view class="bb row verCenter">
<text class="t1">商务状态：</text>
<text class="t2">{{ customerDetail.ask_customer_status_cn || '--' }}</text>
</view>
<view class="bb row verCenter">
<text class="t1">商务状态：</text>
<text class="t3">{{ customerDetail.ask_customer_sw_status_cn || '--' }}</text>
</view>
</view> </view>
</view> </view>
<view class="question-box" v-for="(item, index) in customerDetail.detail" :key="index"> <view class="question-box">
<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>
<text class="tt">问题类型{{ index + 1 }}</text> <text class="tt">问题类型</text>
</view> </view>
<view class="exception-ico row verCenter"> <view class="exception-ico row verCenter">
<text class="iconfont icon-jinggao1"></text> <text class="iconfont icon-jinggao1"></text>
<text class="tt">{{ item.ask_customer_exception_id_cn }}</text> <text class="tt">{{ customerDetail.ask_customer_exception_id_cn }}</text>
</view>
</view>
<view class="status-box row verCenter bothSide">
<view class="bb row verCenter">
<text class="t1">客户状态：</text>
<text class="t2">{{ item.ask_customer_status_cn }}</text>
</view>
<view class="bb row verCenter">
<text class="t1">商务状态：</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">下单数据</text>
<text class="row verCenter">实到{{ item.ask_customer_exception_id_cn.substr(0, 2) }}</text> <text class="row verCenter">仓库数据</text>
<text class="row verCenter">商务回复</text>
</view> </view>
<view class="uni-tr row verCenter" v-for="(v, i) in item.goods_info" :key="i"> <view class="uni-tr row verCenter" v-for="(item, index) in customerDetail.order_goods" :key="index">
<text class="txt w row verCenter tc">{{ i + 1 }}</text> <text class="txt w row verCenter tc">{{ index + 1 }}</text>
<text class="txt w row verCenter">{{ v.goods_type }}</text> <text class="txt w row verCenter">{{ item.goods_type }}</text>
<text class="txt w row verCenter">{{ v.order_result }}</text> <text class="txt w row verCenter">{{ item.order_result }}</text>
<text class="txt w row verCenter">{{ v.store_result }}</text> <text class="txt w row verCenter">{{ item.store_result }}</text>
<text class="txt w row verCenter desc">{{ item.customer_result }}</text>
</view> </view>
</view> </view>
<view class="show-pic"> <view class="show-pic" v-if="customerDetail.upload_img">
<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="i"><image :src="v" mode="aspectFill"></image></view> <view class="box" @click="previewChange(customerDetail.upload_img.split(','), i)" v-for="(v, i) in customerDetail.upload_img.split(',')" :key="i"><image :src="v" mode="aspectFill"></image></view>
</view> </view>
</view> </view>
<view class="text-box"> <view class="text-box">
<view class="tt-box row"> <view class="tt-box row">
<text class="label">采购备注：</text> <text class="label">采购备注：</text>
<text class="t1">{{ v.ask_customer_remark || '--' }}</text> <text class="t1">{{ customerDetail.ask_customer_remark || '--' }}</text>
</view> </view>
<view class="tt-box row"> <view class="tt-box row">
<text class="label">商务回复：</text> <text class="label">商务回复：</text>
<text class="t2">{{ v.ask_customer_sw_confirm_remark || '--' }}</text> <text class="t2">{{ customerDetail.ask_customer_sw_confirm_remark || '--' }}</text>
</view> </view>
</view> </view>
</view> </view>
<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" @click="changeWatch(customerDetail.ask_customer_id)" v-if="customerDetail.is_watch == 0">核对并执行</view>
<view class="btn row rowCenter verCenter disabled" v-if="customerDetail.base.is_watch == 1">已核对</view> <view class="btn row rowCenter verCenter disabled" v-if="customerDetail.is_watch == 1">已核对</view>
</view> </view>
</template> </template>
...@@ -89,12 +91,12 @@ export default { ...@@ -89,12 +91,12 @@ export default {
data() { data() {
return { return {
noexebshowFalg: true, //控制是否会触发生命周期 noexebshowFalg: true, //控制是否会触发生命周期
number: '', //入仓号 ask_customer_problem_list_id: '',
customerDetail: {} customerDetail: {}
}; };
}, },
onLoad(options) { onLoad(options) {
this.number = options.erp_order_sn; this.ask_customer_problem_list_id = options.ask_customer_problem_list_id;
}, },
onShow() { onShow() {
if (this.noexebshowFalg) { if (this.noexebshowFalg) {
...@@ -110,7 +112,7 @@ export default { ...@@ -110,7 +112,7 @@ export default {
}); });
}, },
getData() { getData() {
this.request(API.getAskCustomerDetail, 'GET', { erp_order_sn: this.number }).then(res => { this.request(API.askCustomerProblemDetail, 'GET', { ask_customer_problem_list_id: this.ask_customer_problem_list_id }).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
this.customerDetail = res.data; this.customerDetail = res.data;
} else { } else {
......
pages/tallyGoods/originSplit.vue
...@@ -154,6 +154,7 @@ export default { ...@@ -154,6 +154,7 @@ export default {
} else if (type == 2) { } else if (type == 2) {
this.tally_num = parseInt(e.target.value) + 1; this.tally_num = parseInt(e.target.value) + 1;
this.index = e.target.value; this.index = e.target.value;
console.log(this.goods_index);
this.detail_json = Array.from({ length: this.tally_num }, () => ({ origin: '', tally_num: '', ptEntryID: this.goods_list[this.goods_index].ptEntryID })); this.detail_json = Array.from({ length: this.tally_num }, () => ({ origin: '', tally_num: '', ptEntryID: this.goods_list[this.goods_index].ptEntryID }));
} }
}, },
......
util/api.js
...@@ -198,7 +198,7 @@ const API = { ...@@ -198,7 +198,7 @@ const API = {
*/ */
askCustomerProblemList: API_BASE + '/supplywechatwms/askCustomerProblemList', askCustomerProblemList: API_BASE + '/supplywechatwms/askCustomerProblemList',
/** /**
* 详情 * 异常理货详情
*/ */
askCustomerProblemDetail: API_BASE + '/supplywechatwms/askCustomerProblemDetail', askCustomerProblemDetail: API_BASE + '/supplywechatwms/askCustomerProblemDetail',
/** /**
......
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