fix:bug修复
This commit is contained in:
parent
53f405070d
commit
dc7a15f3e8
|
|
@ -320,6 +320,7 @@
|
|||
})
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err, 'sss');
|
||||
that.submitFlag = false
|
||||
}).finally(result => {
|
||||
that.submitFlag = false
|
||||
|
|
|
|||
|
|
@ -1,18 +1,10 @@
|
|||
<template>
|
||||
<view>
|
||||
<view class="ipt-area">
|
||||
<uni-easyinput
|
||||
suffixIcon="search"
|
||||
v-model="keywordVal"
|
||||
placeholder="请输入关键字"
|
||||
@iconClick="searchKeyword"
|
||||
></uni-easyinput>
|
||||
<uni-easyinput suffixIcon="search" v-model="keywordVal" placeholder="请输入领料单号"
|
||||
@iconClick="searchKeyword"></uni-easyinput>
|
||||
</view>
|
||||
<view
|
||||
class="single-fetch"
|
||||
v-for="(fetch, index) in fetchMaterialList"
|
||||
:key="index"
|
||||
>
|
||||
<view class="single-fetch" v-for="(fetch, index) in fetchMaterialList" :key="index">
|
||||
<view class="fetch-upper">
|
||||
<!-- {{ fetch.taskStatus }} -->
|
||||
<!-- <checkbox-group
|
||||
|
|
@ -30,10 +22,7 @@
|
|||
<h4 style="color: #989898;">{{ fetch.phoneNumber }}</h4>
|
||||
</view>
|
||||
</view>
|
||||
<view
|
||||
class="fetch-lower"
|
||||
@click="seeDetail(fetch.taskId, fetch.taskStatus, fetch.id)"
|
||||
>
|
||||
<view class="fetch-lower" @click="seeDetail(fetch.taskId, fetch.taskStatus, fetch.id)">
|
||||
<view>
|
||||
<span>领料申请单位</span>
|
||||
<h4>{{ fetch.unitName }}</h4>
|
||||
|
|
@ -82,38 +71,22 @@
|
|||
</view>
|
||||
</view> -->
|
||||
<view class="sticky-area">
|
||||
<h4
|
||||
v-show="fetch.taskStatus == '33'"
|
||||
>
|
||||
<h4 v-show="fetch.taskStatus == '33'">
|
||||
待出库
|
||||
</h4>
|
||||
<h4
|
||||
v-show="fetch.taskStatus == '34'"
|
||||
>
|
||||
<h4 v-show="fetch.taskStatus == '34'">
|
||||
出库进行中
|
||||
</h4>
|
||||
<h4
|
||||
v-show="fetch.taskStatus == '35'"
|
||||
style="border: 1px solid #27D870; color: #27D870;"
|
||||
>
|
||||
<h4 v-show="fetch.taskStatus == '35'" style="border: 1px solid #27D870; color: #27D870;">
|
||||
出库完成
|
||||
</h4>
|
||||
<h4
|
||||
v-show="fetch.taskStatus == '98'"
|
||||
style="border: 1px solid #EE603D; color: #EE603D;"
|
||||
>
|
||||
<h4 v-show="fetch.taskStatus == '98'" style="border: 1px solid #EE603D; color: #EE603D;">
|
||||
分公司审核驳回
|
||||
</h4>
|
||||
<h4
|
||||
v-show="fetch.taskStatus == '99'"
|
||||
style="border: 1px solid #EE603D; color: #EE603D;"
|
||||
>
|
||||
<h4 v-show="fetch.taskStatus == '99'" style="border: 1px solid #EE603D; color: #EE603D;">
|
||||
分管审核驳回
|
||||
</h4>
|
||||
<h4
|
||||
v-show="fetch.taskStatus == '100'"
|
||||
style="border: 1px solid #EE603D; color: #EE603D;"
|
||||
>
|
||||
<h4 v-show="fetch.taskStatus == '100'" style="border: 1px solid #EE603D; color: #EE603D;">
|
||||
内部审核驳回
|
||||
</h4>
|
||||
</view>
|
||||
|
|
@ -224,7 +197,7 @@ import { basePath } from '../../public'
|
|||
role: uni.getStorageSync('roles').join(','),
|
||||
flag: 0
|
||||
}).then(res => {
|
||||
console.log(res);
|
||||
console.log(code);
|
||||
if (res.data.code == 200) {
|
||||
if (res.data.data.rows.length == 0) {
|
||||
that.showLoading = false
|
||||
|
|
@ -265,10 +238,12 @@ import { basePath } from '../../public'
|
|||
box-sizing: border-box;
|
||||
padding-bottom: 10vh;
|
||||
}
|
||||
|
||||
.ipt-area {
|
||||
width: 95%;
|
||||
margin: 20rpx auto;
|
||||
}
|
||||
|
||||
.single-fetch {
|
||||
width: 95%;
|
||||
margin: 20rpx auto;
|
||||
|
|
@ -277,6 +252,7 @@ import { basePath } from '../../public'
|
|||
box-sizing: border-box;
|
||||
padding: 15rpx;
|
||||
position: relative;
|
||||
|
||||
.fetch-upper {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
|
|
@ -284,6 +260,7 @@ import { basePath } from '../../public'
|
|||
border-bottom: 1px solid #D7D7D7;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.upper-lef {
|
||||
width: 12%;
|
||||
height: 5vh;
|
||||
|
|
@ -295,6 +272,7 @@ import { basePath } from '../../public'
|
|||
color: #fff;
|
||||
font-size: 24px;
|
||||
}
|
||||
|
||||
.upper-rig {
|
||||
flex: 1;
|
||||
box-sizing: border-box;
|
||||
|
|
@ -302,42 +280,50 @@ import { basePath } from '../../public'
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
|
||||
h4 {
|
||||
font-weight: normal;
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.fetch-lower {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 15rpx;
|
||||
|
||||
view {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 15rpx;
|
||||
font-size: 14px;
|
||||
|
||||
span {
|
||||
color: #9D9D9D;
|
||||
padding-right: 20rpx;
|
||||
}
|
||||
|
||||
h4 {
|
||||
color: #000;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
}
|
||||
}
|
||||
|
||||
view:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.fetch-btns {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 15rpx;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
|
||||
view {
|
||||
box-sizing: border-box;
|
||||
padding: 8rpx 25rpx;
|
||||
|
|
@ -346,14 +332,17 @@ import { basePath } from '../../public'
|
|||
margin-right: 15rpx;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
view:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.sticky-area {
|
||||
position: absolute;
|
||||
top: 20rpx;
|
||||
right: 20rpx;
|
||||
|
||||
h4 {
|
||||
box-sizing: border-box;
|
||||
padding: 8rpx 20rpx;
|
||||
|
|
|
|||
|
|
@ -9,46 +9,44 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="switch-log">
|
||||
<view
|
||||
:class="[{ active: switchStatus == 1 }]"
|
||||
@click="switchUpper(1)"
|
||||
>
|
||||
<view :class="[{ active: switchStatus == 1 }]" @click="switchUpper(1)">
|
||||
账号登录
|
||||
</view>
|
||||
<view
|
||||
:class="[{ active: switchStatus == 2 }]"
|
||||
@click="switchUpper(2)"
|
||||
>
|
||||
<view :class="[{ active: switchStatus == 2 }]" @click="switchUpper(2)">
|
||||
手机登录
|
||||
</view>
|
||||
</view>
|
||||
<view class="login-area">
|
||||
<uni-forms v-show="switchStatus == 1" ref="accountForm" :modelValue="accountFormData" :rules="accountRules" class="form-area" label-position="top">
|
||||
<uni-forms v-show="switchStatus == 1" ref="accountForm" :modelValue="accountFormData" :rules="accountRules"
|
||||
class="form-area" label-position="top">
|
||||
<uni-forms-item name="username" required label="用户名" label-width="100">
|
||||
<uni-easyinput placeholder="请输入用户名称" maxlength="60" v-model="accountFormData.username"></uni-easyinput>
|
||||
<uni-easyinput placeholder="请输入用户名称" maxlength="60"
|
||||
v-model="accountFormData.username"></uni-easyinput>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item name="password" required label="密码" label-width="100">
|
||||
<uni-easyinput type="password" placeholder="请输入密码" maxlength="60" v-model="accountFormData.password"></uni-easyinput>
|
||||
<uni-easyinput type="password" placeholder="请输入密码" maxlength="60"
|
||||
v-model="accountFormData.password"></uni-easyinput>
|
||||
</uni-forms-item>
|
||||
<text
|
||||
style="
|
||||
<text style="
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
color: #3689FF;
|
||||
font-size: 14px;
|
||||
"
|
||||
>
|
||||
">
|
||||
忘记密码
|
||||
</text>
|
||||
<button class="submit-btn" @click="accountSubmit">登录</button>
|
||||
</uni-forms>
|
||||
<uni-forms v-show="switchStatus == 2" ref="veriForm" :modelValue="veriFormData" :rules="veriRules" class="form-area" label-position="top">
|
||||
<uni-forms v-show="switchStatus == 2" ref="veriForm" :modelValue="veriFormData" :rules="veriRules"
|
||||
class="form-area" label-position="top">
|
||||
<uni-forms-item name="phone" required label="手机号码" label-width="100">
|
||||
<uni-easyinput placeholder="请输入手机号码" type="number" v-model="veriFormData.phone" maxlength="11"></uni-easyinput>
|
||||
<uni-easyinput placeholder="请输入手机号码" type="number" v-model="veriFormData.phone"
|
||||
maxlength="11"></uni-easyinput>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item name="code" required label="验证码" label-width="100">
|
||||
<uni-easyinput type="number" maxlength="6" placeholder="请输入验证码" v-model="veriFormData.code"></uni-easyinput>
|
||||
<uni-easyinput type="number" maxlength="6" placeholder="请输入验证码"
|
||||
v-model="veriFormData.code"></uni-easyinput>
|
||||
<button class="count-down" :disabled="sendDisabled" @click="sendVeriCode" style="font-size: 14px;">
|
||||
<span v-if="countDownStatus == 0">发送验证码</span>
|
||||
<span v-if="countDownStatus == 1">
|
||||
|
|
@ -162,8 +160,8 @@ import { authPath, publicPath, systemPath } from '../../public'
|
|||
that.$api.login.checkCode(formRes).then(res => {
|
||||
console.log(res);
|
||||
if (res.data.code == 200) {
|
||||
uni.setStorageSync('userInfo', res.data.data)
|
||||
uni.setStorageSync('token', res.data.data.token)
|
||||
uni.setStorageSync('userInfo', res.data.data.login_user)
|
||||
uni.setStorageSync('token', res.data.data.access_token)
|
||||
uni.setStorageSync('roles', res.data.data.login_user.roles)
|
||||
uni.setStorageSync('deptId', res.data.data.login_user.sysUser.dept.deptId)
|
||||
uni.showToast({
|
||||
|
|
@ -236,21 +234,25 @@ import { authPath, publicPath, systemPath } from '../../public'
|
|||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
}
|
||||
|
||||
.upper-bgd {
|
||||
width: 100%;
|
||||
height: 25vh;
|
||||
box-sizing: border-box;
|
||||
padding-top: 10vh;
|
||||
|
||||
.logo {
|
||||
width: 20%;
|
||||
height: 10vh;
|
||||
margin: 0 auto;
|
||||
margin-bottom: 2vh;
|
||||
|
||||
image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.tit {
|
||||
width: 100%;
|
||||
font-size: 20px;
|
||||
|
|
@ -260,6 +262,7 @@ import { authPath, publicPath, systemPath } from '../../public'
|
|||
color: #3C87F3;
|
||||
}
|
||||
}
|
||||
|
||||
.switch-log {
|
||||
width: 80%;
|
||||
height: 100rpx;
|
||||
|
|
@ -269,6 +272,7 @@ import { authPath, publicPath, systemPath } from '../../public'
|
|||
justify-content: space-around;
|
||||
align-items: center;
|
||||
font-size: 26rpx;
|
||||
|
||||
.active {
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
|
|
@ -277,6 +281,7 @@ import { authPath, publicPath, systemPath } from '../../public'
|
|||
border-bottom-right-radius: 15rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.login-area {
|
||||
width: 80%;
|
||||
box-sizing: border-box;
|
||||
|
|
@ -285,9 +290,11 @@ import { authPath, publicPath, systemPath } from '../../public'
|
|||
background-color: #fff;
|
||||
border-radius: 20rpx;
|
||||
box-shadow: 0 3px 5px #E6EEFE;
|
||||
|
||||
.uni-forms-item__content[data-v-61dfc0d0] {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.submit-btn {
|
||||
background-color: #3888FF;
|
||||
margin: 10vh auto;
|
||||
|
|
|
|||
Loading…
Reference in New Issue