Browse Source

Merge branch 'dev-fangyi0706'

master
jiangyy 3 years ago
parent
commit
d18e1f5b5a
  1. 49
      src/views/components/rangeInput.vue
  2. 60
      src/views/modules/base/epidemic/antiInfo.vue
  3. 2
      src/views/modules/base/epidemic/natInfo/natList.vue
  4. 63
      src/views/modules/base/epidemic/vaccin.vue
  5. 571
      src/views/modules/base/epidemic/vaccinAdd.vue
  6. 95
      src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
  7. 1
      src/views/modules/communityService/fuwujilu/fuwuList.vue

49
src/views/components/rangeInput.vue

@ -1,33 +1,31 @@
<template>
<el-form :model="inputForm" :rules="rules" class="demo-form-inline">
<el-form :model="inputForm"
:rules="rules"
class="demo-form-inline">
<div class="flex-div">
<el-form-item prop="start">
<el-input
v-model="inputForm.start"
<el-input v-model="inputForm.start"
class="wd50"
size="small"
:type="inputType"
clearable
placeholder="请输入"
@change="handleChange"
/>
@change="handleChange" />
</el-form-item>
<div>-</div>
<div class="div_middle">-</div>
<el-form-item prop="end">
<el-input
v-model="inputForm.end"
<el-input v-model="inputForm.end"
class="wd50"
size="small"
:type="inputType"
clearable
placeholder="请输入"
@change="handleChange"
@blur="handleBlur"
/>
@blur="handleBlur" />
</el-form-item>
</div>
</el-form>
</el-form>
</template>
<script>
@ -52,19 +50,22 @@ export default {
default: ''
}
},
data() {
data () {
let checkAge = (rule, value, callback) => {
// debugger
if (value === '') {
callback(new Error('请输入内容'))
} else {
if (value < this.inputForm.start) {
if (parseInt(value) < parseInt(this.inputForm.start)) {
callback(new Error('结束值不能小于开始值'))
}
} else {
callback()
}
}
}
return {
inputForm: {...this.value},
inputForm: { ...this.value },
rules: {
end: [
{ validator: checkAge, trigger: 'blur' }
@ -73,24 +74,25 @@ export default {
}
},
computed: {
inputType() {
inputType () {
if (this.type == 'num') return 'number'
}
},
watch: {
'value.start'(val) {
'value.start' (val) {
this.inputForm.start = val
},
'value.end'(val) {
'value.end' (val) {
this.inputForm.end = val
},
},
methods: {
handleChange(val) {
handleChange (val) {
// if ()
this.$emit('change', { ...this.inputForm})
this.$emit('change', { ...this.inputForm })
},
handleBlur() {
handleBlur () {
}
}
@ -117,10 +119,13 @@ export default {
input::-webkit-inner-spin-button {
-webkit-appearance: none;
}
input[type='number']{
input[type="number"] {
-moz-appearance: textfield;
}
}
}
.div_middle {
padding: 0 10px;
}
</style>

60
src/views/modules/base/epidemic/antiInfo.vue

@ -81,9 +81,6 @@
</el-form-item>
</div>
<div>
<el-form-item label="姓名"
prop="name">
<el-input v-model="searchForm.name"
@ -113,9 +110,17 @@
placeholder="请输入身份证">
</el-input>
</el-form-item>
<el-form-item label="年龄"
prop="age">
<inputRange v-model="searchForm.age"
type="num"
@change="handleAgeChange" />
</el-form-item>
<el-form-item label="疫苗接种针次"
style="margin-left:20px"
prop="vaccineCount">
<el-input v-model="searchForm.vaccineCount"
size="small"
@ -195,6 +200,12 @@
label="身份证号"
width="180">
</el-table-column>
<el-table-column prop="birthDay"
header-align="center"
align="center"
label="出生日期"
width="140">
</el-table-column>
<el-table-column prop="vaccineCount"
header-align="center"
align="center"
@ -481,6 +492,7 @@
<script>
import natForm from './natInfo/natForm'
import inputRange from '@/views/components/rangeInput.vue'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
@ -509,7 +521,10 @@ export default {
mobile: '',
idCard: '',
vaccineCount: '',
natCount: ''
natCount: '',
age: {},
startBirthDay: '',
endBirthDay: '',
},
formDetail: {
name: '',
@ -538,7 +553,7 @@ export default {
}
},
components: {
natForm
natForm, inputRange
},
async created () {
@ -560,6 +575,38 @@ export default {
},
methods: {
handleAgeChange (val) {
console.log('val----age---', val)
if (val.start) {
const e = this.computedBirth(val.start)
this.searchForm.endBirthDay = e
} else {
this.searchForm.endBirthDay = ''
}
if (val.end) {
const s = this.computedBirth(val.end)
this.searchForm.startBirthDay = s
} else {
this.searchForm.startBirthDay = ''
}
},
computedBirth (age) {
let now = new Date();
let nowYear = now.getFullYear();
let nowMonth = now.getMonth() + 1;
let nowDay = now.getDate(); // daymonthmonthyearyear
let subYear = nowYear - age
if (nowMonth < 10) {
nowMonth = '0' + nowMonth
}
if (nowDay < 10) {
nowDay = '0' + nowDay
}
console.log(subYear + '-' + nowMonth + '-' + nowDay);
return subYear + '-' + nowMonth + '-' + nowDay
},
handleCnalceForm () {
this.$refs.detail_form.resetFields()
this.vaccineList = []
@ -832,6 +879,9 @@ export default {
this.searchForm.buildingId = ''
this.searchForm.unitId = ''
this.searchForm.houseId = ''
this.searchForm.age = {}
this.searchForm.startBirthDay = ''
this.searchForm.endBirthDay = ''
this.pageSize = 20
this.pageNo = 1
this.loadTable()

2
src/views/modules/base/epidemic/natInfo/natList.vue

@ -4,7 +4,7 @@
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
:label-width="'90px'">
:label-width="'110px'">
<div>
<el-form-item label="信息范围">
<el-select class="list_item_width_1"

63
src/views/modules/base/epidemic/vaccin.vue

@ -4,7 +4,7 @@
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
:label-width="'90px'">
:label-width="'110px'">
<div>
<el-form-item label="信息范围">
<el-select class="list_item_width_1"
@ -92,9 +92,9 @@
</div>
<div class="div_table">
<div class="div_btn">
<!-- <el-button class="diy-button--add"
<el-button class="diy-button--add"
size="small"
@click="handleAdd">新增</el-button> -->
@click="handleAdd">新增</el-button>
<el-button style="float: left"
class="diy-button--export"
@ -183,7 +183,7 @@
<el-table-column label="操作"
fixed="right"
width="140"
width="240"
header-align="center"
align="center"
class="operate">
@ -198,7 +198,17 @@
class="div-table-button--edit"
size="small"
@click="handleAttention(scope.row)">同步</el-button>
<el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text"
class="div-table-button--delete "
size="small"
@click="handleDelete(scope.row)">删除</el-button>
<el-button v-if="
isResiUser &&
scope.row.userType === 'synchro' &&
@ -223,7 +233,7 @@
</div>
</div>
<!-- 修改弹出框 -->
<!-- 详情弹出框 -->
<el-dialog :visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
@ -236,11 +246,24 @@
@dialogCancle="diaClose"
@dialogOk="addFormOk"></vaccinForm>
</el-dialog>
<el-dialog :visible.sync="addFormShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="addDiaClose">
<vaccinAdd ref="ref_form_add"
@dialogCancle="addDiaClose"
@dialogOk="addFormOk"></vaccinAdd>
</el-dialog>
</div>
</template>
<script>
import vaccinForm from "./vaccinForm";
import vaccinAdd from "./vaccinAdd";
import natForm from "./natInfo/natForm";
import { requestPost } from "@/js/dai/request";
@ -296,11 +319,14 @@ export default {
//form
formShow: false,
formTitle: "新增",
addFormShow: false,
};
},
components: {
vaccinForm,
natForm,
vaccinAdd
},
async created () { },
async mounted () {
@ -311,6 +337,9 @@ export default {
await this.loadTable();
},
activated () {
this.$refs["ref_table"].doLayout();
},
methods: {
async handleSearch () {
@ -370,6 +399,10 @@ export default {
this.$refs.ref_form.resetData();
this.formShow = false;
},
addDiaClose () {
this.addFormShow = false;
},
async handleDetail (row) {
this.formTitle = "详情";
@ -381,22 +414,24 @@ export default {
handleAdd () {
this.formTitle = "新增";
this.formShow = true;
this.addFormShow = true;
this.$nextTick(() => {
this.$refs.ref_form.initForm("add", null);
this.$refs.ref_form_add.initForm("add", null);
});
},
handleEdit (row) {
async handleEdit (row) {
this.formTitle = "修改";
this.formShow = true;
const row1 = { ...row }
let row2 = await this.getInfo(row1);
this.addFormShow = true;
this.$nextTick(() => {
this.$refs.ref_form.initForm("edit", row.icNatId);
this.$refs.ref_form_add.initForm("edit", row2);
});
},
addFormOk () {
this.formShow = false;
this.addFormShow = false;
this.loadTable();
},
@ -412,6 +447,7 @@ export default {
if (code === 0) {
row.mobile = data.mobile;
row.idCard = data.idCard;
row.isResiUser = data.isResiUser
}
return row;
},
@ -431,11 +467,10 @@ export default {
},
async deleteNat (row) {
const url = "/epmetuser/icNat/del";
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/del"
const url = "/epmetuser/icVaccine/del";
let params = {
icNatId: row.icNatId,
vaccineId: row.vaccineId,
};
const { data, code, msg } = await requestPost(url, params);

571
src/views/modules/base/epidemic/vaccinAdd.vue

@ -0,0 +1,571 @@
<template>
<div class="epidemic-form">
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType==='detail'"
class="form">
<el-form-item v-if="formType==='add'"
label="录入方式"
label-width="150px"
style="display: block">
<el-radio-group v-model="enterType"
@change="handleChangeEnterType">
<el-radio :label="'1'">手动输入</el-radio>
<el-radio :label="'2'">选择居民</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="formType==='add'"
label="所属网格"
style="display: block"
label-width="150px">
<el-select class="item_width_2"
v-model.trim="formData.gridId"
placeholder="请选择"
:disabled="!isFromResi"
clearable>
<el-option v-for="item in gridList"
@click.native="handleSelGrid(item.value)"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="formType==='add'"
label="居民"
prop="userId"
style="display: block"
label-width="150px">
<el-select class="item_width_2"
v-model.trim="formData.userId"
placeholder="请选择"
filterable
:disabled="!isFromResi"
clearable>
<el-option v-for="item in personList"
@click.native="handleSelPerson(item)"
:key="item.demandUserId"
:label="item.demandUserName"
:value="item.demandUserId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="姓名"
prop="name"
label-width="150px"
style="display: block">
<el-input class="item_width_2"
placeholder="请输入姓名"
clearable
:disabled="isFromResi"
v-model="formData.name">
</el-input>
</el-form-item>
<el-form-item label="手机号"
prop="mobile"
label-width="150px"
style="display: block">
<el-input class="item_width_2"
placeholder="请输入手机号"
clearable
:disabled="isFromResi"
v-model="formData.mobile">
</el-input>
</el-form-item>
<el-form-item label="身份证号"
prop="idCard"
label-width="150px"
style="display: block">
<el-input class="item_width_2"
placeholder="请输入身份证号"
clearable
:disabled="isFromResi"
v-model="formData.idCard">
</el-input>
</el-form-item>
<el-form-item label="接种时间"
style="display: block"
prop="inoculateTime"
label-width="150px">
<el-date-picker class="item_width_2"
v-model="formData.inoculateTime"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
type="datetime"
:picker-options="pickerOptions"
clearable
placeholder="选择时间">
</el-date-picker>
</el-form-item>
<el-form-item label="接种地点"
prop="inoculateAddress"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入检测地点"
clearable
v-model="formData.inoculateAddress">
</el-input>
</el-form-item>
<el-form-item label="疫苗厂家"
prop="manufacturer"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入检测地点"
clearable
v-model="formData.manufacturer">
</el-input>
</el-form-item>
<div v-if=" formType!=='detail'">
<el-form-item label="通知渠道"
prop="isSelChannel"
label-width="150px"
style="display: block">
<el-checkbox v-model="formData.isSelChannel"
@change="handleChannelChange"
key="0"
label="0">小程序通知</el-checkbox>
<!-- <el-checkbox-group v-model="formData.channel">
<el-checkbox key="0"
label="0">小程序通知</el-checkbox>
<el-checkbox key="1"
label="1">短信通知</el-checkbox>
</el-checkbox-group> -->
</el-form-item>
<el-form-item v-if="formData.isSelChannel"
label="通知内容"
prop="content"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
show-word-limit
:autosize="{ minRows: 5, maxRows: 10 }"
clearable
placeholder="请输入通知内容"
v-model="formData.content"></el-input>
</el-form-item>
</div>
</el-form>
</div>
<div class="form_div_btn">
<el-button size="small"
@click="handleCancle"> </el-button>
<el-button v-if="formType != 'detail'"
size="small"
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>
</div>
</div>
</template>
<script>
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import { dateFormats } from '@/utils/index'
let loading //
export default {
data () {
return {
formType: 'add', // addeditdetail
enterType: '1',//1 2
isFromResi: false,//
gridList: [],
personList: [],
pickerOptions: { //
disabledDate (time) {
return time.getTime() > (Date.now())
}
},
btnDisable: false,
vaccineId: '',
formData: {
vaccineId: '',
agencyId: '',//Id
userId: '',//idicResiUserId
userType: 'icresi',//resi;icresi;import;synchro
isResiUser: "0",//(0: 1:)
name: '',
idCard: '',
mobile: '',
inoculateTime: '',
inoculateAddress: '',
manufacturer: '',
isSelChannel: false,
channel: [],
content: '',
},
}
},
components: {},
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
//
await this.loadGrid()
},
methods: {
handleChannelChange (val) {
this.formData.content = ''
},
async initForm (type, row) {
this.startLoading()
this.formData.agencyId = this.agencyId
this.$refs['ref_form'].resetFields();
this.isFromResi = false
this.enterType = '1'
this.formType = type
if (row) {
if (row.userId) {
this.isFromResi = true
}
row.content = ''
row.isSelChannel = false
row.channel = []
this.formData = { ...row }
}
this.endLoading()
},
handleChangeEnterType (value) {
this.formData.name = ''
this.formData.mobile = ''
this.formData.idCard = ''
this.formData.gridId = ''
this.formData.userId = ''
this.$refs['ref_form'].resetFields();
if (value === '2') {
this.formData.isResiUser = "1"
this.isFromResi = true
} else {
this.formData.isResiUser = "0"
this.isFromResi = false
}
},
async loadGrid () {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
} else {
this.$message.error(msg)
}
},
async handleSelGrid (value) {
const url = "/epmetuser/icresiuser/demandusers"
let params = {
agencyId: this.agencyId,
gridId: value
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.personList = data
} else {
this.$message.error(msg)
}
},
async handleSelPerson (personItem) {
this.formData.userId = personItem.demandUserId
this.formData.name = personItem.demandUserName
this.formData.mobile = personItem.demandUserMobile
this.formData.idCard = personItem.idCard
},
async loadFormData () {
const url = '/epmetuser/icNat/detail'
let params = {
vaccineId: this.vaccineId,
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = data
this.formData.channel = []
this.formData.content = ''
// if (data.channel && data.channel.length > 0) {
// this.$set(this.formData, 'isSelChannel', true)
// // this.formData.isSelChannel = true
// } else {
// this.$set(this.formData, 'isSelChannel', false)
// // this.formData.isSelChannel = false
// this.formData.channel = []
// this.formData.content = ''
// }
console.log(this.formData.isSelChannel)
this.formData.vaccineId = this.vaccineId
if (this.formData.userId) {
this.isFromResi = true
} else {
this.isFromResi = false
}
} else {
this.$message.error(msg)
}
},
handleComfirm () {
this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) {
app.util.validateRule(messageObj)
} else {
this.addVaccin()
}
})
},
async addVaccin () {
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //
if (regPhone.test(this.formData.mobile) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
message: '请输入正确的手机号码'
})
return false;
}
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //1518151817X
if (regCard.test(this.formData.idCard) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
message: '请输入正确的身份证号码'
})
return false;
}
if (this.formData.isSelChannel) {
if (!this.formData.content) {
this.$message({
type: 'warning',
message: '请填写通知内容'
})
return false;
} else {
this.formData.channel = ['0']
}
} else {
this.formData.channel = []
this.formData.content = ''
}
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
}, 5000)
let url = ''
if (this.formType === 'add') {
url = '/epmetuser/icVaccine/add'
this.formData.vaccineId = ''
} else {
url = '/epmetuser/icVaccine/edit'
}
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
this.$emit('dialogOk')
this.resetData()
this.btnDisable = false
} else {
this.btnDisable = false
this.$message.error(msg)
}
},
handleCancle () {
this.resetData()
this.$emit('dialogCancle')
},
resetData () {
this.vaccineId = ''
this.formData = {
vaccineId: '',
agencyId: '',//Id
userId: '',//idicResiUserId
userType: 'icresi',//resi;icresi;import;synchro
isResiUser: "0",//(0: 1:)
name: '',
idCard: '',
mobile: '',
inoculateTime: '',
inoculateAddress: '',
manufacturer: '',
isSelChannel: false,
channel: [],
content: '',
}
},
//
startLoading () {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
computed: {
dataRule () {
return {
name: [
{ required: true, message: '姓名不能为空', trigger: 'change' }
],
idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'change' }
],
mobile: [
{ required: true, message: '手机号不能为空', trigger: 'change' },
],
inoculateTime: [
{ required: true, message: '接种时间不能为空', trigger: 'change' },
],
inoculateAddress: [
{ required: true, message: '接接种地点不能为空', trigger: 'change' },
],
manufacturer: [
{ required: true, message: '疫苗厂家不能为空', trigger: 'change' },
],
isSelChannel: [
{ required: false },
],
channel: [
{ required: false },
],
content: [
{ required: false },
],
}
},
},
props: {
// serviceList: {
// type: Array,
// default: []
// },
}
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/epidemic.scss";
</style>
<style lang='scss'>
//
.hide .el-upload--picture-card {
display: none;
}
// /
.el-upload-list__item {
transition: none !important;
}
</style>

95
src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue

@ -128,6 +128,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="疫苗接种次数小于"
label-width="150px">
<el-input-number class="item_width_3"
@ -137,6 +138,31 @@
:max="20"
label="疫苗接种次数小于"></el-input-number>
</el-form-item>
<el-form-item label="接种时间"
label-width="80px"
prop="startDate">
<el-date-picker v-model="startDate"
:picker-options="startPickerOptions"
class="item_width_3"
size="mini"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="开始时间">
</el-date-picker>
<span class="data-tag"></span>
<el-date-picker v-model="endDate"
:picker-options="endPickerOptions"
class="item_width_3 data-tag"
size="mini"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="结束时间">
</el-date-picker>
</el-form-item>
<el-button style="margin-left:30px"
size="mini"
class="diy-button--search"
@ -182,19 +208,27 @@
header-align="center"
align="center"
label="身份证"
min-width="170">
width="150">
</el-table-column>
<el-table-column prop="houseName"
header-align="center"
align="center"
:show-overflow-tooltip="true"
label="所属房屋"
min-width="170">
</el-table-column>
<el-table-column prop="vaccineCount"
header-align="center"
align="center"
label="疫苗接种次数"
min-width="100">
label="接种次数"
width="80">
</el-table-column>
<el-table-column prop="createdTime"
header-align="center"
align="center"
:show-overflow-tooltip="true"
label="接种时间"
width="140">
</el-table-column>
</el-table>
@ -323,6 +357,21 @@ import { mapGetters } from 'vuex'
let loading //
export default {
data () {
let endDisabledDate = (time) => {//datareturn
let nowData = Date.now()
if (this.startDate) {
let startDate = new Date(this.startDate)
return time.getTime() > nowData || time.getTime() < startDate || time.getTime() === startDate
} else {
return time.getTime() > nowData
}
}
let startDisabledDate = (time) => {//datareturn
let nowData = Date.now()
return time.getTime() > nowData
}
return {
activeName: "first",
@ -331,10 +380,21 @@ export default {
btnDisable: false,
startDate: '',
endDate: '',
formDataSearch: {
gridId: '',
vaccineCount: undefined,
attentionType: 1
attentionType: 1,
startDate: '',
endDate: ''
},
endPickerOptions: {
disabledDate: endDisabledDate
},
startPickerOptions: {
disabledDate: startDisabledDate
},
formData1: {
@ -374,6 +434,7 @@ export default {
this.agencyId = user.agencyId
//
await this.loadGrid()
// this.loadTable()
},
methods: {
@ -384,7 +445,7 @@ export default {
this.formData2.content = ''
},
async initForm () {
this.tableData = []
// this.loadTable()
this.$refs['ref_form1'].resetFields();
this.$refs['ref_form2'].resetFields();
@ -400,6 +461,20 @@ export default {
async loadTable () {
this.tableLoading = true
if (this.startDate) {
let array = this.startDate.split('-')
this.formDataSearch.startDate = array[0] + array[1] + array[2]
} else {
this.formDataSearch.startDate = ''
}
if (this.endDate) {
let array = this.endDate.split('-')
this.formDataSearch.endDate = array[0] + array[1] + array[2]
} else {
this.formDataSearch.endDate = ''
}
const url = "/epmetuser/epidemicPrevention/user-list"
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
let params = {
@ -670,10 +745,14 @@ export default {
},
resetSearch () {
this.startDate = ''
this.endDate = ''
this.formDataSearch = {
gridId: '',
vaccineCount: undefined,
attentionType: 1
attentionType: 1,
startDate: '',
endDate: ''
}
},
@ -782,6 +861,10 @@ export default {
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/epidemic.scss";
.data-tag {
margin-left: 10px;
}
</style>

1
src/views/modules/communityService/fuwujilu/fuwuList.vue

@ -280,6 +280,7 @@ export default {
data () {
let endDisabledDate = (time) => {//datareturn
let nowData = Date.now()
if (this.formData.serviceTimeStart) {
let serviceTimeStart = new Date(this.formData.serviceTimeStart)
return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart

Loading…
Cancel
Save