优化
This commit is contained in:
parent
1342fb28a9
commit
e3cd9db93c
@ -127,9 +127,9 @@
|
|||||||
departmentName:i.departName
|
departmentName:i.departName
|
||||||
}"/>
|
}"/>
|
||||||
<div class="chooseManage-item-center">
|
<div class="chooseManage-item-center">
|
||||||
<el-tag size="mini" type="warning">未确认</el-tag>
|
<el-tag v-if='i.status===0' size="mini" type="warning">未确认</el-tag>
|
||||||
<!-- <el-tag>已跳过</el-tag>
|
<el-tag v-if='i.status===4' size="mini" >已跳过</el-tag>
|
||||||
<el-tag type="success">已确认</el-tag> -->
|
<el-tag v-if='i.status===1' size="mini" type="success">已确认</el-tag>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<UseButton :info='i' :formList='formList' :tableInfo.sync='tableInfo'/>
|
<UseButton :info='i' :formList='formList' :tableInfo.sync='tableInfo'/>
|
||||||
@ -186,7 +186,7 @@ export default {
|
|||||||
this.$loadingStart()
|
this.$loadingStart()
|
||||||
let res = await apiResultGetDetail({ id })
|
let res = await apiResultGetDetail({ id })
|
||||||
this.$loadingEnd()
|
this.$loadingEnd()
|
||||||
if (res.code !== 200) return
|
if (res.code !== 200) return this.$message.error(res.msg)
|
||||||
this.obj = res.data
|
this.obj = res.data
|
||||||
},
|
},
|
||||||
handleRight (item) {
|
handleRight (item) {
|
||||||
|
|||||||
@ -252,12 +252,20 @@ export default {
|
|||||||
}
|
}
|
||||||
const a = this.$personlGetForm(res.staffs)
|
const a = this.$personlGetForm(res.staffs)
|
||||||
const c = this.$departGetForm(res.deps)
|
const c = this.$departGetForm(res.deps)
|
||||||
this.form.staffIds = a.value
|
const obj = {
|
||||||
this.form.depIds = c.value
|
staffIds: a.value,
|
||||||
|
depIds: c.value,
|
||||||
|
id: this.$route.query.copy ? '' : res.id,
|
||||||
|
name: this.$route.query.copy ? '' : res.name
|
||||||
|
}
|
||||||
|
// this.form.staffIds = a.value
|
||||||
|
// this.form.depIds = c.value
|
||||||
this.personnelList = a
|
this.personnelList = a
|
||||||
this.showData = c
|
this.showData = c
|
||||||
this.form.id = this.$route.query.copy ? '' : res.id
|
this.form = obj
|
||||||
this.form.name = this.$route.query.copy ? '' : res.name
|
// 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)
|
||||||
}
|
}
|
||||||
@ -292,6 +300,7 @@ 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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -74,6 +74,7 @@ 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('请选择被考核人员')
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user