DZ/faw-report-library-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】修改部门

Browse Source
This commit is contained in:
zhoulingpo
2023-05-16 19:08:01 +08:00
parent a03e268e33
commit c76a892a39
5 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/System/Org.vue
+32 -31
View File
@@ -8,7 +8,7 @@
<el-col :span="20">
<div class="search-box-left">
<label>部门名称:</label>
<el-input v-model="q.orgName" placeholder="请输入部门名称"></el-input>
<el-input v-model="q.longName" placeholder="请输入部门名称"></el-input>
<!-- <label>角色名:</label>-->
<!-- <el-select v-model="q.roleName" class="icon-auth" placeholder="请选择角色名">-->
<!-- <el-option label="全部" value=""></el-option>-->
@@ -50,10 +50,10 @@
{{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }}
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="orgCode" title="部门编码"></vxe-column>
<vxe-column show-overflow show-header-overflow field="orgName" title="部门名称"></vxe-column>
<vxe-column show-overflow show-header-overflow field="orgLevel" title="部门级别"></vxe-column>
<vxe-column show-overflow show-header-overflow field="orgShortName" title="部门简称"></vxe-column>
<vxe-column show-overflow show-header-overflow field="departmentCode" title="部门编码"></vxe-column>
<vxe-column show-overflow show-header-overflow field="longName" title="部门名称"></vxe-column>
<vxe-column show-overflow show-header-overflow field="leveL" title="部门级别"></vxe-column>
<vxe-column show-overflow show-header-overflow field="shortName" title="部门简称"></vxe-column>
<vxe-column show-overflow show-header-overflow field="attribution" title="归属地"></vxe-column>
<vxe-column show-overflow show-header-overflow field="bmdm14" title="部门14位码"></vxe-column>
<vxe-column show-overflow show-header-overflow field="updateTime" title="更新时间"></vxe-column>
@@ -86,19 +86,19 @@
<div class="user-form showLimit">
<el-form :model="form" label-width="186px" :disabled="mode === 'view'">
<el-form-item label="部门名称:" required>
<el-input v-model="form.orgName" maxlength="50" show-word-limit placeholder="请输入部门名称"></el-input>
<el-input v-model="form.longName" maxlength="50" show-word-limit placeholder="请输入部门名称"></el-input>
</el-form-item>
<el-form-item label="部门编码:" required>
<el-input v-model="form.orgCode" :disabled="dialogTitle=='编辑'" maxlength="50" show-word-limit placeholder="请输入部门编码"></el-input>
<el-input v-model="form.departmentCode" :disabled="dialogTitle=='编辑'" maxlength="50" show-word-limit placeholder="请输入部门编码"></el-input>
</el-form-item>
<el-form-item label="部门级别:" required>
<el-input v-model="form.orgLevel" maxlength="10" show-word-limit placeholder="请输入部门级别"></el-input>
<el-input v-model="form.leveL" maxlength="10" show-word-limit placeholder="请输入部门级别"></el-input>
</el-form-item>
<el-form-item label="父部门编码:" >
<el-input v-model="form.supOrgCode" maxlength="50" show-word-limit placeholder="请输入父部门编码"></el-input>
<el-input v-model="form.parentID" maxlength="50" show-word-limit placeholder="请输入父部门编码"></el-input>
</el-form-item>
<el-form-item label="部门简称:" >
<el-input v-model="form.orgShortName" maxlength="50" show-word-limit placeholder="请输入部门简称"></el-input>
<el-input v-model="form.shortName" maxlength="50" show-word-limit placeholder="请输入部门简称"></el-input>
</el-form-item>
<el-form-item label="归属地:" >
<el-input v-model="form.attribution" maxlength="50" show-word-limit placeholder="请输入归属地"></el-input>
@@ -113,7 +113,7 @@
<!--<el-input v-model="repassword" maxlength="20" type="password" placeholder="请确认密码"></el-input>-->
<!--</el-form-item>-->
<!-- <el-form-item label="手机号:">-->
<!-- <el-input v-model="form.orgCode" placeholder="请输入手机号"></el-input>-->
<!-- <el-input v-model="form.departmentCode" placeholder="请输入手机号"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="部门:">-->
<!-- <el-input v-model="form.department" maxlength="50" show-word-limit placeholder="请输入部门"></el-input>-->
@@ -148,7 +148,7 @@ export default {
data () {
return {
q: {
orgName: '', // 用户名
longName: '', // 用户名
// roleName: '', // 角色名称
pageNo: 1,
pageSize: 10
@@ -158,11 +158,11 @@ export default {
mode: '',
dialogUser: false,
form: {
orgName: '', // 部门名称
orgCode: '', // 部门编码
orgLevel: '', // 部门级别
supOrgCode: '', // 父部门编码
orgShortName: '', // 部门简称
longName: '', // 部门名称
departmentCode: '', // 部门编码
leveL: '', // 部门级别
parentID: '', // 父部门编码
shortName: '', // 部门简称
attribution: '', //归属地
bmdm14: '', // 部门14位码
// roleIdList: [''] // 角色
@@ -201,7 +201,7 @@ export default {
// 重置
reset () {
this.q = {
orgName: '', // 部门名称
longName: '', // 部门名称
// roleName: '', // 角色名称
pageNo: 1,
pageSize: 10
@@ -225,11 +225,11 @@ export default {
add () {
this.mode = 'add'
this.form = {
orgName: '', // 部门名称
orgCode: '', // 部门编码
orgLevel: '', // 部门级别
supOrgCode: '', // 父部门编码
orgShortName: '', // 部门简称
longName: '', // 部门名称
departmentCode: '', // 部门编码
leveL: '', // 部门级别
parentID: '', // 父部门编码
shortName: '', // 部门简称
attribution: '', //归属地
bmdm14: '', // 部门14位码
// roleIdList: [''] // 角色
@@ -258,13 +258,13 @@ export default {
},
// 验证
checkUserForm () {
if (!this.form.orgName) {
if (!this.form.longName) {
return this.$message.warning('请检查部门名称') && false
}
if (!this.form.orgCode) {
if (!this.form.departmentCode) {
return this.$message.warning('请检查部门编码') && false
}
if (!this.form.orgLevel || !(/^[a-zA-Z0-9]*$/.test(this.form.orgLevel))) {
if (!this.form.leveL || !(/^[a-zA-Z0-9]*$/.test(this.form.leveL))) {
return this.$message.warning('部门级别只能为纯数字') && false
}
return true
@@ -272,6 +272,7 @@ export default {
// 新增用户
sysOrgAddOrg () {
if (!this.checkUserForm()) return
let form={}
const data = JSON.parse(JSON.stringify(this.form))
this.$api.org.sysOrgAddUser(data).then(_ => {
@@ -284,11 +285,11 @@ export default {
openRowData (mode, row) {
this.mode = mode
this.form = {
orgName: row.orgName, // 部门名称
orgLevel: row.orgLevel, // 部门级别
orgCode: row.orgCode, // 部门级别
supOrgCode: row.supOrgCode, // 父部门编码
orgShortName: row.orgShortName, // 部门简称
longName: row.longName, // 部门名称
leveL: row.leveL, // 部门级别
departmentCode: row.departmentCode, // 部门级别
parentID: row.parentID, // 父部门编码
shortName: row.shortName, // 部门简称
id: row.id, // ID
attribution: row.attribution, // 归属地
bmdm14: row.bmdm14 // 部门14位码
src/views/System/User.vue
+2 -2
View File
@@ -168,8 +168,8 @@ export default {
const parts = []
const partsName = []
checkedList.map((item, index) => {
parts.push(item.orgCode)
partsName.push(item.orgName)
parts.push(item.id)
partsName.push(item.longName)
})
this.form.orgId = parts.toString()
this.form.orgName = partsName.toString()
src/views/reportProcess/components/reportForm.vue
+2 -2
View File
@@ -310,8 +310,8 @@ export default {
const parts = []
const partsName = []
checkedList.map((item, index) => {
parts.push(item.orgCode)
partsName.push(item.orgName)
parts.push(item.id)
partsName.push(item.longName)
})
this.qcrList = checkedList
src/views/reportProcess/launch.vue
+2 -2
View File
@@ -198,8 +198,8 @@ export default {
// 需要给部门带出来
if(this.$store.getters.userInfo.orgEOList.length>0){
let temp=this.$store.getters.userInfo.orgEOList
this.$set(this.processForm,'departmentName',temp[0].orgName)
this.$set(this.processForm,'department',temp[0].orgCode)
this.$set(this.processForm,'departmentName',temp[0].longName)
this.$set(this.processForm,'department',temp[0].id)
console.log(this.processForm,"wowowwoo")
}
}