Skip to content

梁建民 / wmsApp

Go to a project
Commit ee3dbc54 by LJM
Options

bug

parent 627a2326
Inline Side-by-side
Showing with 174 additions and 155 deletions
assets/css/stockRecheck/print.scss
...@@ -94,12 +94,15 @@ ...@@ -94,12 +94,15 @@
::v-deep .uni-drawer__content { ::v-deep .uni-drawer__content {
width: 85% !important; width: 85% !important;
height: 100%;
box-sizing: border-box;
} }
.uni-drawer-picking { .uni-drawer-picking {
width: 100%; width: 100%;
background-color: #ffffff; background-color: #ffffff;
padding: 22rpx 22rpx 0 22rpx; padding: 22rpx 22rpx 10rpx 22rpx;
box-sizing: border-box;
.title { .title {
position: relative; position: relative;
.iconfont { .iconfont {
...@@ -243,11 +246,7 @@ ...@@ -243,11 +246,7 @@
margin-bottom: 17rpx; margin-bottom: 17rpx;
} }
.btn { .btn {
position: absolute; margin: 0 auto;
bottom: 0;
left: 0;
width: 100%;
z-index: 99;
.btn1 { .btn1 {
width: 100%; width: 100%;
height: 75rpx; height: 75rpx;
......
pages/mine/login.vue
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<text class="label row rowCenter verCenter">密码</text> <text class="label row rowCenter verCenter">密码</text>
<input class="uni-input" password placeholder="请输入账号密码" placeholder-style="color:#919399" v-model="passwd" /> <input class="uni-input" password placeholder="请输入账号密码" placeholder-style="color:#919399" v-model="passwd" />
</view> </view>
<view class="btn row rowCenter verCenter" @click="submit()">登录</view> <button class="btn row rowCenter verCenter" @click="submit()" :disabled="disabled">登录</button>
<text class="copyright">© 深圳市猎芯科技有限公司</text> <text class="copyright">© 深圳市猎芯科技有限公司</text>
</view> </view>
</template> </template>
...@@ -32,7 +32,8 @@ export default { ...@@ -32,7 +32,8 @@ export default {
index: 0, index: 0,
array: ['深圳市猎芯科技有限公司', '深贸电子有限公司'], array: ['深圳市猎芯科技有限公司', '深贸电子有限公司'],
name: '', name: '',
passwd: '' passwd: '',
disabled: false
}; };
}, },
onLoad() { onLoad() {
...@@ -54,6 +55,7 @@ export default { ...@@ -54,6 +55,7 @@ export default {
bindPickerChange: function(e) { bindPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value); console.log('picker发送选择改变，携带值为', e.detail.value);
this.index = e.detail.value; this.index = e.detail.value;
this.disabled = false;
}, },
/** /**
* 组织切换 * 组织切换
...@@ -61,7 +63,18 @@ export default { ...@@ -61,7 +63,18 @@ export default {
changeOrgId() { changeOrgId() {
this.request(API.changeOrgId, 'POST', { org_id: Number(this.index) + 1 }, false).then(res => { this.request(API.changeOrgId, 'POST', { org_id: Number(this.index) + 1 }, false).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.disabled = false;
uni.showToast({
title: '登录成功',
icon: 'success'
});
setTimeout(() => {
uni.redirectTo({
url: '/pages/index/index'
});
}, 2000);
} else { } else {
this.disabled = true;
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: res.msg, content: res.msg,
...@@ -98,16 +111,8 @@ export default { ...@@ -98,16 +111,8 @@ export default {
uni.setStorageSync('oa_skey', res.data.skey); uni.setStorageSync('oa_skey', res.data.skey);
uni.setStorageSync('oa_user_id', res.data.userId); uni.setStorageSync('oa_user_id', res.data.userId);
uni.setStorageSync('company_id', Number(this.index) + 1); uni.setStorageSync('company_id', Number(this.index) + 1);
//调用选用组织
this.changeOrgId(); this.changeOrgId();
uni.showToast({
title: '登录成功',
icon: 'success'
});
setTimeout(() => {
uni.redirectTo({
url: '/pages/index/index'
});
}, 2000);
} else { } else {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
......
pages/stockRecheck/print.vue
...@@ -70,164 +70,166 @@ ...@@ -70,164 +70,166 @@
</view> </view>
<!-- 打快递单弹窗 --> <!-- 打快递单弹窗 -->
<uni-drawer ref="showRight" mode="right"> <uni-drawer ref="showRight" mode="right">
<view class="uni-drawer-picking" v-if="detail.stock_out_info"> <view class="uni-drawer-picking" v-if="detail.stock_out_info" style="height: 100%;">
<view class="title row rowCenter verCenter"> <scroll-view scroll-y="true" style="height: 100%;overflow-y: scroll;">
<text class="iconfont icon-juxing2" @click="closeDrawer(1)"></text> <view class="title row rowCenter verCenter">
<text class="text">打快递单</text> <text class="iconfont icon-juxing2" @click="closeDrawer(1)"></text>
</view> <text class="text">打快递单</text>
<view class="field-item row" style="margin-top: 39rpx;">
<view class="item row verCenter">
<text class="label">出库单号：</text>
<text class="text">{{ detail.stock_out_info.stock_out_sn }}</text>
</view> </view>
<view class="item row verCenter"> <view class="field-item row" style="margin-top: 39rpx;">
<text class="label">状态：</text> <view class="item row verCenter">
<text class="text">{{ detail.stock_out_info.stock_out_status_val }}：</text> <text class="label">出库单号：</text>
<text class="text">{{ detail.stock_out_info.stock_out_sn }}</text>
</view>
<view class="item row verCenter">
<text class="label">状态：</text>
<text class="text">{{ detail.stock_out_info.stock_out_status_val }}：</text>
</view>
</view> </view>
</view> <view class="bor"></view>
<view class="bor"></view> <view class="field-item row">
<view class="field-item row"> <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="tt" style="max-width: 100%;">{{ detail.upstream_remark }}</text>
<text class="tt" style="max-width: 100%;">{{ detail.upstream_remark }}</text> </view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">收货客户：</text>
<text class="tt" style="max-width: 100%;">{{ detail.stock_out_info.customer_name }}</text>
</view>
<view class="item row verCenter">
<text class="label">操 作 人：</text>
<text class="tt">{{ detail.stock_out_info.create_name }}</text>
</view>
</view> </view>
<view class="item row verCenter" style="flex: 0 0 100%;"> <view class="bor"></view>
<text class="label">收货客户：</text> <view class="item-tit row verCenter bothSide">
<text class="tt" style="max-width: 100%;">{{ detail.stock_out_info.customer_name }}</text> <text>交货信息</text>
<view class="text">
<text class="label">包 裹 数：</text>
<text class="tt">{{ detail.stock_out_info.box_num }}</text>
</view>
</view> </view>
<view class="item row verCenter"> <view class="form-input">
<text class="label">操 作 人：</text> <view class="input-title">
<text class="tt">{{ detail.stock_out_info.create_name }}</text> <text class="input-title-t1">*</text>
<text class="input-title-t2">交货方式：</text>
</view>
<view class="select-box row">
<picker @change="bindPickerChange(1, $event)" :value="real_shipping_type_index" :range="real_shipping_type_data" :range-key="'name'" style="width: 100%;">
<view class="row verCenter bothSide wrap">
<view class="uni-input">{{ real_shipping_type_index == -1 ? '请选择' : real_shipping_type_data[real_shipping_type_index].name }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
</view>
</view> </view>
</view> <view class="form-input">
<view class="bor"></view> <view class="input-title">
<view class="item-tit row verCenter bothSide"> <text class="input-title-t1" v-if="formParams.real_shipping_type != 2">*</text>
<text>交货信息</text> <text class="input-title-t2">物流公司：</text>
<view class="text"> </view>
<text class="label">包 裹 数：</text> <view class="select-box row">
<text class="tt">{{ detail.stock_out_info.box_num }}</text> <picker @change="bindPickerChange(2, $event)" :value="real_shipping_id_index" :range="real_shipping_id_data" :range-key="'name'" style="width: 100%;">
<view class="row verCenter bothSide wrap">
<view class="uni-input">{{ real_shipping_id_index == -1 ? '请选择' : real_shipping_id_data[real_shipping_id_index].name }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
</view>
</view> </view>
</view> <view class="form-input">
<view class="form-input"> <view class="input-title"><text class="input-title-t2">物流模式：</text></view>
<view class="input-title"> <view class="select-box row">
<text class="input-title-t1">*</text> <picker @change="bindPickerChange(3, $event)" :value="real_shipping_mode_index" :range="real_shipping_mode_data" :range-key="'name'" style="width: 100%;">
<text class="input-title-t2">交货方式：</text> <view class="row verCenter bothSide wrap">
<view class="uni-input">{{ real_shipping_mode_index == -1 ? '请选择' : real_shipping_mode_data[real_shipping_mode_index].name }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
</view>
</view> </view>
<view class="select-box row"> <view class="form-input">
<picker @change="bindPickerChange(1, $event)" :value="real_shipping_type_index" :range="real_shipping_type_data" :range-key="'name'" style="width: 100%;"> <view class="input-title"><text class="input-title-t2">物流单号：</text></view>
<view class="row verCenter bothSide wrap"> <view class="input-box">
<view class="uni-input">{{ real_shipping_type_index == -1 ? '请选择' : real_shipping_type_data[real_shipping_type_index].name }}</view> <template v-if="formParams.real_shipping_type == 1 && formParams.real_shipping_id == 1 && company_id == 1">
<view class="uni-arrow"></view> <input type="text" disabled style="background-color: #f6f6f6;border: 1px solid #eee;" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.shipping_code" />
</view> </template>
</picker> <template v-else>
<input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.shipping_code" />
</template>
</view>
</view> </view>
</view> <view class="print row verCenter" v-if="detail.stock_out_info">
<view class="form-input"> <text class="check-box-icon" :class="{ curr: detail.stock_out_info.is_receipt == 1 }"></text>
<view class="input-title"> <text class="tt">签回单</text>
<text class="input-title-t1" v-if="formParams.real_shipping_type != 2">*</text>
<text class="input-title-t2">物流公司：</text>
</view> </view>
<view class="select-box row"> <view class="bor"></view>
<picker @change="bindPickerChange(2, $event)" :value="real_shipping_id_index" :range="real_shipping_id_data" :range-key="'name'" style="width: 100%;"> <view class="item-tit">地址信息</view>
<view class="row verCenter bothSide wrap"> <view class="field-item row">
<view class="uni-input">{{ real_shipping_id_index == -1 ? '请选择' : real_shipping_id_data[real_shipping_id_index].name }}</view> <view class="item row verCenter" style="flex: 0 0 100%;">
<view class="uni-arrow"></view> <text class="label">收货公司：</text>
</view> <text class="tt" style="max-width: 100%;">{{ detail.stock_out_info.customer_name }}</text>
</picker> </view>
</view> </view>
</view> <view class="row bothSide verCenter">
<view class="form-input"> <view class="form-input" style="width: 48%;">
<view class="input-title"><text class="input-title-t2">物流模式：</text></view> <view class="input-title">
<view class="select-box row"> <text class="input-title-t1">*</text>
<picker @change="bindPickerChange(3, $event)" :value="real_shipping_mode_index" :range="real_shipping_mode_data" :range-key="'name'" style="width: 100%;"> <text class="input-title-t2">收货联系人：</text>
<view class="row verCenter bothSide wrap">
<view class="uni-input">{{ real_shipping_mode_index == -1 ? '请选择' : real_shipping_mode_data[real_shipping_mode_index].name }}</view>
<view class="uni-arrow"></view>
</view> </view>
</picker> <view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.consignee" /></view>
</view>
</view>
<view class="form-input">
<view class="input-title"><text class="input-title-t2">物流单号：</text></view>
<view class="input-box">
<template v-if="formParams.real_shipping_type == 1 && formParams.real_shipping_id == 1 && company_id == 1">
<input type="text" disabled style="background-color: #f6f6f6;border: 1px solid #eee;" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.shipping_code" />
</template>
<template v-else>
<input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.shipping_code" />
</template>
</view>
</view>
<view class="print row verCenter" v-if="detail.stock_out_info">
<text class="check-box-icon" :class="{ curr: detail.stock_out_info.is_receipt == 1 }"></text>
<text class="tt">签回单</text>
</view>
<view class="bor"></view>
<view class="item-tit">地址信息</view>
<view class="field-item row">
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">收货公司：</text>
<text class="tt" style="max-width: 100%;">{{ detail.stock_out_info.customer_name }}</text>
</view>
</view>
<view class="row bothSide verCenter">
<view class="form-input" style="width: 48%;">
<view class="input-title">
<text class="input-title-t1">*</text>
<text class="input-title-t2">收货联系人：</text>
</view> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.consignee" /></view> <view class="form-input" style="width: 48%;">
</view> <view class="input-title">
<view class="form-input" style="width: 48%;"> <text class="input-title-t1">*</text>
<view class="input-title"> <text class="input-title-t2">联系电话：</text>
<text class="input-title-t1">*</text> </view>
<text class="input-title-t2">联系电话：</text> <view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.mobile" /></view>
</view> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.mobile" /></view>
</view> </view>
</view> <view class="row bothSide verCenter">
<view class="row bothSide verCenter"> <view class="form-input" style="width: 48%;">
<view class="form-input" style="width: 48%;"> <view class="input-title">
<view class="input-title"> <text class="input-title-t1">*</text>
<text class="input-title-t1">*</text> <text class="input-title-t2">国家：</text>
<text class="input-title-t2">国家：</text> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.country" /></view>
</view> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.country" /></view> <view class="form-input" style="width: 48%;">
</view> <view class="input-title">
<view class="form-input" style="width: 48%;"> <text class="input-title-t1" v-if="company_id == 1">*</text>
<view class="input-title"> <text class="input-title-t2">省：</text>
<text class="input-title-t1" v-if="company_id == 1">*</text> </view>
<text class="input-title-t2">省：</text> <view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.province" /></view>
</view> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.province" /></view>
</view> </view>
</view> <view class="row bothSide verCenter">
<view class="row bothSide verCenter"> <view class="form-input" style="width: 48%;">
<view class="form-input" style="width: 48%;"> <view class="input-title">
<view class="input-title"> <text class="input-title-t1" v-if="company_id == 1">*</text>
<text class="input-title-t1" v-if="company_id == 1">*</text> <text class="input-title-t2">市：</text>
<text class="input-title-t2">市：</text> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.city" /></view>
</view> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.city" /></view> <view class="form-input" style="width: 48%;">
</view> <view class="input-title">
<view class="form-input" style="width: 48%;"> <text class="input-title-t1" v-if="company_id == 1">*</text>
<view class="input-title"> <text class="input-title-t2">区：</text>
<text class="input-title-t1" v-if="company_id == 1">*</text> </view>
<text class="input-title-t2">区：</text> <view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.district" /></view>
</view> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.district" /></view>
</view> </view>
</view> <view class="row bothSide verCenter">
<view class="row bothSide verCenter"> <view class="form-input" style="width: 48%;">
<view class="form-input" style="width: 48%;"> <view class="input-title">
<view class="input-title"> <text class="input-title-t1">*</text>
<text class="input-title-t1">*</text> <text class="input-title-t2">地址：</text>
<text class="input-title-t2">地址：</text> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.address" /></view>
</view> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.address" /></view>
</view> </view>
</view> <view class="btn row verCenter bothSide"><view class="btn1 row rowCenter verCenter" style="width: 100%;" @click="updateDeliveryInfo(detail.stock_out_info.stock_out_id)">保存</view></view>
<view class="btn row verCenter bothSide"><view class="btn1 row rowCenter verCenter" style="width: 100%;" @click="updateDeliveryInfo(detail.stock_out_info.stock_out_id)">保存</view></view> </scroll-view>
</view> </view>
</uni-drawer> </uni-drawer>
</view> </view>
...@@ -244,7 +246,7 @@ export default { ...@@ -244,7 +246,7 @@ export default {
input_flag: false, input_flag: false,
flag: false, flag: false,
page: 1, page: 1,
limit: 10000, limit: 30,
list: [], list: [],
index: 0, index: 0,
real_shipping_type_index: -1, real_shipping_type_index: -1,
...@@ -258,6 +260,7 @@ export default { ...@@ -258,6 +260,7 @@ export default {
searchParams: { searchParams: {
stock_out_sn: '' stock_out_sn: ''
}, },
hasMoreData: true, //是否分页加载
formParams: { formParams: {
real_shipping_type: '', //交货方式 real_shipping_type: '', //交货方式
real_shipping_id: '', //物流公司 real_shipping_id: '', //物流公司
...@@ -274,6 +277,13 @@ export default { ...@@ -274,6 +277,13 @@ export default {
} }
}; };
}, },
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index == 0) { if (e.index == 0) {
uni.reLaunch({ uni.reLaunch({
...@@ -377,7 +387,12 @@ export default { ...@@ -377,7 +387,12 @@ export default {
getData() { getData() {
this.request(API.getToPrintList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, true).then(res => { this.request(API.getToPrintList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, true).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.list = res.data.list; if (res.data.list.length > 0) {
this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
} else {
this.hasMoreData = false;
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
......
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