|
@@ -241,7 +241,7 @@ import dayjs from "dayjs";
|
|
|
import SelectPoint from "../../ruleManager/dialog.select.point.vue";
|
|
import SelectPoint from "../../ruleManager/dialog.select.point.vue";
|
|
|
import imgUpload from "@/components/ImageUpload/index.vue";
|
|
import imgUpload from "@/components/ImageUpload/index.vue";
|
|
|
import { getLabel } from "@/views/commonOption.js";
|
|
import { getLabel } from "@/views/commonOption.js";
|
|
|
-import { getNamesByOrgId } from "@/api/system/role.js";
|
|
|
|
|
|
|
+import { getNamesByOrgId, getAllNames } from "@/api/system/role.js";
|
|
|
import orgDropDown from "@/components/orgTree/orgDropDown.vue";
|
|
import orgDropDown from "@/components/orgTree/orgDropDown.vue";
|
|
|
import { arabicToChinese } from "@/utils/util.js";
|
|
import { arabicToChinese } from "@/utils/util.js";
|
|
|
export default {
|
|
export default {
|
|
@@ -284,8 +284,14 @@ export default {
|
|
|
},
|
|
},
|
|
|
mounted() {
|
|
mounted() {
|
|
|
this.taskInfo.checkOrgId = this.orgId;
|
|
this.taskInfo.checkOrgId = this.orgId;
|
|
|
- this.taskInfo.checkRoleId = this.roleList[0].roleId;
|
|
|
|
|
|
|
+ //this.taskInfo.checkRoleId = this.roleList[0].roleId;
|
|
|
this.taskInfo.signImg = this.$route.params.signImg;
|
|
this.taskInfo.signImg = this.$route.params.signImg;
|
|
|
|
|
+ getAllNames().then((r) => {
|
|
|
|
|
+ this.roleOptions = r.data;
|
|
|
|
|
+ if (!this.roleOptions.find((op) => op.id == this.taskInfo.checkRoleId)) {
|
|
|
|
|
+ this.taskInfo.checkRoleId = null;
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
dayjs,
|
|
dayjs,
|
|
@@ -302,13 +308,6 @@ export default {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
this.$refs["point_baseInfo"].clearValidate(["checkOrgId"]);
|
|
this.$refs["point_baseInfo"].clearValidate(["checkOrgId"]);
|
|
|
- getNamesByOrgId(node.id).then((r) => {
|
|
|
|
|
- this.roleOptions = r.data;
|
|
|
|
|
- this.prevCheckOrgType = node.type;
|
|
|
|
|
- if (!this.roleOptions.find((op) => op.id == this.taskInfo.checkRoleId)) {
|
|
|
|
|
- this.taskInfo.checkRoleId = null;
|
|
|
|
|
- }
|
|
|
|
|
- });
|
|
|
|
|
},
|
|
},
|
|
|
onBecheckOrgSelect(node) {
|
|
onBecheckOrgSelect(node) {
|
|
|
if (node == null) {
|
|
if (node == null) {
|