|
@@ -31,6 +31,7 @@
|
|
|
:key="item.deptId"
|
|
|
:label="item.deptName"
|
|
|
:value="item.deptId"
|
|
|
+ :disabled="item.type == user.type"
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select>
|
|
@@ -150,10 +151,10 @@ export default {
|
|
|
{ required: true, message: "协作单位不能为空", trigger: "blur" },
|
|
|
],
|
|
|
|
|
|
- type: [{ required: true, message: "状态不能为空", trigger: "blur" }],
|
|
|
- collaborativeContent: [
|
|
|
- { required: true, message: "协作要求不能为空", trigger: "blur" },
|
|
|
- ],
|
|
|
+ // type: [{ required: true, message: "状态不能为空", trigger: "blur" }],
|
|
|
+ // collaborativeContent: [
|
|
|
+ // { required: true, message: "协作要求不能为空", trigger: "blur" },
|
|
|
+ // ],
|
|
|
date: [
|
|
|
{ required: true, message: "限期时间不能为空", trigger: "blur" },
|
|
|
],
|
|
@@ -167,7 +168,7 @@ export default {
|
|
|
getJOINTCONFERENCE(this.param.id).then((response) => {
|
|
|
this.form = response.data;
|
|
|
let arr = eval("(" + this.form.deptIds + ")");
|
|
|
- this.form.cooperativeUnitId = arr[0];
|
|
|
+ // this.form.cooperativeUnitId = arr[0];
|
|
|
this.deptId = JSON.parse(this.form.deptIds);
|
|
|
});
|
|
|
}
|
|
@@ -175,9 +176,43 @@ export default {
|
|
|
|
|
|
|
|
|
getInfo().then((res) => {
|
|
|
- if (res.user.dept.type == 1 && res.user.userId == 1) {
|
|
|
+ this.user = res.user.dept
|
|
|
+ if (res.user.dept.type == 1 && res.user.userId == 14) {
|
|
|
getDept(2).then((res) => {
|
|
|
- this.deptList = res.data;
|
|
|
+ this.deptList = [...res.data,{
|
|
|
+ searchValue: null,
|
|
|
+ createBy: "admin",
|
|
|
+ createTime: "2023-07-20 14:40:52",
|
|
|
+ updateBy: "admin",
|
|
|
+ updateTime: "2023-09-18 18:46:44",
|
|
|
+ params: {},
|
|
|
+ deptId: 100,
|
|
|
+ parentId: 0,
|
|
|
+ ancestors: "0",
|
|
|
+ deptName: "广西壮族自治区北部湾办公室",
|
|
|
+ type: 1,
|
|
|
+ orderNum: 0,
|
|
|
+ leader: "XXX",
|
|
|
+ phone: "15888888888",
|
|
|
+ biaoCang: "23",
|
|
|
+ email: "ry@qq.com",
|
|
|
+ status: "0",
|
|
|
+ delFlag: "0",
|
|
|
+ parentName: null,
|
|
|
+ industryOrientation: null,
|
|
|
+ planningArea: null,
|
|
|
+ acceptanceArea: null,
|
|
|
+ useArea: null,
|
|
|
+ usageRate: null,
|
|
|
+ warehouse: null,
|
|
|
+ oilDepot: null,
|
|
|
+ refrigeratory: null,
|
|
|
+ workshop: null,
|
|
|
+ approvalTime: null,
|
|
|
+ children: [],
|
|
|
+ createBy_dictText: "管理员",
|
|
|
+ }];
|
|
|
+ console.log(this.deptList);
|
|
|
});
|
|
|
} else if (res.user.dept.type == 2) {
|
|
|
this.deptList = [
|
|
@@ -217,16 +252,6 @@ export default {
|
|
|
];
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
- // if (this.user.type == 1) {
|
|
|
- getDept(2).then((res) => {
|
|
|
- this.deptList = res.data;
|
|
|
- });
|
|
|
- // }else{
|
|
|
- // getDept(1).then((res) => {
|
|
|
- // this.deptList = res.data;
|
|
|
- // });
|
|
|
- // }
|
|
|
},
|
|
|
updated() {
|
|
|
this.form.conferenceContent = this.$refs["test"].innerText;
|