|
@@ -67,14 +67,9 @@
|
|
{{ scope.row.cooperationOrganId ? scope.row.cooperationOrganId : '租赁' }}
|
|
{{ scope.row.cooperationOrganId ? scope.row.cooperationOrganId : '租赁' }}
|
|
</template> -->
|
|
</template> -->
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column
|
|
|
|
- align="center"
|
|
|
|
- label="可用状态"
|
|
|
|
-
|
|
|
|
- width="120px"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-table-column align="center" label="可用状态" width="120px">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- {{ scope.row.userId ? scope.row.userName : '公共' }}
|
|
|
|
|
|
+ {{ scope.row.userId ? scope.row.userName : "公共" }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="center" width="120px" label="租赁费用">
|
|
<el-table-column align="center" width="120px" label="租赁费用">
|
|
@@ -107,13 +102,19 @@
|
|
>修改</el-button
|
|
>修改</el-button
|
|
>
|
|
>
|
|
<el-button
|
|
<el-button
|
|
- v-if="scope.row.delFlag == 0 && $helpers.permission('school/update/stop')"
|
|
|
|
|
|
+ v-if="
|
|
|
|
+ scope.row.delFlag == 0 &&
|
|
|
|
+ $helpers.permission('school/update/stop')
|
|
|
|
+ "
|
|
@click="onUpdateSubmit(scope.row, 2)"
|
|
@click="onUpdateSubmit(scope.row, 2)"
|
|
type="text"
|
|
type="text"
|
|
>停用</el-button
|
|
>停用</el-button
|
|
>
|
|
>
|
|
<el-button
|
|
<el-button
|
|
- v-if="scope.row.delFlag == 2 && $helpers.permission('school/update/open')"
|
|
|
|
|
|
+ v-if="
|
|
|
|
+ scope.row.delFlag == 2 &&
|
|
|
|
+ $helpers.permission('school/update/open')
|
|
|
|
+ "
|
|
@click="onUpdateSubmit(scope.row, 0)"
|
|
@click="onUpdateSubmit(scope.row, 0)"
|
|
type="text"
|
|
type="text"
|
|
>启用</el-button
|
|
>启用</el-button
|
|
@@ -203,22 +204,32 @@
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item
|
|
<el-form-item
|
|
|
|
+ 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"
|
|
v-if="form.source == 2"
|
|
prop="remark"
|
|
prop="remark"
|
|
label="租赁费用"
|
|
label="租赁费用"
|
|
:label-width="formLabelWidth"
|
|
:label-width="formLabelWidth"
|
|
>
|
|
>
|
|
- <el-input v-model.trim="form.remark" type="number" autocomplete="off"></el-input>
|
|
|
|
|
|
+ <el-input
|
|
|
|
+ v-model.trim="form.remark"
|
|
|
|
+ type="number"
|
|
|
|
+ autocomplete="off"
|
|
|
|
+ ></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<!-- v-if="form.source == 2" -->
|
|
<!-- v-if="form.source == 2" -->
|
|
<el-form-item
|
|
<el-form-item
|
|
-
|
|
|
|
prop="organId"
|
|
prop="organId"
|
|
label="所属分部"
|
|
label="所属分部"
|
|
:label-width="formLabelWidth"
|
|
:label-width="formLabelWidth"
|
|
>
|
|
>
|
|
<el-select
|
|
<el-select
|
|
- :disabled="form.source != 2"
|
|
|
|
|
|
+ :disabled="form.source != 2"
|
|
v-model.trim="form.organId"
|
|
v-model.trim="form.organId"
|
|
clearable
|
|
clearable
|
|
style="width: 100% !important"
|
|
style="width: 100% !important"
|
|
@@ -232,10 +243,9 @@
|
|
></el-option>
|
|
></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <!-- :show-message="addressMessage" -->
|
|
|
|
|
|
+ <!-- :show-message="addressMessage" -->
|
|
<el-form-item
|
|
<el-form-item
|
|
prop="address"
|
|
prop="address"
|
|
-
|
|
|
|
label="上课地点"
|
|
label="上课地点"
|
|
:label-width="formLabelWidth"
|
|
:label-width="formLabelWidth"
|
|
>
|
|
>
|
|
@@ -400,7 +410,9 @@ export default {
|
|
source: [
|
|
source: [
|
|
{ required: true, message: "请选择教学点来源", trigger: "change" },
|
|
{ required: true, message: "请选择教学点来源", trigger: "change" },
|
|
],
|
|
],
|
|
- remark: [{ required: true, message: "请输入租赁费用", trigger: "blur" }],
|
|
|
|
|
|
+ remark: [
|
|
|
|
+ { required: true, message: "请输入租赁费用", trigger: "blur" },
|
|
|
|
+ ],
|
|
address: [
|
|
address: [
|
|
{ required: true, message: "请选择上课地点", trigger: "blur" },
|
|
{ required: true, message: "请选择上课地点", trigger: "blur" },
|
|
],
|
|
],
|
|
@@ -493,8 +505,8 @@ export default {
|
|
this.mapStatus = true;
|
|
this.mapStatus = true;
|
|
// let poi = this.addressDetail.poi
|
|
// let poi = this.addressDetail.poi
|
|
// let address = this.addressDetail.address
|
|
// let address = this.addressDetail.address
|
|
- this.addressDetail.address = this.form.address
|
|
|
|
- this.addressDetail.poi = this.form.longitudeLatitude
|
|
|
|
|
|
+ this.addressDetail.address = this.form.address;
|
|
|
|
+ this.addressDetail.poi = this.form.longitudeLatitude;
|
|
let poi = this.form.longitudeLatitude;
|
|
let poi = this.form.longitudeLatitude;
|
|
let address = this.form.address;
|
|
let address = this.form.address;
|
|
// 获取经纬度
|
|
// 获取经纬度
|
|
@@ -521,6 +533,7 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
onCooperationChange(value) {
|
|
onCooperationChange(value) {
|
|
|
|
+ this.form.organId = null
|
|
this.cooperationList.forEach((item) => {
|
|
this.cooperationList.forEach((item) => {
|
|
if (item.value == value) {
|
|
if (item.value == value) {
|
|
// this.selectOrganId = item.organId
|
|
// this.selectOrganId = item.organId
|
|
@@ -549,10 +562,10 @@ export default {
|
|
},
|
|
},
|
|
getpoient(e) {
|
|
getpoient(e) {
|
|
// let geocoder = new AMap.Geocoder()
|
|
// let geocoder = new AMap.Geocoder()
|
|
- let geocoder = null
|
|
|
|
- AMap.plugin(["AMap.Geocoder"], function() {
|
|
|
|
- geocoder = new AMap.Geocoder()
|
|
|
|
- })
|
|
|
|
|
|
+ let geocoder = null;
|
|
|
|
+ AMap.plugin(["AMap.Geocoder"], function () {
|
|
|
|
+ geocoder = new AMap.Geocoder();
|
|
|
|
+ });
|
|
let that = this;
|
|
let that = this;
|
|
geocoder.getAddress(e.lnglat, function (status, result) {
|
|
geocoder.getAddress(e.lnglat, function (status, result) {
|
|
if (status === "complete" && result.regeocode) {
|
|
if (status === "complete" && result.regeocode) {
|
|
@@ -571,7 +584,7 @@ export default {
|
|
ct.streetNumber,
|
|
ct.streetNumber,
|
|
poi: e.lnglat.lng + "," + e.lnglat.lat,
|
|
poi: e.lnglat.lng + "," + e.lnglat.lat,
|
|
};
|
|
};
|
|
- that.onSearchResult([{lng:e.lnglat.lng,lat:e.lnglat.lat}])
|
|
|
|
|
|
+ that.onSearchResult([{ lng: e.lnglat.lng, lat: e.lnglat.lat }]);
|
|
// console.log(that.form.address,that.form.longitudeLatitude)
|
|
// console.log(that.form.address,that.form.longitudeLatitude)
|
|
// that.form.address = result.regeocode.formattedAddress;
|
|
// that.form.address = result.regeocode.formattedAddress;
|
|
// that.mapStatus = false
|
|
// that.mapStatus = false
|
|
@@ -663,7 +676,8 @@ export default {
|
|
address: row.address.split(",").join(""), // 上课地点
|
|
address: row.address.split(",").join(""), // 上课地点
|
|
subsidy: row.subsidy, // 课酬补贴
|
|
subsidy: row.subsidy, // 课酬补贴
|
|
organId: row.organId,
|
|
organId: row.organId,
|
|
- longitudeLatitude:row.longitudeLatitude
|
|
|
|
|
|
+ longitudeLatitude: row.longitudeLatitude,
|
|
|
|
+ user:row.userName?row.userName:'公共'
|
|
};
|
|
};
|
|
}
|
|
}
|
|
},
|
|
},
|