elink-star
/
epmet-oper-gov
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'feature/dev_point_manage' into dev

test
wanggongfeng 3 years ago
parent
a6645fd490 cfdbb1d8cc
commit
2de4ec9c4e
4 changed files with 267 additions and 216 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 117
      src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
  2. 28
      src/views/modules/plugins/point/icpointnucleicmonitoring.vue
  3. 179
      src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
  4. 51
      src/views/modules/plugins/point/icpointvaccinesinoculation.vue

117
src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div style="height:600px;overflow:auto;padding: 20px;" class="form-class"> <div style="height: 600px; overflow: auto; padding: 20px" class="form-class">
<el-form <el-form
:model="dataForm" :model="dataForm"
:rules="dataRule" :rules="dataRule"
@ -8,7 +8,12 @@
label-width="120px" label-width="120px"
> >
<el-form-item label="所属组织名称" prop="orgId"> <el-form-item label="所属组织名称" prop="orgId">
<el-select v-model="dataForm.orgId" placeholder="所属组织名称" @change="orgChangeHandle" :disabled='dialogTitle == "查看"'> <el-select
v-model="dataForm.orgId"
placeholder="所属组织名称"
@change="orgChangeHandle"
:disabled="dialogTitle == '查看'"
>
<el-option <el-option
ref="org" ref="org"
v-for="item in organizationList" v-for="item in organizationList"
@ -23,7 +28,7 @@
<el-input <el-input
v-model="dataForm.name" v-model="dataForm.name"
placeholder="核酸检测点名称" placeholder="核酸检测点名称"
:disabled='dialogTitle == "查看"' :disabled="dialogTitle == '查看'"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="服务时间" prop="serveTime"> <el-form-item label="服务时间" prop="serveTime">
@ -32,7 +37,7 @@
type="textarea" type="textarea"
:rows="2" :rows="2"
placeholder="请输入服务时间，如：每日开放 上午：8:00-11:30 ；下午：13:00-17:00" placeholder="请输入服务时间，如：每日开放 上午：8:00-11:30 ；下午：13:00-17:00"
:disabled='dialogTitle == "查看"' :disabled="dialogTitle == '查看'"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="咨询电话" prop="mobile"> <el-form-item label="咨询电话" prop="mobile">
@ -40,13 +45,14 @@
v-model="dataForm.mobile" v-model="dataForm.mobile"
placeholder="咨询电话" placeholder="咨询电话"
:change="check_num()" :change="check_num()"
:disabled='dialogTitle == "查看"' :disabled="dialogTitle == '查看'"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="检测点地址" prop="address"> <el-form-item label="检测点地址" prop="address">
<el-input <el-input
v-model="dataForm.address" v-model="dataForm.address"
placeholder="例:青岛市时代国际广场" placeholder="例:青岛市时代国际广场"
style="width:65%;"
></el-input> ></el-input>
<el-button <el-button
style="margin-left: 10px" style="margin-left: 10px"
@ -56,7 +62,12 @@
>查询</el-button >查询</el-button
> >
</el-form-item> </el-form-item>
<el-form-item label="位置坐标" prop="longitude" style="display: block" class="position_label"> <el-form-item
label="位置坐标"
prop="longitude"
style="display: block"
class="position_label"
>
<div> <div>
<!-- <el-input <!-- <el-input
class="item_width_4" class="item_width_4"
@ -87,7 +98,7 @@
placeholder="请输入经度" placeholder="请输入经度"
v-model="dataForm.longitude" v-model="dataForm.longitude"
disabled disabled
style="width: 200px;margin-left: 20px;" style="width: 200px; margin-left: 20px"
> >
</el-input> </el-input>
<span style="margin-left: 20px">纬度</span> <span style="margin-left: 20px">纬度</span>
@ -97,7 +108,7 @@
placeholder="请输入纬度" placeholder="请输入纬度"
v-model="dataForm.latitude" v-model="dataForm.latitude"
disabled disabled
style="width: 200px;margin-left: 20px;" style="width: 200px; margin-left: 20px"
> >
</el-input> </el-input>
</div> </div>
@ -106,9 +117,12 @@
</el-form> </el-form>
<div class="submit"> <div class="submit">
<el-button @click="closeSubmit">{{ $t("cancel") }}</el-button> <el-button @click="closeSubmit">{{ $t("cancel") }}</el-button>
<el-button v-if='dialogTitle != "查看"' type="primary" @click="dataFormSubmitHandle()">{{ <el-button
$t("confirm") v-if="dialogTitle != '查看'"
}}</el-button> type="primary"
@click="dataFormSubmitHandle()"
>{{ $t("confirm") }}</el-button
>
</div> </div>
</div> </div>
</template> </template>
@ -134,8 +148,8 @@ export default {
serveTime: "", serveTime: "",
mobile: "", mobile: "",
address: "", address: "",
longitude: "120.38945519", longitude: '',
latitude: "36.0722275", latitude: '',
}, },
keyWords: null, keyWords: null,
organizationList: [], organizationList: [],
@ -213,29 +227,34 @@ export default {
mounted() { mounted() {
this.getFormInfo(); this.getFormInfo();
}, },
props:{ props: {
dialogTitle:{ dialogTitle: {
type:String, type: String,
default:'' default: "",
} },
}, },
methods: { methods: {
closeSubmit(){ closeSubmit() {
this.$emit('closeDialog') this.$emit("closeDialog");
}, },
orgChangeHandle(val){ orgChangeHandle(val) {
for(var i = 0 ; i < this.organizationList.length ; i++){ for (var i = 0; i < this.organizationList.length; i++) {
if( this.organizationList[i].orgId === val){ if (this.organizationList[i].orgId === val) {
this.dataForm.orgName=this.organizationList[i].orgName this.dataForm.orgName = this.organizationList[i].orgName;
return false return false;
} }
} }
}, },
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义 // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() { initMap() {
let { latitude, longitude } = this.dataForm;
// 定义地图中心点坐标 // 定义地图中心点坐标
let _this = this if (!latitude || latitude == "" || latitude == "0") {
var center = new window.TMap.LatLng(_this.dataForm.latitude, _this.dataForm.longitude); latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
console.log(latitude,longitude);
var center = new window.TMap.LatLng(latitude, longitude);
// 定义map变量，调用 TMap.Map() 构造函数创建地图 // 定义map变量，调用 TMap.Map() 构造函数创建地图
map = new window.TMap.Map(document.getElementById("map_add"), { map = new window.TMap.Map(document.getElementById("map_add"), {
center: center, // 设置地图中心点坐标 center: center, // 设置地图中心点坐标
@ -250,12 +269,14 @@ export default {
geometries: [], geometries: [],
}); });
infoWindowList = Array(10); infoWindowList = Array(10);
geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类 geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
// 监听地图平移结束 // 监听地图平移结束
map.on("panend", () => { map.on("panend", () => {
this.handleMoveCenter(); this.handleMoveCenter();
}); });
this.handleMoveCenter(); // this.handleMoveCenter()
this.convert(); this.convert();
}, },
handleMoveCenter() { handleMoveCenter() {
@ -278,7 +299,6 @@ export default {
// 在地图显示范围内以给定的关键字搜索地点 // 在地图显示范围内以给定的关键字搜索地点
search search
.searchRectangle({ .searchRectangle({
// keyword: this.keyWords,
keyword: this.dataForm.address, keyword: this.dataForm.address,
bounds: map.getBounds(), bounds: map.getBounds(),
}) })
@ -288,6 +308,7 @@ export default {
const { const {
location: { lat, lng }, location: { lat, lng },
} = data[0]; } = data[0];
map.setCenter(new TMap.LatLng(lat, lng)); map.setCenter(new TMap.LatLng(lat, lng));
this.setMarker(lat, lng); this.setMarker(lat, lng);
this.dataForm.latitude = lat; this.dataForm.latitude = lat;
@ -321,8 +342,14 @@ export default {
geocoder geocoder
.getAddress({ location: location }) // 将给定的坐标位置转换为地址 .getAddress({ location: location }) // 将给定的坐标位置转换为地址
.then((result) => { .then((result) => {
this.dataForm.address = result.result.address; this.dataForm.address =
this.dataForm.address !== "" &&
this.dataForm.address !== null &&
(this.dataForm.longitude === "" || this.dataForm.longitude === null)
? this.dataForm.address
: result.result.address;
// 显示搜索到的地址 // 显示搜索到的地址
console.log(this.dataForm.address);
}); });
}, },
@ -344,7 +371,7 @@ export default {
this.$http this.$http
.post(`/gov/org/agency/communityListByCustomerId`) .post(`/gov/org/agency/communityListByCustomerId`)
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (tMapres.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
} }
this.organizationList = res.data; this.organizationList = res.data;
@ -356,9 +383,8 @@ export default {
this.$refs["dataForm"].resetFields(); this.$refs["dataForm"].resetFields();
if (this.dataForm.id) { if (this.dataForm.id) {
this.getInfo(); this.getInfo();
}else{ } else {
this.dataForm.longitude = "120.38945519"
this.dataForm.latitude = "36.0722275"
this.initMap(); this.initMap();
} }
}); });
@ -376,11 +402,6 @@ export default {
...this.dataForm, ...this.dataForm,
...res.data, ...res.data,
}; };
if(!this.dataForm.longitude && !this.dataForm.latitude){
this.dataForm.longitude = "120.38945519"
this.dataForm.latitude = "36.0722275"
}
this.initMap(); this.initMap();
}) })
.catch(() => {}); .catch(() => {});
@ -398,7 +419,7 @@ export default {
) )
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.internalMsg); return this.$message.error(res.internalMsg ? res.internalMsg : res.msg);
} }
this.$message({ this.$message({
message: this.$t("prompt.success"), message: this.$t("prompt.success"),
@ -406,7 +427,7 @@ export default {
duration: 500, duration: 500,
onClose: () => { onClose: () => {
this.$emit("refreshDataList"); this.$emit("refreshDataList");
this.closeSubmit() this.closeSubmit();
}, },
}); });
}) })
@ -427,17 +448,17 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.position_label >>> .el-form-item__label::before{ .position_label >>> .el-form-item__label::before {
color:#fff!important; color: #fff !important;
} }
.submit{ .submit {
text-align: center; text-align: center;
margin: auto; margin: auto;
} }
.form-class .el-input{ .form-class .el-input {
width: 75%; width: 75%;
} }
.form-class .el-textarea{ .form-class .el-textarea {
width: 75%!important; width: 75% !important;
} }
</style> </style>

