+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
@@ -285,10 +505,10 @@ export default {
return {
loading: false,
total: 0,
- pageSize: 10,
+ pageSize: 20,
pageNo: 0,
tableLoading: false,
-
+ activeName: 'second',
agencyId: '',
sHeight: 0,
timeRange: [],
@@ -302,16 +522,22 @@ export default {
name: '',
mobile: '',
idCard: '',
- vaccinateCount: '',
- testCount: ''
+ vaccineCount: '',
+ natCount: ''
},
- formData: {
- personInCharge: '',//负责人
- mobile: '',//联系电话
- gridId: '',//负责区域【网格Id】
- ninePlaceVal: '',//场所类型【九小场所Value值】
- isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是
+ formDetail: {
+ name: '',
+ gridName: '',
+ houseName: '',
+ mobile: '',
+ idCard: '',
+ vaccineCount: '',
+ natCount: ''
},
+ vaccineList: [], // 疫苗接种
+ natList: [], // 核酸检测
+ tripList: [], // 行程信息
+
optionsV: [],
optionsB: [],
optionsH: [],
@@ -345,6 +571,14 @@ export default {
},
methods: {
+ handleCnalceForm() {
+ this.$refs.detail_form.resetFields()
+ this.vaccineList = []
+ this.natList = []
+ this.tripList = []
+ this.formShow = false
+
+ },
handleSearch () {
this.loadTable()
},
@@ -474,16 +708,15 @@ export default {
})
},
-
async loadTable () {
this.tableLoading = true
- const url = "/gov/org/placepatrolteam/getlist"
+ const url = "/epmetuser/epidemicPrevention/page"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
- ...this.formData
+ ...this.searchForm
}
const { data, code, msg } = await requestPost(url, params)
@@ -504,31 +737,54 @@ export default {
}
this.tableLoading = false
},
+ async getDetailInfo (id) {
- handleScheduledTimeChange (time) {
- if (time) {
- this.formData.scheduledStartTime = time[0]
- this.formData.scheduledEndTime = time[1]
+ const url = "/epmetuser/epidemicPrevention/detail"
+ let params = {
+ id
+ }
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.formDetail = data
} else {
- this.formData.scheduledStartTime = ''
- this.formData.scheduledEndTime = ''
+ this.$message.error(msg)
+ }
+ },
+ async getDetailList (id) {
+ const url = "/epmetuser/epidemicPrevention/info"
+ let params = {
+ id
}
- },
+ const { data, code, msg } = await requestPost(url, params)
+ if (code === 0) {
+ const { vaccineList, natList, tripList } = data
+ this.vaccineList = vaccineList
+ this.natList = natList
+ this.tripList = tripList
+ } else {
+ this.$message.error(msg)
+ }
+ },
diaClose () {
- this.$refs.ref_form.resetData()
+ // this.$refs.ref_form.resetData()
this.formShow = false
},
- handleDetail (row) {
+
+ async handleDetail (row) {
+
+ await this.getDetailInfo(row.id)
+ await this.getDetailList(row.id)
this.formTitle = '详情'
this.formShow = true
- this.$nextTick(() => {
- this.$refs.ref_form.initForm('detail', row.natId, this.agencyId)
- })
+ // this.$nextTick(() => {
+ // this.$refs.ref_form.initForm('detail', row.natId, this.agencyId)
+ // })
},
addFormCancle () {
@@ -586,7 +842,7 @@ export default {
this.searchForm.buildingId = ''
this.searchForm.unitId = ''
this.searchForm.houseId = ''
- this.pageSize = 10
+ this.pageSize = 20
this.pageNo = 1
this.loadTable()
},
@@ -638,6 +894,9 @@ export default {
.resi-cell-select:last-child {
margin-right: 0;
}
+ .min-w180 {
+ min-width: 170px;
+ }
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
new file mode 100644
index 000000000..49d2df70a
--- /dev/null
+++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
@@ -0,0 +1,742 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
new file mode 100644
index 000000000..0c12d5e0a
--- /dev/null
+++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
@@ -0,0 +1,300 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 小程序通知
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{selectionAll.length}}
+
+
+
+
+
+ 小程序通知
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
new file mode 100644
index 000000000..087c6fe72
--- /dev/null
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -0,0 +1,775 @@
+
+
+
+
+
+
+ {{formData.name}}
+
+
+
+
+
+ {{formData.mobile}}
+
+
+
+ {{formData.idCard}}
+
+
+
+
+
+
+
+
+
+
+ 小程序通知
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue
new file mode 100644
index 000000000..7b7fb33ca
--- /dev/null
+++ b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 修改
+
+
+ 更多
+
+
+
+
+
+
+
+
+
+ 新增
+
+ 下载模板
+
+ 导入
+
+
+ 导出
+
+ 发送通知
+ 取消关注
+
+
+
+ 通知记录
+
+
+
+ 随访记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
new file mode 100644
index 000000000..9274d9286
--- /dev/null
+++ b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
@@ -0,0 +1,240 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
new file mode 100644
index 000000000..67448435e
--- /dev/null
+++ b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
@@ -0,0 +1,324 @@
+
+
+
+
+
+
+ 小程序通知
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
index 8d1b761ee..4307a74eb 100644
--- a/src/views/modules/base/epidemic/natInfo/natForm.vue
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -1,6 +1,7 @@
+ 新增
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
@@ -162,13 +164,17 @@
prop="channel"
label-width="150px"
style="display: block">
-
+
+ 小程序通知
+
+ 短信通知
-
+ -->
@@ -221,6 +227,9 @@ let loading // 加载动画
export default {
data () {
return {
+
+
+
formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
hideUploadEdit: false, // 隐藏'上传按钮'
limitNum: 1,
@@ -229,6 +238,11 @@ export default {
gridList: [],
personList: [],
+ pickerOptions: { //控制时间范围
+ disabledDate (time) {
+ return time.getTime() > (Date.now())
+ }
+ },
btnDisable: false,
@@ -244,6 +258,7 @@ export default {
natTime: '',
natAddress: '',
natResult: '',
+ isSelChannel: false,
channel: [],
content: '',
@@ -270,11 +285,12 @@ export default {
methods: {
async initForm (type, icNatId) {
-
+ this.startLoading()
this.formData.agencyId = this.agencyId
this.$refs['ref_form'].resetFields();
-
+ this.isFromResi = false
+ this.enterType = '1'
this.formType = type
if (icNatId) {
@@ -284,6 +300,8 @@ export default {
await this.loadFormData()
}
+ this.endLoading()
+
},
@@ -293,6 +311,8 @@ export default {
this.formData.idCard = ''
this.formData.gridId = ''
this.formData.userId = ''
+
+ this.$refs['ref_form'].resetFields();
if (value === '2') {
this.isFromResi = true
} else {
@@ -354,7 +374,14 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = data
+ this.formData.channel = []
+ this.formData.content = ''
this.formData.icNatId = this.icNatId
+ if (this.formData.userId) {
+ this.isFromResi = true
+ } else {
+ this.isFromResi = false
+ }
this.fileList = []
if (data.fileName) {
let obj = {
@@ -378,10 +405,19 @@ export default {
}
},
+ handleComfirm () {
+ this.$refs['ref_form'].validate((valid, messageObj) => {
+ if (!valid) {
+ app.util.validateRule(messageObj)
- async handleComfirm () {
+ } else {
+ this.addNat()
+ }
+ })
+ },
+ async addNat () {
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
if (regPhone.test(this.formData.mobile) === false) {
this.btnDisable = false
@@ -401,12 +437,19 @@ export default {
return false;
}
- if (this.formData.channel.length > 0 && !this.formData.content) {
- 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.btnDisable = true
@@ -518,6 +561,7 @@ export default {
natTime: '',
natAddress: '',
natResult: '',
+ isSelChannel: false,
channel: [],
content: '',
@@ -565,9 +609,7 @@ export default {
natResult: [
{ required: true },
],
- natAddress: [
- { required: false },
- ],
+
channel: [
{ required: false },
],
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index f81b23058..af1acf4fe 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -190,13 +190,13 @@
type="text"
class="div-table-button--edit"
size="small"
- @click="handleAttention(scope.row)">关注
+ @click="handleAttention(scope.row)">同步
取消关注
+ @click="handleDelete(scope.row,'attention')">取消同步
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 小程序通知
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+