elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

疫情防护

master
jiangyy 3 years ago
parent
0bb4a130d1
commit
f95b9cfb40
5 changed files with 138 additions and 62 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. 2
      src/views/modules/base/epidemic/natInfo/natList.vue
  2. 22
      src/views/modules/base/epidemic/vaccin.vue
  3. 87
      src/views/modules/base/epidemic/vaccinAdd.vue
  4. 88
      src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
  5. 1
      src/views/modules/communityService/fuwujilu/fuwuList.vue

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

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

22
src/views/modules/base/epidemic/vaccin.vue
View File

@ -4,7 +4,7 @@
<el-form :inline="true" <el-form :inline="true"
:model="formData" :model="formData"
ref="ref_searchform" ref="ref_searchform"
:label-width="'90px'"> :label-width="'110px'">
<div> <div>
<el-form-item label="信息范围"> <el-form-item label="信息范围">
<el-select class="list_item_width_1" <el-select class="list_item_width_1"
@ -253,9 +253,9 @@
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="diaClose"> @closed="addDiaClose">
<vaccinAdd ref="ref_form_add" <vaccinAdd ref="ref_form_add"
@dialogCancle="diaClose" @dialogCancle="addDiaClose"
@dialogOk="addFormOk"></vaccinAdd> @dialogOk="addFormOk"></vaccinAdd>
</el-dialog> </el-dialog>
</div> </div>
@ -399,6 +399,10 @@ export default {
this.$refs.ref_form.resetData(); this.$refs.ref_form.resetData();
this.formShow = false; this.formShow = false;
}, },
addDiaClose () {
this.addFormShow = false;
},
async handleDetail (row) { async handleDetail (row) {
this.formTitle = "详情"; this.formTitle = "详情";
@ -416,16 +420,18 @@ export default {
}); });
}, },
handleEdit (row) { async handleEdit (row) {
this.formTitle = "修改"; this.formTitle = "修改";
const row1 = { ...row }
let row2 = await this.getInfo(row1);
this.addFormShow = true; this.addFormShow = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_form_add.initForm("edit", row.vaccineId); this.$refs.ref_form_add.initForm("edit", row2);
}); });
}, },
addFormOk () { addFormOk () {
this.formShow = false; this.addFormShow = false;
this.loadTable(); this.loadTable();
}, },
@ -441,6 +447,7 @@ export default {
if (code === 0) { if (code === 0) {
row.mobile = data.mobile; row.mobile = data.mobile;
row.idCard = data.idCard; row.idCard = data.idCard;
row.isResiUser = data.isResiUser
} }
return row; return row;
}, },
@ -461,10 +468,9 @@ export default {
async deleteNat (row) { async deleteNat (row) {
const url = "/epmetuser/icVaccine/del"; const url = "/epmetuser/icVaccine/del";
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icVaccine/del"
let params = { let params = {
icVaccineId: row.vaccineId, vaccineId: row.vaccineId,
}; };
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);

87
src/views/modules/base/epidemic/vaccinAdd.vue
View File

@ -179,15 +179,6 @@
@click="handleComfirm">确 定</el-button> @click="handleComfirm">确 定</el-button>
</div> </div>
<el-dialog :visible.sync="dialogVisible"
width="550px"
top="5vh"
append-to-body>
<img width="100%"
:src="dialogImageUrl"
alt="">
</el-dialog>
</div> </div>
</template> </template>
@ -203,8 +194,7 @@ export default {
data () { data () {
return { return {
formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
hideUploadEdit: false, // 隐藏'上传按钮'
limitNum: 1,
enterType: '1',//录入方式1 手动输入 2 选择居民 enterType: '1',//录入方式1 手动输入 2 选择居民
isFromResi: false,//是否从已有居民信息中选择 isFromResi: false,//是否从已有居民信息中选择
@ -218,12 +208,13 @@ export default {
btnDisable: false, btnDisable: false,
icVaccineId: '', vaccineId: '',
formData: { formData: {
icVaccineId: '', vaccineId: '',
agencyId: '',//当前网格所属组织Id agencyId: '',//当前网格所属组织Id
userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
isResiUser: "0",//是否客户下居民(0:否 1:是)
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
@ -253,7 +244,7 @@ export default {
this.formData.content = '' this.formData.content = ''
}, },
async initForm (type, icVaccineId) { async initForm (type, row) {
this.startLoading() this.startLoading()
this.formData.agencyId = this.agencyId this.formData.agencyId = this.agencyId
@ -262,11 +253,16 @@ export default {
this.enterType = '1' this.enterType = '1'
this.formType = type this.formType = type
if (icVaccineId) { if (row) {
this.icVaccineId = icVaccineId
this.formData.icVaccineId = icVaccineId if (row.userId) {
this.isFromResi = false this.isFromResi = true
await this.loadFormData() }
row.content = ''
row.isSelChannel = false
row.channel = []
this.formData = { ...row }
} }
this.endLoading() this.endLoading()
@ -283,8 +279,10 @@ export default {
this.$refs['ref_form'].resetFields(); this.$refs['ref_form'].resetFields();
if (value === '2') { if (value === '2') {
this.formData.isResiUser = "1"
this.isFromResi = true this.isFromResi = true
} else { } else {
this.formData.isResiUser = "0"
this.isFromResi = false this.isFromResi = false
} }
@ -335,10 +333,9 @@ export default {
async loadFormData () { async loadFormData () {
// const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
const url = '/epmetuser/icNat/detail' const url = '/epmetuser/icNat/detail'
let params = { let params = {
icVaccineId: this.icVaccineId, vaccineId: this.vaccineId,
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
@ -356,7 +353,7 @@ export default {
// } // }
console.log(this.formData.isSelChannel) console.log(this.formData.isSelChannel)
this.formData.icVaccineId = this.icVaccineId this.formData.vaccineId = this.vaccineId
if (this.formData.userId) { if (this.formData.userId) {
this.isFromResi = true this.isFromResi = true
} else { } else {
@ -375,20 +372,14 @@ export default {
app.util.validateRule(messageObj) app.util.validateRule(messageObj)
} else { } else {
this.addNat() this.addVaccin()
} }
}) })
}, },
async addNat () { async addVaccin () {
// if (this.imgLoading) {
// this.$message({
// type: 'warning',
// message: '正在上传图片，请稍候重试'
// })
// return false;
// }
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
if (regPhone.test(this.formData.mobile) === false) { if (regPhone.test(this.formData.mobile) === false) {
this.btnDisable = false this.btnDisable = false
@ -424,6 +415,8 @@ export default {
this.formData.content = '' this.formData.content = ''
} }
this.btnDisable = true this.btnDisable = true
setTimeout(() => { setTimeout(() => {
this.btnDisable = false this.btnDisable = false
@ -431,13 +424,13 @@ export default {
let url = '' let url = ''
if (this.formType === 'add') { if (this.formType === 'add') {
url = '/epmetuser/icNat/add' url = '/epmetuser/icVaccine/add'
// url = "http://yapi.elinkservice.cn/mock/102/epmetuser/icNat/add"
this.formData.icVaccineId = '' this.formData.vaccineId = ''
} else { } else {
url = '/epmetuser/icNat/edit' url = '/epmetuser/icVaccine/edit'
// url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/edit"
} }
@ -448,8 +441,9 @@ export default {
type: 'success', type: 'success',
message: '操作成功' message: '操作成功'
}) })
this.resetData()
this.$emit('dialogOk') this.$emit('dialogOk')
this.resetData()
this.btnDisable = false this.btnDisable = false
} else { } else {
@ -467,15 +461,14 @@ export default {
resetData () { resetData () {
this.icVaccineId = '' this.vaccineId = ''
this.fileList = []
this.hideUploadEdit = false
this.formData = { this.formData = {
icVaccineId: '', vaccineId: '',
agencyId: '',//当前网格所属组织Id agencyId: '',//当前网格所属组织Id
userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
isResiUser: "0",//是否客户下居民(0:否 1:是)
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
@ -511,22 +504,22 @@ export default {
dataRule () { dataRule () {
return { return {
name: [ name: [
{ required: true, message: '姓名不能为空', trigger: 'blur' } { required: true, message: '姓名不能为空', trigger: 'change' }
], ],
idCard: [ idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'blur' } { required: true, message: '身份证号不能为空', trigger: 'change' }
], ],
mobile: [ mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' }, { required: true, message: '手机号不能为空', trigger: 'change' },
], ],
inoculateTime: [ inoculateTime: [
{ required: true, message: '接种时间不能为空', trigger: 'blur' }, { required: true, message: '接种时间不能为空', trigger: 'change' },
], ],
inoculateTime: [ inoculateTime: [
{ required: true, message: '接种地点不能为空', trigger: 'blur' }, { required: true, message: '接种地点不能为空', trigger: 'change' },
], ],
inoculateTime: [ inoculateTime: [
{ required: true, message: '疫苗厂家不能为空', trigger: 'blur' }, { required: true, message: '疫苗厂家不能为空', trigger: 'change' },
], ],

88
src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
View File

@ -128,6 +128,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="疫苗接种次数小于" <el-form-item label="疫苗接种次数小于"
label-width="150px"> label-width="150px">
<el-input-number class="item_width_3" <el-input-number class="item_width_3"
@ -137,6 +138,31 @@
:max="20" :max="20"
label="疫苗接种次数小于"></el-input-number> label="疫苗接种次数小于"></el-input-number>
</el-form-item> </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" <el-button style="margin-left:30px"
size="mini" size="mini"
class="diy-button--search" class="diy-button--search"
@ -182,19 +208,27 @@
header-align="center" header-align="center"
align="center" align="center"
label="身份证" label="身份证"
min-width="170"> width="150">
</el-table-column> </el-table-column>
<el-table-column prop="houseName" <el-table-column prop="houseName"
header-align="center" header-align="center"
align="center" align="center"
:show-overflow-tooltip="true"
label="所属房屋" label="所属房屋"
min-width="170"> min-width="170">
</el-table-column> </el-table-column>
<el-table-column prop="vaccineCount" <el-table-column prop="vaccineCount"
header-align="center" header-align="center"
align="center" align="center"
label="疫苗接种次数" label="接种次数"
min-width="100"> 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-column>
</el-table> </el-table>
@ -323,6 +357,21 @@ import { mapGetters } from 'vuex'
let loading // 加载动画 let loading // 加载动画
export default { export default {
data () { data () {
let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
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) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now()
return time.getTime() > nowData
}
return { return {
activeName: "first", activeName: "first",
@ -331,10 +380,21 @@ export default {
btnDisable: false, btnDisable: false,
startDate: '',
endDate: '',
formDataSearch: { formDataSearch: {
gridId: '', gridId: '',
vaccineCount: undefined, vaccineCount: undefined,
attentionType: 1 attentionType: 1,
startDate: '',
endDate: ''
},
endPickerOptions: {
disabledDate: endDisabledDate
},
startPickerOptions: {
disabledDate: startDisabledDate
}, },
formData1: { formData1: {
@ -374,6 +434,7 @@ export default {
this.agencyId = user.agencyId this.agencyId = user.agencyId
//获取网格下拉框数据 //获取网格下拉框数据
await this.loadGrid() await this.loadGrid()
this.loadTable()
}, },
methods: { methods: {
@ -384,7 +445,7 @@ export default {
this.formData2.content = '' this.formData2.content = ''
}, },
async initForm () { async initForm () {
this.tableData = [] this.loadTable()
this.$refs['ref_form1'].resetFields(); this.$refs['ref_form1'].resetFields();
this.$refs['ref_form2'].resetFields(); this.$refs['ref_form2'].resetFields();
@ -400,6 +461,15 @@ export default {
async loadTable () { async loadTable () {
this.tableLoading = true this.tableLoading = true
if (this.startDate) {
let array = this.startDate.split('-')
this.formDataSearch.startDate = array[0] + array[1] + array[2]
}
if (this.endDate) {
let array = this.endDate.split('-')
this.formDataSearch.endDate = array[0] + array[1] + array[2]
}
const url = "/epmetuser/epidemicPrevention/user-list" const url = "/epmetuser/epidemicPrevention/user-list"
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
let params = { let params = {
@ -673,7 +743,9 @@ export default {
this.formDataSearch = { this.formDataSearch = {
gridId: '', gridId: '',
vaccineCount: undefined, vaccineCount: undefined,
attentionType: 1 attentionType: 1,
startDate: '',
endDate: ''
} }
}, },
@ -782,6 +854,10 @@ export default {
<style lang="scss" scoped > <style lang="scss" scoped >
@import "@/assets/scss/modules/management/epidemic.scss"; @import "@/assets/scss/modules/management/epidemic.scss";
.data-tag {
margin-left: 10px;
}
</style> </style>

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

@ -280,6 +280,7 @@ export default {
data () { data () {
let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now() let nowData = Date.now()
if (this.formData.serviceTimeStart) { if (this.formData.serviceTimeStart) {
let serviceTimeStart = new Date(this.formData.serviceTimeStart) let serviceTimeStart = new Date(this.formData.serviceTimeStart)
return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart

Write Preview
Loading…
Cancel
Save