Skip to content

P
pica.cloud.web-education-admin
提交 994fd6c4 编写于 作者: zhentian.jia's avatar zhentian.jia
浏览文件
操作

2.2.0二期逻辑update

上级 ea9530c9
隐藏空白字符变更
内嵌 并排
正在显示 包含 321 行增加 和 331 行删除
src/utils/mixins.js
浏览文件 @ 994fd6c4
......@@ -186,7 +186,15 @@ module.exports = {
data: para
})
},
// 通用PUT请求
PUT(api, para, callback) {
// para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
return fetch({
url: getBaseUrl(api),
method: 'put',
data: para
})
},
// 通用POST请求
POST(api, para, callback) {
// para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
......
src/utils/operation.js
浏览文件 @ 994fd6c4
......@@ -285,7 +285,7 @@ export function isOverlap(startA, endA, startB, endB) {
}
export function setRegionOption(data) {
let option = [];
option[0] = {id: 0, value: 0, label: "全部", leaf: true};
option[0] = { id: 0, value: 0, label: "全部", leaf: true };
for (let i = 0; i < data.length; i++) {
let obj = data[i];
obj.label = data[i].provinceName;
......@@ -296,6 +296,7 @@ export function setRegionOption(data) {
}
export function setRegionOption2(data) {
let option = [];
option[0] = { id: 0, value: '0', label: "全部地区", leaf: true };
for (let i = 0; i < data.length; i++) {
let obj = data[i];
obj.label = data[i].provinceName;
......@@ -304,6 +305,13 @@ export function setRegionOption2(data) {
}
return option;
}
export function setAdministrativeId(value) {
let areaId = '000';
for (let i = 0; i < value.length; i++) {
areaId += '_' + value[i];
}
return areaId;
}
export function getRegionOption() {
let option = [{
value: 1,
......@@ -323,7 +331,7 @@ export function getRegionOption() {
return option;
}
export function getLearnOrganization(data) {
if(data.length == 0) {
if (data.length == 0) {
let arr = [];
return arr;
}
......@@ -490,11 +498,11 @@ export function getRank(xAxisData, seriesData) {
};
return option;
}
export function getSearchType(formData,checkAll) {
export function getSearchType(formData, checkAll) {
let type = 0;
if (formData.region.length == 1 || formData.region.length == 2) {
type = formData.region.length;
if(formData.region.length == 1 && formData.region[0] == 0) {
if (formData.region.length == 1 && formData.region[0] == 0) {
type = 6;
}
} else if (formData.region.length == 3) {
......@@ -503,7 +511,7 @@ export function getSearchType(formData,checkAll) {
} else {
type = 4;
}
} else if (formData.region.length == 4) {
} else if (formData.region.length == 4) {
if (formData.organization.length == 0 || checkAll === true) {
type = 5;
} else {
......@@ -570,23 +578,23 @@ export function getAjustmentList(data) {
}
export function removeZero(data) {
let list = [];
for(let i = 0;i<data.length;i++) {
if(data[i].value != 0) {
for (let i = 0; i < data.length; i++) {
if (data[i].value != 0) {
list.push(data[i]);
}
}
return list;
}
export function initRank(data) {
let list = [{gradeFlag: -1, gradeName: "全部"}];
for(let i=0;i<data.length;i++) {
let list = [{ gradeFlag: -1, gradeName: "全部" }];
for (let i = 0; i < data.length; i++) {
list.push(data[i]);
}
return list;
}
export function getAvgTime(data) {
let list = [0,0];
if(data != null && data !='') {
let list = [0, 0];
if (data != null && data != '') {
list[0] = Math.floor(data / 60);
list[1] = data % 60;
}
......@@ -594,16 +602,16 @@ export function getAvgTime(data) {
}
export function getComponent(data) {
let list = [];
for(let i=0;i<data.length;i++) {
for (let i = 0; i < data.length; i++) {
list.push(data[i].value);
}
return list;
}
export function getSimpleCheckedNodes(store) {
const checkedNodes = [];
const traverse = function(node) {
const traverse = function (node) {
const childNodes = node.root ? node.root.childNodes : node.childNodes;
childNodes.forEach(child => {
if (child.checked) {
checkedNodes.push(child.data);
......@@ -616,16 +624,16 @@ export function getSimpleCheckedNodes(store) {
traverse(store)
return checkedNodes;
}
export function setSelectedKeys(checkedKeys,halfCheckedKeys) {
export function setSelectedKeys(checkedKeys, halfCheckedKeys) {
let selected = [];
for(let i=0;i<checkedKeys.length;i++) {
for (let i = 0; i < checkedKeys.length; i++) {
let obj = {
key: checkedKeys[i].id,
type: 1,
};
selected.push(obj);
}
for(let j=0;j<halfCheckedKeys.length;j++) {
for (let j = 0; j < halfCheckedKeys.length; j++) {
let obj = {
key: halfCheckedKeys[j],
type: 2,
......
src/views/education/edit-manager.vue
浏览文件 @ 994fd6c4
......@@ -446,17 +446,7 @@
</el-tab-pane>
<el-tab-pane label="设定人员" name="fourth">
<el-form :inline="true" :model="formPerson" class="demo-form-inline">
<!-- <el-form-item label>
<el-select size="small" v-model="formPerson.hospitalId" placeholder="全部医院">
<el-option
v-for="(item, index) in hospitalList"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item> -->
<el-form-item>
<!-- <el-form-item>
<el-select size="small" v-model="formPerson.departmentId" placeholder="全部科室">
<el-option
v-for="item in departmentList"
......@@ -465,9 +455,12 @@
:value="item.value"
></el-option>
</el-select>
</el-form-item> -->
<el-form-item label>
<el-input size="small" v-model="formPerson.hospitalName" placeholder="请输入机构名称"></el-input>
</el-form-item>
<el-form-item label>
<el-input size="small" v-model="formPerson.name" placeholder="请输入人员名称"></el-input>
<el-input size="small" v-model="formPerson.doctorName" placeholder="请输入人员名称"></el-input>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="searchPeople">搜索</el-button>
......@@ -503,19 +496,23 @@
</div>
</el-form-item>
</el-form>
<!--
:row-key="getRowKeys"
:reserve-selection="true"
@selection-change="selectionChangePerson"
-->
<el-table
class="rim"
ref="multiplePerson"
:data="tablePerson"
tooltip-effect="dark"
style="width: 100%"
@selection-change="selectionChangePerson"
:row-key="getRowKeysPerson"
@select-all="selectAllPerson"
@select="selectPerson"
>
<el-table-column
type="selection"
width="55"
:reserve-selection="true"
:selectable="selectableTableList"
></el-table-column>
<el-table-column prop="name" label="人员名称" align="center"></el-table-column>
......@@ -833,7 +830,7 @@ export default {
curmbSecond: "新建项目",
//页面展示位置
stepData: [true, false, false],
active: 1,
active: 0,
activeName: "first",
//基层信息 数据
uploadImgMessage: false,
......@@ -934,7 +931,8 @@ export default {
formPerson: {
hospitalId: 0,
departmentId: -1,
name: "",
doctorName: "",
hospitalName: "",
pageNum: 1,
pageSize: 10
},
......@@ -1563,28 +1561,31 @@ export default {
}
let req = {
projectId: this.projectId,
setKindOfAdministrative: this.getKind("administrativeScope"),
setKindOfOrganization: this.getKind("organization"),
setKindOfDepartment: this.getKind("department"),
setKindOfPeople: this.getKind("person"),
flag: this.flagCover,
// setKindOfAdministrative: this.getKind("administrativeScope"),
// setKindOfOrganization: this.getKind("organization"),
// setKindOfDepartment: this.getKind("department"),
// setKindOfPeople: this.getKind("person"),
// flag: this.flagCover,
scopeOfAdministrative: this.getScope("administrativeUpdate"),
scopeOfDepartment: this.getScopeDepartment(),
};
if (req.setKindOfAdministrative == 3) {
req.scopeOfAdministrative = this.getScope("administrativeUpdate");
}
if (req.setKindOfOrganization == 2 || req.setKindOfOrganization == 3) {
req.scopeOfOrganization = this.getScopeOrganization(
req.setKindOfOrganization
);
}
if (req.setKindOfDepartment == 3) {
req.scopeOfDepartment = this.getScopeDepartment();
}
if (req.setKindOfPeople == 2 || req.setKindOfPeople == 3) {
req.scopeOfPeople = this.getScopePeople(req.setKindOfPeople);
}
// if (req.setKindOfAdministrative == 3) {
// req.scopeOfAdministrative = this.getScope("administrativeUpdate");
// }
// if (req.setKindOfOrganization == 2 || req.setKindOfOrganization == 3) {
// req.scopeOfOrganization = this.getScopeOrganization(
// req.setKindOfOrganization
// );
// }
// if (req.setKindOfDepartment == 3) {
// req.scopeOfDepartment = this.getScopeDepartment();
// }
// if (req.setKindOfPeople == 2 || req.setKindOfPeople == 3) {
// req.scopeOfPeople = this.getScopePeople(req.setKindOfPeople);
// }
openLoading(vm);
vm.POST("portal/scope", req).then(res => {
// vm.POST("portal/scope", req).then(res => {
vm.POST("portal/new/scope", req).then(res => {
//暂存范围
closeLoading(vm);
console.log(res);
......@@ -1699,36 +1700,34 @@ export default {
//选择了范围
let req = {
projectId: this.projectId,
setKindOfAdministrative: this.getKind("administrativeScope"),
//scopeOfAdministrative: "000:2|000_110:1",
setKindOfOrganization: this.getKind("organization"),
//scopeOfOrganization: "2|3|4|5|6|7",
setKindOfDepartment: this.getKind("department"),
//scopeOfDepartment: "54",
setKindOfPeople: this.getKind("person"),
//scopeOfPeople: ""
flag: this.flagCover,
// setKindOfAdministrative: this.getKind("administrativeScope"),
// setKindOfOrganization: this.getKind("organization"),
// setKindOfDepartment: this.getKind("department"),
// setKindOfPeople: this.getKind("person"),
// flag: this.flagCover,
scopeOfAdministrative: this.getScope("administrativeUpdate"),
scopeOfDepartment: this.getScopeDepartment(),
};
if (req.setKindOfAdministrative == 3) {
req.scopeOfAdministrative = this.getScope("administrativeUpdate");
}
if (
req.setKindOfOrganization == 2 ||
req.setKindOfOrganization == 3
) {
req.scopeOfOrganization = this.getScopeOrganization(
req.setKindOfOrganization
);
}
if (req.setKindOfDepartment == 3) {
req.scopeOfDepartment = this.getScopeDepartment();
}
if (req.setKindOfPeople == 2 || req.setKindOfPeople == 3) {
req.scopeOfPeople = this.getScopePeople(req.setKindOfPeople);
}
// if (req.setKindOfAdministrative == 3) {
// req.scopeOfAdministrative = this.getScope("administrativeUpdate");
// }
// if (
// req.setKindOfOrganization == 2 ||
// req.setKindOfOrganization == 3
// ) {
// req.scopeOfOrganization = this.getScopeOrganization(
// req.setKindOfOrganization
// );
// }
// if (req.setKindOfDepartment == 3) {
// req.scopeOfDepartment = this.getScopeDepartment();
// }
// if (req.setKindOfPeople == 2 || req.setKindOfPeople == 3) {
// req.scopeOfPeople = this.getScopePeople(req.setKindOfPeople);
// }
openLoading(vm);
vm.POST("portal/scope", req).then(res => {
// vm.POST("portal/scope", req).then(res => {
vm.POST("portal/new/scope", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
//移动到选择项目组件
......@@ -1760,27 +1759,32 @@ export default {
//外部人员
let req = {
projectId: this.projectId,
setKindOfAdministrative: 0,
setKindOfOrganization: this.getKind("organization"),
setKindOfDepartment: this.getKind("department"),
setKindOfPeople: this.getKind("person"),
flag: this.flagCover,
// setKindOfAdministrative: 0,
// setKindOfOrganization: this.getKind("organization"),
// setKindOfDepartment: this.getKind("department"),
// setKindOfPeople: this.getKind("person"),
// flag: this.flagCover,
scopeOfAdministrative: null,
scopeOfDepartment: this.getScopeDepartment(),
};
if (
req.setKindOfOrganization == 2 ||
req.setKindOfOrganization == 3
) {
req.scopeOfOrganization = this.getScopeOrganization(
req.setKindOfOrganization
);
}
if (req.setKindOfDepartment == 3) {
req.scopeOfDepartment = this.getScopeDepartment();
}
if (req.setKindOfPeople == 2 || req.setKindOfPeople == 3) {
req.scopeOfPeople = this.getScopePeople(req.setKindOfPeople);
}
vm.POST("portal/scope", req).then(res => {
// if (
// req.setKindOfOrganization == 2 ||
// req.setKindOfOrganization == 3
// ) {
// req.scopeOfOrganization = this.getScopeOrganization(
// req.setKindOfOrganization
// );
// }
// if (req.setKindOfDepartment == 3) {
// req.scopeOfDepartment = this.getScopeDepartment();
// }
// if (req.setKindOfPeople == 2 || req.setKindOfPeople == 3) {
// req.scopeOfPeople = this.getScopePeople(req.setKindOfPeople);
// }
// vm.POST("portal/scope", req).then(res => {
openLoading(vm);
vm.POST("portal/new/scope", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
//移动到选择项目组件
let statusMove = this.scopeStatus(res.data.status);
......@@ -2013,10 +2017,9 @@ export default {
} else if (tabName == "fourth") {
//设定人员
this.formPerson.pageNum = 1;
this.formPerson.name ="";
this.formPerson.departmentId = -1;
this.formPerson.hospitalId = 0;
this.getHospital();
this.formPerson.doctorName = "";
this.formPerson.hospitalName = "";
// this.getHospital();
this.departmentList = this.getDepartmentList();
//console.log('departmentList',this.departmentList);
this.getPeople();
......@@ -2196,7 +2199,7 @@ export default {
// if (row.status == 1) {
// return false;
// }
if (row.setFlag == false) {
if (row.modifyFlag == 0) {
return false;
}
return true;
......@@ -2233,7 +2236,6 @@ export default {
//改变机构 table 的check状态
selectionChangeDepartment(val) {
this.multipleSelectionDepartment = val;
//console.log(this.multipleSelectionDepartment);
},
//改变人员 table的check状态
selectionChangePerson(rows) {
......@@ -2289,108 +2291,6 @@ export default {
this.changedPerson = [];
this.changedPerson2 = [];
},
//设定机构table全选
checkAll(flag, name) {
if (name == "multipleOrganization") {
//机构全选
let checkItem = this.checkTableState[name];
if (flag === true) {
let idList = operationData.getIdList(this.tableOrganization);
//console.log('idList',idList,'changedOrganization',this.changedOrganization);
let difference = operationData.getDifference(
idList,
this.changedOrganization
);
//console.log('difference',difference);
if (difference.length > 0) {
this.$refs[name].toggleAllSelection();
}
this.checkTableState[name] = true;
this.changedOrganization2 = [];
this.changedOrganization = operationData.getDifference(
this.lookedOrganization,
this.changedOrganization2
);
//机构影响人员
//this.checkAll(true,'multiplePerson');
this.resetPeople();
} else {
this.$refs[name].clearSelection();
this.checkTableState[name] = false;
this.changedOrganization = [];
this.changedOrganization2 = operationData.getDifference(
this.lookedOrganization,
this.changedOrganization
);
//机构影响人员
//this.checkAll(false,'multiplePerson');
this.resetPeople();
}
//置空
} else if (name == "multiplePerson") {
//人员全选
if (flag === true) {
let idList = operationData.getIdList(this.tablePerson);
//console.log('idList',idList,'changedPerson',this.changedPerson);
let difference = operationData.getDifference(
idList,
this.changedPerson
);
//console.log('difference',difference);
if (difference.length > 0) {
this.$refs[name].toggleAllSelection();
}
this.checkTableState[name] = true;
this.changedPerson2 = [];
this.changedPerson = operationData.getDifference(
this.lookedPerson,
this.changedPerson2
);
} else {
this.$refs[name].clearSelection();
this.checkTableState[name] = false;
this.changedPerson = [];
this.changedPerson2 = operationData.getDifference(
this.lookedPerson,
this.changedPerson
);
}
}
},
checkAllEcology(flag) {
if (flag === true) {
let idList = operationData.getIdList(this.tableEcology);
//console.log('idList',idList,'changedPerson',this.changedPerson);
let difference = operationData.getDifference(
idList,
this.changedEcology
);
//console.log('difference',difference);
if (difference.length > 0) {
this.$refs.multipleEcology.toggleAllSelection();
}
this.checkTableEcology = true;
this.changedEcology2 = [];
this.changedEcology = operationData.getDifference(
this.lookedEcology,
this.changedEcology
);
} else {
this.$refs.multipleEcology.clearSelection();
this.checkTableEcology = false;
this.changedEcology = [];
this.changedEcology2 = operationData.getDifference(
this.lookedEcology,
this.changedEcology
);
}
},
//获取用户类型
getKind(type) {
let kind = 3;
......@@ -2519,12 +2419,15 @@ export default {
}
}
//console.log(scope);
if(scope == "") {
return null;
}
return scope;
},
initOrganizationStatus() {
let tableStatus = this.tableOrganization;
tableStatus.forEach(row => {
if (row.status == 1 && row.setFlag == true) {
if (row.status == 1 && row.modifyFlag == 0) {
this.$nextTick(function() {
this.$refs.multipleOrganization.toggleRowSelection(row);
});
......@@ -2578,25 +2481,25 @@ export default {
//机构搜索
getOrganizationChoose() {
// console.log('formOrganization',this.formOrganization);
let lastNum = this.formOrganization.administrativeIdList.length - 1
let administrativeIdItem = this.formOrganization.administrativeIdList[lastNum];
console.log('多级选中administrativeIdItem：',administrativeIdItem)
// let lastNum = this.formOrganization.administrativeIdList.length - 1
// let administrativeIdItem = this.formOrganization.administrativeIdList[lastNum];
let administrativeIdItem = operationData.setAdministrativeId(this.formOrganization.administrativeIdList);
let req = {
projectId: this.projectId,
setKind: this.getKind("administrative"),
// scope: "000_110",
//administrativeId: this.formOrganization.administrativeId,
// setKind: this.getKind("administrative"),
administrativeId: administrativeIdItem,
departmentLevel: this.formOrganization.level,
organizationName: this.formOrganization.name,
hospitalLevel: this.formOrganization.level,
hospitalName: this.formOrganization.name,
pageNum: this.formOrganization.pageNum,
pageSize: this.formOrganization.pageSize
pageSize: this.formOrganization.pageSize,
scope: this.getScope("administrative"),
};
if (req.setKind == 3) {
req.scope = this.getScope("administrative");
}
// if (req.setKind == 3) {
// req.scope = this.getScope("administrative");
// }
openLoading(vm);
vm.POST("portal/scope/v1/organization/choose", req).then(res => {
// vm.POST("portal/scope/v1/organization/choose", req).then(res => {
vm.POST("portal/new/scope/org/v1/organization/search", req).then(res => {
closeLoading(vm);
console.log(res);
if (res.code == "000000") {
......@@ -2626,6 +2529,8 @@ export default {
// this.$refs.multipleOrganization.toggleAllSelection();
// }
// }
} else {
vm.$message(res.message);
}
});
},
......@@ -2679,6 +2584,8 @@ export default {
// }
// }
} else {
vm.$message(res.message)
}
});
},
......@@ -2755,6 +2662,12 @@ export default {
//获取科室列表
getScopeDepartment() {
let scope = "";
if(this.multipleSelectionDepartment.length == this.tableDepartment.length) {
return 99999999;
}
if(this.multipleSelectionDepartment.length == 0) {
return null;
}
for (let i = 0; i < this.multipleSelectionDepartment.length; i++) {
scope += this.multipleSelectionDepartment[i].id + "|";
}
......@@ -2766,10 +2679,7 @@ export default {
let req = {
projectId: this.projectId,
setKindOfAdministrative: this.getKind("administrative"),
//scopeOfAdministrative: "000_110",
setKindOfOrganization: this.getKind("organization"),
//scopeOfOrganization: "2|3|4|5|6|7",
pageNum: this.formPerson.pageNum,
pageSize: this.formPerson.pageSize
};
......@@ -2793,9 +2703,8 @@ export default {
this.formPerson.pageNum = 1;
let searchForm = this.formPerson;
if (
searchForm.hospitalId === 0 &&
searchForm.departmentId === -1 &&
searchForm.name == ""
searchForm.hospitalName === "" &&
searchForm.doctorName === ""
) {
this.searchPeopleType = '';
this.getPeople();
......@@ -2835,62 +2744,58 @@ export default {
// console.log('formOrganization',this.formOrganization);
let req = {
projectId: this.projectId,
setKindOfAdministrative: this.getKind("administrative"),
//scopeOfAdministrative: "000_110",
setKindOfOrganization: this.getKind("organization"),
//scopeOfOrganization: "2|3|4|5|6|7",
setKindOfDepartment: this.getKind("department"),
//scopeOfDepartment: 54,
// setKindOfAdministrative: this.getKind("administrative"),
// setKindOfOrganization: this.getKind("organization"),
// setKindOfDepartment: this.getKind("department"),
pageNum: this.formPerson.pageNum,
pageSize: this.formPerson.pageSize,
hospitalId: this.formPerson.hospitalId,
departmentId: this.formPerson.departmentId,
name: this.formPerson.name,
doctorName: this.formPerson.doctorName,
hospitalName: this.formPerson.hospitalName,
scopeOfAdministrative: this.getScope("administrative"),
setKindOfDepartment: this.getScopeDepartment(),
};
if (req.setKindOfAdministrative == 3) {
req.scopeOfAdministrative = this.getScope("administrative");
}
if (req.setKindOfOrganization == 2 || req.setKindOfOrganization == 3) {
req.scopeOfOrganization = this.getScopeOrganization(
req.setKindOfOrganization
);
}
if (req.setKindOfDepartment == 3) {
req.scopeOfDepartment = this.getScopeDepartment();
}
// if (req.setKindOfAdministrative == 3) {
// req.scopeOfAdministrative = this.getScope("administrative");
// }
// if (req.setKindOfOrganization == 2 || req.setKindOfOrganization == 3) {
// req.scopeOfOrganization = this.getScopeOrganization(
// req.setKindOfOrganization
// );
// }
// if (req.setKindOfDepartment == 3) {
// req.scopeOfDepartment = this.getScopeDepartment();
// }
openLoading(vm);
vm.POST("portal/scope/v1/people/choose", req).then(res => {
// vm.POST("portal/scope/v1/people/choose", req).then(res => {
vm.POST("portal/new/scope/doctor/v1/doctor/search", req).then(res => {
closeLoading(vm);
console.log(res);
if (res.code == "000000") {
this.tablePerson = res.data.people;
this.totalPerson = res.data.total;
vm.initPeopleStatus();
let idList = operationData.getIdList(this.tablePerson);
let intersect = operationData.getIntersect(
idList,
this.changedPerson
);
this.lookedPerson = operationData.getUnion(
this.lookedPerson,
idList
);
// this.changedPerson2 = operationData.getDifference(
// this.lookedPerson,
// let idList = operationData.getIdList(this.tablePerson);
// let intersect = operationData.getIntersect(
// idList,
// this.changedPerson
// );
//console.log('全部看过的：',this.lookedPerson);
if (vm.checkTableState.multiplePerson === "") {
this.initPeopleChoose();
} else if (vm.checkTableState.multiplePerson === true) {
let intersect2 = operationData.getIntersect(
idList,
this.changedPerson
);
if (intersect2.length == 0) {
this.$refs.multiplePerson.toggleAllSelection();
}
}
// this.lookedPerson = operationData.getUnion(
// this.lookedPerson,
// idList
// );
// if (vm.checkTableState.multiplePerson === "") {
// this.initPeopleChoose();
// } else if (vm.checkTableState.multiplePerson === true) {
// let intersect2 = operationData.getIntersect(
// idList,
// this.changedPerson
// );
// if (intersect2.length == 0) {
// this.$refs.multiplePerson.toggleAllSelection();
// }
// }
} else {
vm.$message(res.message)
}
});
},
......@@ -2908,67 +2813,60 @@ export default {
getPeople() {
let req = {
projectId: this.projectId,
setKindOfAdministrative: this.getKind("administrative"),
//scopeOfAdministrative: "000_110",
setKindOfOrganization: this.getKind("organization"),
//scopeOfOrganization: "2|3|4|5|6|7",
setKindOfDepartment: this.getKind("department"),
//scopeOfDepartment: 54,
doctorName: '',
hospitalName: '',
scopeOfAdministrative: this.getScope("administrative"),
setKindOfDepartment: this.getScopeDepartment(),
pageNum: this.formPerson.pageNum,
pageSize: this.formPerson.pageSize
};
if (req.setKindOfAdministrative == 3) {
req.scopeOfAdministrative = this.getScope("administrative");
}
if (req.setKindOfOrganization == 2 || req.setKindOfOrganization == 3) {
req.scopeOfOrganization = this.getScopeOrganization(
req.setKindOfOrganization
);
}
if (req.setKindOfDepartment == 3) {
req.scopeOfDepartment = this.getScopeDepartment();
}
// if (req.setKindOfAdministrative == 3) {
// req.scopeOfAdministrative = this.getScope("administrative");
// }
// if (req.setKindOfOrganization == 2 || req.setKindOfOrganization == 3) {
// req.scopeOfOrganization = this.getScopeOrganization(
// req.setKindOfOrganization
// );
// }
// if (req.setKindOfDepartment == 3) {
// req.scopeOfDepartment = this.getScopeDepartment();
// }
openLoading(vm);
vm.POST("portal/scope/v1/people", req).then(res => {
// vm.POST("portal/scope/v1/people", req).then(res => {
vm.POST("portal/new/scope/doctor/v1/doctor", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
console.log(res);
this.tablePerson = res.data.people;
this.totalPerson = res.data.total;
vm.initPeopleStatus();
let idList = operationData.getIdList(this.tablePerson);
let intersect = operationData.getIntersect(
idList,
this.changedPerson
);
this.lookedPerson = operationData.getUnion(
this.lookedPerson,
idList
);
// this.changedPerson2 = operationData.getDifference(
// this.lookedPerson,
// let idList = operationData.getIdList(this.tablePerson);
// let intersect = operationData.getIntersect(
// idList,
// this.changedPerson
// );
let difference = operationData.getDifference(
idList,
this.changedPerson2
);
//console.log('全部看过的：',this.lookedPerson);
if (vm.checkTableState.multiplePerson === "") {
// if (intersect.length == 0 && difference.length > 0) {
// this.initPeopleStatus();
// }
this.initPeopleChoose();
} else if (vm.checkTableState.multiplePerson === true) {
let intersect2 = operationData.getIntersect(
idList,
this.changedPerson
);
// console.log('intersect2',intersect2);
if (intersect2.length == 0) {
this.$refs.multiplePerson.toggleAllSelection();
}
}
// this.lookedPerson = operationData.getUnion(
// this.lookedPerson,
// idList
// );
// let difference = operationData.getDifference(
// idList,
// this.changedPerson2
// );
// if (vm.checkTableState.multiplePerson === "") {
// this.initPeopleChoose();
// } else if (vm.checkTableState.multiplePerson === true) {
// let intersect2 = operationData.getIntersect(
// idList,
// this.changedPerson
// );
// if (intersect2.length == 0) {
// this.$refs.multiplePerson.toggleAllSelection();
// }
// }
} else {
vm.$message(res.message)
}
});
},
......@@ -3537,16 +3435,38 @@ export default {
}
});
},
//机构table中勾选一排
selectAllOrganization(selection) {
let setList = [];
let selectList = [];
for(let i=0;i<vm.tableOrganization.length;i++) {
if(vm.tableOrganization[i].setFlag == true) {
if(vm.tableOrganization[i].modifyFlag == 0) {
setList.push(vm.tableOrganization[i].id)
}
}
for(let j=0;j<selection.length;j++) {
selectList.push(selection[j].id);
}
let intersect = operationData.getIntersect(setList,selectList);
let typeStatus = 0;
if(intersect.length > 0) {
typeStatus = 1;
}
// let = this.$refs.multipleTable.selection
console.log('selectAll',selection,setList);
console.log(selection,setList,selectList);
if(setList.length > 0) {
let req = {
ids: setList,
projectId: this.projectId,
type: typeStatus
};
openLoading(vm);
vm.PUT("portal/new/scope/org/v1/organization/option", req).then(res => {
closeLoading(vm);
});
}
},
//机构table中勾选一个
selectOrganization(selection, row) {
console.log('select',selection,row)
let flag = false;
......@@ -3563,7 +3483,59 @@ export default {
type: flag === false ? 0 : 1
};
openLoading(vm);
vm.GET("portal/new/scope/org/v1/organization/option", req).then(res => {
vm.PUT("portal/new/scope/org/v1/organization/option", req).then(res => {
closeLoading(vm);
});
},
//
//人员table中勾选一排
selectAllPerson(selection) {
let setList = [];
let selectList = [];
for(let i=0;i<vm.tablePerson.length;i++) {
if(vm.tablePerson[i].modifyFlag == 0) {
setList.push(vm.tablePerson[i].id)
}
}
for(let j=0;j<selection.length;j++) {
selectList.push(selection[j].id);
}
let intersect = operationData.getIntersect(setList,selectList);
let typeStatus = 0;
if(intersect.length > 0) {
typeStatus = 1;
}
console.log(selection,setList,selectList);
if(setList.length > 0) {
let req = {
ids: setList,
projectId: this.projectId,
type: typeStatus
};
openLoading(vm);
vm.PUT("portal/new/scope/doctor/v1/doctor/option", req).then(res => {
closeLoading(vm);
});
}
},
//人员table中勾选一个
selectPerson(selection, row) {
console.log('select',selection,row)
let flag = false;
for(let i=0;i<selection.length;i++) {
if(selection[i].id == row.id) {
flag = true;
}
}
let req = {
ids: [
row.id
],
projectId: this.projectId,
type: flag === false ? 0 : 1
};
openLoading(vm);
vm.PUT("portal/new/scope/doctor/v1/doctor/option", req).then(res => {
closeLoading(vm);
});
},
......
src/views/education/item-shield.vue
浏览文件 @ 994fd6c4
......@@ -296,7 +296,7 @@ export default {
} else if (vm.shieldType == 1) {
let req = {
blackStatus: vm.formInline.blackStatus,
hospitalName: vm.formInline.organizationName,
hospitalName: vm.formInline.hospitalName,
doctorName: vm.formInline.doctorName,
pageNo: vm.formInline.pageNo,
pageSize: vm.formInline.pageSize,
......@@ -332,9 +332,10 @@ export default {
projectId: vm.projectId
};
openLoading(vm);
vm.GET("portal/black/setHospitalBlackStatus", req).then(res => {
vm.POST("portal/black/setHospitalBlackStatus", req).then(res => {
closeLoading(vm);
vm.dialogShow = false;
vm.$message(res.message);
vm.search();
});
} else if (vm.shieldType == 1) {
......@@ -345,9 +346,10 @@ export default {
projectId: vm.projectId
};
openLoading(vm);
vm.GET("portal/black/setPeopleBlackStatus", req).then(res => {
vm.POST("portal/black/setPeopleBlackStatus", req).then(res => {
closeLoading(vm);
vm.dialogShow = false;
vm.$message(res.message);
vm.search();
});
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或