-
+
@@ -50,10 +50,10 @@
{{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }}
-
-
-
-
+
+
+
+
@@ -86,19 +86,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -113,7 +113,7 @@
-
+
@@ -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位码
diff --git a/src/views/System/User.vue b/src/views/System/User.vue
index 01f2b00..90c7b1f 100644
--- a/src/views/System/User.vue
+++ b/src/views/System/User.vue
@@ -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()
diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue
index f3f65e8..f3ca439 100644
--- a/src/views/reportProcess/components/reportForm.vue
+++ b/src/views/reportProcess/components/reportForm.vue
@@ -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
diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue
index 79a1a06..c0f0987 100644
--- a/src/views/reportProcess/launch.vue
+++ b/src/views/reportProcess/launch.vue
@@ -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")
}
}