Skip to content

梁建民 / wmsApp

Go to a project
Commit b9baa23c by LJM
Options

bug

parent f32ea5fb
Inline Side-by-side
Showing with 48 additions and 58 deletions
pages/arrivalRegister/index.vue
......@@ -19,7 +19,7 @@
<input class="uni-input" placeholder="请输入入库单号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_sn" @input="handleInput(2, $event)" />
</template>
<template v-else-if="index == 2">
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(3, $event)" />
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(3, $event)" maxlength="7" />
</template>
<template v-else-if="index == 3">
<input class="uni-input" placeholder="请输入型号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_goods_sn" @input="handleInput(4, $event)" />
......@@ -78,7 +78,7 @@
<view class="fix-btn row verCenter">
<view class="btn3 row rowCenter verCenter" @click="allChnage()">
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">全选</text>
<text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text>
</view>
<view class="btn1 row rowCenter verCenter" @click="showDrawers()">无单号登记</view>
<view class="btn2 row rowCenter verCenter" @click="addStockInRegister(1)" style="width: calc(100% - 376rpx);">到货登记</view>
......@@ -210,16 +210,6 @@ 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() {
if (!this.hasMoreData) {
return;
......
pages/arrivalRegister/registered.vue
......@@ -19,7 +19,7 @@
<input class="uni-input" placeholder="请输入入库单号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_sn" @input="handleInput(2, $event)" />
</template>
<template v-else-if="index == 2">
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(3, $event)" />
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(3, $event)" maxlength="7" />
</template>
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
......@@ -71,7 +71,7 @@
<view class="fix-btn row verCenter">
<view class="btn3 row rowCenter verCenter" @click="allChnage()">
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">全选</text>
<text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text>
</view>
<view class="btn4 row rowCenter verCenter" @click="closeStockInRegister(1)">取消登记</view>
</view>
......
pages/mine/login.vue
......@@ -40,6 +40,15 @@ export default {
uni.removeStorageSync('oa_user_id');
uni.removeStorageSync('company_id');
uni.removeStorageSync('oa_user_email');
//记住密码
const name = uni.getStorageSync('name') || '';
const passwd = uni.getStorageSync('passwd') || '';
if (name && passwd) {
this.name = name;
this.passwd = passwd;
}
},
methods: {
bindPickerChange: function(e) {
......@@ -80,6 +89,10 @@ export default {
});
return false;
}
uni.setStorageSync('name', this.name);
uni.setStorageSync('passwd', this.passwd);
this.request(API.login, 'POST', { name: this.name, passwd: md5.hex_md5_32(this.passwd) }, true).then(res => {
if (res.retcode === 0) {
uni.setStorageSync('oa_skey', res.data.skey);
......
pages/picking/record.vue
......@@ -78,7 +78,7 @@
<view class="fix-btn row verCenter">
<view class="btn1 row rowCenter verCenter" @click="allChnage()">
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">全选</text>
<text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text>
</view>
<view class="btn2 row rowCenter verCenter" @click="cancelPicking">取消拣货</view>
</view>
......
pages/putaway/index.vue
......@@ -76,7 +76,7 @@
<view class="fix-btn row verCenter">
<view class="btn1 row rowCenter verCenter" @click="allChnage()">
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">全选</text>
<text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text>
</view>
<view class="btn2 row rowCenter verCenter" @click="showDrawer()">一键上架</view>
</view>
......
pages/putaway/record.vue
......@@ -122,7 +122,7 @@
<view class="fix-btn row verCenter">
<view class="btn1 row rowCenter verCenter" style="width: 127rpx;" @click="allChnage()">
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">全选</text>
<text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text>
</view>
<view class="btn3 row rowCenter verCenter" @click="cancelShelfRecord(1)">取消上架</view>
<view class="btn2 row rowCenter verCenter" style="width: calc(100% - 308rpx);" @click="submitOnShelf(1)">提 交</view>
......
pages/stockRecheck/record.vue
......@@ -73,7 +73,7 @@
<view class="fix-btn row verCenter">
<view class="btn1 row rowCenter verCenter" @click="allChnage()">
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">全选</text>
<text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text>
</view>
<view class="btn2 row rowCenter verCenter" @click="cancelCheck()">取消复核</view>
</view>
......@@ -88,7 +88,7 @@ export default {
data() {
return {
page: 1,
limit: 10,
limit: 50,
list: [],
stock_out_sn: '',
hasMoreData: true, //是否分页加载
......
pages/stockRecheck/sort.vue
......@@ -154,7 +154,7 @@
<view class="fix-btn row verCenter" v-if="curr == 0">
<view class="btn1 row rowCenter verCenter" @click="allChnage()">
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">全选</text>
<text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text>
</view>
<view class="btn2 row rowCenter verCenter" @click="showDrawer(0)">一键复核</view>
</view>
......
pages/tallyReceive/index.vue
......@@ -19,7 +19,7 @@
<input class="uni-input" placeholder="请输入入库单号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_sn" @input="handleInput(2, $event)" />
</template>
<template v-else-if="index == 2">
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(3, $event)" />
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(3, $event)" maxlength="7" />
</template>
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput(1)" v-if="input_flag"></text>
......@@ -101,7 +101,7 @@
<view class="fix-btn row verCenter">
<view class="btn1 row rowCenter verCenter" @click="allChnage()">
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">全选</text>
<text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text>
</view>
<view class="btn2 row rowCenter verCenter" @click="showDrawer()" :class="{ 'btn-disabled': !is_submit }">一键理货</view>
</view>
......@@ -206,14 +206,6 @@ 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(',');
......@@ -333,10 +325,10 @@ export default {
* @param {Object} event
*/
handleInput: debounce(function(type, event) {
this.resetChange();
var val = event.target.value;
if (val) {
if (type == 1) {
this.resetChange();
this.searchParams.tracking_no = '';
this.searchParams.stock_in_sn = '';
this.searchParams.stock_in_with_stock_in_items_inhouse = '';
......@@ -345,6 +337,7 @@ export default {
this.input_flag = true;
this.getData();
} else if (type == 2) {
this.resetChange();
this.searchParams.tracking_no = '';
this.searchParams.stock_in_sn = '';
this.searchParams.stock_in_with_stock_in_items_inhouse = '';
......@@ -353,6 +346,7 @@ export default {
this.input_flag = true;
this.getData();
} else if (type == 3) {
this.resetChange();
this.searchParams.tracking_no = '';
this.searchParams.stock_in_sn = '';
this.searchParams.stock_in_with_stock_in_items_inhouse = '';
......@@ -367,6 +361,7 @@ export default {
}
} else {
if (type == 1 || type == 2 || type == 3) {
this.resetChange();
this.input_flag = false;
this.getData();
} else if (type == 4) {
......@@ -382,7 +377,7 @@ export default {
* 获取列表数据
*/
getData() {
this.request(API.waitTallyReceiveList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
this.request(API.waitTallyReceiveList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, true).then(res => {
if (res.code === 0) {
if (res.data.total > 0) {
this.hasMoreData = true;
......
pages/tallyReceive/operate.vue
......@@ -19,7 +19,7 @@
<input class="uni-input" placeholder="请输入入库单号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_sn" @input="handleInput(2, $event)" />
</template>
<template v-else-if="index == 2">
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(3, $event)" />
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(3, $event)" maxlength="7" />
</template>
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput(1)" v-if="input_flag"></text>
......@@ -247,14 +247,6 @@ 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(',');
......
pages/tallyReceive/record.vue
......@@ -111,7 +111,7 @@
<view class="fix-btn row verCenter">
<view class="btn1 row rowCenter verCenter" style="width: 127rpx;" @click="allChnage()">
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">全选</text>
<text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text>
</view>
<view class="btn3 row rowCenter verCenter" @click="cancelTallyReceive(1)">取消理货</view>
<view class="row verCenter" style="width: calc(100% - 308rpx);">
......
util/api.js
const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
const API_BASE_ORDER = 'http://order.liexindev.net'; //订单系统
const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
const API_BASE_SUPPLIER = 'http://supplier.liexin.net'; //供应商系统
const API_BASE_CRM = 'http://crmnew.liexindev.net'; //CRM系统
const API_BASE = 'http://wms.liexindev.net'; //WMS系统
const API_BASE_LIEXIN = 'http://api.liexin.com'; //api系统
const API_BASE_OSS = 'http://file.liexindev.net'; //oss系统
// const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
// const API_BASE_ORDER = 'http://order.liexindev.net'; //订单系统
// const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
// const API_BASE_SUPPLIER = 'http://supplier.liexin.net'; //供应商系统
// const API_BASE_CRM = 'http://crmnew.liexindev.net'; //CRM系统
// const API_BASE = 'http://wms.liexindev.net'; //WMS系统
// const API_BASE_LIEXIN = 'http://api.liexin.com'; //api系统
// const API_BASE_OSS = 'http://file.liexindev.net'; //oss系统
// const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
// const API_BASE_ORDER = 'https://order.ichunt.net'; //订单系统
// const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
// const API_BASE_SUPPLIER = 'https://supplier.ichunt.net'; //供应商系统
// const API_BASE_CRM = 'https://crm.ichunt.net'; //CRM系统
// const API_BASE = 'https://wms.ichunt.net'; //WMS系统
// const API_BASE_LIEXIN = 'https://api.ichunt.com'; //api系统
// const API_BASE_OSS = 'https://files.ichunt.net'; //oss系统
const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
const API_BASE_ORDER = 'https://order.ichunt.net'; //订单系统
const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
const API_BASE_SUPPLIER = 'https://supplier.ichunt.net'; //供应商系统
const API_BASE_CRM = 'https://crm.ichunt.net'; //CRM系统
const API_BASE = 'https://wms.ichunt.net'; //WMS系统
const API_BASE_LIEXIN = 'https://api.ichunt.com'; //api系统
const API_BASE_OSS = 'https://files.ichunt.net'; //oss系统
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