|
|
@ -429,7 +429,8 @@
|
|
|
|
<el-col :span="12" class="el-col">
|
|
|
|
<el-col :span="12" class="el-col">
|
|
|
|
<el-form-item label="所属组别:" prop="constituencies" class="query-form-item">
|
|
|
|
<el-form-item label="所属组别:" prop="constituencies" class="query-form-item">
|
|
|
|
<el-select v-model="formData.constituencies" placeholder="请选择所属组别"
|
|
|
|
<el-select v-model="formData.constituencies" placeholder="请选择所属组别"
|
|
|
|
style="width: 80%">
|
|
|
|
style="width: 80%"
|
|
|
|
|
|
|
|
>
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
v-for="item in fromDeptOptions"
|
|
|
|
v-for="item in fromDeptOptions"
|
|
|
|
:key="item.code"
|
|
|
|
:key="item.code"
|
|
|
@ -690,7 +691,7 @@ export default {
|
|
|
|
list: [],
|
|
|
|
list: [],
|
|
|
|
treeList: [
|
|
|
|
treeList: [
|
|
|
|
{
|
|
|
|
{
|
|
|
|
code: 1001,
|
|
|
|
code: '1001',
|
|
|
|
parentCode: null,
|
|
|
|
parentCode: null,
|
|
|
|
label: '全部'
|
|
|
|
label: '全部'
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -750,7 +751,7 @@ export default {
|
|
|
|
],
|
|
|
|
],
|
|
|
|
workplaceStatus: [
|
|
|
|
workplaceStatus: [
|
|
|
|
{ required: true, message: '请选择工位状态', trigger: 'blur' }
|
|
|
|
{ required: true, message: '请选择工位状态', trigger: 'blur' }
|
|
|
|
],
|
|
|
|
]
|
|
|
|
// workplaceType: [
|
|
|
|
// workplaceType: [
|
|
|
|
// { required: true, message: '请选择工位类型', trigger: 'blur' }
|
|
|
|
// { required: true, message: '请选择工位类型', trigger: 'blur' }
|
|
|
|
// ]
|
|
|
|
// ]
|
|
|
@ -892,7 +893,7 @@ export default {
|
|
|
|
workplaceStatus: 1,
|
|
|
|
workplaceStatus: 1,
|
|
|
|
deptCode: null,
|
|
|
|
deptCode: null,
|
|
|
|
chargeUser: null,
|
|
|
|
chargeUser: null,
|
|
|
|
constituencies: '1001',
|
|
|
|
constituencies: null,
|
|
|
|
invRemindNumber: 0,
|
|
|
|
invRemindNumber: 0,
|
|
|
|
remake: null
|
|
|
|
remake: null
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -942,6 +943,9 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
formSubmit() {
|
|
|
|
formSubmit() {
|
|
|
|
// this.formData.constituencies = this.groupData.code
|
|
|
|
// this.formData.constituencies = this.groupData.code
|
|
|
|
|
|
|
|
if (this.formData.constituencies == null) {
|
|
|
|
|
|
|
|
this.formData.constituencies = '1001'
|
|
|
|
|
|
|
|
}
|
|
|
|
if (this.fromName == 'add') {
|
|
|
|
if (this.fromName == 'add') {
|
|
|
|
this.$refs['dataForm'].validate((valid) => {
|
|
|
|
this.$refs['dataForm'].validate((valid) => {
|
|
|
|
if (valid) {
|
|
|
|
if (valid) {
|
|
|
@ -997,6 +1001,7 @@ export default {
|
|
|
|
this.$message.error('错误')
|
|
|
|
this.$message.error('错误')
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
this.getTree()
|
|
|
|
this.addWorkplaceDialogVisible = true
|
|
|
|
this.addWorkplaceDialogVisible = true
|
|
|
|
},
|
|
|
|
},
|
|
|
|
deleteWorkplace(row) {
|
|
|
|
deleteWorkplace(row) {
|
|
|
@ -1086,7 +1091,17 @@ export default {
|
|
|
|
.then((response) => {
|
|
|
|
.then((response) => {
|
|
|
|
var treeList = response.data || []
|
|
|
|
var treeList = response.data || []
|
|
|
|
const filteredList = treeList.filter(item => item.parentCode != null)
|
|
|
|
const filteredList = treeList.filter(item => item.parentCode != null)
|
|
|
|
|
|
|
|
if (treeList.length == 0) {
|
|
|
|
|
|
|
|
this.fromDeptOptions = [
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
code: '1001',
|
|
|
|
|
|
|
|
parentCode: null,
|
|
|
|
|
|
|
|
label: '全部'
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
]
|
|
|
|
|
|
|
|
} else {
|
|
|
|
this.fromDeptOptions = treeList
|
|
|
|
this.fromDeptOptions = treeList
|
|
|
|
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
})
|
|
|
|
})
|
|
|
@ -1233,7 +1248,8 @@ export default {
|
|
|
|
getDeptList() {
|
|
|
|
getDeptList() {
|
|
|
|
this.deptList = []
|
|
|
|
this.deptList = []
|
|
|
|
let data =
|
|
|
|
let data =
|
|
|
|
{enable: true,
|
|
|
|
{
|
|
|
|
|
|
|
|
enable: true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
filterList(data).then(res => {
|
|
|
|
filterList(data).then(res => {
|
|
|
|
if (res.code == 20000) {
|
|
|
|
if (res.code == 20000) {
|
|
|
|