28
src/views/modules/plugins/point/icpointnucleicmonitoring.vue
View File

@ -11,7 +11,7 @@
ref="org" ref="org"
v-model="orgIds" v-model="orgIds"
:options="organizationList" :options="organizationList"
:props="{ checkStrictly: false, multiple: false, emitPath: true }" :props="{ checkStrictly: true, multiple: false, emitPath: true }"
style="width: 200px" style="width: 200px"
clearable clearable
@change="orgChangeHandle" @change="orgChangeHandle"
@ -112,13 +112,12 @@
v-loading="dataListLoading" v-loading="dataListLoading"
:data="dataList" :data="dataList"
border border
@selection-change="dataListSelectionChangeHandle" style="width: 100%; height: 564px"
style="width: 100%" ><el-table-column
> label="序号"
<el-table-column
type="selection"
header-align="center" header-align="center"
align="center" align="center"
type="index"
width="50" width="50"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
@ -181,15 +180,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination @size-change="pageSizeChangeHandle"
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle" @current-change="pageCurrentChangeHandle"
> :page-sizes="[20, 50, 100, 200]"
:page-size="limit"
layout="sizes, prev, pager, next, total"
:total="total">
</el-pagination> </el-pagination>
</div> </div>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
@ -499,6 +495,8 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 20px; margin-bottom: 20px;
margin-top: 10px;
margin-left: 10px;
} }
.div_left_table { .div_left_table {
margin-top: 10px; margin-top: 10px;
@ -507,7 +505,7 @@ export default {
border-radius: 5px; border-radius: 5px;
padding: 10px; padding: 10px;
} }
.dialog-h >>> .el-dialog__body{ .dialog-h >>> .el-dialog__body {
overflow: scroll; overflow: scroll;
} }
</style> </style>

179
src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div style="height:600px;overflow:auto;padding: 20px;" class="form-class"> <div style="height: 600px; overflow: auto; padding: 20px" class="form-class">
<el-form <el-form
:model="dataForm" :model="dataForm"
:rules="dataRule" :rules="dataRule"
@ -22,24 +22,25 @@
<el-input <el-input
v-model="dataForm.name" v-model="dataForm.name"
placeholder="疫苗接种点名称" placeholder="疫苗接种点名称"
:disabled='dialogTitle == "查看"' :disabled="dialogTitle == '查看'"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="接种日期" prop="inoculationDate"> <el-form-item label="接种时间" :class="dataForm.noAvailableVaccines != '2'?'':'time-class'">
<!-- <el-input <div class="data-block">
v-model="dataForm.inoculationDate" <div style="width: 30%">
placeholder="接种日期"
></el-input> -->
<el-date-picker <el-date-picker
v-model="dataForm.inoculationDate" v-model="dataForm.inoculationDate"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="date" type="date"
:clearable="false"
placeholder="选择日期" placeholder="选择日期"
:disabled='dialogTitle == "查看"' :disabled="dialogTitle == '查看'"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </div>
<el-form-item label="上午接种时间" prop="morningTime" class="time-class"> <div class="time-block">
<div>
<span>上午</span>
<el-time-picker <el-time-picker
is-range is-range
v-model="morningTime" v-model="morningTime"
@ -50,13 +51,15 @@
end-placeholder="结束时间" end-placeholder="结束时间"
placeholder="选择时间范围" placeholder="选择时间范围"
@change="startTimeChange" @change="startTimeChange"
:disabled='dialogTitle == "查看"' :disabled="dialogTitle == '查看'"
:clearable="false" :clearable="false"
:editable="false" :editable="false"
style="width: 56%"
> >
</el-time-picker> </el-time-picker>
</el-form-item> </div>
<el-form-item label="下午接种时间" prop="afterTime" class="time-class"> <div>
<span>下午</span>
<el-time-picker <el-time-picker
is-range is-range
v-model="afterTime" v-model="afterTime"
@ -67,28 +70,37 @@
end-placeholder="结束时间" end-placeholder="结束时间"
placeholder="选择时间范围" placeholder="选择时间范围"
@change="endTimeChange" @change="endTimeChange"
:disabled='dialogTitle == "查看"' :disabled="dialogTitle == '查看'"
:clearable="false" :clearable="false"
:editable="false" :editable="false"
style="width: 56%"
> >
</el-time-picker> </el-time-picker>
</div>
</div>
</div>
</el-form-item> </el-form-item>
<el-form-item label="" prop="noAvailableVaccines"> <el-form-item label="" prop="noAvailableVaccines">
<el-checkbox <el-checkbox
v-model="dataForm.noAvailableVaccines" v-model="dataForm.noAvailableVaccines"
true-label="1" true-label="1"
false-label="2" false-label="2"
:disabled='dialogTitle == "查看"' :disabled="dialogTitle == '查看'"
>暂无疫苗</el-checkbox >暂无疫苗</el-checkbox
> >
</el-form-item> </el-form-item>
<el-form-item label="咨询电话" prop="mobile"> <el-form-item label="咨询电话" prop="mobile">
<el-input v-model="dataForm.mobile" :disabled='dialogTitle == "查看"' placeholder="咨询电话"></el-input> <el-input
v-model="dataForm.mobile"
:disabled="dialogTitle == '查看'"
placeholder="咨询电话"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="接种点地址" prop="address"> <el-form-item label="接种点地址" prop="address">
<el-input <el-input
v-model="dataForm.address" v-model="dataForm.address"
placeholder="例:青岛市时代国际广场" placeholder="例:青岛市时代国际广场"
style="width: 65%"
></el-input> ></el-input>
<el-button <el-button
style="margin-left: 10px" style="margin-left: 10px"
@ -122,7 +134,7 @@
>查询</el-button >查询</el-button
> --> > -->
<div <div
id="map_app" id="map_add"
class="div_map" class="div_map"
style="width: 500px; height: 300px; margin-top: 20px" style="width: 500px; height: 300px; margin-top: 20px"
></div> ></div>
@ -153,9 +165,12 @@
</el-form> </el-form>
<div class="submit"> <div class="submit">
<el-button @click="closeSubmit">{{ $t("cancel") }}</el-button> <el-button @click="closeSubmit">{{ $t("cancel") }}</el-button>
<el-button v-if='dialogTitle != "查看"' type="primary" @click="dataFormSubmitHandle()">{{ <el-button
$t("confirm") v-if="dialogTitle != '查看'"
}}</el-button> type="primary"
@click="dataFormSubmitHandle()"
>{{ $t("confirm") }}</el-button
>
</div> </div>
</div> </div>
</template> </template>
@ -187,8 +202,8 @@ export default {
noAvailableVaccines: "1", noAvailableVaccines: "1",
mobile: "", mobile: "",
address: "", address: "",
longitude: "120.38945519", longitude: "",
latitude: "36.0722275", latitude: "",
}, },
keyWords: null, keyWords: null,
// organizationList: [], // organizationList: [],
@ -213,13 +228,6 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
inoculationDate: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
],
noAvailableVaccines: [ noAvailableVaccines: [
{ {
required: true, required: true,
@ -258,11 +266,11 @@ export default {
}; };
}, },
}, },
props:{ props: {
dialogTitle:{ dialogTitle: {
type:String, type: String,
default:'' default: "",
} },
}, },
methods: { methods: {
startTimeChange() { startTimeChange() {
@ -279,14 +287,14 @@ export default {
return false; return false;
} }
if (hour_0 == 12) { if (hour_0 == 12) {
if(minute_0 > 0 || second_0 > 0){ if (minute_0 > 0 || second_0 > 0) {
this.$message.error("请选择00:00-12:00时间段的时间"); this.$message.error("请选择00:00-12:00时间段的时间");
this.morningTime = null; this.morningTime = null;
return false; return false;
} }
} }
if (hour_1 == 12) { if (hour_1 == 12) {
if(minute_1 > 0 || second_1 > 0){ if (minute_1 > 0 || second_1 > 0) {
this.$message.error("请选择00:00-12:00时间段的时间"); this.$message.error("请选择00:00-12:00时间段的时间");
this.morningTime = null; this.morningTime = null;
return false; return false;
@ -310,14 +318,14 @@ export default {
return false; return false;
} }
if (hour_0 == 12) { if (hour_0 == 12) {
if(minute_0 == 0 && second_0 == 0){ if (minute_0 == 0 && second_0 == 0) {
this.$message.error("请选择12:01-23:59时间段的时间"); this.$message.error("请选择12:01-23:59时间段的时间");
this.afterTime = null; this.afterTime = null;
return false; return false;
} }
} }
if (hour_1 == 12) { if (hour_1 == 12) {
if(minute_1 == 0 && second_1 == 0){ if (minute_1 == 0 && second_1 == 0) {
this.$message.error("请选择12:01-23:59时间段的时间"); this.$message.error("请选择12:01-23:59时间段的时间");
this.afterTime = null; this.afterTime = null;
return false; return false;
@ -332,14 +340,16 @@ export default {
}, },
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义 // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() { initMap() {
let { latitude, longitude } = this.dataForm;
// 定义地图中心点坐标 // 定义地图中心点坐标
let _this = this; if (!latitude || latitude == "" || latitude == "0") {
var center = new window.TMap.LatLng( latitude = 39.9088810666821;
_this.dataForm.latitude, longitude = 116.39743841556731;
_this.dataForm.longitude }
); console.log(latitude, longitude);
var center = new window.TMap.LatLng(latitude, longitude);
// 定义map变量，调用 TMap.Map() 构造函数创建地图 // 定义map变量，调用 TMap.Map() 构造函数创建地图
map = new window.TMap.Map(document.getElementById("map_app"), { map = new window.TMap.Map(document.getElementById("map_add"), {
center: center, // 设置地图中心点坐标 center: center, // 设置地图中心点坐标
zoom: 17.2, // 设置地图缩放级别 zoom: 17.2, // 设置地图缩放级别
pitch: 43.5, // 设置俯仰角 pitch: 43.5, // 设置俯仰角
@ -352,12 +362,14 @@ export default {
geometries: [], geometries: [],
}); });
infoWindowList = Array(10); infoWindowList = Array(10);
geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类 geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
// 监听地图平移结束 // 监听地图平移结束
map.on("panend", () => { map.on("panend", () => {
this.handleMoveCenter(); this.handleMoveCenter();
}); });
this.handleMoveCenter(); // this.handleMoveCenter()
this.convert(); this.convert();
}, },
handleMoveCenter() { handleMoveCenter() {
@ -380,7 +392,6 @@ export default {
// 在地图显示范围内以给定的关键字搜索地点 // 在地图显示范围内以给定的关键字搜索地点
search search
.searchRectangle({ .searchRectangle({
// keyword: this.keyWords,
keyword: this.dataForm.address, keyword: this.dataForm.address,
bounds: map.getBounds(), bounds: map.getBounds(),
}) })
@ -390,6 +401,7 @@ export default {
const { const {
location: { lat, lng }, location: { lat, lng },
} = data[0]; } = data[0];
map.setCenter(new TMap.LatLng(lat, lng)); map.setCenter(new TMap.LatLng(lat, lng));
this.setMarker(lat, lng); this.setMarker(lat, lng);
this.dataForm.latitude = lat; this.dataForm.latitude = lat;
@ -423,8 +435,14 @@ export default {
geocoder geocoder
.getAddress({ location: location }) // 将给定的坐标位置转换为地址 .getAddress({ location: location }) // 将给定的坐标位置转换为地址
.then((result) => { .then((result) => {
this.dataForm.address = result.result.address; this.dataForm.address =
this.dataForm.address !== "" &&
this.dataForm.address !== null &&
(this.dataForm.longitude === "" || this.dataForm.longitude === null)
? this.dataForm.address
: result.result.address;
// 显示搜索到的地址 // 显示搜索到的地址
console.log(this.dataForm.address);
}); });
}, },
@ -460,8 +478,6 @@ export default {
if (this.dataForm.id) { if (this.dataForm.id) {
this.getInfo(); this.getInfo();
} else { } else {
this.dataForm.longitude = "120.38945519";
this.dataForm.latitude = "36.0722275";
this.initMap(); this.initMap();
} }
}); });
@ -478,11 +494,13 @@ export default {
...this.dataForm, ...this.dataForm,
...res.data, ...res.data,
}; };
this.morningTime = [res.data.moStartTime,res.data.moEndTime] if (res.data.moStartTime !== "" && res.data.afStartTime !== "") {
this.afterTime = [res.data.afStartTime,res.data.afEndTime] this.morningTime = [res.data.moStartTime, res.data.moEndTime];
if(!this.dataForm.longitude && !this.dataForm.latitude){ this.afterTime = [res.data.afStartTime, res.data.afEndTime];
this.dataForm.longitude = "120.38945519" }
this.dataForm.latitude = "36.0722275" if (!this.dataForm.longitude && !this.dataForm.latitude) {
this.dataForm.longitude = "120.38945519";
this.dataForm.latitude = "36.0722275";
} }
this.initMap(); this.initMap();
}) })
@ -495,13 +513,24 @@ export default {
if (!valid) { if (!valid) {
return false; return false;
} }
if(this.morningTime === null){ if(!this.dataForm.inoculationDate &&
this.$message.error('请填写上午接种时间'); this.dataForm.noAvailableVaccines === "2"){
return false this.$message.error("请选择接种日期");
return false;
}
if (
this.morningTime === null &&
this.dataForm.noAvailableVaccines === "2"
) {
this.$message.error("请填写上午接种时间");
return false;
} }
if(this.afterTime === null ){ if (
this.$message.error('请填写下午接种时间'); this.afterTime === null &&
return false this.dataForm.noAvailableVaccines === "2"
) {
this.$message.error("请填写下午接种时间");
return false;
} }
this.$http[!this.dataForm.id ? "post" : "put"]( this.$http[!this.dataForm.id ? "post" : "put"](
"/epmetuser/icPointVaccinesInoculation/", "/epmetuser/icPointVaccinesInoculation/",
@ -509,7 +538,9 @@ export default {
) )
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.internalMsg); return this.$message.error(
res.internalMsg ? res.internalMsg : res.msg
);
} }
this.$message({ this.$message({
message: this.$t("prompt.success"), message: this.$t("prompt.success"),
@ -532,6 +563,15 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.data-block {
display: flex;
}
.time-block>div{
margin-bottom: 10px;
}
.time-block span {
padding: 10px;
}
.position_label >>> .el-form-item__label::before { .position_label >>> .el-form-item__label::before {
color: #fff !important; color: #fff !important;
} }
@ -539,21 +579,20 @@ export default {
text-align: center; text-align: center;
margin: auto; margin: auto;
} }
.form-class .el-input{ .form-class .el-input {
width: 75%; width: 75%;
} }
.form-class .el-textarea{ .form-class .el-textarea {
width: 75%!important; width: 75% !important;
} }
.time-class{ .time-class {
position: relative; position: relative;
} }
.time-class::before{ .time-class::before {
content: '*'; content: "*";
color: #F56C6C; color: #f56c6c;
position: absolute; position: absolute;
left:16px; left: 42px;
top: 10px; top: 10px;
} }
</style> </style>

51
src/views/modules/plugins/point/icpointvaccinesinoculation.vue
View File

@ -102,13 +102,13 @@
v-loading="dataListLoading" v-loading="dataListLoading"
:data="dataList" :data="dataList"
border border
@selection-change="dataListSelectionChangeHandle" style="width: 100%; height: 564px"
style="width: 100%"
> >
<el-table-column <el-table-column
type="selection" label="序号"
header-align="center" header-align="center"
align="center" align="center"
type="index"
width="50" width="50"
></el-table-column> ></el-table-column>
<!--<el-table-column--> <!--<el-table-column-->
@ -130,29 +130,23 @@
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="moStartTime" label="接种上午时间"
label="接种上午开始时间"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> >
<el-table-column <template slot-scope="scope">
prop="moEndTime" <div>{{ scope.row.moStartTime }} - {{ scope.row.moEndTime }}</div>
label="接种上午结束时间" </template>
header-align="center" </el-table-column>
align="center"
></el-table-column>
<el-table-column <el-table-column
prop="afStartTime"
label="接种下午开始时间" label="接种下午开始时间"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> >
<el-table-column <template slot-scope="scope">
prop="afEndTime" <div>{{ scope.row.afStartTime }} - {{ scope.row.afEndTime }}</div>
label="接种下午结束时间" </template>
header-align="center" </el-table-column>
align="center"
></el-table-column>
<el-table-column <el-table-column
prop="noAvailableVaccines" prop="noAvailableVaccines"
label="暂无疫苗" label="暂无疫苗"
@ -201,15 +195,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination @size-change="pageSizeChangeHandle"
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle" @current-change="pageCurrentChangeHandle"
> :page-sizes="[20, 50, 100, 200]"
:page-size="limit"
layout="sizes, prev, pager, next, total"
:total="total">
</el-pagination> </el-pagination>
</div> </div>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
@ -483,6 +474,8 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 20px; margin-bottom: 20px;
margin-top: 10px;
margin-left: 10px;
} }
.div_left_table { .div_left_table {
margin-top: 10px; margin-top: 10px;
@ -491,7 +484,7 @@ export default {
border-radius: 5px; border-radius: 5px;
padding: 10px; padding: 10px;
} }
.dialog-h{ .dialog-h {
overflow: scroll; overflow: scroll;
} }
</style> </style>

Write Preview
Loading…
Cancel
Save