|
|
@ -61,10 +61,10 @@ |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item label="通知渠道" |
|
|
|
prop="noticeWay" |
|
|
|
prop="channel" |
|
|
|
label-width="150px" |
|
|
|
style="display: block"> |
|
|
|
<el-checkbox-group v-model="formData1.noticeWay"> |
|
|
|
<el-checkbox-group v-model="formData1.channel"> |
|
|
|
<el-checkbox key="1" |
|
|
|
label="1">小程序通知</el-checkbox> |
|
|
|
<el-checkbox key="2" |
|
|
@ -100,7 +100,7 @@ |
|
|
|
<el-form-item label="所属网格" |
|
|
|
label-width="80px"> |
|
|
|
<el-select class="item_width_3" |
|
|
|
v-model.trim="formDataSearch.selGridId" |
|
|
|
v-model.trim="formDataSearch.gridId" |
|
|
|
placeholder="请选择" |
|
|
|
size="mini" |
|
|
|
clearable> |
|
|
@ -114,7 +114,7 @@ |
|
|
|
<el-form-item label="疫苗接种次数小于" |
|
|
|
label-width="150px"> |
|
|
|
<el-input-number class="item_width_3" |
|
|
|
v-model="formDataSearch.veroNum" |
|
|
|
v-model="formDataSearch.vaccineCount" |
|
|
|
size="mini" |
|
|
|
:min="0" |
|
|
|
:max="20" |
|
|
@ -149,25 +149,25 @@ |
|
|
|
type="index" |
|
|
|
width="50"></el-table-column> |
|
|
|
|
|
|
|
<el-table-column prop="NAME" |
|
|
|
<el-table-column prop="name" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="姓名" |
|
|
|
width="90"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="MOBILE" |
|
|
|
<el-table-column prop="mobile" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="手机号" |
|
|
|
width="110"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="ID_CARD" |
|
|
|
<el-table-column prop="idCard" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="身份证" |
|
|
|
min-width="170"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="ID_CARD" |
|
|
|
<el-table-column prop="idCard" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="疫苗接种次数" |
|
|
@ -198,7 +198,7 @@ |
|
|
|
:disable-transitions="false" |
|
|
|
@close="handleCloseTag(tag,index)" |
|
|
|
closable> |
|
|
|
{{tag.NAME}} |
|
|
|
{{tag.name}} |
|
|
|
</el-tag> |
|
|
|
</div> |
|
|
|
<div v-else |
|
|
@ -228,14 +228,14 @@ |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item label="通知渠道" |
|
|
|
prop="noticeWay" |
|
|
|
prop="channel" |
|
|
|
label-width="100px" |
|
|
|
style="display: block"> |
|
|
|
<el-checkbox-group v-model="formData2.noticeWay"> |
|
|
|
<el-checkbox-group v-model="formData2.channel"> |
|
|
|
<el-checkbox key="0" |
|
|
|
label="0">小程序通知</el-checkbox> |
|
|
|
<el-checkbox key="1" |
|
|
|
label="1">小程序通知</el-checkbox> |
|
|
|
<el-checkbox key="2" |
|
|
|
label="2">短信通知</el-checkbox> |
|
|
|
label="1">短信通知</el-checkbox> |
|
|
|
|
|
|
|
</el-checkbox-group> |
|
|
|
</el-form-item> |
|
|
@ -291,35 +291,35 @@ export default { |
|
|
|
btnDisable: false, |
|
|
|
|
|
|
|
formDataSearch: { |
|
|
|
selGridId: '', |
|
|
|
veroNum: undefined, |
|
|
|
gridId: '', |
|
|
|
vaccineCount: undefined, |
|
|
|
}, |
|
|
|
|
|
|
|
formData1: { |
|
|
|
attentionType: 1, |
|
|
|
name: '', |
|
|
|
idCard: '', |
|
|
|
mobile: '', |
|
|
|
remark: '', |
|
|
|
noticeWay: [], |
|
|
|
channel: [], |
|
|
|
content: '', |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
formData2: { |
|
|
|
personList: [], |
|
|
|
attentionType: 1, |
|
|
|
remark: '', |
|
|
|
noticeWay: [], |
|
|
|
channel: [], |
|
|
|
content: '', |
|
|
|
}, |
|
|
|
tableData: [], |
|
|
|
total: 0, |
|
|
|
pageSize: 20, |
|
|
|
pageNo: 0, |
|
|
|
pageNo: 1, |
|
|
|
tableLoading: false, |
|
|
|
|
|
|
|
selectionAll: [],//选中的人员 |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
}, |
|
|
|
components: {}, |
|
|
@ -348,12 +348,11 @@ export default { |
|
|
|
async loadTable () { |
|
|
|
this.tableLoading = true |
|
|
|
|
|
|
|
const url = "/epmetuser/icresiuser/listresi" |
|
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist" |
|
|
|
// const url = "/epmetuser/epidemicPrevention/page" |
|
|
|
const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" |
|
|
|
let params = { |
|
|
|
pageSize: this.pageSize, |
|
|
|
pageNo: this.pageNo, |
|
|
|
formCode: 'resi_base_info', |
|
|
|
...this.formDataSearch |
|
|
|
} |
|
|
|
|
|
|
@ -384,7 +383,7 @@ export default { |
|
|
|
} else { |
|
|
|
for (let i = 0; i < this.selectionAll.length; i++) { |
|
|
|
let item = this.selectionAll[i] |
|
|
|
if (item.ID_CARD === row.ID_CARD) { |
|
|
|
if (item.idCard === row.idCard) { |
|
|
|
this.selectionAll.splice(i, 1) |
|
|
|
break |
|
|
|
} |
|
|
@ -402,7 +401,7 @@ export default { |
|
|
|
let isHasItem = false |
|
|
|
for (let j = 0; j < this.selectionAll.length; j++) { |
|
|
|
let selectionItem = this.selectionAll[j] |
|
|
|
if (selectionItem.ID_CARD === tableItem.ID_CARD) { |
|
|
|
if (selectionItem.idCard === tableItem.idCard) { |
|
|
|
isHasItem = true |
|
|
|
if (!selFlag) { |
|
|
|
this.selectionAll.splice(j, 1) |
|
|
@ -425,7 +424,7 @@ export default { |
|
|
|
for (let i = 0; i < this.tableData.length; i++) { |
|
|
|
|
|
|
|
let tableItem = this.tableData[i] |
|
|
|
if (tag.ID_CARD === tableItem.ID_CARD) {//如果表中存在这个数据 |
|
|
|
if (tag.idCard === tableItem.idCard) {//如果表中存在这个数据 |
|
|
|
tableItem.isSel = false |
|
|
|
this.$refs.ref_table.toggleRowSelection(tableItem); |
|
|
|
break |
|
|
@ -435,7 +434,7 @@ export default { |
|
|
|
|
|
|
|
for (let i = 0; i < this.selectionAll.length; i++) { |
|
|
|
let item = this.selectionAll[i] |
|
|
|
if (item.ID_CARD === tag.ID_CARD) { |
|
|
|
if (item.idCard === tag.idCard) { |
|
|
|
this.selectionAll.splice(i, 1) |
|
|
|
break |
|
|
|
} |
|
|
@ -452,7 +451,7 @@ export default { |
|
|
|
for (let j = 0; j < this.selectionAll.length; j++) { |
|
|
|
let selectionItem = this.selectionAll[j] |
|
|
|
|
|
|
|
if (selectionItem.ID_CARD === tableItem.ID_CARD) { |
|
|
|
if (selectionItem.idCard === tableItem.idCard) { |
|
|
|
tableItem.isSel = true |
|
|
|
break |
|
|
|
|
|
|
@ -502,9 +501,10 @@ export default { |
|
|
|
|
|
|
|
}, |
|
|
|
async addVero () { |
|
|
|
let formData = {} |
|
|
|
let list = [] |
|
|
|
if (this.activeName === 'first') { |
|
|
|
formData = this.formData1 |
|
|
|
list.push(this.formData1) |
|
|
|
|
|
|
|
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 |
|
|
|
// if (regPhone.test(this.formData.mobile) === false) { |
|
|
|
// this.btnDisable = false |
|
|
@ -520,10 +520,20 @@ export default { |
|
|
|
return false |
|
|
|
} |
|
|
|
|
|
|
|
formData = this.formData2 |
|
|
|
formData.personList = this.selectionAll |
|
|
|
this.selectionAll.forEach(element => { |
|
|
|
let obj = { |
|
|
|
name: element.name, |
|
|
|
idCard: element.idCard, |
|
|
|
mobile: element.mobile, |
|
|
|
|
|
|
|
...this.formData2 |
|
|
|
} |
|
|
|
|
|
|
|
list.push(obj) |
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
console.log(formData) |
|
|
|
console.log(list) |
|
|
|
return false |
|
|
|
|
|
|
|
|
|
|
@ -564,13 +574,17 @@ export default { |
|
|
|
|
|
|
|
resetSearch () { |
|
|
|
this.formDataSearch = { |
|
|
|
selGridId: '', |
|
|
|
veroNum: undefined, |
|
|
|
gridId: '', |
|
|
|
vaccineCount: undefined, |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
destroyed () { |
|
|
|
console.log(11111111) |
|
|
|
}, |
|
|
|
|
|
|
|
resetData () { |
|
|
|
|
|
|
|
this.formData1 = { |
|
|
@ -578,20 +592,20 @@ export default { |
|
|
|
idCard: '', |
|
|
|
mobile: '', |
|
|
|
remark: '', |
|
|
|
noticeWay: [], |
|
|
|
channel: [], |
|
|
|
content: '', |
|
|
|
|
|
|
|
attentionType: 1, |
|
|
|
} |
|
|
|
|
|
|
|
this.formData2 = { |
|
|
|
personList: [], |
|
|
|
attentionType: 1, |
|
|
|
remark: '', |
|
|
|
noticeWay: [], |
|
|
|
channel: [], |
|
|
|
content: '', |
|
|
|
} |
|
|
|
this.formDataSearch = { |
|
|
|
selGridId: '', |
|
|
|
veroNum: undefined, |
|
|
|
gridId: '', |
|
|
|
vaccineCount: undefined, |
|
|
|
} |
|
|
|
|
|
|
|
this.selectionAll = []//选中的人员 |
|
|
|