|
@@ -4,54 +4,24 @@
|
|
|
<div class="squrt"></div>
|
|
|
教学点管理
|
|
|
</h2>
|
|
|
- <div
|
|
|
- class="m-core"
|
|
|
- v-if="
|
|
|
- (tableList.length > 0 ||
|
|
|
- pageInfo.page > 1 ||
|
|
|
- searchForm.search ||
|
|
|
- searchForm.organId ||
|
|
|
- searchForm.publicFlag) &&
|
|
|
- contextFlag
|
|
|
- "
|
|
|
- >
|
|
|
- <save-form
|
|
|
- :inline="true"
|
|
|
- class="searchForm"
|
|
|
- @submit="search"
|
|
|
- @reset="onReset"
|
|
|
- :model="searchForm"
|
|
|
- >
|
|
|
+ <div class="m-core" v-if="(tableList.length > 0 ||
|
|
|
+ pageInfo.page > 1 ||
|
|
|
+ searchForm.search ||
|
|
|
+ searchForm.organId ||
|
|
|
+ searchForm.publicFlag) &&
|
|
|
+ contextFlag
|
|
|
+ ">
|
|
|
+ <save-form :inline="true" class="searchForm" @submit="search" @reset="onReset" :model="searchForm">
|
|
|
<el-form-item>
|
|
|
- <el-input
|
|
|
- type="text"
|
|
|
- clearable
|
|
|
- v-model.trim="searchForm.search"
|
|
|
- placeholder="教学点名称"
|
|
|
- ></el-input>
|
|
|
+ <el-input type="text" clearable v-model.trim="searchForm.search" placeholder="教学点名称"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-select
|
|
|
- v-model.trim="searchForm.organId"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="请选择分部"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in selects.branchs"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model.trim="searchForm.organId" clearable filterable placeholder="请选择分部">
|
|
|
+ <el-option v-for="item in selects.branchs" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-select
|
|
|
- v-model.trim="searchForm.publicFlag"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="可用状态"
|
|
|
- >
|
|
|
+ <el-select v-model.trim="searchForm.publicFlag" clearable filterable placeholder="可用状态">
|
|
|
<el-option label="个人" value="0"></el-option>
|
|
|
<el-option label="公共" value="1"></el-option>
|
|
|
</el-select>
|
|
@@ -59,40 +29,22 @@
|
|
|
<el-form-item>
|
|
|
<el-button native-type="submit" type="danger">搜索</el-button>
|
|
|
<el-button native-type="reset" type="primary">重置</el-button>
|
|
|
- <el-button
|
|
|
- @click="onExport"
|
|
|
- type="primary"
|
|
|
- v-permission="'export/exportSchoolList'"
|
|
|
- >导出</el-button
|
|
|
- >
|
|
|
+ <el-button @click="onExport" type="primary" v-permission="'export/exportSchoolList'">导出</el-button>
|
|
|
</el-form-item>
|
|
|
</save-form>
|
|
|
- <el-button
|
|
|
- @click="openTeaching('create')"
|
|
|
- v-permission="'school/add'"
|
|
|
- type="primary"
|
|
|
- style="margin-bottom: 20px"
|
|
|
- >
|
|
|
+ <el-button @click="openTeaching('create')" v-permission="'school/add'" type="primary" style="margin-bottom: 20px">
|
|
|
新建
|
|
|
</el-button>
|
|
|
<!-- 列表 -->
|
|
|
<div class="tableWrap">
|
|
|
- <el-table
|
|
|
- :data="tableList"
|
|
|
- :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
|
|
|
- >
|
|
|
+ <el-table :data="tableList" :header-cell-style="{ background: '#EDEEF0', color: '#444' }">
|
|
|
<el-table-column align="center" width="55" prop="id" label="编号">
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" prop="name" label="教学点名称">
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" prop="organName" label="所属分部">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="教学点来源"
|
|
|
- :formatter="filterOrgan"
|
|
|
- width="120px"
|
|
|
- >
|
|
|
+ <el-table-column align="center" label="教学点来源" :formatter="filterOrgan" width="120px">
|
|
|
<!-- <template slot-scope="scope">
|
|
|
{{ scope.row.cooperationOrganId ? scope.row.cooperationOrganId : '租赁' }}
|
|
|
</template> -->
|
|
@@ -125,162 +77,74 @@
|
|
|
</el-table-column> -->
|
|
|
<el-table-column align="center" label="操作">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- @click="openTeaching('update', scope.row)"
|
|
|
- v-if="$helpers.permission('school/update')"
|
|
|
- type="text"
|
|
|
- >修改</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- v-if="scope.row.delFlag == 0 && $helpers.permission('school/update/stop')"
|
|
|
- @click="onUpdateSubmit(scope.row, 2)"
|
|
|
- type="text"
|
|
|
- >停用</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- v-if="scope.row.delFlag == 2 && $helpers.permission('school/update/open')"
|
|
|
- @click="onUpdateSubmit(scope.row, 0)"
|
|
|
- type="text"
|
|
|
- >启用</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- @click="onUpdateSubmit(scope.row, 1)"
|
|
|
- v-if="$helpers.permission('school/update/del')"
|
|
|
- type="text"
|
|
|
- >删除</el-button
|
|
|
- >
|
|
|
+ <el-button @click="openTeaching('update', scope.row)" v-if="$helpers.permission('school/update')"
|
|
|
+ type="text">修改</el-button>
|
|
|
+ <el-button v-if="scope.row.delFlag == 0 && $helpers.permission('school/update/stop')"
|
|
|
+ @click="onUpdateSubmit(scope.row, 2)" type="text">停用</el-button>
|
|
|
+ <el-button v-if="scope.row.delFlag == 2 && $helpers.permission('school/update/open')"
|
|
|
+ @click="onUpdateSubmit(scope.row, 0)" type="text">启用</el-button>
|
|
|
+ <el-button @click="onUpdateSubmit(scope.row, 1)" v-if="$helpers.permission('school/update/del')"
|
|
|
+ type="text">删除</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <pagination
|
|
|
- sync
|
|
|
- :total.sync="pageInfo.total"
|
|
|
- :page.sync="pageInfo.page"
|
|
|
- :limit.sync="pageInfo.limit"
|
|
|
- :page-sizes="pageInfo.page_size"
|
|
|
- @pagination="getList"
|
|
|
- />
|
|
|
+ <pagination sync :total.sync="pageInfo.total" :page.sync="pageInfo.page" :limit.sync="pageInfo.limit"
|
|
|
+ :page-sizes="pageInfo.page_size" @pagination="getList" />
|
|
|
</div>
|
|
|
</div>
|
|
|
- <emptyPage
|
|
|
- @submit="openTeaching('create')"
|
|
|
- title="教学点管理"
|
|
|
- btnTitle="新建教学点"
|
|
|
- :context="context"
|
|
|
- v-if="
|
|
|
- !(
|
|
|
- tableList.length > 0 ||
|
|
|
- pageInfo.page > 1 ||
|
|
|
- searchForm.search ||
|
|
|
- searchForm.organId ||
|
|
|
- searchForm.publicFlag
|
|
|
- ) && contextFlag
|
|
|
- "
|
|
|
- />
|
|
|
- <el-dialog
|
|
|
- :title="formTitle[formActionTitle]"
|
|
|
- :visible.sync="teachingStatus"
|
|
|
- @close="onFormClose('ruleForm')"
|
|
|
- width="500px"
|
|
|
- >
|
|
|
+ <emptyPage @submit="openTeaching('create')" title="教学点管理" btnTitle="新建教学点" :context="context" v-if="!(
|
|
|
+ tableList.length > 0 ||
|
|
|
+ pageInfo.page > 1 ||
|
|
|
+ searchForm.search ||
|
|
|
+ searchForm.organId ||
|
|
|
+ searchForm.publicFlag
|
|
|
+ ) && contextFlag
|
|
|
+ " />
|
|
|
+ <el-dialog :title="formTitle[formActionTitle]" :visible.sync="teachingStatus" @close="onFormClose('ruleForm')"
|
|
|
+ width="500px">
|
|
|
<el-form :model="form" :rules="rules" ref="ruleForm">
|
|
|
<el-form-item label="教学点名称" prop="name" :label-width="formLabelWidth">
|
|
|
<el-input v-model.trim="form.name" autocomplete="off"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="教学点来源" prop="source" :label-width="formLabelWidth">
|
|
|
<template v-if="formActionTitle == 'update'">
|
|
|
- <el-select
|
|
|
- v-model.trim="form.source"
|
|
|
- style="width: 100% !important"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- disabled
|
|
|
- >
|
|
|
+ <el-select v-model.trim="form.source" style="width: 100% !important" filterable clearable disabled>
|
|
|
<el-option label="合作单位" value="1"></el-option>
|
|
|
<el-option label="租赁" value="2"></el-option>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
- <el-select
|
|
|
- v-model.trim="form.source"
|
|
|
- filterable
|
|
|
- style="width: 100% !important"
|
|
|
- clearable
|
|
|
- >
|
|
|
+ <el-select v-model.trim="form.source" filterable style="width: 100% !important" clearable>
|
|
|
<el-option label="合作单位" value="1"></el-option>
|
|
|
<el-option label="租赁" value="2"></el-option>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- v-if="form.source == 1"
|
|
|
- prop="cooperationOrganId"
|
|
|
- label="合作单位"
|
|
|
- :label-width="formLabelWidth"
|
|
|
- >
|
|
|
- <el-select
|
|
|
- v-model.trim="form.cooperationOrganId"
|
|
|
- filterable
|
|
|
- style="width: 100% !important"
|
|
|
- clearable
|
|
|
- @change="onCooperationChange"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in cooperationList"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-form-item v-if="form.source == 1" prop="cooperationOrganId" label="合作单位" :label-width="formLabelWidth">
|
|
|
+ <el-select v-model.trim="form.cooperationOrganId" filterable style="width: 100% !important" clearable
|
|
|
+ @change="onCooperationChange">
|
|
|
+ <el-option v-for="item in cooperationList" :key="item.value" :label="item.label"
|
|
|
+ :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- v-if="formActionTitle == 'update'"
|
|
|
- prop="user"
|
|
|
- label="可用状态"
|
|
|
- :label-width="formLabelWidth"
|
|
|
- >
|
|
|
+ <el-form-item v-if="formActionTitle == 'update'" prop="user" label="可用状态" :label-width="formLabelWidth">
|
|
|
<el-input v-model="form.user" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- v-if="form.source == 2"
|
|
|
- prop="remark"
|
|
|
- label="租赁费用"
|
|
|
- :label-width="formLabelWidth"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model.trim="form.remark"
|
|
|
- type="number"
|
|
|
- autocomplete="off"
|
|
|
- ></el-input>
|
|
|
+ <el-form-item v-if="form.source == 2" prop="remark" label="租赁费用" :label-width="formLabelWidth">
|
|
|
+ <el-input v-model.trim="form.remark" type="number" autocomplete="off"></el-input>
|
|
|
</el-form-item>
|
|
|
<!-- v-if="form.source == 2" -->
|
|
|
<el-form-item prop="organId" label="所属分部" :label-width="formLabelWidth">
|
|
|
- <el-select
|
|
|
- :disabled="form.source != 2"
|
|
|
- v-model.trim="form.organId"
|
|
|
- clearable
|
|
|
- style="width: 100% !important"
|
|
|
- filterable
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in selects.branchs"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
+ <el-select :disabled="form.source != 2" v-model.trim="form.organId" clearable style="width: 100% !important"
|
|
|
+ filterable>
|
|
|
+ <el-option v-for="item in selects.branchs" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<!-- :show-message="addressMessage" -->
|
|
|
<el-form-item prop="address" label="上课地点" :label-width="formLabelWidth">
|
|
|
<el-input class="text-address" v-model.trim="form.address" :disabled="true">
|
|
|
<template slot="append">
|
|
|
- <el-button
|
|
|
- class="addMapBtn"
|
|
|
- @click="addMap"
|
|
|
- type="primary"
|
|
|
- icon="el-icon-plus"
|
|
|
- >选择</el-button
|
|
|
- >
|
|
|
+ <el-button class="addMapBtn" @click="addMap" type="primary" icon="el-icon-plus">选择</el-button>
|
|
|
</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
@@ -301,35 +165,16 @@
|
|
|
<el-button type="primary" @click="onTeachingSubmit('ruleForm')">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
- <el-dialog
|
|
|
- :close-on-click-modal="false"
|
|
|
- title="选择地图"
|
|
|
- custom-class="map-container"
|
|
|
- :visible.sync="mapStatus"
|
|
|
- width="800px"
|
|
|
- >
|
|
|
+ <el-dialog :close-on-click-modal="false" title="选择地图" custom-class="map-container" :visible.sync="mapStatus"
|
|
|
+ width="800px">
|
|
|
<div style="padding: 0 20px">
|
|
|
- <el-alert
|
|
|
- style="margin: 10px 0"
|
|
|
- title="选中地点:"
|
|
|
- :closable="false"
|
|
|
- type="info"
|
|
|
- :description="addressDetail.address"
|
|
|
- >
|
|
|
+ <el-alert style="margin: 10px 0" title="选中地点:" :closable="false" type="info" :description="addressDetail.address">
|
|
|
</el-alert>
|
|
|
- <el-amap-search-box
|
|
|
- class="search-box"
|
|
|
- value="searchValue"
|
|
|
- :search-option="searchOption"
|
|
|
- :on-search-result="onSearchResult"
|
|
|
- ></el-amap-search-box>
|
|
|
+ <el-amap-search-box class="search-box" value="searchValue" :search-option="searchOption"
|
|
|
+ :on-search-result="onSearchResult"></el-amap-search-box>
|
|
|
<el-amap :zoom="zoom" :plugin="plugin" :center="center" :events="events">
|
|
|
- <el-amap-marker
|
|
|
- :events="markerEvents()"
|
|
|
- v-for="(marker, index) in markers"
|
|
|
- :key="index"
|
|
|
- :position="marker"
|
|
|
- ></el-amap-marker>
|
|
|
+ <el-amap-marker :events="markerEvents()" v-for="(marker, index) in markers" :key="index"
|
|
|
+ :position="marker"></el-amap-marker>
|
|
|
</el-amap>
|
|
|
</div>
|
|
|
|
|
@@ -357,7 +202,7 @@ import cleanDeep from "clean-deep";
|
|
|
});
|
|
|
document.addEventListener("testPassive", null, opts);
|
|
|
document.removeEventListener("testPassive", null, opts);
|
|
|
- } catch (e) {}
|
|
|
+ } catch (e) { }
|
|
|
|
|
|
EventTarget.prototype.addEventListener = function (type, fn, capture) {
|
|
|
this.func = func;
|
|
@@ -378,7 +223,7 @@ import store from "@/store";
|
|
|
import VueAMap from "vue-amap";
|
|
|
// Vue.use(VueAMap)
|
|
|
VueAMap.initAMapApiLoader({
|
|
|
- key: "fa90e24ad5e923f446635d068cacf794",
|
|
|
+ key: "ac943ac1522de0d63eb8a99b71fe2601",
|
|
|
plugin: ["AMap.Geolocation", "AMap.PlaceSearch", "AMap.Geocoder", "Geocoder"],
|
|
|
v: "1.4.4",
|
|
|
});
|
|
@@ -433,7 +278,7 @@ export default {
|
|
|
subsidy: [{ type: "number", message: "课酬补贴只能为数字", trigger: "blur" }],
|
|
|
},
|
|
|
events: {
|
|
|
- init(o) {},
|
|
|
+ init(o) { },
|
|
|
zoomchange: (e) => {
|
|
|
// console.log(e);
|
|
|
},
|
|
@@ -793,27 +638,33 @@ export default {
|
|
|
.el-select {
|
|
|
width: auto !important;
|
|
|
}
|
|
|
+
|
|
|
.el-vue-amap-container {
|
|
|
width: 100%;
|
|
|
height: 50vh !important;
|
|
|
}
|
|
|
+
|
|
|
* {
|
|
|
// touch-action: pan-y;
|
|
|
touch-action: none;
|
|
|
}
|
|
|
+
|
|
|
.map-container {
|
|
|
.el-dialog__body {
|
|
|
padding: 0;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.addMapBtn {
|
|
|
background-color: var(--color-primary) !important;
|
|
|
color: #fff !important;
|
|
|
}
|
|
|
+
|
|
|
.el-input-group__append {
|
|
|
background: #f5f7fa;
|
|
|
border-color: #dcdfe6;
|
|
|
color: #909399;
|
|
|
+
|
|
|
&:hover,
|
|
|
&:active,
|
|
|
&:focus {
|
|
@@ -822,6 +673,7 @@ export default {
|
|
|
color: #909399;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.el-vue-search-box-container {
|
|
|
position: absolute !important;
|
|
|
left: 30px;
|