|
@@ -3,13 +3,14 @@
|
|
<normal-dialog
|
|
<normal-dialog
|
|
v-if="modalShow"
|
|
v-if="modalShow"
|
|
ref="normalDialog"
|
|
ref="normalDialog"
|
|
|
|
+ v-loading="loading"
|
|
:show-dialog="false"
|
|
:show-dialog="false"
|
|
is-succes
|
|
is-succes
|
|
:title="titleName"
|
|
:title="titleName"
|
|
width="45%"
|
|
width="45%"
|
|
@succes="updateModule"
|
|
@succes="updateModule"
|
|
>
|
|
>
|
|
- <el-form label-width="100px" style="padding-right: 20px;padding-left: 20px">
|
|
|
|
|
|
+ <el-form :key="domKey" label-width="100px" style="padding-right: 20px;padding-left: 20px">
|
|
<el-form-item label="问题">
|
|
<el-form-item label="问题">
|
|
<el-input
|
|
<el-input
|
|
v-model="normalAreaName"
|
|
v-model="normalAreaName"
|
|
@@ -67,11 +68,13 @@ export default {
|
|
titleName: '标记为重点问题',
|
|
titleName: '标记为重点问题',
|
|
normalAreaName: '',
|
|
normalAreaName: '',
|
|
menuData: '',
|
|
menuData: '',
|
|
|
|
+ domKey: '123456',
|
|
callBack: null,
|
|
callBack: null,
|
|
columns: null,
|
|
columns: null,
|
|
cascaderValue: null,
|
|
cascaderValue: null,
|
|
headerTitle: null,
|
|
headerTitle: null,
|
|
subTitles: null,
|
|
subTitles: null,
|
|
|
|
+ loading: false,
|
|
multiplePeople: null
|
|
multiplePeople: null
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -86,6 +89,9 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
uuid10,
|
|
uuid10,
|
|
openModal(params) {
|
|
openModal(params) {
|
|
|
|
+ this.loading = true
|
|
|
|
+ this.multiplePeople = null
|
|
|
|
+ this.domKey = new Date().getTime()
|
|
const { title, scope, columns, normalAreaName, subTitles, headerTitle } = params
|
|
const { title, scope, columns, normalAreaName, subTitles, headerTitle } = params
|
|
this.titleName = title
|
|
this.titleName = title
|
|
if (scope) this.menuData = scope.row
|
|
if (scope) this.menuData = scope.row
|
|
@@ -96,6 +102,7 @@ export default {
|
|
this.headerTitle = headerTitle
|
|
this.headerTitle = headerTitle
|
|
if (normalAreaName) this.normalAreaName = normalAreaName
|
|
if (normalAreaName) this.normalAreaName = normalAreaName
|
|
this.setDefaultValues()
|
|
this.setDefaultValues()
|
|
|
|
+ this.loading = false
|
|
},
|
|
},
|
|
// 设置默认值
|
|
// 设置默认值
|
|
setDefaultValues() {
|
|
setDefaultValues() {
|
|
@@ -155,7 +162,10 @@ export default {
|
|
this.menuData[headerKeyMK.headerKey] &&
|
|
this.menuData[headerKeyMK.headerKey] &&
|
|
`${this.menuData[headerKeyMK.headerKey]}模块一次全量回滚`
|
|
`${this.menuData[headerKeyMK.headerKey]}模块一次全量回滚`
|
|
}
|
|
}
|
|
- this.setDeptCharge()
|
|
|
|
|
|
+ if (this.cascaderValue && this.cascaderValue.length) {
|
|
|
|
+ console.log(161)
|
|
|
|
+ this.setDeptCharge()
|
|
|
|
+ }
|
|
},
|
|
},
|
|
updateModule() {
|
|
updateModule() {
|
|
this.$store.commit('monthlyReportEdit/MARK_ISSUES', {
|
|
this.$store.commit('monthlyReportEdit/MARK_ISSUES', {
|
|
@@ -170,7 +180,16 @@ export default {
|
|
async setDeptCharge() {
|
|
async setDeptCharge() {
|
|
const res = await getDeptCharge({ deptCode: this.cascaderValue })
|
|
const res = await getDeptCharge({ deptCode: this.cascaderValue })
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
- this.multiplePeople = Array.from(new Set([...this.multiplePeople, this.cascaderValue]))
|
|
|
|
|
|
+ if (!this.multiplePeople) {
|
|
|
|
+ this.multiplePeople = []
|
|
|
|
+ }
|
|
|
|
+ console.log(this.multiplePeople)
|
|
|
|
+ console.log(res.data.map(elm => elm.manageName))
|
|
|
|
+ this.multiplePeople = [...this.multiplePeople, ...res.data.map(elm => elm.manageName)]
|
|
|
|
+ // console.log(this.multiplePeople)
|
|
|
|
+ // this.multiplePeople = Array.from(new Set([...this.multiplePeople, ...this.cascaderValue.map(elm => elm.manageName)]))
|
|
|
|
+ this.multiplePeople = Array.from(new Set(this.multiplePeople))
|
|
|
|
+ // console.log(this.multiplePeople)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|