|
@@ -715,8 +715,7 @@
|
|
|
v-if="
|
|
|
eventStatusButton == 'wb' ||
|
|
|
eventStatusButton == 'qs' ||
|
|
|
- eventStatusButton == 'cf' ||
|
|
|
- eventStatusButton == 'ld'
|
|
|
+ eventStatusButton == 'cf'
|
|
|
"
|
|
|
:label="deptNameitem"
|
|
|
>
|
|
@@ -731,8 +730,7 @@
|
|
|
v-if="
|
|
|
eventStatusButton == 'wb' ||
|
|
|
eventStatusButton == 'qs' ||
|
|
|
- eventStatusButton == 'cf' ||
|
|
|
- eventStatusButton == 'ld'
|
|
|
+ eventStatusButton == 'cf'
|
|
|
"
|
|
|
>
|
|
|
<el-option
|
|
@@ -2842,6 +2840,18 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ //设置联动部门不可选择本部门
|
|
|
+ recursiveChildren(arrayList,deptId) {
|
|
|
+ arrayList.forEach((item, index) => {
|
|
|
+ if(item.id==deptId){
|
|
|
+ item.disabled="true";
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(item.children){
|
|
|
+ this.recursiveChildren(item.children,deptId)
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
listResourceByWz(type) {
|
|
|
if (this.resourcesListCheck.indexOf(type) > -1) {
|
|
|
this.resourcesListCheck.splice(
|
|
@@ -3239,6 +3249,8 @@ export default {
|
|
|
that.eventConfirmTitle = "事件联动";
|
|
|
/** 查询部门树结构 */
|
|
|
await deptTreeselect().then((response) => {
|
|
|
+ let deptId=Cookies.get("deptId")
|
|
|
+ that.recursiveChildren(response.data,deptId)
|
|
|
that.deptOptionsLiandong = response.data;
|
|
|
});
|
|
|
that.showEventConfirm = true;
|
|
@@ -3279,15 +3291,15 @@ export default {
|
|
|
that.$message.error(`请选择任务联动部门!`);
|
|
|
return;
|
|
|
}
|
|
|
- if (
|
|
|
- that.sendDeptId == "" ||
|
|
|
- that.sendDeptId == null ||
|
|
|
- that.sendDeptName == "" ||
|
|
|
- that.sendDeptName == null
|
|
|
- ) {
|
|
|
- that.$message.error(`请选择任务发起部门!`);
|
|
|
- return;
|
|
|
- }
|
|
|
+ // if (
|
|
|
+ // that.sendDeptId == "" ||
|
|
|
+ // that.sendDeptId == null ||
|
|
|
+ // that.sendDeptName == "" ||
|
|
|
+ // that.sendDeptName == null
|
|
|
+ // ) {
|
|
|
+ // that.$message.error(`请选择任务发起部门!`);
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
let eventState = "";
|
|
|
listSJfl({
|
|
|
parentId: that.eventType,
|
|
@@ -3299,8 +3311,8 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
let param = {
|
|
|
- sendDeptId: that.sendDeptId,
|
|
|
- sendDept: that.sendDeptName,
|
|
|
+ sendDeptId: Cookies.get("deptId"),
|
|
|
+ sendDept: Cookies.get("deptName"),
|
|
|
eventCode: that.eventCode,
|
|
|
longitude: that.longitude,
|
|
|
latitude: that.latitude,
|