Skip to content

梁建民 / wmsMin

Go to a project
Commit 18ba86ef by LJM
Options

bug

parent b7c0f379
Inline Side-by-side
Showing with 29 additions and 33 deletions
pages/goods/tally.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<text class="t2" v-if="index == currentIndex">({{ total }})</text> <text class="t2" v-if="index == currentIndex">({{ total }})</text>
</view> </view>
</view> </view>
<view class="await_response"> <view class="await_response" v-if="list.length > 0">
<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 }"> <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">
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</view> </view>
<view class="p2 row verCenter"> <view class="p2 row verCenter">
<text class="t1">仓库备注：</text> <text class="t1">仓库备注：</text>
<text class="t2">{{ item.ask_customer_exception_id_cn }}</text> <text class="t2">{{ item.ask_customer_remark }}</text>
</view> </view>
<view class="p3 row bothSide verCenter"> <view class="p3 row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
...@@ -54,11 +54,11 @@ ...@@ -54,11 +54,11 @@
</view> </view>
</view> </view>
</navigator> </navigator>
<view class="no-data column verCenter rowCenter" v-else> </view>
<text class="iconfont icon-jinggao2"></text> <view class="no-data column verCenter rowCenter" v-else>
<text class="text">查找不到相关信息</text> <text class="iconfont icon-jinggao2"></text>
<text class="p">1、请输入正确的入仓号</text> <text class="text">查找不到相关信息</text>
</view> <text class="p">1、请输入正确的入仓号</text>
</view> </view>
</view> </view>
</template> </template>
...@@ -77,7 +77,8 @@ export default { ...@@ -77,7 +77,8 @@ export default {
page: 1, page: 1,
limit: 1000, limit: 1000,
erp_order_sn: '', //入仓号 erp_order_sn: '', //入仓号
ask_customer_status: 1 //等待回复 商务已回复 ask_customer_status: 1, //等待回复
ask_customer_sw_status: '' //商务已回复
} }
}; };
}, },
...@@ -93,9 +94,13 @@ export default { ...@@ -93,9 +94,13 @@ export default {
changeTab(index) { changeTab(index) {
this.currentIndex = index; this.currentIndex = index;
if (index == 0) { if (index == 0) {
//等待回复列表
this.searchParams.ask_customer_status = 1; this.searchParams.ask_customer_status = 1;
this.searchParams.ask_customer_sw_status = '';
} else if (index == 1) { } else if (index == 1) {
this.searchParams.ask_customer_status = 2; //商务已回复列表
this.searchParams.ask_customer_status = '';
this.searchParams.ask_customer_sw_status = 2;
} }
this.getData(); this.getData();
}, },
...@@ -108,15 +113,13 @@ export default { ...@@ -108,15 +113,13 @@ export default {
}, 800); }, 800);
}, },
getData() { getData() {
this.request(API.askCustomerProblemList, 'GET', { page: this.searchParams.page, limit: this.searchParams.limit, ask_customer_status: this.searchParams.ask_customer_status }, true).then(res => { this.request(API.askCustomerProblemList, 'GET', this.searchParams, true).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
this.list = res.data.data; this.list = res.data.data;
this.total = res.data.total; this.total = res.data.total;
} else { } else {
uni.showToast({ this.list = [];
title: res.err_msg, this.total = 0;
icon: 'none'
});
} }
}); });
}, },
......
pages/goods/tallyExectionDetail.vue
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</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">{{ customerDetail.ask_customer_remark || '--' }}</text> <text class="t1">{{ customerDetail.ask_customer_remark || '--' }}</text>
</view> </view>
<view class="tt-box row"> <view class="tt-box row">
...@@ -79,8 +79,10 @@ ...@@ -79,8 +79,10 @@
</view> </view>
</view> </view>
</view> </view>
<view class="btn row rowCenter verCenter" @click="changeWatch(customerDetail.ask_customer_problem_list_id)" v-if="customerDetail.is_watch == 0">核对并执行</view> <template v-if="customerDetail.ask_customer_sw_status == 2 && customerDetail.store_execute_status == 1">
<view class="btn row rowCenter verCenter disabled" v-if="customerDetail.is_watch == 1">已核对</view> <view class="btn row rowCenter verCenter" @click="changeWatch(customerDetail.ask_customer_problem_list_id)" v-if="customerDetail.is_watch == 0">核对并执行</view>
<view class="btn row rowCenter verCenter disabled" v-if="customerDetail.is_watch == 1">已核对</view>
</template>
</view> </view>
</template> </template>
......
pages/tallyGoods/confirm.vue
...@@ -62,18 +62,7 @@ ...@@ -62,18 +62,7 @@
<view class="upload-box"> <view class="upload-box">
<view class="title row bothSide verCenter" v-if="goods_check_pic_list.length > 0"> <view class="title row bothSide verCenter" v-if="goods_check_pic_list.length > 0">
<text class="tt-l">商检图片上传（仅商检必填）</text> <text class="tt-l">商检图片上传（仅商检必填）</text>
<template v-if="goods_check_pic_list[2].length > 0"> <text class="tt-r">{{ goods_check_pic_list.filter(subArray => subArray.length > 0).length }}/{{ goods_check_pic_list.length }}</text>
<text class="tt-r">3/3</text>
</template>
<template v-else-if="goods_check_pic_list[1].length > 0">
<text class="tt-r">2/3</text>
</template>
<template v-else-if="goods_check_pic_list[0].length > 0">
<text class="tt-r">1/3</text>
</template>
<template v-else>
<text class="tt-r">0/3</text>
</template>
</view> </view>
<view class="model-upload-list"> <view class="model-upload-list">
<view class="box row bothSide verCenter" v-for="(item, index) in list" :key="index" :class="{ curr: goods_check_pic_list[index].length > 0 }"> <view class="box row bothSide verCenter" v-for="(item, index) in list" :key="index" :class="{ curr: goods_check_pic_list[index].length > 0 }">
...@@ -115,7 +104,7 @@ ...@@ -115,7 +104,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="btn row rowCenter verCenter" @click="submit()" :class="{ disabled: disabled }">确认提交</view> <view class="btn row rowCenter verCenter" @click="submit()">确认提交</view>
</view> </view>
</template> </template>
...@@ -132,8 +121,8 @@ export default { ...@@ -132,8 +121,8 @@ export default {
currentIndex: 0, currentIndex: 0,
image_list: [], //图片列表 image_list: [], //图片列表
goods_check_pic_list: [], //商检图片列表 goods_check_pic_list: [], //商检图片列表
maxNum: 10, //最大上传图片数量
list: [], //商检型号列表 list: [], //商检型号列表
maxNum: 10, //最大上传图片数量
disabled: false, disabled: false,
form: { form: {
erp_order_sn: '', //入仓号 erp_order_sn: '', //入仓号
...@@ -231,9 +220,10 @@ export default { ...@@ -231,9 +220,10 @@ export default {
getTallyGoods() { getTallyGoods() {
this.request(API.getTallyGoods, 'GET', { erp_order_sn: this.form.erp_order_sn }, true).then(res => { this.request(API.getTallyGoods, 'GET', { erp_order_sn: this.form.erp_order_sn }, true).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
this.isInspOrg = Boolean(res.data.isInspOrg); this.isInspOrg = Boolean(res.data.isInspOrg); //是否商检
this.list = res.data.entrys; this.list = res.data.entrys;
const length = res.data.entrys.length; const length = res.data.entrys.length;
this.goods_check_pic_list = Array.from({ length }, () => []); this.goods_check_pic_list = Array.from({ length }, () => []);
this.form.pic_json = res.data.entrys.map(item => ({ this.form.pic_json = res.data.entrys.map(item => ({
ptEntryID: item.ptEntryID, ptEntryID: item.ptEntryID,
......
pages/tallyGoods/originSplit.vue
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<view class="text-row row verCenter bothSide" style="margin-bottom: 20rpx;"> <view class="text-row row verCenter bothSide" style="margin-bottom: 20rpx;">
<view class="left"> <view class="left">
<text class="t1">原产国家：</text> <text class="t1">原产国家：</text>
<text class="t2">{{ goods_list[goods_index].origin || '' }}</text> <text class="t2">{{ goods_list[goods_index].country || '' }}</text>
</view> </view>
<view class="right"></view> <view class="right"></view>
</view> </view>
...@@ -177,6 +177,7 @@ export default { ...@@ -177,6 +177,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;
this.total = 0;
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 }));
} }
}, },
......
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