wilson
/
cq-ccl-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

用户工厂修改

master
[li_she] 4 years ago
parent
8057f6644f
commit
672c427938
3 changed files with 111 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      package-lock.json
  2. 2
      package.json
  3. 195
      src/views/modules/sys/user-add-or-update.vue

10
package-lock.json
View File

@ -3545,6 +3545,11 @@
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
},
"decimal.js": {
"version": "10.3.1",
"resolved": "https://r.cnpmjs.org/decimal.js/download/decimal.js-10.3.1.tgz",
"integrity": "sha1-2MOkRKnGd0umDKatcmHDqU/V54M="
},
"decode-uri-component": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@ -19470,6 +19475,11 @@
"integrity": "sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g==",
"dev": true
},
"vue-i18n": {
"version": "8.26.5",
"resolved": "https://r.cnpmjs.org/vue-i18n/download/vue-i18n-8.26.5.tgz",
"integrity": "sha1-th6ZTnroNWTGrr0ARUMVa73Hx+k="
},
"vue-jest": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-1.0.2.tgz",

2
package.json
View File

@ -17,6 +17,7 @@
"axios": "0.17.1",
"babel-plugin-component": "0.10.1",
"babel-polyfill": "6.26.0",
"decimal.js": "^10.3.1",
"element-ui": "2.8.2",
"file-saver": "^2.0.5",
"gulp": "4.0.2",
@ -31,6 +32,7 @@
"svg-sprite-loader": "3.7.3",
"vue": "2.5.16",
"vue-cookie": "1.1.4",
"vue-i18n": "^8.26.5",
"vue-json-excel": "^0.3.0",
"vue-router": "3.0.1",
"vuex": "3.0.1",

195
src/views/modules/sys/user-add-or-update.vue
View File

