Skip to content

P
pica.cloud.web-education-admin
提交 05b14fa6 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-mvp-20200331' of... 

Merge branch 'dev-mvp-20200331' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-mvp-20200331

* 'dev-mvp-20200331' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin:
  解决秀米图片403，发送请求时去掉referrer
  修改模板查看详情的显示
  优化代码逻辑
  修改 设定机构的设定行政范围
  增加选择范围的项目id
上级 81e2eef2 b16cd406
隐藏空白字符变更
内嵌 并排
正在显示 包含 108 行增加 和 142 行删除
index.html
浏览文件 @ 05b14fa6
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<meta name="full-screen" content="yes"> <meta name="full-screen" content="yes">
<meta name="x5-fullscreen" content="true"> <meta name="x5-fullscreen" content="true">
<meta name="referrer" content="no-referrer" />
<title>云鹊医工作站</title> <title>云鹊医工作站</title>
</head> </head>
<body id="appBody"> <body id="appBody">
......
src/components/education/template/selectRegion.vue
浏览文件 @ 05b14fa6
...@@ -80,25 +80,25 @@ export default { ...@@ -80,25 +80,25 @@ export default {
}, },
created() { created() {
vm = this; vm = this;
this.initRange(); vm.initRange();
}, },
methods: { methods: {
//选择范围 初始化 //选择范围 初始化
initRange() { initRange() {
console.log('====================initRange') console.log('====================initRange')
let projectId = this.projectId; let projectId = vm.projectId;
if (projectId == null) { if (projectId == null) {
//新建 //新建
} else { } else {
//编辑 //编辑
this.getAdministrative(); vm.getAdministrative();
} }
}, },
//查询行政范围（树） //查询行政范围（树）
getAdministrative() { getAdministrative() {
console.log('=========================getAdministrative') console.log('=========================getAdministrative')
let req = { let req = {
projectId: this.projectId projectId: vm.projectId
}; };
openLoading(vm); openLoading(vm);
vm.GET("portal/scope/v1/administrative", req).then(res => { vm.GET("portal/scope/v1/administrative", req).then(res => {
...@@ -107,22 +107,22 @@ export default { ...@@ -107,22 +107,22 @@ export default {
//console.log(res.data); //console.log(res.data);
let administrativeAll = res.data.administrativeAll; let administrativeAll = res.data.administrativeAll;
let administrative = res.data.administrative; let administrative = res.data.administrative;
this.treeData = []; vm.treeData = [];
this.treeData[0] = administrativeAll; vm.treeData[0] = administrativeAll;
this.setTreeData(administrative); vm.setTreeData(administrative);
// this.getCheckedTree(); // vm.getCheckedTree();
} }
}); });
}, },
//获取勾选树 //获取勾选树
getCheckedTree() { getCheckedTree() {
console.log('=========================getCheckedTree') console.log('=========================getCheckedTree')
if (this.idType != 2) { if (vm.idType != 2) {
let allTree = JSON.parse(JSON.stringify(this.treeData[0].children)); let allTree = JSON.parse(JSON.stringify(vm.treeData[0].children));
let changedTags = JSON.parse(JSON.stringify(this.tagsRegion)); let changedTags = JSON.parse(JSON.stringify(vm.tagsRegion));
let organizationArea = operationData.treeHandler(allTree, changedTags); let organizationArea = operationData.treeHandler(allTree, changedTags);
console.log("多级树：", organizationArea); console.log("多级树：", organizationArea);
this.organizationRegion = organizationArea; vm.organizationRegion = organizationArea;
} }
}, },
//初始化范围树 //初始化范围树
...@@ -137,8 +137,8 @@ export default { ...@@ -137,8 +137,8 @@ export default {
checkList[i].key = administrative[i].id; checkList[i].key = administrative[i].id;
} }
//console.log(treeIdList); //console.log(treeIdList);
this.$refs.tree.setCheckedKeys(treeIdList); vm.$refs.tree.setCheckedKeys(treeIdList);
this.tagsRegion = checkList; vm.tagsRegion = checkList;
}, },
// 选择行政范围 // 选择行政范围
onChecked(node, data) { onChecked(node, data) {
...@@ -146,20 +146,20 @@ export default { ...@@ -146,20 +146,20 @@ export default {
vm.checkUpdate(node, data); vm.checkUpdate(node, data);
//重构归并树 //重构归并树
let checkedTree = operationData.getSimpleCheckedNodes( let checkedTree = operationData.getSimpleCheckedNodes(
this.$refs.tree.store vm.$refs.tree.store
); );
let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys(); let halfCheckedTree = vm.$refs.tree.getHalfCheckedKeys();
let allSelectedKeys = operationData.setSelectedKeys( let allSelectedKeys = operationData.setSelectedKeys(
checkedTree, checkedTree,
halfCheckedTree halfCheckedTree
); );
//重构内容 //重构内容
this.allSelectedKeys = allSelectedKeys; vm.allSelectedKeys = allSelectedKeys;
this.initCheckList(allSelectedKeys); vm.initCheckList(allSelectedKeys);
//console.log("allSelectedKeys", allSelectedKeys); //console.log("allSelectedKeys", allSelectedKeys);
//改变行政范围后，更新设定机构和设定人员 //改变行政范围后，更新设定机构和设定人员
// this.updateOrganizationAndPerson(allSelectedKeys); // vm.updateOrganizationAndPerson(allSelectedKeys);
this.updatedTree = true; vm.updatedTree = true;
}, },
//v2.2教培更新 //v2.2教培更新
checkUpdate(node, data) { checkUpdate(node, data) {
...@@ -171,16 +171,16 @@ export default { ...@@ -171,16 +171,16 @@ export default {
vm.nowCheck = node; vm.nowCheck = node;
vm.warnType = 0; vm.warnType = 0;
vm.dialogWarn = true; vm.dialogWarn = true;
// this.$refs.tree.setChecked(data,false) // vm.$refs.tree.setChecked(data,false)
} }
}, },
//列举选中地区 //列举选中地区
initCheckList(allSelectedKeys) { initCheckList(allSelectedKeys) {
console.log('=========================initCheckList') console.log('=========================initCheckList')
this.tagsRegion = []; vm.tagsRegion = [];
// console.log(allSelectedKeys); // console.log(allSelectedKeys);
// console.log(this.$refs.tree.getCheckedNodes()); // console.log(vm.$refs.tree.getCheckedNodes());
let nodeData = this.$refs.tree.getCheckedNodes(); let nodeData = vm.$refs.tree.getCheckedNodes();
for (let i = 0; i < nodeData.length; i++) { for (let i = 0; i < nodeData.length; i++) {
for (let j = 0; j < allSelectedKeys.length; j++) { for (let j = 0; j < allSelectedKeys.length; j++) {
if ( if (
...@@ -190,7 +190,7 @@ export default { ...@@ -190,7 +190,7 @@ export default {
let tagObj = {}; let tagObj = {};
tagObj.name = nodeData[i].label; tagObj.name = nodeData[i].label;
tagObj.key = nodeData[i].id; tagObj.key = nodeData[i].id;
this.tagsRegion.push(tagObj); vm.tagsRegion.push(tagObj);
} }
} }
} }
...@@ -216,7 +216,7 @@ export default { ...@@ -216,7 +216,7 @@ export default {
let administrative = res.data.administrative; let administrative = res.data.administrative;
//console.log(administrative); //console.log(administrative);
data.children = administrative; data.children = administrative;
this.appendCheck(administrative, node.checked); vm.appendCheck(administrative, node.checked);
} }
}); });
} }
...@@ -226,23 +226,23 @@ export default { ...@@ -226,23 +226,23 @@ export default {
console.log('====================appendCheck') console.log('====================appendCheck')
//console.log(checked,administrative) //console.log(checked,administrative)
let checkList = []; let checkList = [];
checkList = this.$refs.tree.getCheckedKeys(); checkList = vm.$refs.tree.getCheckedKeys();
if (checked) { if (checked) {
for (let i = 0; i < administrative.length; i++) { for (let i = 0; i < administrative.length; i++) {
checkList.push(administrative[i].id); checkList.push(administrative[i].id);
// console.log(checkList); // console.log(checkList);
} }
} }
this.$nextTick(function() { vm.$nextTick(function() {
this.$refs.tree.setCheckedKeys(checkList); vm.$refs.tree.setCheckedKeys(checkList);
}); });
}, },
//删除label节点 同步树结构 //删除label节点 同步树结构
handleCloseTree(tag) { handleCloseTree(tag) {
console.log('=========================handleCloseTree') console.log('=========================handleCloseTree')
if (this.status4Flag != 1) { if (vm.status4Flag != 1) {
this.tagsRegion.splice(this.tagsRegion.indexOf(tag), 1); vm.tagsRegion.splice(vm.tagsRegion.indexOf(tag), 1);
this.setCheckedKeys(this.tagsRegion); vm.setCheckedKeys(vm.tagsRegion);
} }
}, },
//通过key设置tree //通过key设置tree
...@@ -254,14 +254,14 @@ export default { ...@@ -254,14 +254,14 @@ export default {
treeKeyList[index] = tagsRegion[index].key; treeKeyList[index] = tagsRegion[index].key;
} }
console.log(treeKeyList); console.log(treeKeyList);
this.$refs.tree.setCheckedKeys(treeKeyList); vm.$refs.tree.setCheckedKeys(treeKeyList);
}, },
//设定的行政范围内容(传给设定机构的范围) //设定的行政范围内容(传给设定机构的范围)
getScope(type) { getScope(type) {
let scope = ""; let scope = "";
for (let i = 0; i < this.tagsRegion.length; i++) { for (let i = 0; i < vm.tagsRegion.length; i++) {
scope += this.tagsRegion[i].key; scope += vm.tagsRegion[i].key;
if (i < this.tagsRegion.length - 1) { if (i < vm.tagsRegion.length - 1) {
scope += "|"; scope += "|";
} }
} }
...@@ -272,18 +272,18 @@ export default { ...@@ -272,18 +272,18 @@ export default {
}, },
//设定的行政范围内容(完成或是暂存时传给后台的数据格式) //设定的行政范围内容(完成或是暂存时传给后台的数据格式)
setScope(type) { setScope(type) {
let noChangeTree = this.getTreeCheck(); let noChangeTree = vm.getTreeCheck();
let scope = ""; let scope = "";
if (this.allSelectedKeys.length > 0) { if (vm.allSelectedKeys.length > 0) {
for (let i = 0; i < this.allSelectedKeys.length; i++) { for (let i = 0; i < vm.allSelectedKeys.length; i++) {
scope += scope +=
this.allSelectedKeys[i].key + ":" + this.allSelectedKeys[i].type; vm.allSelectedKeys[i].key + ":" + vm.allSelectedKeys[i].type;
if (i < this.allSelectedKeys.length - 1) { if (i < vm.allSelectedKeys.length - 1) {
scope += "|"; scope += "|";
} }
} }
} else { } else {
// let noChangeTree = this.getTreeCheck(); // let noChangeTree = vm.getTreeCheck();
console.log('noChangeTree值',noChangeTree); console.log('noChangeTree值',noChangeTree);
if(noChangeTree.length > 0) { if(noChangeTree.length > 0) {
for (let i = 0; i < noChangeTree.length; i++) { for (let i = 0; i < noChangeTree.length; i++) {
...@@ -294,9 +294,9 @@ export default { ...@@ -294,9 +294,9 @@ export default {
} }
} else { } else {
//选全国项目 //选全国项目
if(this.tagsRegion.length > 0 && this.tagsRegion[0].key == '000') { if(vm.tagsRegion.length > 0 && vm.tagsRegion[0].key == '000') {
scope = '000:1'; scope = '000:1';
console.log(this.tagsRegion,'scope',scope); console.log(vm.tagsRegion,'scope',scope);
} }
} }
} }
...@@ -308,8 +308,8 @@ export default { ...@@ -308,8 +308,8 @@ export default {
}, },
getTreeCheck() { getTreeCheck() {
//重构归并树 //重构归并树
let checkedTree = operationData.getSimpleCheckedNodes(this.$refs.tree.store); let checkedTree = operationData.getSimpleCheckedNodes(vm.$refs.tree.store);
let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys() let halfCheckedTree = vm.$refs.tree.getHalfCheckedKeys()
let allSelectedKeys = operationData.setSelectedKeys(checkedTree,halfCheckedTree); let allSelectedKeys = operationData.setSelectedKeys(checkedTree,halfCheckedTree);
vm.allSelectedKeys = allSelectedKeys; vm.allSelectedKeys = allSelectedKeys;
//重构内容 //重构内容
......
src/components/education/template/setOrganization.vue
浏览文件 @ 05b14fa6
...@@ -163,6 +163,12 @@ import { ...@@ -163,6 +163,12 @@ import {
} from "@/utils/education/educationApi"; } from "@/utils/education/educationApi";
import Sortable from "sortablejs"; import Sortable from "sortablejs";
export default { export default {
props: {
projectId:{
type: String | Number,
default:''
}
},
data() { data() {
return { return {
getRowKeys(row) { getRowKeys(row) {
...@@ -233,37 +239,39 @@ export default { ...@@ -233,37 +239,39 @@ export default {
}); });
} }
} }
} },
regio: '' //设定行政范围选择的范围
} }
}, },
created() { created() {
vm = this; vm = this;
vm.idType = localStorage.getItem("storageIdType"); vm.idType = localStorage.getItem("storageIdType");
// this.getOrganization(); // vm.getOrganization();
this.getRegionOption(); vm.getRegionOption();
this.listLevels(); vm.listLevels();
}, },
methods: { methods: {
//查询机构列表 //查询机构列表
getOrganization(r) { getOrganization(r) {
console.log('=========================getOrganization') vm.regio = r;
vm.formOrganization.administrativeIdList = ["0"];
let req = { let req = {
projectId: this.projectId, projectId: vm.projectId,
administrativeId: "", administrativeId: "",
hospitalLevel: "", hospitalLevel: "",
hospitalLevel: "", hospitalLevel: "",
// scope: this.regio == '' ? null : this.regio, // scope: vm.regio == '' ? null : vm.regio,
scope: r ? r : null, scope: r ? r : null,
pageNum: this.formOrganization.pageNum, pageNum: vm.formOrganization.pageNum,
pageSize: this.formOrganization.pageSize pageSize: vm.formOrganization.pageSize
}; };
openLoading(vm); openLoading(vm);
// vm.POST("portal/scope/v1/organization", req).then(res => { // vm.POST("portal/scope/v1/organization", req).then(res => {
vm.POST("portal/new/scope/org/v1/organization", req).then(res => { vm.POST("portal/new/scope/org/v1/organization", req).then(res => {
closeLoading(vm); closeLoading(vm);
if (res.code == "000000") { if (res.code == "000000") {
this.tableOrganization = res.data.organizationList; vm.tableOrganization = res.data.organizationList;
this.totalOrganization = res.data.total; vm.totalOrganization = res.data.total;
vm.initOrganizationStatus(); vm.initOrganizationStatus();
} else { } else {
...@@ -273,69 +281,24 @@ export default { ...@@ -273,69 +281,24 @@ export default {
}, },
//设定的行政范围内容 //设定的行政范围内容
getScope(type) { getScope(type) {
console.log('=========================getScope') console.log('=========================getScope')
if (vm.idType == 2) { if (vm.idType == 2) {
return null; return null;
} }
let scope = ""; let scope = "";
let noChangeTree = this.getTreeCheck();
if (type == "administrative") { if (type == "administrative") {
for (let i = 0; i < this.tagsRegion.length; i++) { for (let i = 0; i < vm.tagsRegion.length; i++) {
scope += this.tagsRegion[i].key; scope += vm.tagsRegion[i].key;
if (i < this.tagsRegion.length - 1) { if (i < vm.tagsRegion.length - 1) {
scope += "|"; scope += "|";
} }
} }
} else if (type == "administrativeUpdate") {
console.log("this.allSelectedKeys", this.allSelectedKeys);
if (this.allSelectedKeys.length > 0) {
for (let i = 0; i < this.allSelectedKeys.length; i++) {
scope +=
this.allSelectedKeys[i].key + ":" + this.allSelectedKeys[i].type;
if (i < this.allSelectedKeys.length - 1) {
scope += "|";
}
}
} else {
// let noChangeTree = this.getTreeCheck();
console.log("noChangeTree值", noChangeTree);
if (noChangeTree.length > 0) {
for (let i = 0; i < noChangeTree.length; i++) {
scope += noChangeTree[i].key + ":" + noChangeTree[i].type;
if (i < noChangeTree.length - 1) {
scope += "|";
}
}
} else {
//选全国项目
if (this.tagsRegion.length > 0 && this.tagsRegion[0].key == "000") {
scope = "000:1";
console.log(this.tagsRegion, "scope", scope);
}
}
}
} }
//console.log(scope); //console.log(scope);
if (scope == "") { if (scope == "") {
return null; return null;
} }
return scope; return scope;
},
// 获取行政范围树
getTreeCheck() {
console.log('=========================getTreeCheck')
//重构归并树
// let checkedTree = operationData.getSimpleCheckedNodes(
// this.$refs.tree.store
// );
let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys();
let allSelectedKeys = operationData.setSelectedKeys(
checkedTree,
halfCheckedTree
);
vm.allSelectedKeys = allSelectedKeys;
//重构内容
return allSelectedKeys;
}, },
//获取地区select //获取地区select
getRegionOption() { getRegionOption() {
...@@ -353,11 +316,11 @@ export default { ...@@ -353,11 +316,11 @@ export default {
// 初始化机构状态 // 初始化机构状态
initOrganizationStatus() { initOrganizationStatus() {
console.log('=========================initOrganizationStatus') console.log('=========================initOrganizationStatus')
let tableStatus = this.tableOrganization; let tableStatus = vm.tableOrganization;
tableStatus.forEach(row => { tableStatus.forEach(row => {
if (row.status == 1) { if (row.status == 1) {
this.$nextTick(function() { vm.$nextTick(function() {
this.$refs.multipleOrganization.toggleRowSelection(row); vm.$refs.multipleOrganization.toggleRowSelection(row);
}); });
} }
}); });
...@@ -365,7 +328,7 @@ export default { ...@@ -365,7 +328,7 @@ export default {
// 选择列表 // 选择列表
selectableTableList(row, index) { selectableTableList(row, index) {
console.log('=========================selectableTableList') console.log('=========================selectableTableList')
// if (this.status4Flag == 1) { // if (vm.status4Flag == 1) {
if (row.modifyFlag == 1) { if (row.modifyFlag == 1) {
return false; return false;
} }
...@@ -376,8 +339,8 @@ export default { ...@@ -376,8 +339,8 @@ export default {
//搜索机构 //搜索机构
searchOrganization() { searchOrganization() {
console.log('=========================searchOrganization') console.log('=========================searchOrganization')
this.formOrganization.pageNum = 1; vm.formOrganization.pageNum = 1;
let searchForm = this.formOrganization; let searchForm = vm.formOrganization;
if ( if (
searchForm.administrativeId == "0" && searchForm.administrativeId == "0" &&
searchForm.administrativeIdList[ searchForm.administrativeIdList[
...@@ -386,11 +349,11 @@ export default { ...@@ -386,11 +349,11 @@ export default {
searchForm.level == "-1" && searchForm.level == "-1" &&
searchForm.name == "" searchForm.name == ""
) { ) {
this.searchOrganizationType = ""; vm.searchOrganizationType = "";
this.getOrganization(); vm.getOrganization();
} else { } else {
this.searchOrganizationType = "choose"; vm.searchOrganizationType = "choose";
this.getOrganizationChoose(); vm.getOrganizationChoose();
} }
}, },
//重置机构、人员查询 //重置机构、人员查询
...@@ -433,12 +396,12 @@ export default { ...@@ -433,12 +396,12 @@ export default {
if (intersect.length > 0) { if (intersect.length > 0) {
typeStatus = 1; typeStatus = 1;
} }
// let = this.$refs.multipleTable.selection // let = vm.$refs.multipleTable.selection
console.log(selection, setList, selectList); console.log(selection, setList, selectList);
if (setList.length > 0) { if (setList.length > 0) {
let req = { let req = {
ids: setList, ids: setList,
projectId: this.projectId, projectId: vm.projectId,
type: typeStatus type: typeStatus
}; };
openLoading(vm); openLoading(vm);
...@@ -451,18 +414,18 @@ export default { ...@@ -451,18 +414,18 @@ export default {
handleSizeOrganization(val) { handleSizeOrganization(val) {
console.log('=========================handleSizeOrganization') console.log('=========================handleSizeOrganization')
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.formOrganization.pageSize = val; vm.formOrganization.pageSize = val;
this.searchOrganization(); vm.searchOrganization();
}, },
//分页相关 //分页相关
handleCurrentOrganization(val) { handleCurrentOrganization(val) {
console.log('=========================handleCurrentOrganization') console.log('=========================handleCurrentOrganization')
//console.log(`当前页: ${val}`); //console.log(`当前页: ${val}`);
this.formOrganization.pageNum = val; vm.formOrganization.pageNum = val;
if (this.searchOrganizationType == "choose") { if (vm.searchOrganizationType == "choose") {
this.getOrganizationChoose(); vm.getOrganizationChoose();
} else { } else {
this.getOrganization(); vm.getOrganization();
} }
}, },
//机构table中勾选一个 //机构table中勾选一个
...@@ -477,7 +440,7 @@ export default { ...@@ -477,7 +440,7 @@ export default {
} }
let req = { let req = {
ids: [row.id], ids: [row.id],
projectId: this.projectId, projectId: vm.projectId,
type: flag === false ? 0 : 1 type: flag === false ? 0 : 1
}; };
openLoading(vm); openLoading(vm);
...@@ -509,7 +472,8 @@ export default { ...@@ -509,7 +472,8 @@ export default {
]; ];
let req = { let req = {
fileArray: fileArray, fileArray: fileArray,
scopeOfAdministrative: vm.getScope("administrative") // scopeOfAdministrative: vm.getScope("administrative")
scopeOfAdministrative: vm.regio
}; };
let projectId = vm.projectId; let projectId = vm.projectId;
console.log("req", req); console.log("req", req);
...@@ -570,9 +534,9 @@ export default { ...@@ -570,9 +534,9 @@ export default {
vm.GET("contents/courseDoctor/listLevels?sysCode=10", req).then(res => { vm.GET("contents/courseDoctor/listLevels?sysCode=10", req).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
// console.log(res); // console.log(res);
this.organizationRank = operationData.getLevelList(res.data.list); vm.organizationRank = operationData.getLevelList(res.data.list);
} else { } else {
this.organizationRank = [ vm.organizationRank = [
{ {
id: "0", id: "0",
label: "全部医院等级" label: "全部医院等级"
...@@ -584,19 +548,20 @@ export default { ...@@ -584,19 +548,20 @@ export default {
//机构搜索 //机构搜索
getOrganizationChoose() { getOrganizationChoose() {
console.log('=========================getOrganizationChoose') console.log('=========================getOrganizationChoose')
// console.log('formOrganization',this.formOrganization); // console.log('formOrganization',vm.formOrganization);
let administrativeIdItem = operationData.setAdministrativeId( let administrativeIdItem = operationData.setAdministrativeId(
this.formOrganization.administrativeIdList vm.formOrganization.administrativeIdList
); );
let req = { let req = {
projectId: this.projectId, projectId: vm.projectId,
administrativeId: administrativeIdItem, administrativeId: administrativeIdItem,
hospitalLevel: this.formOrganization.level, hospitalLevel: vm.formOrganization.level,
hospitalName: this.formOrganization.name, hospitalName: vm.formOrganization.name,
pageNum: this.formOrganization.pageNum, pageNum: vm.formOrganization.pageNum,
pageSize: this.formOrganization.pageSize, pageSize: vm.formOrganization.pageSize,
// scope: this.getScope("administrative") // scope: vm.getScope("administrative")
scope: '000' scope: vm.regio
// scope: '000'
}; };
openLoading(vm); openLoading(vm);
// vm.POST("portal/scope/v1/organization/choose", req).then(res => { // vm.POST("portal/scope/v1/organization/choose", req).then(res => {
...@@ -604,8 +569,8 @@ export default { ...@@ -604,8 +569,8 @@ export default {
closeLoading(vm); closeLoading(vm);
console.log(res); console.log(res);
if (res.code == "000000") { if (res.code == "000000") {
this.tableOrganization = res.data.organizationList; vm.tableOrganization = res.data.organizationList;
this.totalOrganization = res.data.total; vm.totalOrganization = res.data.total;
vm.initOrganizationStatus(); vm.initOrganizationStatus();
} else { } else {
......
src/components/education/template/templateList.vue
浏览文件 @ 05b14fa6
...@@ -65,9 +65,9 @@ ...@@ -65,9 +65,9 @@
<div class="dm-name">项目学科:</div> <div class="dm-name">项目学科:</div>
<div class="dm-nr">{{detailObj.subjectName}}</div> <div class="dm-nr">{{detailObj.subjectName}}</div>
</div> </div>
<div class="mian-list" v-if="detailObj.organizationName"> <div class="mian-list" v-if="detailObj.organizationNameList && detailObj.organizationNameList.length>1">
<div class="dm-name">已参加的机构:</div> <div class="dm-name">已参加的机构:</div>
<div class="dm-nr">{{detailObj.organizationName}}</div> <div class="dm-nr">{{detailObj.organizationNameList.join(', ')}}</div>
</div> </div>
</div> </div>
</div> </div>
......
src/views/education/template-open.vue
浏览文件 @ 05b14fa6
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<select-region ref="selectRegion" :projectId="projectId"></select-region> <select-region ref="selectRegion" :projectId="projectId"></select-region>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="设定机构" name="second"> <el-tab-pane label="设定机构" name="second">
<set-organization ref="setOrganization"></set-organization> <set-organization ref="setOrganization" :projectId="projectId"></set-organization>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或