优化
This commit is contained in:
parent
87ec798a33
commit
e1d918222c
@ -135,7 +135,6 @@ export default {
|
|||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
this.handleGainAssessmentGroupList()
|
this.handleGainAssessmentGroupList()
|
||||||
console.log('showChooseList: ', this.showChooseList)
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
checkSelectable (row, index) {
|
checkSelectable (row, index) {
|
||||||
@ -202,7 +201,6 @@ export default {
|
|||||||
watch: {
|
watch: {
|
||||||
'showChooseList': function (newVal, oldVal) {
|
'showChooseList': function (newVal, oldVal) {
|
||||||
if (newVal) {
|
if (newVal) {
|
||||||
console.log('newVal: ', newVal)
|
|
||||||
this.$nextTick(res => {
|
this.$nextTick(res => {
|
||||||
if (this.oldSelectedList.length > 0) {
|
if (this.oldSelectedList.length > 0) {
|
||||||
this.oldSelectedList.map(i => {
|
this.oldSelectedList.map(i => {
|
||||||
|
|||||||
@ -72,7 +72,6 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
aa () { },
|
aa () { },
|
||||||
onSubmit () {
|
onSubmit () {
|
||||||
console.log('submit!')
|
|
||||||
this.isShow = false
|
this.isShow = false
|
||||||
this.$emit('update:show', false)
|
this.$emit('update:show', false)
|
||||||
},
|
},
|
||||||
|
|||||||
@ -193,7 +193,6 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleGetNextChildren (list = this.data) {
|
handleGetNextChildren (list = this.data) {
|
||||||
console.log('list: ', list)
|
|
||||||
},
|
},
|
||||||
handleCancel () {
|
handleCancel () {
|
||||||
this.$emit('update:isShow', false)
|
this.$emit('update:isShow', false)
|
||||||
|
|||||||
@ -231,10 +231,8 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击下级
|
// 点击下级
|
||||||
handleNext (item) {
|
handleNext (item) {
|
||||||
console.log('item: ', item)
|
|
||||||
if (item.staffDtos) {
|
if (item.staffDtos) {
|
||||||
this.staffDtos = item.staffDtos.map(i => {
|
this.staffDtos = item.staffDtos.map(i => {
|
||||||
console.log('i: ', i)
|
|
||||||
i.departmentId = i.staffId + '-id'
|
i.departmentId = i.staffId + '-id'
|
||||||
i.departmentName = i.name
|
i.departmentName = i.name
|
||||||
return i
|
return i
|
||||||
@ -258,7 +256,6 @@ export default {
|
|||||||
},
|
},
|
||||||
// 关闭弹窗
|
// 关闭弹窗
|
||||||
close () {
|
close () {
|
||||||
// console.log('isShow: ', this.isShow)
|
|
||||||
this.show = true
|
this.show = true
|
||||||
this.$emit('update:isShow', false)
|
this.$emit('update:isShow', false)
|
||||||
// this.$forceUpdate()
|
// this.$forceUpdate()
|
||||||
@ -296,7 +293,6 @@ export default {
|
|||||||
return getList
|
return getList
|
||||||
},
|
},
|
||||||
handleGetNextChildren (list = this.data) {
|
handleGetNextChildren (list = this.data) {
|
||||||
console.log('list: ', list)
|
|
||||||
},
|
},
|
||||||
handleCancel () {
|
handleCancel () {
|
||||||
this.$emit('update:isShow', false)
|
this.$emit('update:isShow', false)
|
||||||
|
|||||||
@ -57,7 +57,6 @@ export default {
|
|||||||
this.$router.push({name: item})
|
this.$router.push({name: item})
|
||||||
},
|
},
|
||||||
handleSelect (key, keyPath) {
|
handleSelect (key, keyPath) {
|
||||||
console.log(key, keyPath)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
|||||||
@ -244,7 +244,6 @@ export default {
|
|||||||
staffIds: removeStaffIds.join(),
|
staffIds: removeStaffIds.join(),
|
||||||
startId: this.startId
|
startId: this.startId
|
||||||
}
|
}
|
||||||
console.log('删除数据===', dicPara)
|
|
||||||
apiAssessManagerChange(dicPara).then(res => {
|
apiAssessManagerChange(dicPara).then(res => {
|
||||||
if (res.code !== 200) {
|
if (res.code !== 200) {
|
||||||
return
|
return
|
||||||
@ -271,13 +270,11 @@ export default {
|
|||||||
this.rqAssessmentParameter.totalCount = res.data.totalCount
|
this.rqAssessmentParameter.totalCount = res.data.totalCount
|
||||||
this.rqAssessmentParameter.currPage = res.data.currPage
|
this.rqAssessmentParameter.currPage = res.data.currPage
|
||||||
this.popupData.tableList = res.data.list
|
this.popupData.tableList = res.data.list
|
||||||
console.log('获取数据成功')
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 部门筛选
|
// 部门筛选
|
||||||
handleDeptSubmit (val) {
|
handleDeptSubmit (val) {
|
||||||
this.deptFilterData.showDataList = val
|
this.deptFilterData.showDataList = val
|
||||||
console.log('部门筛选--====-==-== ', val)
|
|
||||||
let deptNames = []
|
let deptNames = []
|
||||||
this.deptFilterData.showDataList.list.forEach(item => {
|
this.deptFilterData.showDataList.list.forEach(item => {
|
||||||
deptNames.push(item.departmentName)
|
deptNames.push(item.departmentName)
|
||||||
@ -297,7 +294,6 @@ export default {
|
|||||||
// 重新获取数据
|
// 重新获取数据
|
||||||
this.rqAssessmentParameter.staffIds = this.deptFilterData.staffIds
|
this.rqAssessmentParameter.staffIds = this.deptFilterData.staffIds
|
||||||
this.handleGainAssessmentGroupList()
|
this.handleGainAssessmentGroupList()
|
||||||
console.log('部门筛选--====-==-== ', this.deptFilterData)
|
|
||||||
},
|
},
|
||||||
handleGainDeptPerson (dicArr, list) {
|
handleGainDeptPerson (dicArr, list) {
|
||||||
for (let index = 0; index < list.length; index++) {
|
for (let index = 0; index < list.length; index++) {
|
||||||
@ -385,7 +381,6 @@ export default {
|
|||||||
this.popupData.selectedList = []
|
this.popupData.selectedList = []
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
if (this.$refs.popupMultipleTable) {
|
if (this.$refs.popupMultipleTable) {
|
||||||
console.log('lllllllllllllllllllllllllllllllll')
|
|
||||||
this.$refs.popupMultipleTable.clearSelection()
|
this.$refs.popupMultipleTable.clearSelection()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@ -7,4 +7,3 @@ Vue.component('svg-icon', SvgIcon)
|
|||||||
const requireAll = requireContext => requireContext.keys().map(requireContext)
|
const requireAll = requireContext => requireContext.keys().map(requireContext)
|
||||||
const req = require.context('./svg', false, /\.svg$/)
|
const req = require.context('./svg', false, /\.svg$/)
|
||||||
requireAll(req)
|
requireAll(req)
|
||||||
console.log('requireAll(req): ', requireAll(req))
|
|
||||||
|
|||||||
@ -25,7 +25,6 @@ const user = {
|
|||||||
actions: {
|
actions: {
|
||||||
GET_USERINFO: async ({ commit }) => {
|
GET_USERINFO: async ({ commit }) => {
|
||||||
let res = await apiUserInfo()
|
let res = await apiUserInfo()
|
||||||
console.log('获取用户信息res: ', res)
|
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
commit('SET_USER_INFO', res.user)
|
commit('SET_USER_INFO', res.user)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -66,7 +66,6 @@ export function departGetForm (arr = []) {
|
|||||||
const key = 'departmentId'
|
const key = 'departmentId'
|
||||||
const key1 = 'departmentName'
|
const key1 = 'departmentName'
|
||||||
arr = arr.sort((a, b) => a[key] - b[key])
|
arr = arr.sort((a, b) => a[key] - b[key])
|
||||||
console.log('arr: ', arr)
|
|
||||||
params.list = arr
|
params.list = arr
|
||||||
for (let i in arr) {
|
for (let i in arr) {
|
||||||
if (i < 1) {
|
if (i < 1) {
|
||||||
|
|||||||
@ -212,7 +212,6 @@ export default {
|
|||||||
return Math.round((num * 100) * 1000) / 1000
|
return Math.round((num * 100) * 1000) / 1000
|
||||||
},
|
},
|
||||||
handleGetWeight (arr) {
|
handleGetWeight (arr) {
|
||||||
console.log('arr: ', arr)
|
|
||||||
const weight = arr.detailDtos.filter(i => !i.isDelete).reduce((num, i) => {
|
const weight = arr.detailDtos.filter(i => !i.isDelete).reduce((num, i) => {
|
||||||
num += i.isDelete !== 1 ? i.checkWeight : 0
|
num += i.isDelete !== 1 ? i.checkWeight : 0
|
||||||
return num
|
return num
|
||||||
@ -254,7 +253,6 @@ export default {
|
|||||||
if (v) {
|
if (v) {
|
||||||
if (this.formIndicators.index === -1) {
|
if (this.formIndicators.index === -1) {
|
||||||
this.obj.recortModelDtos[this.formIndicators.dazhibiaoIndex].detailDtos.push(Object.assign({}, this.formIndicators, {checkWeight: this.formIndicators.checkWeight / 100}))
|
this.obj.recortModelDtos[this.formIndicators.dazhibiaoIndex].detailDtos.push(Object.assign({}, this.formIndicators, {checkWeight: this.formIndicators.checkWeight / 100}))
|
||||||
console.log('this.obj.recortModelDtos[this.formIndicators.dazhibiaoIndex].: ', this.obj.recortModelDtos[this.formIndicators.dazhibiaoIndex])
|
|
||||||
} else {
|
} else {
|
||||||
this.obj.recortModelDtos[this.formIndicators.dazhibiaoIndex].detailDtos[this.formIndicators.index] = Object.assign({}, this.formIndicators, {checkWeight: this.formIndicators.checkWeight / 100})
|
this.obj.recortModelDtos[this.formIndicators.dazhibiaoIndex].detailDtos[this.formIndicators.index] = Object.assign({}, this.formIndicators, {checkWeight: this.formIndicators.checkWeight / 100})
|
||||||
}
|
}
|
||||||
@ -266,7 +264,6 @@ export default {
|
|||||||
hanidleEdit (item, index, type) {
|
hanidleEdit (item, index, type) {
|
||||||
if (item.maxCount !== null) {
|
if (item.maxCount !== null) {
|
||||||
const len = this.handleNumber(item)
|
const len = this.handleNumber(item)
|
||||||
console.log('len: ', len)
|
|
||||||
if (item.maxCount <= len) {
|
if (item.maxCount <= len) {
|
||||||
this.$message.info('指标数量不能大于' + item.maxCount)
|
this.$message.info('指标数量不能大于' + item.maxCount)
|
||||||
return
|
return
|
||||||
@ -302,7 +299,6 @@ export default {
|
|||||||
if (res.code !== 200) return
|
if (res.code !== 200) return
|
||||||
this.obj = res.data
|
this.obj = res.data
|
||||||
this.activeId = String(res.data.recortModelDtos[0].id)
|
this.activeId = String(res.data.recortModelDtos[0].id)
|
||||||
console.log('res: ', res)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {}
|
watch: {}
|
||||||
|
|||||||
@ -146,7 +146,6 @@ export default {
|
|||||||
},
|
},
|
||||||
handleChange (value) {
|
handleChange (value) {
|
||||||
this.params.currPage = 1
|
this.params.currPage = 1
|
||||||
console.log(' this.form: ', this.form)
|
|
||||||
this.handleGetData(Object.assign({}, this.form, this.params))
|
this.handleGetData(Object.assign({}, this.form, this.params))
|
||||||
},
|
},
|
||||||
handlePush (id) {
|
handlePush (id) {
|
||||||
@ -173,9 +172,6 @@ export default {
|
|||||||
this.show = true
|
this.show = true
|
||||||
},
|
},
|
||||||
handleSelectClick (row, column, event) {
|
handleSelectClick (row, column, event) {
|
||||||
console.log('event: ', event)
|
|
||||||
console.log('column: ', column)
|
|
||||||
console.log('row: ', row)
|
|
||||||
},
|
},
|
||||||
handleToHome (i) {
|
handleToHome (i) {
|
||||||
this.$router.push({name: i})
|
this.$router.push({name: i})
|
||||||
|
|||||||
@ -197,7 +197,6 @@ export default {
|
|||||||
// 催办
|
// 催办
|
||||||
handleCuiban () {
|
handleCuiban () {
|
||||||
if (!this.info) return
|
if (!this.info) return
|
||||||
console.log('item: ', this.info)
|
|
||||||
this.$confirm('确认对该节点处理人进行催办?', '提示', {
|
this.$confirm('确认对该节点处理人进行催办?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
cancelButtonText: '取消',
|
cancelButtonText: '取消',
|
||||||
@ -229,7 +228,6 @@ export default {
|
|||||||
// 跳过
|
// 跳过
|
||||||
handleJump () {
|
handleJump () {
|
||||||
if (!this.info && !this.$attrs.flowRecordId) return
|
if (!this.info && !this.$attrs.flowRecordId) return
|
||||||
console.log('item: ', this.info)
|
|
||||||
this.$confirm('确认跳过该人员?', '提示', {
|
this.$confirm('确认跳过该人员?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
cancelButtonText: '取消',
|
cancelButtonText: '取消',
|
||||||
@ -276,7 +274,6 @@ export default {
|
|||||||
this.$loadingStart()
|
this.$loadingStart()
|
||||||
let res = await this.handlApiSaveapproval({status: 5, menuName: '驳回了'})
|
let res = await this.handlApiSaveapproval({status: 5, menuName: '驳回了'})
|
||||||
this.$loadingEnd()
|
this.$loadingEnd()
|
||||||
console.log('!!res: ', !!res)
|
|
||||||
this.bohui = !!res
|
this.bohui = !!res
|
||||||
},
|
},
|
||||||
handleCancel () {
|
handleCancel () {
|
||||||
|
|||||||
@ -159,7 +159,6 @@ export default {
|
|||||||
return k[l]
|
return k[l]
|
||||||
})
|
})
|
||||||
result += eval(str)
|
result += eval(str)
|
||||||
console.log('k: ', k)
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
const arr = this.scoreList.filter(i => i.minScore <= result && i.maxScore > result)
|
const arr = this.scoreList.filter(i => i.minScore <= result && i.maxScore > result)
|
||||||
@ -168,8 +167,6 @@ export default {
|
|||||||
Level: arr.length > 0 ? arr[0].name : ''
|
Level: arr.length > 0 ? arr[0].name : ''
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
// console.log('this.obj.recortModelDtos: ', this.obj.recortModelDtos[0].detailDtos[0].scoreDtos)
|
|
||||||
// return 10
|
|
||||||
},
|
},
|
||||||
score () {
|
score () {
|
||||||
const result = this.obj.recortModelDtos.reduce((result, i) => {
|
const result = this.obj.recortModelDtos.reduce((result, i) => {
|
||||||
|
|||||||
@ -162,7 +162,6 @@ export default {
|
|||||||
i = i.replace(/{|}/g, '')
|
i = i.replace(/{|}/g, '')
|
||||||
return k[i]
|
return k[i]
|
||||||
})
|
})
|
||||||
console.log('str: ', str)
|
|
||||||
let a = eval(str)
|
let a = eval(str)
|
||||||
result += a
|
result += a
|
||||||
})
|
})
|
||||||
|
|||||||
@ -162,7 +162,6 @@ export default {
|
|||||||
i = i.replace(/{|}/g, '')
|
i = i.replace(/{|}/g, '')
|
||||||
return k[i]
|
return k[i]
|
||||||
})
|
})
|
||||||
console.log('str: ', str)
|
|
||||||
let a = eval(str)
|
let a = eval(str)
|
||||||
result += a
|
result += a
|
||||||
})
|
})
|
||||||
|
|||||||
@ -246,7 +246,6 @@ export default {
|
|||||||
pageSize: 999
|
pageSize: 999
|
||||||
})
|
})
|
||||||
res = res.data
|
res = res.data
|
||||||
console.log('res: ', res)
|
|
||||||
this.key += 10
|
this.key += 10
|
||||||
this.timeOptions[j].children = res.list.map(i => {
|
this.timeOptions[j].children = res.list.map(i => {
|
||||||
if (i.startId === this.startIds) {
|
if (i.startId === this.startIds) {
|
||||||
|
|||||||
@ -322,7 +322,6 @@ export default {
|
|||||||
name: 'assessment-performance',
|
name: 'assessment-performance',
|
||||||
query: { id }
|
query: { id }
|
||||||
})
|
})
|
||||||
console.log('id: ', id)
|
|
||||||
},
|
},
|
||||||
handleChangeInput () {
|
handleChangeInput () {
|
||||||
this.params.currPage = 1
|
this.params.currPage = 1
|
||||||
@ -340,7 +339,6 @@ export default {
|
|||||||
this.tableData = res.data.list
|
this.tableData = res.data.list
|
||||||
this.params.totalCount = res.data.totalCount
|
this.params.totalCount = res.data.totalCount
|
||||||
this.params.currPage = res.data.currPage
|
this.params.currPage = res.data.currPage
|
||||||
console.log('this.params: ', this.params)
|
|
||||||
},
|
},
|
||||||
// 为了不分页直接传999
|
// 为了不分页直接传999
|
||||||
async handleStartsReq (type, handleNode) {
|
async handleStartsReq (type, handleNode) {
|
||||||
@ -358,7 +356,6 @@ export default {
|
|||||||
pageSize: 999
|
pageSize: 999
|
||||||
})
|
})
|
||||||
res = res.data
|
res = res.data
|
||||||
console.log('res: ', res)
|
|
||||||
this.key += 10
|
this.key += 10
|
||||||
this.timeOptions[j].children = res.list.map(i => {
|
this.timeOptions[j].children = res.list.map(i => {
|
||||||
if (i.startId === this.params.startId) {
|
if (i.startId === this.params.startId) {
|
||||||
@ -383,8 +380,6 @@ export default {
|
|||||||
this.params.currPage = 1
|
this.params.currPage = 1
|
||||||
this.params.startId = item[1]
|
this.params.startId = item[1]
|
||||||
await this.handleGetChartList()
|
await this.handleGetChartList()
|
||||||
console.log('this.params: ', this.params)
|
|
||||||
console.log('item: ', item)
|
|
||||||
},
|
},
|
||||||
handleSubmit () {
|
handleSubmit () {
|
||||||
this.kaopingFrom.showRight = false
|
this.kaopingFrom.showRight = false
|
||||||
@ -397,7 +392,6 @@ export default {
|
|||||||
this.form.isShowPersonnel = true
|
this.form.isShowPersonnel = true
|
||||||
},
|
},
|
||||||
handleGetList () {
|
handleGetList () {
|
||||||
console.log('1', this.form.personnelList)
|
|
||||||
},
|
},
|
||||||
async handleActive (i) {
|
async handleActive (i) {
|
||||||
if (i.active) return
|
if (i.active) return
|
||||||
|
|||||||
@ -15,7 +15,6 @@ export default {
|
|||||||
computed: {},
|
computed: {},
|
||||||
beforeMount () {},
|
beforeMount () {},
|
||||||
mounted () {
|
mounted () {
|
||||||
console.log('this.$route', this.$route)
|
|
||||||
},
|
},
|
||||||
methods: {},
|
methods: {},
|
||||||
watch: {}
|
watch: {}
|
||||||
|
|||||||
@ -12,15 +12,9 @@ export default {
|
|||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// beforeRouteLeave (to, from, next) {
|
|
||||||
// console.log('123')
|
|
||||||
// next(false)
|
|
||||||
// // ...
|
|
||||||
// },
|
|
||||||
computed: {},
|
computed: {},
|
||||||
beforeMount () {},
|
beforeMount () {},
|
||||||
mounted () {
|
mounted () {
|
||||||
console.log('this.$route', this.$route)
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
open () {
|
open () {
|
||||||
|
|||||||
@ -31,12 +31,9 @@ export default {
|
|||||||
mounted () {},
|
mounted () {},
|
||||||
methods: {
|
methods: {
|
||||||
bbb (item) {
|
bbb (item) {
|
||||||
console.log(145623)
|
|
||||||
return this.arr1.some(i => i === item.id)
|
return this.arr1.some(i => i === item.id)
|
||||||
},
|
},
|
||||||
aaa () {
|
aaa () {
|
||||||
// this.arr1 = []
|
|
||||||
console.log('this.array: ', this.array)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {}
|
watch: {}
|
||||||
|
|||||||
@ -102,11 +102,8 @@ export default {
|
|||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
showDialogDepart (newV, oldV) {
|
showDialogDepart (newV, oldV) {
|
||||||
console.log(this.showData)
|
|
||||||
if (!newV && oldV) {
|
if (!newV && oldV) {
|
||||||
console.log(this.showData.list[0])
|
|
||||||
this.selectDepName = this.showData.list[0].departmentName
|
this.selectDepName = this.showData.list[0].departmentName
|
||||||
console.log(this.selectDepName)
|
|
||||||
this.selectDepId = this.showData.list[0].departmentId
|
this.selectDepId = this.showData.list[0].departmentId
|
||||||
this.handleDetailReq(this.selectDepId)
|
this.handleDetailReq(this.selectDepId)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -263,7 +263,6 @@ export default {
|
|||||||
},
|
},
|
||||||
//
|
//
|
||||||
handleChange (val) {
|
handleChange (val) {
|
||||||
console.log(val)
|
|
||||||
this.startId = val
|
this.startId = val
|
||||||
this.handleChartDataReq(val[1])
|
this.handleChartDataReq(val[1])
|
||||||
},
|
},
|
||||||
@ -272,7 +271,6 @@ export default {
|
|||||||
let params = {
|
let params = {
|
||||||
startId: startId
|
startId: startId
|
||||||
}
|
}
|
||||||
console.log('params: ', params)
|
|
||||||
try {
|
try {
|
||||||
this.$loadingStart()
|
this.$loadingStart()
|
||||||
const result = await getChartData(params)
|
const result = await getChartData(params)
|
||||||
@ -312,17 +310,14 @@ export default {
|
|||||||
let res = await getStartsData(Object.assign({}, params, { cycleType: this.timeOptions[i].startId }))
|
let res = await getStartsData(Object.assign({}, params, { cycleType: this.timeOptions[i].startId }))
|
||||||
if (res.code !== 200) return this.$message.error(res.msg)
|
if (res.code !== 200) return this.$message.error(res.msg)
|
||||||
res = res.data
|
res = res.data
|
||||||
console.log('res: ', res)
|
|
||||||
this.key += 10
|
this.key += 10
|
||||||
this.timeOptions[i].children = res.list.map((m, mindex) => {
|
this.timeOptions[i].children = res.list.map((m, mindex) => {
|
||||||
console.log('timeOptions: ', typeof i)
|
|
||||||
if (m.startId === this.defaultId) {
|
if (m.startId === this.defaultId) {
|
||||||
this.startId = [this.timeOptions[i].startId, this.defaultId]
|
this.startId = [this.timeOptions[i].startId, this.defaultId]
|
||||||
}
|
}
|
||||||
return m
|
return m
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
console.log('this.timeOptions: ', this.timeOptions)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -434,7 +434,6 @@ export default {
|
|||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
'showPopupAddSub': function (newVal, oldVal) {
|
'showPopupAddSub': function (newVal, oldVal) {
|
||||||
console.log('showPopupAddSub==--===', newVal, oldVal)
|
|
||||||
if (!newVal) {
|
if (!newVal) {
|
||||||
this.popupSubMngEdit = false
|
this.popupSubMngEdit = false
|
||||||
this.popupFromSub = {
|
this.popupFromSub = {
|
||||||
@ -555,7 +554,6 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.handleChangeDirectorRg(val)
|
this.handleChangeDirectorRg(val)
|
||||||
}
|
}
|
||||||
console.log('handleDialogSubmitDepart== ', val)
|
|
||||||
},
|
},
|
||||||
handleSubAdd () {
|
handleSubAdd () {
|
||||||
this.popupFromSub.menuCheckData = this.menuCheckAllData
|
this.popupFromSub.menuCheckData = this.menuCheckAllData
|
||||||
@ -571,7 +569,6 @@ export default {
|
|||||||
this.popupSubMngEdit = true
|
this.popupSubMngEdit = true
|
||||||
this.showPopupAddSub = true
|
this.showPopupAddSub = true
|
||||||
// 获取权限列表
|
// 获取权限列表
|
||||||
console.log('编辑-----=====', row)
|
|
||||||
apiSetPermissionsRoleDetail({ id: row.id }).then(res => {
|
apiSetPermissionsRoleDetail({ id: row.id }).then(res => {
|
||||||
if (res.code !== 200) {
|
if (res.code !== 200) {
|
||||||
this.$message.error(res.msg)
|
this.$message.error(res.msg)
|
||||||
@ -585,8 +582,7 @@ export default {
|
|||||||
this.popupFromSub.shwoDepartData.list = data.departmentInfos // 指定部门
|
this.popupFromSub.shwoDepartData.list = data.departmentInfos // 指定部门
|
||||||
this.popupFromSub.groupRadio = data.evaluationGroupId // 考评组
|
this.popupFromSub.groupRadio = data.evaluationGroupId // 考评组
|
||||||
this.popupFromSub.assessmentList = data.evaluationGroupInfos
|
this.popupFromSub.assessmentList = data.evaluationGroupInfos
|
||||||
this.popupFromSub.menuCheckAllState = false // 全选中状态
|
this.popupFromSub.menuCheckAllState = false // 全选中状态)
|
||||||
console.log('selectStaffMenuInfos====', data.selectStaffMenuInfos)
|
|
||||||
let selectStaffMenuInfos = data.selectStaffMenuInfos ? data.selectStaffMenuInfos : []
|
let selectStaffMenuInfos = data.selectStaffMenuInfos ? data.selectStaffMenuInfos : []
|
||||||
selectStaffMenuInfos.forEach(item => {
|
selectStaffMenuInfos.forEach(item => {
|
||||||
switch (item) {
|
switch (item) {
|
||||||
@ -596,7 +592,6 @@ export default {
|
|||||||
case 2:
|
case 2:
|
||||||
case 21:
|
case 21:
|
||||||
case 23:
|
case 23:
|
||||||
console.log('item ======', item)
|
|
||||||
if (this.popupFromSub.menuCheckData.indexOf(item) < 0) {
|
if (this.popupFromSub.menuCheckData.indexOf(item) < 0) {
|
||||||
this.popupFromSub.menuCheckData.push(item)
|
this.popupFromSub.menuCheckData.push(item)
|
||||||
}
|
}
|
||||||
@ -614,14 +609,11 @@ export default {
|
|||||||
if (this.popupFromSub.menuCheckData.indexOf(2) < 0) {
|
if (this.popupFromSub.menuCheckData.indexOf(2) < 0) {
|
||||||
this.popupFromSub.menuMngCheck = []
|
this.popupFromSub.menuMngCheck = []
|
||||||
}
|
}
|
||||||
console.log('编辑====', this.popupFromSub)
|
|
||||||
// console.log('权限详情---', res)
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
handleChildDelete (row) {
|
handleChildDelete (row) {
|
||||||
// 删除子管理员
|
// 删除子管理员
|
||||||
this.$confirm('确认删除该管理员,删除后该子管理员将失去智能绩效的子管理员权限', '提示').then(_ => {
|
this.$confirm('确认删除该管理员,删除后该子管理员将失去智能绩效的子管理员权限', '提示').then(_ => {
|
||||||
console.log('删除子管理员', row)
|
|
||||||
apiSetPermissionsRoleDelete({ id: row.id }).then(res => {
|
apiSetPermissionsRoleDelete({ id: row.id }).then(res => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
// 删除成功
|
// 删除成功
|
||||||
@ -691,7 +683,6 @@ export default {
|
|||||||
this.showDialogPersonnel = true
|
this.showDialogPersonnel = true
|
||||||
},
|
},
|
||||||
handlePopupCheckModel (val) {
|
handlePopupCheckModel (val) {
|
||||||
console.log(val.indexOf('1'))
|
|
||||||
this.popupFromSub.showChoosePerformance = val.indexOf('1') > -1
|
this.popupFromSub.showChoosePerformance = val.indexOf('1') > -1
|
||||||
// 功能模块
|
// 功能模块
|
||||||
},
|
},
|
||||||
@ -722,7 +713,6 @@ export default {
|
|||||||
// 特定考评组选择
|
// 特定考评组选择
|
||||||
this.popupFromSub.assessmentList = val.list
|
this.popupFromSub.assessmentList = val.list
|
||||||
this.dialogVisibleTeamFilter = false
|
this.dialogVisibleTeamFilter = false
|
||||||
console.log('特定考评组选择 ', val, this.dialogVisibleTeamFilter)
|
|
||||||
},
|
},
|
||||||
handlePopupCloseAssessment (item) {
|
handlePopupCloseAssessment (item) {
|
||||||
this.popupFromSub.assessmentList = this.popupFromSub.assessmentList.filter(i => i !== item)
|
this.popupFromSub.assessmentList = this.popupFromSub.assessmentList.filter(i => i !== item)
|
||||||
@ -744,7 +734,6 @@ export default {
|
|||||||
this.mainData.childPm = res.data.childPm
|
this.mainData.childPm = res.data.childPm
|
||||||
this.mainData.boss = res.data.boss
|
this.mainData.boss = res.data.boss
|
||||||
this.masterPM = res.data.masterPM
|
this.masterPM = res.data.masterPM
|
||||||
console.log('权限设置页面====---', res)
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -45,8 +45,6 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
handleSelect (key, keyPath) {
|
handleSelect (key, keyPath) {
|
||||||
this.activeIndex = key
|
this.activeIndex = key
|
||||||
console.log(key, keyPath)
|
|
||||||
console.log(this.activeIndex)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {}
|
watch: {}
|
||||||
|
|||||||
@ -47,19 +47,13 @@ export default {
|
|||||||
form: {
|
form: {
|
||||||
deep: true,
|
deep: true,
|
||||||
handler (n, o) {
|
handler (n, o) {
|
||||||
console.log('n: ', n)
|
|
||||||
this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '' : '已禁用'}))
|
this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '' : '已禁用'}))
|
||||||
// console.log('info: ', this.info)
|
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
'info': {
|
'info': {
|
||||||
deep: true,
|
deep: true,
|
||||||
handler (n, o) {
|
handler (n, o) {
|
||||||
console.log('n222: ', n)
|
|
||||||
// this.form = n
|
|
||||||
// this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n ? '' : '已禁用'}))
|
|
||||||
// console.log('info: ', this.info)
|
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -129,7 +129,6 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
// 将传入的数值复现
|
// 将传入的数值复现
|
||||||
handleListFor (list) {
|
handleListFor (list) {
|
||||||
console.log('list: ', list)
|
|
||||||
if (list.length === 0) return []
|
if (list.length === 0) return []
|
||||||
list = list.map(i => {
|
list = list.map(i => {
|
||||||
i.isShow = false
|
i.isShow = false
|
||||||
@ -147,8 +146,6 @@ export default {
|
|||||||
return arr
|
return arr
|
||||||
},
|
},
|
||||||
handleOptType (i) {
|
handleOptType (i) {
|
||||||
console.log('i: ', i)
|
|
||||||
// itemInfo.isActive
|
|
||||||
const obj = {}
|
const obj = {}
|
||||||
if (i.optType === 0) {
|
if (i.optType === 0) {
|
||||||
obj.isActive = 0
|
obj.isActive = 0
|
||||||
@ -172,10 +169,8 @@ export default {
|
|||||||
// itemInfo.list.list.length===0?(itemInfo.list.title + '等' + itemInfo.list.list.length + '人' ):"未指定成员"
|
// itemInfo.list.list.length===0?(itemInfo.list.title + '等' + itemInfo.list.list.length + '人' ):"未指定成员"
|
||||||
},
|
},
|
||||||
handleChang (item) {
|
handleChang (item) {
|
||||||
console.log('item: ', item)
|
|
||||||
},
|
},
|
||||||
handleChoose (item) {
|
handleChoose (item) {
|
||||||
console.log('item: ', item)
|
|
||||||
this.itemInfo.isShow = true
|
this.itemInfo.isShow = true
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
},
|
},
|
||||||
@ -188,7 +183,6 @@ export default {
|
|||||||
})
|
})
|
||||||
item.isCick = true
|
item.isCick = true
|
||||||
this.itemInfo = item
|
this.itemInfo = item
|
||||||
console.log('this.itemInfo: ', this.itemInfo)
|
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
},
|
},
|
||||||
// 添加流程
|
// 添加流程
|
||||||
@ -268,7 +262,6 @@ export default {
|
|||||||
list: {
|
list: {
|
||||||
deep: true,
|
deep: true,
|
||||||
handler (n, o) {
|
handler (n, o) {
|
||||||
console.log('n22: ', n)
|
|
||||||
this.handleIsEmit(JSON.parse(JSON.stringify(n)))
|
this.handleIsEmit(JSON.parse(JSON.stringify(n)))
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -51,7 +51,6 @@ export default {
|
|||||||
deep: true,
|
deep: true,
|
||||||
handler (n, o) {
|
handler (n, o) {
|
||||||
this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '' : '已禁用'}))
|
this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '' : '已禁用'}))
|
||||||
// console.log('info: ', this.info)
|
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -124,7 +124,6 @@ export default {
|
|||||||
computed: {},
|
computed: {},
|
||||||
created () {
|
created () {
|
||||||
this.list = this.handleListFor(this.info)
|
this.list = this.handleListFor(this.info)
|
||||||
// console.log(' this.list : ', this.list)
|
|
||||||
},
|
},
|
||||||
beforeMount () {
|
beforeMount () {
|
||||||
},
|
},
|
||||||
@ -138,7 +137,6 @@ export default {
|
|||||||
list = list.map(i => {
|
list = list.map(i => {
|
||||||
i.isShow = false
|
i.isShow = false
|
||||||
i = Object.assign({}, this.handleOptType(i), i)
|
i = Object.assign({}, this.handleOptType(i), i)
|
||||||
console.log('i: ', i)
|
|
||||||
i.isActive = (i.optType === 0 || i.optType === -1) ? i.optType : 1
|
i.isActive = (i.optType === 0 || i.optType === -1) ? i.optType : 1
|
||||||
i.roleDtos = JSON.parse(JSON.stringify(this.roleDtos)).map(j => {
|
i.roleDtos = JSON.parse(JSON.stringify(this.roleDtos)).map(j => {
|
||||||
j.checked = i.roleIds ? i.roleIds.includes(String(j.roleId)) : false
|
j.checked = i.roleIds ? i.roleIds.includes(String(j.roleId)) : false
|
||||||
@ -152,8 +150,6 @@ export default {
|
|||||||
return arr
|
return arr
|
||||||
},
|
},
|
||||||
handleOptType (i) {
|
handleOptType (i) {
|
||||||
console.log('i: ', i)
|
|
||||||
// itemInfo.isActive
|
|
||||||
const obj = {}
|
const obj = {}
|
||||||
if (i.optType === 0) {
|
if (i.optType === 0) {
|
||||||
obj.isActive = 0
|
obj.isActive = 0
|
||||||
@ -173,15 +169,12 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleTitle (item) {
|
handleTitle (item) {
|
||||||
console.log('item: ', item)
|
|
||||||
return item.list.length > 0 ? (item.title + '等' + item.list.length + '人') : '指定成员'
|
return item.list.length > 0 ? (item.title + '等' + item.list.length + '人') : '指定成员'
|
||||||
// itemInfo.list.list.length===0?(itemInfo.list.title + '等' + itemInfo.list.list.length + '人' ):"未指定成员"
|
// itemInfo.list.list.length===0?(itemInfo.list.title + '等' + itemInfo.list.list.length + '人' ):"未指定成员"
|
||||||
},
|
},
|
||||||
handleChang (item) {
|
handleChang (item) {
|
||||||
console.log('item: ', item)
|
|
||||||
},
|
},
|
||||||
handleChoose (item) {
|
handleChoose (item) {
|
||||||
console.log('item: ', item)
|
|
||||||
this.itemInfo.isShow = true
|
this.itemInfo.isShow = true
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
},
|
},
|
||||||
@ -194,7 +187,6 @@ export default {
|
|||||||
})
|
})
|
||||||
item.isCick = true
|
item.isCick = true
|
||||||
this.itemInfo = item
|
this.itemInfo = item
|
||||||
console.log('this.itemInfo: ', this.itemInfo)
|
|
||||||
// this.$forceUpdate()
|
// this.$forceUpdate()
|
||||||
},
|
},
|
||||||
// 添加流程
|
// 添加流程
|
||||||
@ -226,8 +218,6 @@ export default {
|
|||||||
}
|
}
|
||||||
this.handleClick(params)
|
this.handleClick(params)
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
console.log('this.itemInfo: ', this.itemInfo)
|
|
||||||
console.log('this.list: ', this.list)
|
|
||||||
},
|
},
|
||||||
handleDelete (item) {
|
handleDelete (item) {
|
||||||
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
|
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
|
||||||
@ -288,7 +278,6 @@ export default {
|
|||||||
handler (n, o) {
|
handler (n, o) {
|
||||||
if (Object.keys(n).length !== 0) {
|
if (Object.keys(n).length !== 0) {
|
||||||
const arr = n
|
const arr = n
|
||||||
console.log('arr: ', arr)
|
|
||||||
if (arr.isActive !== 0 && arr.isActive !== -1) {
|
if (arr.isActive !== 0 && arr.isActive !== -1) {
|
||||||
if (arr.optType < 1) arr.optType = 1
|
if (arr.optType < 1) arr.optType = 1
|
||||||
arr.name = this.options.filter(i => i.id === arr.optType)[0].name
|
arr.name = this.options.filter(i => i.id === arr.optType)[0].name
|
||||||
|
|||||||
@ -49,7 +49,6 @@ export default {
|
|||||||
deep: true,
|
deep: true,
|
||||||
handler (n, o) {
|
handler (n, o) {
|
||||||
this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '' : '已禁用'}))
|
this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '' : '已禁用'}))
|
||||||
console.log('info: ', this.info)
|
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,7 +40,6 @@ export default {
|
|||||||
beforeMount () {},
|
beforeMount () {},
|
||||||
created () {
|
created () {
|
||||||
this.form = this.info
|
this.form = this.info
|
||||||
console.log('info: ', this.info)
|
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
|
|
||||||
@ -50,7 +49,6 @@ export default {
|
|||||||
form: {
|
form: {
|
||||||
deep: true,
|
deep: true,
|
||||||
handler (n, o) {
|
handler (n, o) {
|
||||||
console.log('n: ', n)
|
|
||||||
let weight1 = 0
|
let weight1 = 0
|
||||||
n.chartDetails.recordSimpleDtos.map(i => {
|
n.chartDetails.recordSimpleDtos.map(i => {
|
||||||
if (i.isDelete !== 1) {
|
if (i.isDelete !== 1) {
|
||||||
@ -58,17 +56,12 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '权重评分:' + weight1 + '%' : '已禁用'}))
|
this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '权重评分:' + weight1 + '%' : '已禁用'}))
|
||||||
// console.log('info: ', this.info)
|
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
'info': {
|
'info': {
|
||||||
deep: true,
|
deep: true,
|
||||||
handler (n, o) {
|
handler (n, o) {
|
||||||
console.log('n222: ', n)
|
|
||||||
// this.form = n
|
|
||||||
// this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n ? '' : '已禁用'}))
|
|
||||||
// console.log('info: ', this.info)
|
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -228,7 +228,6 @@ export default {
|
|||||||
async handleCheckStaff (parmas = this.form) {
|
async handleCheckStaff (parmas = this.form) {
|
||||||
return new Promise(async (resolve, reject) => {
|
return new Promise(async (resolve, reject) => {
|
||||||
let res = await apiCheckStaff(Object.assign({}, parmas, {confirm: 0, id: this.$route.query.id || ''}))
|
let res = await apiCheckStaff(Object.assign({}, parmas, {confirm: 0, id: this.$route.query.id || ''}))
|
||||||
console.log('res: ', res)
|
|
||||||
if (res.code === 504) {
|
if (res.code === 504) {
|
||||||
this.$confirm(res.msg, '提示', {
|
this.$confirm(res.msg, '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
@ -282,13 +281,8 @@ export default {
|
|||||||
this.personnelList = a
|
this.personnelList = a
|
||||||
this.showData = c
|
this.showData = c
|
||||||
}
|
}
|
||||||
// this.form.staffIds = a.value
|
|
||||||
// this.form.depIds = c.value
|
|
||||||
|
|
||||||
this.form = obj
|
this.form = obj
|
||||||
// this.form.id = this.$route.query.copy ? '' : res.id
|
|
||||||
// this.form.name = this.$route.query.copy ? '' : res.name
|
|
||||||
console.log('this.form: ', this.form)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.$message.error(error.msg)
|
this.$message.error(error.msg)
|
||||||
}
|
}
|
||||||
@ -316,7 +310,6 @@ export default {
|
|||||||
this.showRight = false
|
this.showRight = false
|
||||||
},
|
},
|
||||||
handleGetChoose (item) {
|
handleGetChoose (item) {
|
||||||
console.log('item: ', item)
|
|
||||||
this[item] = true
|
this[item] = true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -324,7 +317,6 @@ export default {
|
|||||||
form: {
|
form: {
|
||||||
deep: true,
|
deep: true,
|
||||||
handler (n, o) {
|
handler (n, o) {
|
||||||
console.log('n: ', n)
|
|
||||||
this.$emit('update:basisForm', n)
|
this.$emit('update:basisForm', n)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -305,7 +305,6 @@ export default {
|
|||||||
)
|
)
|
||||||
this.info = res
|
this.info = res
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
console.log('res: ', res)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.$message.error(error.msg)
|
this.$message.error(error.msg)
|
||||||
}
|
}
|
||||||
@ -327,7 +326,6 @@ export default {
|
|||||||
}
|
}
|
||||||
res = res.data
|
res = res.data
|
||||||
this.dimensionsList = res
|
this.dimensionsList = res
|
||||||
console.log('res: ', res)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.$message.error(error.msg)
|
this.$message.error(error.msg)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -74,7 +74,6 @@ export default {
|
|||||||
if (!this.basisForm.name) {
|
if (!this.basisForm.name) {
|
||||||
return this.$message.error('请输入考评组名称')
|
return this.$message.error('请输入考评组名称')
|
||||||
}
|
}
|
||||||
console.log('!this.basisForm: ', this.basisForm)
|
|
||||||
if (!this.basisForm.depIds && !this.basisForm.staffIds) {
|
if (!this.basisForm.depIds && !this.basisForm.staffIds) {
|
||||||
return this.$message.error('请选择被考核人员')
|
return this.$message.error('请选择被考核人员')
|
||||||
}
|
}
|
||||||
@ -90,7 +89,6 @@ export default {
|
|||||||
result += Number(item.weight)
|
result += Number(item.weight)
|
||||||
return result
|
return result
|
||||||
}, 0)
|
}, 0)
|
||||||
console.log('sco: ', sco)
|
|
||||||
if (sco !== 1) {
|
if (sco !== 1) {
|
||||||
return this.$message.error('权重评分总和必须为100!')
|
return this.$message.error('权重评分总和必须为100!')
|
||||||
}
|
}
|
||||||
@ -109,7 +107,6 @@ export default {
|
|||||||
try {
|
try {
|
||||||
this.$loadingStart()
|
this.$loadingStart()
|
||||||
let res12 = await apiCheckStaff(Object.assign({}, this.basisForm, {confirm: 1}))
|
let res12 = await apiCheckStaff(Object.assign({}, this.basisForm, {confirm: 1}))
|
||||||
console.log('res1: ', res12)
|
|
||||||
let res = await saveBaseSet(this.basisForm)
|
let res = await saveBaseSet(this.basisForm)
|
||||||
if (res.code !== 200) {
|
if (res.code !== 200) {
|
||||||
this.loadings = false
|
this.loadings = false
|
||||||
@ -139,27 +136,22 @@ export default {
|
|||||||
this.$message.error(res1.msg)
|
this.$message.error(res1.msg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
console.log('res: ', res1)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.loadings = false
|
this.loadings = false
|
||||||
this.$loadingEnd()
|
this.$loadingEnd()
|
||||||
return this.$message.error(error.msg)
|
return this.$message.error(error.msg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log('res: ', res)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.loadings = false
|
this.loadings = false
|
||||||
this.$loadingEnd()
|
this.$loadingEnd()
|
||||||
return this.$message.error(error.msg)
|
return this.$message.error(error.msg)
|
||||||
}
|
}
|
||||||
console.log('this.templateForm: ', JSON.stringify(this.templateForm))
|
|
||||||
try {
|
try {
|
||||||
let res = await saveTemSet(this.templateForm)
|
let res = await saveTemSet(this.templateForm)
|
||||||
this.loadings = false
|
this.loadings = false
|
||||||
this.$loadingEnd()
|
this.$loadingEnd()
|
||||||
res = res.data
|
res = res.data
|
||||||
// this.basisForm = res
|
|
||||||
console.log('res: ', res)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.loadings = false
|
this.loadings = false
|
||||||
this.$loadingEnd()
|
this.$loadingEnd()
|
||||||
|
|||||||
@ -128,7 +128,6 @@ export default {
|
|||||||
this.$message.error('请选择考评组!')
|
this.$message.error('请选择考评组!')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
console.log('this.copyList : ', this.copyList)
|
|
||||||
this.showRight = false
|
this.showRight = false
|
||||||
this.$router.push({name: 'workbench-edit-group', query: {id: this.selectId, copy: 1}})
|
this.$router.push({name: 'workbench-edit-group', query: {id: this.selectId, copy: 1}})
|
||||||
},
|
},
|
||||||
@ -166,7 +165,6 @@ export default {
|
|||||||
this.$loadingEnd()
|
this.$loadingEnd()
|
||||||
if (res.code !== 200) return
|
if (res.code !== 200) return
|
||||||
res = res.data
|
res = res.data
|
||||||
console.log('res: ', res)
|
|
||||||
this.tableData = res.list
|
this.tableData = res.list
|
||||||
this.params.totalCount = res.totalCount
|
this.params.totalCount = res.totalCount
|
||||||
this.params.currPage = res.currPage
|
this.params.currPage = res.currPage
|
||||||
@ -178,9 +176,6 @@ export default {
|
|||||||
this.$router.push({name: 'workbench-edit-group'})
|
this.$router.push({name: 'workbench-edit-group'})
|
||||||
},
|
},
|
||||||
handleSelectClick (row, column, event) {
|
handleSelectClick (row, column, event) {
|
||||||
console.log('event: ', event)
|
|
||||||
console.log('column: ', column)
|
|
||||||
console.log('row: ', row)
|
|
||||||
},
|
},
|
||||||
async handleDelete (item) {
|
async handleDelete (item) {
|
||||||
this.$confirm('此操作不可撤回, 是否继续?', '提示', {
|
this.$confirm('此操作不可撤回, 是否继续?', '提示', {
|
||||||
|
|||||||
@ -46,7 +46,6 @@ export default {
|
|||||||
localStorage.setItem('input', this.input)
|
localStorage.setItem('input', this.input)
|
||||||
const params = {'userName': this.input, 'password': 'admin', 'uuid': '', 'verify': this.verify, 'verifyCode': this.verify}
|
const params = {'userName': this.input, 'password': 'admin', 'uuid': '', 'verify': this.verify, 'verifyCode': this.verify}
|
||||||
let res = await apiLogin(params)
|
let res = await apiLogin(params)
|
||||||
console.log('res: ', res)
|
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
this.token = res.token
|
this.token = res.token
|
||||||
this.$cookies.set('token', res.token, res.expire)
|
this.$cookies.set('token', res.token, res.expire)
|
||||||
|
|||||||
@ -94,30 +94,23 @@ export default {
|
|||||||
this.waitCount = res.data.totalCount
|
this.waitCount = res.data.totalCount
|
||||||
}
|
}
|
||||||
this.selectedTableList = res.data.list || []
|
this.selectedTableList = res.data.list || []
|
||||||
console.log('待处理', res)
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
handleMenuSeledt (val) {
|
handleMenuSeledt (val) {
|
||||||
console.log('index ======', this.activeIndex)
|
|
||||||
console.log(val)
|
|
||||||
if (this.activeIndex !== val) {
|
if (this.activeIndex !== val) {
|
||||||
console.log('menu 切换')
|
|
||||||
// 待处理 已处理 数据切换
|
// 待处理 已处理 数据切换
|
||||||
if (val === '0') {
|
if (val === '0') {
|
||||||
console.log('menu 0')
|
|
||||||
this.processedTableList = this.selectedTableList
|
this.processedTableList = this.selectedTableList
|
||||||
this.pageProcessedInfo = this.pageSelectedInfo
|
this.pageProcessedInfo = this.pageSelectedInfo
|
||||||
this.selectedTableList = this.waitTableList
|
this.selectedTableList = this.waitTableList
|
||||||
this.pageSelectedInfo = this.pageWaitInfo
|
this.pageSelectedInfo = this.pageWaitInfo
|
||||||
} else {
|
} else {
|
||||||
console.log('menu 1')
|
|
||||||
this.waitTableList = this.selectedTableList
|
this.waitTableList = this.selectedTableList
|
||||||
this.pageWaitInfo = this.pageSelectedInfo
|
this.pageWaitInfo = this.pageSelectedInfo
|
||||||
this.selectedTableList = this.processedTableList
|
this.selectedTableList = this.processedTableList
|
||||||
this.pageSelectedInfo = this.pageProcessedInfo
|
this.pageSelectedInfo = this.pageProcessedInfo
|
||||||
}
|
}
|
||||||
// 如果是第一页 刷新
|
// 如果是第一页 刷新
|
||||||
console.log(this.pageSelectedInfo)
|
|
||||||
if (this.pageSelectedInfo.currPage === 1) {
|
if (this.pageSelectedInfo.currPage === 1) {
|
||||||
this.handleGetList()
|
this.handleGetList()
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user