@ -1,52 +1,73 @@
<template>
<div class="user-add-or-update">
<div class="user-add-or-update">
<el-dialog
width="25%"
width="530px"
:title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false"
:visible.sync="visible">
<!-- 取消 :rules="dataRule"-->
<el-form :model="dataForm" label-position="top" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
label-width="80px">
<el-form-item label="用户名" prop="userName">
<el-input v-model="dataForm.userName" placeholder="登录帐号"></el-input>
</el-form-item>
<el-form-item label="密码" prop="password" :class="{ 'is-required': !dataForm.id }">
<el-input v-model="dataForm.password" type="password" placeholder="密码"></el-input>
</el-form-item>
<el-form-item label="确认密码" prop="comfirmPassword" :class="{ 'is-required': !dataForm.id }">
<el-input v-model="dataForm.comfirmPassword" type="password" placeholder="确认密码"></el-input>
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="dataForm.email" placeholder="邮箱"></el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
</el-form-item>
<el-form-item label="工厂" size="mini" prop="site">
<el-checkbox-group v-model="dataForm.site">
<el-checkbox v-for="item in factorys" :key="item.id" :label="role.roleId">{{ role.roleName }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="角色" size="mini" prop="roleIdList">
<el-checkbox-group v-model="dataForm.roleIdList">
<el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{
role.roleName
}}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="状态" size="mini" prop="status">
<el-radio-group v-model="dataForm.status">
<el-radio :label="0">禁用</el-radio>
<el-radio :label="1">正常</el-radio>
</el-radio-group>
</el-form-item>
<el-form :inline="true" :model="dataForm" label-position="top" ref="dataForm"
@keyup.enter.native="dataFormSubmit()"
label-width="80px">
<el-form>
<el-form-item label="用户账号" prop="userName">
<el-input v-model="dataForm.userName" style="width: 150px;" placeholder="登录帐号"></el-input>
</el-form-item>
<el-form-item label="密码" prop="password" :class="{ 'is-required': !dataForm.id }">
<el-input v-model="dataForm.password" style="width: 150px;" type="password" placeholder="密码"></el-input>
</el-form-item>
<el-form-item label="确认密码" prop="comfirmPassword" :class="{ 'is-required': !dataForm.id }">
<el-input v-model="dataForm.comfirmPassword" style="width: 150px;" type="password"
placeholder="确认密码"></el-input>
</el-form-item>
</el-form>
<el-form>
<el-form-item label="用户名" prop="email">
<el-input v-model="dataForm.userDisplay" style="width: 150px;" placeholder="用户昵称"></el-input>
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="dataForm.email" style="width: 150px;" placeholder="邮箱"></el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="dataForm.mobile" style="width: 150px;" placeholder="手机号"></el-input>
</el-form-item>
</el-form>
<el-form>
<el-form-item label="工厂" size="mini" prop="site">
<el-select filterable v-model="dataForm.site" style="width: 150px;">
<el-option :value="item.site" :label="item.baseDesc" v-for="(item,index) in factorys" :key="index"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="语言" prop="languageDefault">
<el-select filterable v-model="dataForm.languageDefault" clearable style="width: 150px;">
<el-option :label="item.languageName" :value="item.languageCode" v-for="(item,index) in languageList "
:key="index"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form>
<el-form-item label="角色" size="mini" prop="roleIdList">
<el-checkbox-group v-model="dataForm.roleIdList">
<el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{
role.roleName
}}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form>
<el-form>
<el-form-item label="状态" size="mini" prop="status">
<el-radio-group v-model="dataForm.status">
<el-radio :label="0">禁用</el-radio>
<el-radio :label="1">正常</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button @click="visible = false">取消</el-button>
</span>
</el-dialog>
</div>
@ -54,88 +75,60 @@
</template>
<script>
import {isEmail, isMobile} from '@/utils/validate'
import {getFactory} from "@/api/factory";
import {searchSysLanguage} from "@/api/sysLanguage.js"
export default {
data() {
var validatePassword = (rule, value, callback) => {
if (!this.dataForm.id && !/\S/.test(value)) {
callback(new Error('密码不能为空'))
} else {
callback()
}
}
var validateComfirmPassword = (rule, value, callback) => {
if (!this.dataForm.id && !/\S/.test(value)) {
callback(new Error('确认密码不能为空'))
} else if (this.dataForm.password !== value) {
callback(new Error('确认密码与密码输入不一致'))
} else {
callback()
}
}
var validateEmail = (rule, value, callback) => {
if (!isEmail(value)) {
callback(new Error('邮箱格式错误'))
} else {
callback()
}
}
var validateMobile = (rule, value, callback) => {
if (!isMobile(value)) {
callback(new Error('手机号格式错误'))
} else {
callback()
}
}
return {
visible: false,
roleList: [],
factorys: [],
languageList: [],
dataForm: {
id: 0,
userName: '',
password: '',
comfirmPassword: '',
languageDefault: '',
salt: '',
email: '',
mobile: '',
roleIdList: [],
status: 1,
site: 0
},
dataRule: {
userName: [
{required: true, message: '用户名不能为空', trigger: 'blur'}
],
password: [
{validator: validatePassword, trigger: 'blur'}
],
comfirmPassword: [
{validator: validateComfirmPassword, trigger: 'blur'}
],
email: [
{required: true, message: '邮箱不能为空', trigger: 'blur'},
{validator: validateEmail, trigger: 'blur'}
],
mobile: [
{required: true, message: '手机号不能为空', trigger: 'blur'},
{validator: validateMobile, trigger: 'blur'}
]
site: '',
userDisplay: ''
}
}
},
methods: {
// 获取多语言列表
getLanguageList() {
let queryLanguage = {}
searchSysLanguage(queryLanguage).then(({data}) => {
this.languageList = data.rows
})
},
// 获取工厂信息
factoryList() {
getFactory().then((data) => {
this.factorys = data.list
getFactory().then(({data}) => {
this.factorys = data.list.map(item => {
let factory = {
site: item.baseData,
baseDesc: item.baseDesc
}
return factory;
})
})
},
init(id) {
this.dataForm.id = id || 0
this.factoryList()
this.factoryList();
this.getLanguageList();
this.$http({
url: this.$http.adornUrl('/sys/role/select'),
method: 'get',
@ -161,6 +154,9 @@ export default {
this.dataForm.mobile = data.user.mobile
this.dataForm.roleIdList = data.user.roleIdList
this.dataForm.status = data.user.status
this.dataForm.languageDefault = data.user.languageDefault
this.dataForm.site = data.user.site.toString()
this.dataForm.userDisplay = data.user.userDisplay
}
})
}
@ -181,7 +177,10 @@ export default {
'email': this.dataForm.email,
'mobile': this.dataForm.mobile,
'status': this.dataForm.status,
'roleIdList': this.dataForm.roleIdList
'roleIdList': this.dataForm.roleIdList,
'languageDefault': this.dataForm.languageDefault,
'site': this.dataForm.site,
'userDisplay': this.dataForm.userDisplay,
})
}).then(({data}) => {
if (data && data.code === 0) {
@ -201,6 +200,10 @@ export default {
}
})
}
},
created() {
// this.factoryList()
// this.getLanguageList()
}
}
</script>

Write Preview
Loading…
Cancel
Save