提交 e7dbe434 编写于 作者: zhentian.jia's avatar zhentian.jia

教培项目小生态

上级 0f8457a7
...@@ -224,4 +224,44 @@ export function treeHandler(treeData, selData) { ...@@ -224,4 +224,44 @@ export function treeHandler(treeData, selData) {
//return handlerAction(treeData, selData); //return handlerAction(treeData, selData);
let returnData = addEmpty(endData); let returnData = addEmpty(endData);
return returnData; return returnData;
}
//小生态
export function getEcologyList() {
let dataList = [{
id: '123',
name: '上海第一人民医院',
hospitalLevelName: '二甲医院',
provinceName: '上海市',
cityName: '上海市',
countyName: '浦东新区',
townName: '--',
},{
id: '124',
name: '上海第二人民医院',
hospitalLevelName: '二甲医院',
provinceName: '上海市',
cityName: '上海市',
countyName: '浦东新区',
townName: '--',
},{
id: '125',
name: '上海第三人民医院',
hospitalLevelName: '二甲医院',
provinceName: '上海市',
cityName: '上海市',
countyName: '浦东新区',
townName: '--',
}]
return dataList;
}
export function getEcologySelect () {
let data = [{
label: '上海小生态',
value: '1',
},{
label: '北京小生态',
value: '2',
}];
return data;
} }
\ No newline at end of file
...@@ -169,6 +169,17 @@ ...@@ -169,6 +169,17 @@
</el-form-item> </el-form-item>
<p class="upload-message" v-if="uploadImgMessage2">请选择封面</p> <p class="upload-message" v-if="uploadImgMessage2">请选择封面</p>
</div> </div>
<p class="p_label">项目范围来源:(一经选择无法更改)</p>
<el-form-item label="">
<el-radio-group
size="small"
v-model="formData.range"
:disabled="peopleLevel == 'L3'"
>
<el-radio :label="1">使用地区范围</el-radio>
<el-radio :label="2">使用小生态范围</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="添加下载文件:"> <el-form-item label="添加下载文件:">
<el-col :span="10"> <el-col :span="10">
<el-upload <el-upload
...@@ -193,255 +204,332 @@ ...@@ -193,255 +204,332 @@
</el-form> </el-form>
</div> </div>
<div class="second-step" v-else-if="active === 1"> <div class="second-step" v-else-if="active === 1">
<el-tabs v-model="activeName" @tab-click="handleClickTabs"> <div v-if='formData.range !=2'>
<el-tab-pane v-if="idType != 2" label="设定行政范围" name="first"> <el-tabs v-model="activeName" @tab-click="handleClickTabs">
<el-row :gutter="20"> <el-tab-pane v-if="idType != 2" label="设定行政范围" name="first">
<el-col class="rim" :span="12"> <el-row :gutter="20">
<!-- <el-col class="rim" :span="12">
:load="loadNode" <!--
lazy :load="loadNode"
default-expand-all lazy
--> default-expand-all
<el-tree -->
default-expand-all <el-tree
:data="treeData" default-expand-all
show-checkbox :data="treeData"
node-key="id" show-checkbox
ref="tree" node-key="id"
highlight-current ref="tree"
:props="defaultProps" highlight-current
@check="onChecked" :props="defaultProps"
> @check="onChecked"
<span class="custom-tree-node" slot-scope="{ node, data }"> >
<span>{{ node.label }}</span> <span class="custom-tree-node" slot-scope="{ node, data }">
<span> <span>{{ node.label }}</span>
<el-button <span>
type="text" <el-button
icon="el-icon-caret-bottom" type="text"
size="small" icon="el-icon-caret-bottom"
@click="() => append(data,node)" size="small"
></el-button> @click="() => append(data,node)"
></el-button>
</span>
</span> </span>
</span> </el-tree>
</el-tree> </el-col>
</el-col> <el-col :span="11">
<el-col :span="11"> <el-tag
<el-tag v-for="tag in tagsRegion"
v-for="tag in tagsRegion" :key="tag.name"
:key="tag.name" closable
closable :type="tag.type"
:type="tag.type" @close="handleCloseTree(tag)"
@close="handleCloseTree(tag)" >{{tag.name}}</el-tag>
>{{tag.name}}</el-tag> </el-col>
</el-col> </el-row>
</el-row> </el-tab-pane>
</el-tab-pane> <el-tab-pane label="设定机构" name="second">
<el-tab-pane label="设定机构" name="second"> <el-form :inline="true" :model="formOrganization" class="demo-form-inline">
<el-form :inline="true" :model="formOrganization" class="demo-form-inline"> <el-form-item label>
<el-form-item label> <!-- <el-select
<!-- <el-select
size="small"
v-model="formOrganization.administrativeId"
placeholder="全部地区"
v-if="idType != 2"
>
<el-option
v-for="item in organizationRegion"
:key="item.id"
:label="item.label"
:value="item.value"
></el-option>
</el-select> -->
<el-cascader
v-if="idType != 2"
size="small"
expand-trigger="hover"
:options="organizationRegion"
v-model="formOrganization.administrativeIdList"
></el-cascader>
</el-form-item>
<el-form-item>
<el-select size="small" v-model="formOrganization.level" placeholder="全部医院级别">
<el-option
v-for="(item, index) in organizationRank"
:key="index"
:label="item.label"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label>
<el-input size="small" v-model="formOrganization.name" placeholder="请输入机构名称"></el-input>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="searchOrganization()">搜索</el-button>
</el-form-item>
<el-form-item style="float:right;">
<el-button-group>
<el-button
size="small" size="small"
type="default" v-model="formOrganization.administrativeId"
@click="checkAll(true,'multipleOrganization')" placeholder="全部地区"
>选择全部</el-button> v-if="idType != 2"
<el-button >
<el-option
v-for="item in organizationRegion"
:key="item.id"
:label="item.label"
:value="item.value"
></el-option>
</el-select> -->
<el-cascader
v-if="idType != 2"
size="small" size="small"
type="default" expand-trigger="hover"
@click="checkAll(false,'multipleOrganization')" :options="organizationRegion"
>全部不选</el-button> v-model="formOrganization.administrativeIdList"
</el-button-group> ></el-cascader>
</el-form-item> </el-form-item>
</el-form> <el-form-item>
<el-table <el-select size="small" v-model="formOrganization.level" placeholder="全部医院级别">
class="rim" <el-option
ref="multipleOrganization" v-for="(item, index) in organizationRank"
:data="tableOrganization" :key="index"
tooltip-effect="dark" :label="item.label"
style="width: 100%" :value="item.id"
@selection-change="selectionChangeOrganization" ></el-option>
:row-key="getRowKeys" </el-select>
> </el-form-item>
<el-table-column <el-form-item label>
type="selection" <el-input size="small" v-model="formOrganization.name" placeholder="请输入机构名称"></el-input>
width="55" </el-form-item>
:selectable="selectableTableList" <el-form-item>
:reserve-selection="true" <el-button size="small" type="primary" @click="searchOrganization()">搜索</el-button>
></el-table-column> </el-form-item>
<el-table-column prop="name" label="医院名称" min-width="100" align="center"></el-table-column> <el-form-item style="float:right;">
<el-table-column prop="hospitalLevelName" label="医院级别" align="center"></el-table-column> <el-button-group>
<el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column> <el-button
<el-table-column prop="cityName" label="所属城市" align="center"></el-table-column> size="small"
<el-table-column prop="countyName" label="所属区县" align="center"></el-table-column> type="default"
<el-table-column prop="townName" label="所属街道" align="center"></el-table-column> @click="checkAll(true,'multipleOrganization')"
<div slot="empty"> >选择全部</el-button>
<div class="table-empty"> <el-button
<img src="../../assets/image/no-content1.png"> size="small"
<p>没有机构信息</p> type="default"
@click="checkAll(false,'multipleOrganization')"
>全部不选</el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table
class="rim"
ref="multipleOrganization"
:data="tableOrganization"
tooltip-effect="dark"
style="width: 100%"
@selection-change="selectionChangeOrganization"
:row-key="getRowKeys"
>
<el-table-column
type="selection"
width="55"
:selectable="selectableTableList"
:reserve-selection="true"
></el-table-column>
<el-table-column prop="name" label="医院名称" min-width="100" align="center"></el-table-column>
<el-table-column prop="hospitalLevelName" label="医院级别" align="center"></el-table-column>
<el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column>
<el-table-column prop="cityName" label="所属城市" align="center"></el-table-column>
<el-table-column prop="countyName" label="所属区县" align="center"></el-table-column>
<el-table-column prop="townName" label="所属街道" align="center"></el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png">
<p>没有机构信息</p>
</div>
</div> </div>
</el-table>
<div class="pagination">
<el-pagination
background
@size-change="handleSizeOrganization"
@current-change="handleCurrentOrganization"
:current-page="formOrganization.pageNum"
:page-sizes="[10, 20, 40]"
:page-size="formOrganization.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalOrganization"
></el-pagination>
</div> </div>
</el-table> </el-tab-pane>
<div class="pagination"> <el-tab-pane label="设定科室" name="third">
<el-pagination <el-col :span="8">
background <el-table
@size-change="handleSizeOrganization" class="department"
@current-change="handleCurrentOrganization" ref="multipleDepartment"
:current-page="formOrganization.pageNum" :data="tableDepartment"
:page-sizes="[10, 20, 40]" tooltip-effect="dark"
:page-size="formOrganization.pageSize" style="width: 100%"
layout="total, sizes, prev, pager, next, jumper" @selection-change="selectionChangeDepartment"
:total="totalOrganization" >
></el-pagination> <el-table-column
</div> type="selection"
</el-tab-pane> width="55"
<el-tab-pane label="设定科室" name="third"> :selectable="selectableTableList"
<el-col :span="8"> ></el-table-column>
<el-table-column prop="name" label="科室名称" align="center"></el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png">
<p>没有科室信息</p>
</div>
</div>
</el-table>
</el-col>
</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-select size="small" v-model="formPerson.departmentId" placeholder="全部科室">
<el-option
v-for="item in departmentList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label>
<el-input size="small" v-model="formPerson.name" placeholder="请输入人员名称"></el-input>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="searchPeople">搜索</el-button>
</el-form-item>
<el-form-item style="float:right;">
<el-button-group>
<el-button
size="small"
type="default"
@click="checkAll(true,'multiplePerson')"
>选择全部</el-button>
<el-button
size="small"
type="default"
@click="checkAll(false,'multiplePerson')"
>全部不选</el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table <el-table
class="department" class="rim"
ref="multipleDepartment" ref="multiplePerson"
:data="tableDepartment" :data="tablePerson"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
@selection-change="selectionChangeDepartment" @selection-change="selectionChangePerson"
:row-key="getRowKeysPerson"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
:reserve-selection="true"
:selectable="selectableTableList" :selectable="selectableTableList"
></el-table-column> ></el-table-column>
<el-table-column prop="name" label="科室名称" align="center"></el-table-column> <el-table-column prop="name" label="人员名称" align="center"></el-table-column>
<el-table-column prop="hospitalName" label="所属医院" align="center"></el-table-column>
<el-table-column prop="departmentName" label="所属科室" align="center"></el-table-column>
<el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column>
<el-table-column prop="cityName" label="所属城市" align="center"></el-table-column>
<el-table-column prop="countyName" label="所属区县" align="center"></el-table-column>
<div slot="empty"> <div slot="empty">
<div class="table-empty"> <div class="table-empty">
<img src="../../assets/image/no-content1.png"> <img src="../../assets/image/no-content1.png">
<p>没有科室信息</p> <p>没有人员信息</p>
</div> </div>
</div> </div>
</el-table> </el-table>
</el-col> <div class="pagination">
</el-tab-pane> <el-pagination
<el-tab-pane label="设定人员" name="fourth"> background
<el-form :inline="true" :model="formPerson" class="demo-form-inline"> @size-change="handleSizePerson"
@current-change="handleCurrentPerson"
:current-page="formPerson.pageNum"
:page-sizes="[10, 20, 40]"
:page-size="formPerson.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalPerson"
></el-pagination>
</div>
</el-tab-pane>
</el-tabs>
</div>
<div v-else>
<el-form :inline="true" :model="formOrganization" class="demo-form-inline">
<el-form-item label> <el-form-item label>
<el-select size="small" v-model="formPerson.hospitalId" placeholder="全部医院"> <el-select
<el-option size="small"
v-for="(item, index) in hospitalList" v-model="formEcology.id"
:key="index" placeholder="选择小生态"
:label="item.label" v-if="idType != 2"
:value="item.value" @change="selectChangeEcology"
></el-option> >
</el-select>
</el-form-item>
<el-form-item>
<el-select size="small" v-model="formPerson.departmentId" placeholder="全部科室">
<el-option <el-option
v-for="item in departmentList" v-for="item in ecologySelect"
:key="item.value" :key="item.id"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label> <span class="span_ecology">范围</span>
<el-input size="small" v-model="formPerson.name" placeholder="请输入人员名称"></el-input>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="searchPeople">搜索</el-button>
</el-form-item>
<el-form-item style="float:right;"> <el-form-item style="float:right;">
<el-button-group> <el-button-group>
<el-button <el-button
size="small" size="small"
type="default" type="default"
@click="checkAll(true,'multiplePerson')" @click="checkAll(true,'multipleEcology')"
>选择全部</el-button> >选择全部</el-button>
<el-button <el-button
size="small" size="small"
type="default" type="default"
@click="checkAll(false,'multiplePerson')" @click="checkAll(false,'multipleEcology')"
>全部不选</el-button> >全部不选</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
class="rim" class="rim"
ref="multiplePerson" ref="multipleEcology"
:data="tablePerson" :data="tableEcology"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
@selection-change="selectionChangePerson" @selection-change="selectionChangeEcology"
:row-key="getRowKeysPerson" :row-key="getRowKeysEcology"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
:reserve-selection="true" :selectable="selectableTableList"
:selectable="selectableTableList" :reserve-selection="true"
></el-table-column> ></el-table-column>
<el-table-column prop="name" label="人员名称" align="center"></el-table-column> <el-table-column prop="name" label="医院名称" min-width="100" align="center"></el-table-column>
<el-table-column prop="hospitalName" label="所属医院" align="center"></el-table-column> <el-table-column prop="hospitalLevelName" label="医院级别" align="center"></el-table-column>
<el-table-column prop="departmentName" label="所属科室" align="center"></el-table-column> <el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column>
<el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column> <el-table-column prop="cityName" label="所属城市" align="center"></el-table-column>
<el-table-column prop="cityName" label="所属城市" align="center"></el-table-column> <el-table-column prop="countyName" label="所属区县" align="center"></el-table-column>
<el-table-column prop="countyName" label="所属区县" align="center"></el-table-column> <el-table-column prop="townName" label="所属街道" align="center"></el-table-column>
<div slot="empty"> <div slot="empty">
<div class="table-empty"> <div class="table-empty">
<img src="../../assets/image/no-content1.png"> <img src="../../assets/image/no-content1.png">
<p>没有人员信息</p> <p>没有机构信息</p>
</div>
</div> </div>
</el-table>
<div class="pagination">
<el-pagination
background
@size-change="handleSizePerson"
@current-change="handleCurrentPerson"
:current-page="formPerson.pageNum"
:page-sizes="[10, 20, 40]"
:page-size="formPerson.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalPerson"
></el-pagination>
</div> </div>
</el-tab-pane> </el-table>
</el-tabs> <div class="pagination">
<el-pagination
background
@size-change="handleSizeEcology"
@current-change="handleCurrentEcology"
:current-page="formEcology.pageNum"
:page-sizes="[10, 20, 40]"
:page-size="formEcology.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalEcology"
></el-pagination>
</div>
</div>
<el-dialog title :visible.sync="dialogShow" width="40%" center> <el-dialog title :visible.sync="dialogShow" width="40%" center>
<p class="dialog-p">设定范围数据已经被其他管理员修改,是否强制提交进行覆盖</p> <p class="dialog-p">设定范围数据已经被其他管理员修改,是否强制提交进行覆盖</p>
...@@ -577,7 +665,8 @@ export default { ...@@ -577,7 +665,8 @@ export default {
attachmentUrl2: "", attachmentUrl2: "",
attachmentUrl3: "", attachmentUrl3: "",
attachmentMore1: {}, attachmentMore1: {},
attachmentMore2: {} attachmentMore2: {},
range: 1,
}, },
pickerOptions0: { pickerOptions0: {
disabledDate: time => { disabledDate: time => {
...@@ -682,6 +771,21 @@ export default { ...@@ -682,6 +771,21 @@ export default {
//搜索类型 //搜索类型
searchOrganizationType: '', searchOrganizationType: '',
searchPeopleType: '', searchPeopleType: '',
//小生态
ecologySelect: [],
formEcology: {
id: '',
pageNum: 1,
pageSize: 10,
},
totalEcology: 0,
tableEcology: [],
getRowKeysEcology(row) {
return row.id;
},
lookedEcology: [],
changedEcology: [],
changedEcology2: [],
//选择项目组件 数据 //选择项目组件 数据
optionsComponent: [], optionsComponent: [],
optionsCertificate: [], optionsCertificate: [],
...@@ -839,7 +943,8 @@ export default { ...@@ -839,7 +943,8 @@ export default {
attachmentName: editData.attachmentData[1].attachmentName, attachmentName: editData.attachmentData[1].attachmentName,
attachmentExt: editData.attachmentData[1].attachmentExt, attachmentExt: editData.attachmentData[1].attachmentExt,
attachmentSize: editData.attachmentData[1].attachmentSize attachmentSize: editData.attachmentData[1].attachmentSize
} },
range: 2
}; };
if (editData.attachmentData.length > 2) { if (editData.attachmentData.length > 2) {
for (let i = 2; i < editData.attachmentData.length; i++) { for (let i = 2; i < editData.attachmentData.length; i++) {
...@@ -966,10 +1071,16 @@ export default { ...@@ -966,10 +1071,16 @@ export default {
this.projectId = res.data.id; this.projectId = res.data.id;
this.projectStatus = res.data.projectStatus; this.projectStatus = res.data.projectStatus;
this.idTypeProject = res.data.idType; this.idTypeProject = res.data.idType;
this.operationLast(); this.operationLast();
if (option != "storage" && option != "storageEdit") { if (option != "storage" && option != "storageEdit") {
this.active++; this.active++;
this.stepData = [false, true, false]; this.stepData = [false, true, false];
if(this.formData.range == 2) {
this.getEcologySelect();
this.getEcology();
return;
}
// this.projectId = res.data.id; // this.projectId = res.data.id;
this.initRange(); this.initRange();
this.getDepartment(); this.getDepartment();
...@@ -1821,6 +1932,35 @@ export default { ...@@ -1821,6 +1932,35 @@ export default {
"没", "没",
this.changedPerson2 this.changedPerson2
); );
},
selectionChangeDepartment(val) {
this.multipleSelectionDepartment = val;
//console.log(this.multipleSelectionDepartment);
},
//改变小生态 table check
selectionChangeEcology(rows) {
this.changedEcology = [];
this.changedEcology2 = [];
if (rows) {
rows.forEach(row => {
if (row) {
this.changedEcology.push(row.id);
}
});
}
this.changedEcology2 = operationData.getDifference(
this.lookedEcology,
this.changedEcology
);
console.log(
"选",
this.changedEcology,
"没",
this.changedEcology2
);
},
selectChangeEcology() {
}, },
//设定机构table全选 //设定机构table全选
checkAll(flag, name) { checkAll(flag, name) {
...@@ -2488,6 +2628,14 @@ export default { ...@@ -2488,6 +2628,14 @@ export default {
} }
return list; return list;
}, },
getEcologySelect() {
this.ecologySelect = operationData.getEcologySelect();
},
//获取小生态数据
getEcology() {
this.tableEcology = operationData.getEcologyList();
},
//
//机构table修改 //机构table修改
handleSizeOrganization(val) { handleSizeOrganization(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
...@@ -2516,6 +2664,20 @@ export default { ...@@ -2516,6 +2664,20 @@ export default {
this.getPeople(); this.getPeople();
} }
}, },
handleSizeEcology(val) {
console.log(`每页 ${val} 条`);
this.formEcology.pageSize = val;
},
handleCurrentEcology(val) {
console.log(`当前页: ${val}`);
this.formEcology.pageNum = val;
this.getEcology();
// if(this.searchPeopleType == 'choose') {
// this.getPeopleChoose();
// } else {
// this.getPeople();
// }
},
//行政范围改变更新设定机构和设定人员 //行政范围改变更新设定机构和设定人员
updateOrganizationAndPerson(allSelectedKeys) { updateOrganizationAndPerson(allSelectedKeys) {
this.tableOrganization = []; this.tableOrganization = [];
...@@ -2661,6 +2823,11 @@ export default { ...@@ -2661,6 +2823,11 @@ export default {
} }
.first-step { .first-step {
margin-top: 20px; margin-top: 20px;
.p_label {
margin-left: 56px;
font-size: 12px;
color: #606266;
}
.basic-item-icon { .basic-item-icon {
position: relative; position: relative;
.require { .require {
...@@ -2737,6 +2904,10 @@ export default { ...@@ -2737,6 +2904,10 @@ export default {
} }
.second-step { .second-step {
margin: 10px 0 0 20px; margin: 10px 0 0 20px;
.span_ecology {
line-height: 45px;
margin-left: 8px;
}
.dialog-p { .dialog-p {
text-align: center; text-align: center;
span { span {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册