Skip to content

梁建民 / wmsApp

Go to a project
Commit f32ea5fb by LJM
Options

优化

parent b4449cb3
Inline Side-by-side
Showing with 78 additions and 27 deletions
pages/arrivalRegister/index.vue
...@@ -210,6 +210,16 @@ export default { ...@@ -210,6 +210,16 @@ export default {
} }
}; };
}, },
watch: {
'searchParams.stock_in_with_stock_in_items_inhouse'(newValue) {
if (newValue) {
const str = newValue;
const index = str.indexOf('-');
const result = index === -1 ? str : str.substring(0, index);
this.searchParams.stock_in_with_stock_in_items_inhouse = result;
}
}
},
onReachBottom() { onReachBottom() {
if (!this.hasMoreData) { if (!this.hasMoreData) {
return; return;
......
pages/mine/login.vue
...@@ -39,6 +39,7 @@ export default { ...@@ -39,6 +39,7 @@ export default {
uni.removeStorageSync('oa_skey'); uni.removeStorageSync('oa_skey');
uni.removeStorageSync('oa_user_id'); uni.removeStorageSync('oa_user_id');
uni.removeStorageSync('company_id'); uni.removeStorageSync('company_id');
uni.removeStorageSync('oa_user_email');
}, },
methods: { methods: {
bindPickerChange: function(e) { bindPickerChange: function(e) {
......
pages/stockRecheck/sort.vue
...@@ -297,15 +297,15 @@ ...@@ -297,15 +297,15 @@
<text class="label" style="white-space: nowrap;">合计待复核数量：</text> <text class="label" style="white-space: nowrap;">合计待复核数量：</text>
<text class="tt">{{ detailContainer.total_check_num }}</text> <text class="tt">{{ detailContainer.total_check_num }}</text>
</view> </view>
<view class="item row verCenter" style="flex: 0 0 100%;"> <view class="item row verCenter" style="flex: 0 0 100%;" v-if="detailContainer.list">
<text class="label">上游备注：</text> <text class="label">上游备注：</text>
<text class="tt" style="max-width: 56%;">{{ detailContainer.list[0].upstream_remark }}</text> <text class="tt" style="max-width: 56%;">{{ detailContainer.list[0].upstream_remark }}</text>
</view> </view>
<view class="item row verCenter" style="flex: 0 0 100%;"> <view class="item row verCenter" style="flex: 0 0 100%;" v-if="detailContainer.list">
<text class="label">明细备注：</text> <text class="label">明细备注：</text>
<text class="tt" style="max-width: 56%;">{{ detailContainer.list[0].remark }}</text> <text class="tt" style="max-width: 56%;">{{ detailContainer.list[0].remark }}</text>
</view> </view>
<view class="item row verCenter" style="flex: 0 0 100%;"> <view class="item row verCenter" style="flex: 0 0 100%;" v-if="detailContainer.list">
<text class="label">客户名：</text> <text class="label">客户名：</text>
<text class="tt" style="max-width: 56%;">{{ detailContainer.list[0].customer_name }}</text> <text class="tt" style="max-width: 56%;">{{ detailContainer.list[0].customer_name }}</text>
</view> </view>
......
pages/tallyReceive/index.vue
...@@ -81,6 +81,10 @@ ...@@ -81,6 +81,10 @@
</view> </view>
<view class="text-item row"> <view class="text-item row">
<text class="label">上游备注：</text> <text class="label">上游备注：</text>
<text class="desc">{{ item.stock_in_upstream_remark }}</text>
</view>
<view class="text-item row">
<text class="label">明细备注：</text>
<text class="desc">{{ item.upstream_remark }}</text> <text class="desc">{{ item.upstream_remark }}</text>
</view> </view>
<view class="text-item row verCenter"> <view class="text-item row verCenter">
...@@ -201,6 +205,21 @@ export default { ...@@ -201,6 +205,21 @@ export default {
} }
}; };
}, },
watch: {
'searchParams.stock_in_with_stock_in_items_inhouse'(newValue) {
if (newValue) {
const str = newValue;
const index = str.indexOf('-');
const result = index === -1 ? str : str.substring(0, index);
this.searchParams.stock_in_with_stock_in_items_inhouse = result;
}
},
image_list(arr) {
if (arr.length > 0) {
this.formParams.image_ids = arr.join(',');
}
}
},
onReachBottom() { onReachBottom() {
if (!this.hasMoreData) { if (!this.hasMoreData) {
return; return;
...@@ -215,13 +234,6 @@ export default { ...@@ -215,13 +234,6 @@ export default {
}); });
} }
}, },
watch: {
image_list(arr) {
if (arr.length > 0) {
this.formParams.image_ids = arr.join(',');
}
}
},
onShow() { onShow() {
if (this.noexebshowFalg) { if (this.noexebshowFalg) {
this.resetChange(); this.resetChange();
......
pages/tallyReceive/operate.vue
...@@ -111,6 +111,10 @@ ...@@ -111,6 +111,10 @@
</view> </view>
<view class="item row verCenter" style="flex: 0 0 100%;"> <view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">上游备注：</text> <text class="label">上游备注：</text>
<text class="text" style="font-weight: bold;max-width: 491rpx;">{{ detail.stock_in_upstream_remark }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">明细备注：</text>
<text class="text" style="font-weight: bold;max-width: 491rpx;">{{ detail.upstream_remark }}</text> <text class="text" style="font-weight: bold;max-width: 491rpx;">{{ detail.upstream_remark }}</text>
</view> </view>
</view> </view>
...@@ -243,6 +247,14 @@ export default { ...@@ -243,6 +247,14 @@ export default {
} }
}, },
watch: { watch: {
'searchParams.stock_in_with_stock_in_items_inhouse'(newValue) {
if (newValue) {
const str = newValue;
const index = str.indexOf('-');
const result = index === -1 ? str : str.substring(0, index);
this.searchParams.stock_in_with_stock_in_items_inhouse = result;
}
},
image_list(arr) { image_list(arr) {
if (arr.length > 0) { if (arr.length > 0) {
this.formParams.image_ids = arr.join(','); this.formParams.image_ids = arr.join(',');
......
pages/tallyReceive/record.vue
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</radio-group> </radio-group>
</view> </view>
<view class="list row bothSide" v-if="list.length > 0"> <view class="list row bothSide" v-if="list.length > 0">
<view class="box" v-for="(item, index) in list" :key="index" :class="{ curr: filter_list[index] }"> <view class="box" v-for="(item, index) in list" :key="index" :class="{ curr: filter_list[index] }" style="padding-bottom: 50rpx;">
<view class="check-box-icon" @click="filterChange(index)"></view> <view class="check-box-icon" @click="filterChange(index)"></view>
<view class="text-item row verCenter"> <view class="text-item row verCenter">
<text class="label">入库单号：</text> <text class="label">入库单号：</text>
...@@ -93,6 +93,14 @@ ...@@ -93,6 +93,14 @@
<text class="label">理货数量：</text> <text class="label">理货数量：</text>
<text class="ttt">{{ item.tally_qty }}</text> <text class="ttt">{{ item.tally_qty }}</text>
</view> </view>
<view class="text-item row">
<text class="label">上游备注：</text>
<text class="desc">{{ item.stock_in_upstream_remark }}</text>
</view>
<view class="text-item row">
<text class="label">明细备注：</text>
<text class="desc">{{ item.upstream_remark }}</text>
</view>
<view class="btn-box row"><view class="detail-btn row rowCenter verCenter" @click="showDrawer(item)">详情</view></view> <view class="btn-box row"><view class="detail-btn row rowCenter verCenter" @click="showDrawer(item)">详情</view></view>
</view> </view>
</view> </view>
...@@ -171,6 +179,14 @@ ...@@ -171,6 +179,14 @@
<text class="label">其他批次属性：</text> <text class="label">其他批次属性：</text>
<text class="tt">{{ detail.other_batch_attr }}</text> <text class="tt">{{ detail.other_batch_attr }}</text>
</view> </view>
<view class="item row verCenter" style="flex: 0 0 100%;margin-bottom: 17rpx;">
<text class="label">上游备注：</text>
<text class="tt" style="max-width: 454rpx;">{{ detail.stock_in_upstream_remark }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;margin-bottom: 17rpx;">
<text class="label">上游明细备注：</text>
<text class="tt" style="max-width: 454rpx;">{{ detail.upstream_remark }}</text>
</view>
</view> </view>
<view class="bor"></view> <view class="bor"></view>
<view class="field-item row"> <view class="field-item row">
......
util/api.js
// const API_BASE_USER = 'http://user.liexindev.net'; //用户系统 const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
// const API_BASE_ORDER = 'http://order.liexindev.net'; //订单系统 const API_BASE_ORDER = 'http://order.liexindev.net'; //订单系统
// const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统 const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
// const API_BASE_SUPPLIER = 'http://supplier.liexin.net'; //供应商系统 const API_BASE_SUPPLIER = 'http://supplier.liexin.net'; //供应商系统
// const API_BASE_CRM = 'http://crmnew.liexindev.net'; //CRM系统 const API_BASE_CRM = 'http://crmnew.liexindev.net'; //CRM系统
// const API_BASE = 'http://wms.liexindev.net'; //WMS系统 const API_BASE = 'http://wms.liexindev.net'; //WMS系统
// const API_BASE_LIEXIN = 'http://api.liexin.com'; //api系统 const API_BASE_LIEXIN = 'http://api.liexin.com'; //api系统
// const API_BASE_OSS = 'http://file.liexindev.net'; //oss系统 const API_BASE_OSS = 'http://file.liexindev.net'; //oss系统
const API_BASE_USER = 'https://user.ichunt.net'; //用户系统 // const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
const API_BASE_ORDER = 'https://order.ichunt.net'; //订单系统 // const API_BASE_ORDER = 'https://order.ichunt.net'; //订单系统
const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统 // const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
const API_BASE_SUPPLIER = 'https://supplier.ichunt.net'; //供应商系统 // const API_BASE_SUPPLIER = 'https://supplier.ichunt.net'; //供应商系统
const API_BASE_CRM = 'https://crm.ichunt.net'; //CRM系统 // const API_BASE_CRM = 'https://crm.ichunt.net'; //CRM系统
const API_BASE = 'https://wms.ichunt.net'; //WMS系统 // const API_BASE = 'https://wms.ichunt.net'; //WMS系统
const API_BASE_LIEXIN = 'https://api.ichunt.com'; //api系统 // const API_BASE_LIEXIN = 'https://api.ichunt.com'; //api系统
const API_BASE_OSS = 'https://files.ichunt.net'; //oss系统 // const API_BASE_OSS = 'https://files.ichunt.net'; //oss系统
const API = { const API = {
......
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