suzhou-jichuang-lanhai
/
TcAssetVerificationPc
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
lijinlong
吕天方 2 months ago
parent cc34231717
commit 74a869b633
7 changed files with 103 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
.env.development
Unescape View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = 若依管理系统
ENV = 'development'
# 若依管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.0.108:9015'
VUE_APP_BASE_API = 'http://192.168.0.119:9015'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

4
src/layout/components/TagsView/index.vue
Unescape View File

@ -27,7 +27,7 @@
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar" class="user-avatar">
<span class="user-name">{{ name }}</span>
<span class="user-name">{{ nickName }}</span>
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown">
@ -73,7 +73,7 @@ export default {
// }
...mapGetters([
'avatar',
'name'
'nickName'
]),
},
watch: {

1
src/store/getters.js
Unescape View File

@ -8,6 +8,7 @@ const getters = {
token: state => state.user.token,
avatar: state => state.user.avatar,
name: state => state.user.name,
nickName: state => state.user.nickName,
useer: state => state.user.useer,
introduction: state => state.user.introduction,
roles: state => state.user.roles,

5
src/store/modules/user.js
Unescape View File

@ -6,6 +6,7 @@ const user = {
token: getToken(),
id: '',
name: '',
nickName: '',
avatar: '',
roles: [],
permissions: [],
@ -22,6 +23,9 @@ const user = {
SET_NAME: (state, name) => {
state.name = name
},
SET_NICK_NAME: (state, name) => {
state.nickName = name
},
SET_NAMEUSE: (state, name) => {
state.useer = name
},
@ -68,6 +72,7 @@ const user = {
}
commit('SET_ID', user.userId)
commit('SET_NAME', user.userName)
commit('SET_NICK_NAME', user.nickName)
commit('SET_NAMEUSE', user)
commit('SET_AVATAR', avatar)
resolve(res)

82
src/views/auditPages/assetsManagement/assetsAuth.vue
Unescape View File

@ -1,5 +1,6 @@
<template>
<div class="L-assets-info">
<el-backtop target=".L-assets-info" />
<div class="assets-info-top">
<el-row style="margin: 10px 0;">
<span class="top-title-box">基本信息</span>
@ -1290,7 +1291,15 @@
</el-form-item>
</el-col>
<el-col :span="12" style="margin-left: 10px;">
<el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
<el-form-item class="daoqitixingren" :prop="'chepingUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
:rules="[
{
pattern: /^[a-zA-Z0-9]{18}$/,
message: '请输入正确格式的18位统一社会信用代码',
trigger: 'blur'
}
]"
>
<el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
</el-form-item>
</el-col>
@ -1328,7 +1337,15 @@
</el-form-item>
</el-col>
<el-col :span="12" style="margin-left: 10px;">
<el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
<el-form-item class="daoqitixingren" :prop="'yjgysUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
:rules="[
{
pattern: /^[a-zA-Z0-9]{18}$/,
message: '请输入正确格式的18位统一社会信用代码',
trigger: 'blur'
}
]"
>
<el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
</el-form-item>
</el-col>
@ -1366,7 +1383,15 @@
</el-form-item>
</el-col>
<el-col :span="12" style="margin-left: 10px;">
<el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
<el-form-item class="daoqitixingren" :prop="'jfywUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
:rules="[
{
pattern: /^[a-zA-Z0-9]{18}$/,
message: '请输入正确格式的18位统一社会信用代码',
trigger: 'blur'
}
]"
>
<el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
</el-form-item>
</el-col>
@ -1404,7 +1429,15 @@
</el-form-item>
</el-col>
<el-col :span="12" style="margin-left: 10px;">
<el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
<el-form-item class="daoqitixingren" :prop="'xtsjUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
:rules="[
{
pattern: /^[a-zA-Z0-9]{18}$/,
message: '请输入正确格式的18位统一社会信用代码',
trigger: 'blur'
}
]"
>
<el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
</el-form-item>
</el-col>
@ -1442,7 +1475,15 @@
</el-form-item>
</el-col>
<el-col :span="12" style="margin-left: 10px;">
<el-form-item class="daoqitixingren" required :label="'统一社会信用代码' + (index == 0 ? '' : index)">
<el-form-item class="daoqitixingren" required :prop="'xtjsUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
:rules="[
{
pattern: /^[a-zA-Z0-9]{18}$/,
message: '请输入正确格式的18位统一社会信用代码',
trigger: 'blur'
}
]"
>
<el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
</el-form-item>
</el-col>
@ -1499,7 +1540,15 @@
</el-form-item>
</el-col>
<el-col :span="12" style="margin-left: 10px;">
<el-form-item class="daoqitixingren" required :label="'统一社会信用代码' + (index == 0 ? '' : index)">
<el-form-item class="daoqitixingren" :prop="'xtyyUnit.' + index + '.tyshxydm'" required :label="'统一社会信用代码' + (index == 0 ? '' : index)"
:rules="[
{
pattern: /^[a-zA-Z0-9]{18}$/,
message: '请输入正确格式的18位统一社会信用代码',
trigger: 'blur'
}
]"
>
<el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
</el-form-item>
</el-col>
@ -1556,7 +1605,15 @@
</el-form-item>
</el-col>
<el-col :span="12" style="margin-left: 10px;">
<el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
<el-form-item class="daoqitixingren" :prop="'aqfwUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
:rules="[
{
pattern: /^[a-zA-Z0-9]{18}$/,
message: '请输入正确格式的18位统一社会信用代码',
trigger: 'blur'
}
]"
>
<el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
</el-form-item>
</el-col>
@ -2667,11 +2724,11 @@
</myUpload>
</el-form-item>
</el-row>
<el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
<el-button type="danger">不通过</el-button>
<el-button type="primary" @click="newAssets" :loading="loading">通过</el-button>
</el-row>
</div>
<el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
<el-button type="danger" @click="sendBack">取消</el-button>
<el-button type="primary" @click="newAssets" :loading="loading">确认</el-button>
</el-row>
</el-form>
</div>
</div>
@ -3085,6 +3142,9 @@ export default {
})
}
},
sendBack(){
this.$router.go(-1);
},
},
beforeRouteEnter(to,from,next){
if(to.query.pageType == 'add') {

31
src/views/auditPages/unitManagement/index.vue
Unescape View File

@ -110,7 +110,7 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="统一社会信用代码" required>
<el-form-item label="统一社会信用代码" required prop="userName">
<el-input v-model="ruleForm.userName" placeholder="请输入统一社会信用代码"></el-input>
</el-form-item>
</el-col>
@ -477,6 +477,20 @@ import { lookUnit, postUnit } from "@/api/auditPagesApi/index";
export default {
dicts:['zc_xtzyx', 'is_no', 'sshy', 'dwlx', 'dwjs', 'dwzsxz', 'dbxx_dbdj'],
data() {
const validateTyshxydm = (rule, value, callback) => {
const pattern = /^[a-zA-Z0-9]{18}$/;
if (!pattern.test(value)) {
callback(new Error('请输入正确格式的18位统一社会信用代码'));
return;
}
callback();
// if (value.length!== 18) {
// callback(new Error('请输入18位统一社会信用代码'));
// return;
// } else {
// callback();
// }
}
return {
options: pcas ,
props:{
@ -506,19 +520,8 @@ export default {
],
},
rules:{
email: [
{
type: "email",
message: "请输入正确的邮箱地址",
trigger: ["blur", "change"]
}
],
phonenumber: [
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur"
}
userName: [
{ required: true, trigger: "blur" ,validator: validateTyshxydm},
]
},
disabled:false,

12
src/views/system/user/index.vue
Unescape View File

@ -253,16 +253,16 @@
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<div style="display: flex;align-items: center;cursor: pointer;">
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info" @click="handleLookdate(scope.row)" style="color: #1485EF;">查看</span>
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;" @click="handleLookdate(scope.row)">
<span class="look-info" style="color: #1485EF;">查看</span>
</div>
<div style="display: flex;align-items: center;cursor: pointer; margin-left: 10px;">
<div style="display: flex;align-items: center;cursor: pointer; margin-left: 10px;" @click="handleUpdate(scope.row)">
<img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
<span class="look-info" @click="handleUpdate(scope.row)" style="color: #1485EF;">编辑</span>
<span class="look-info" style="color: #1485EF;">编辑</span>
</div>
<div style="display: flex;align-items: center;cursor: pointer; margin-left: 10px;">
<div style="display: flex;align-items: center;cursor: pointer; margin-left: 10px;" @click="handleDelete(scope.row)">
<img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info" @click="handleDelete(scope.row)" style="color: #F50C0C;">删除</span>
<span class="look-info" style="color: #F50C0C;">删除</span>
</div>
</div>
</template>

Write Preview
Loading…
Cancel
Save