系统数据隔离,bug修改
This commit is contained in:
parent
fe9dff60a1
commit
f70ebc62b8
|
|
@ -95,3 +95,13 @@ export function listDept(query) {
|
||||||
params: query
|
params: query
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// 查询部门列表全部
|
||||||
|
export function listDeptAll(query) {
|
||||||
|
return request({
|
||||||
|
url: '/system/attDetails/orgListAll',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ const service = axios.create({
|
||||||
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
||||||
baseURL: process.env.VUE_APP_BASE_API,
|
baseURL: process.env.VUE_APP_BASE_API,
|
||||||
// 超时
|
// 超时
|
||||||
timeout: 10000
|
timeout: 60000
|
||||||
})
|
})
|
||||||
|
|
||||||
// request拦截器
|
// request拦截器
|
||||||
|
|
|
||||||
|
|
@ -229,7 +229,7 @@
|
||||||
<script>
|
<script>
|
||||||
import {
|
import {
|
||||||
listOrg, getOrg, delOrg, addOrg, updateOrg, changeOrgStatus, exportOrg, getPostName,
|
listOrg, getOrg, delOrg, addOrg, updateOrg, changeOrgStatus, exportOrg, getPostName,
|
||||||
getAttGroupList,listDept
|
getAttGroupList, listDept, listDeptAll
|
||||||
} from "@/api/process/orgApply";
|
} from "@/api/process/orgApply";
|
||||||
import Treeselect from "@riophae/vue-treeselect";
|
import Treeselect from "@riophae/vue-treeselect";
|
||||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||||
|
|
@ -405,7 +405,7 @@
|
||||||
this.form.attGroupId = this.$store.state.user.attGroupId;
|
this.form.attGroupId = this.$store.state.user.attGroupId;
|
||||||
this.form.attGroupName = this.$store.state.user.attGroupName;
|
this.form.attGroupName = this.$store.state.user.attGroupName;
|
||||||
console.log(this.form.attGroupName)
|
console.log(this.form.attGroupName)
|
||||||
listDept().then(response => {
|
listDeptAll().then(response => {
|
||||||
this.deptOptions = this.handleTree(response.data, "id");
|
this.deptOptions = this.handleTree(response.data, "id");
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.isView = false;
|
this.isView = false;
|
||||||
|
|
@ -417,7 +417,7 @@
|
||||||
handleUpdate(row) {
|
handleUpdate(row) {
|
||||||
this.reset();
|
this.reset();
|
||||||
const Id = row.id
|
const Id = row.id
|
||||||
listDept().then(response => {
|
listDeptAll().then(response => {
|
||||||
this.deptOptions = this.handleTree(response.data, "id");
|
this.deptOptions = this.handleTree(response.data, "id");
|
||||||
});
|
});
|
||||||
getOrg(Id).then(orgResponse => {
|
getOrg(Id).then(orgResponse => {
|
||||||
|
|
@ -436,7 +436,7 @@
|
||||||
handleView(row) {
|
handleView(row) {
|
||||||
this.reset();
|
this.reset();
|
||||||
const Id = row.id
|
const Id = row.id
|
||||||
listDept().then(response => {
|
listDeptAll().then(response => {
|
||||||
this.deptOptions = this.handleTree(response.data, "id");
|
this.deptOptions = this.handleTree(response.data, "id");
|
||||||
});
|
});
|
||||||
getOrg(Id).then(orgResponse => {
|
getOrg(Id).then(orgResponse => {
|
||||||
|
|
|
||||||
|
|
@ -500,6 +500,7 @@
|
||||||
this.$refs["form"].validate(valid => {
|
this.$refs["form"].validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
if (this.form.userId != undefined) {
|
if (this.form.userId != undefined) {
|
||||||
|
this.form.newFace = "";
|
||||||
console.log("人员修改",this.form);
|
console.log("人员修改",this.form);
|
||||||
updateUser(this.form).then(response => {
|
updateUser(this.form).then(response => {
|
||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("修改成功");
|
||||||
|
|
@ -625,6 +626,7 @@
|
||||||
this.$refs["forms"].validate(valid => {
|
this.$refs["forms"].validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
checkPersonAssignment(this.form).then(response => {
|
checkPersonAssignment(this.form).then(response => {
|
||||||
|
this.form.newFace = "";
|
||||||
if(this.form.reviewerStatus=="1"){
|
if(this.form.reviewerStatus=="1"){
|
||||||
this.$modal.msgSuccess("审核成功");
|
this.$modal.msgSuccess("审核成功");
|
||||||
}else if(this.form.reviewerStatus=="2"){
|
}else if(this.form.reviewerStatus=="2"){
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue