diff --git a/src/App.vue b/src/App.vue index f743cc40..848664f8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -187,4 +187,11 @@ export default { padding: 6px !important; background-color: rgb(247, 250, 253); } + +//列表操作列，更多 +.table-more-btn { + display: flex; + flex-direction: column; + justify-content: center; +} diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss index c79f9efe..46189c05 100644 --- a/src/assets/scss/modules/management/epidemic.scss +++ b/src/assets/scss/modules/management/epidemic.scss @@ -75,11 +75,6 @@ } } -.more-btn { - display: flex; - flex-direction: column; - justify-content: center; -} .div-mult-form { margin-top: 20px; diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue index 49d2df70..3eecb4fe 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue @@ -46,6 +46,17 @@ v-model="formData1.idCard"> + + + + + - @@ -76,7 +88,8 @@ --> - @@ -114,14 +127,29 @@ - + + + + + + label="核酸检测次数小于"> - {{selectionAll.length}} + + + + + - @@ -246,7 +286,8 @@ --> - @@ -298,14 +339,19 @@ export default { formDataSearch: { gridId: '', - vaccineCount: undefined, + natCount: undefined, + startDate: '', + endDate: '', + attentionType: 2 }, + timeRange: [], formData1: { - attentionType: 1, + attentionType: 2, name: '', idCard: '', mobile: '', + reason: '', remark: '', isSelChannel: false, channel: [], @@ -314,7 +360,8 @@ export default { }, formData2: { - attentionType: 1, + attentionType: 2, + reason: '', remark: '', isSelChannel: false, channel: [], @@ -356,7 +403,7 @@ export default { async loadTable () { this.tableLoading = true - const url = "/epmetuser/epidemicPrevention/page" + const url = "/epmetuser/epidemicPrevention/user-list" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" let params = { pageSize: this.pageSize, @@ -382,6 +429,19 @@ export default { this.tableLoading = false }, + handleTimeChange (time) { + if (time) { + this.formData.startDate = time[0] + this.formData.endDate = time[1] + + } else { + this.formData.startDate = '' + this.formData.endDate = '' + + } + + }, + handleSelectTable (selection, row) { row.isSel = !row.isSel @@ -628,14 +688,9 @@ export default { resetSearch () { this.formDataSearch = { gridId: '', - vaccineCount: undefined, - - + natCount: undefined, } - }, - - destroyed () { - console.log(11111111) + this.timeRange = [] }, resetData () { @@ -644,15 +699,17 @@ export default { name: '', idCard: '', mobile: '', + reason: '', remark: '', isSelChannel: false, channel: [], content: '', - attentionType: 1, + attentionType: 2, } this.formData2 = { - attentionType: 1, + attentionType: 2, + reason: '', remark: '', isSelChannel: false, channel: [], @@ -660,12 +717,11 @@ export default { } this.formDataSearch = { gridId: '', - vaccineCount: undefined, + natCount: undefined, } this.selectionAll = []//选中的人员 - }, handleSizeChange (val) { diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue index 0c12d5e0..56962ffb 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue @@ -44,6 +44,17 @@ v-model="formData.idCard"> --> + + + + +
- @@ -75,7 +87,8 @@ --> - @@ -125,10 +138,11 @@ export default { btnDisable: false, formData: { - attentionType: 1, + attentionType: 2, name: '', idCard: '', mobile: '', + reason: '', remark: '', isSelChannel: false, channel: [], @@ -142,6 +156,10 @@ export default { }, + destroyed () { + + }, + methods: { async initForm (formType, row) { @@ -149,6 +167,7 @@ export default { this.$refs['ref_form1'].resetFields(); row.channel = [] row.content = '' + row.attentionType = 2 row.isSelChannel = false this.formData = JSON.parse(JSON.stringify(row)) @@ -210,9 +229,11 @@ export default { this.veroId = '' this.formData = { + attentionType: 2, name: '', idCard: '', mobile: '', + reason: '', remark: '', isSelChannel: false, channel: [], diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue index 087c6fe7..db245c03 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue @@ -38,19 +38,24 @@ + + + - - - - - + + + + @@ -94,7 +99,8 @@ size="small" @click="handleExport">导出 - 发送通知 @@ -140,10 +146,10 @@ label="身份证" min-width="170"> - -
+
通知记录
-
+
{ - this.$refs.ref_sendnotice.initForm(this.selectionAll) + this.$refs.ref_sendnotice.initForm(this.selectionAll, '2') }) }, @@ -505,7 +513,7 @@ export default { handleNoticeList (row) { this.noticeListFormShow = true this.$nextTick(() => { - this.$refs.ref_noticelist.initTable(row.idCard) + this.$refs.ref_noticelist.initTable(row.idCard, '2') }) }, @@ -513,7 +521,7 @@ export default { this.visiteListFormShow = true this.$nextTick(() => { - this.$refs.ref_visitelist.initTable(row) + this.$refs.ref_visitelist.initTable(row, '2') }) @@ -557,7 +565,7 @@ export default { idCards.push(element.idCard) }); let params = { - attentionType: 1, + attentionType: 2, idCards: idCards } @@ -578,7 +586,7 @@ export default { //重置搜索条件 resetSearch () { this.formData = { - attentionType: 1,//关注类型，核酸检测：2，疫苗接种：1 + attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1 name: '', mobile: '', idCard: '', diff --git a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue index 7b7fb33c..05713c97 100644 --- a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue +++ b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue @@ -70,7 +70,7 @@ export default { tableData: [], pageSize: 20, pageNo: 1, - + origin: '' } }, components: {}, @@ -80,8 +80,9 @@ export default { methods: { - async initTable (idCard) { + async initTable (idCard, origin) { this.idCard = idCard + this.origin = origin await this.loadTable() }, @@ -89,13 +90,13 @@ export default { //加载form async loadTable () { this.tableLoading = true - // const url = "/epmetuser/icNotice/page" - const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/page" + const url = "/epmetuser/icNotice/page" + // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/page" let params = { idCard: this.idCard, pageNo: this.pageNo, pageSize: this.pageSize, - origin: '1' + origin: this.origin } const { data, code, msg } = await requestPost(url, params) diff --git a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue index 9274d928..0626a739 100644 --- a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue +++ b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue @@ -8,7 +8,8 @@ :rules="dataRule" class="form"> - @@ -24,7 +25,8 @@ --> - @@ -73,7 +75,7 @@ export default { btnDisable: false, formData: { - origin: '1', + origin: '', isSelChannel: false, channel: [], content: '', @@ -92,10 +94,11 @@ export default { methods: { - async initForm (selectionAll) { + async initForm (selectionAll, origin) { this.$refs['ref_form1'].resetFields(); this.formData.userList = selectionAll + this.formData.origin = origin }, @@ -119,7 +122,7 @@ export default { } console.log(this.formData) - return false + // return false this.btnDisable = true setTimeout(() => { @@ -128,8 +131,7 @@ export default { let url = '' - url = '/epmetuser/icNotice/batchnotice' - // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/batchnotice" + url = '/epmetuser/icNotice/sendNotice' const { data, code, msg } = await requestPost(url, this.formData) diff --git a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue index 67448435..98c7d597 100644 --- a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue +++ b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue @@ -55,7 +55,7 @@ title="新增" append-to-body @closed="handleCancle"> -
+
@@ -160,7 +160,8 @@ - @@ -168,16 +169,17 @@ 小程序通知 - + - @@ -607,7 +609,7 @@ export default { { required: false }, ], natResult: [ - { required: true }, + { required: true, message: '检测结果不能为空', trigger: 'blur' }, ], channel: [ diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index af1acf4f..3d80d128 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -19,51 +19,65 @@ - - - - + + + + + - - - + + + - - - -
+ + + + + - - - + + + + + + + + @@ -160,6 +174,14 @@ label="检测结果" width="100"> + + 查看 - 修改 - - 删除 - - 同步 - 取消同步 - + @click="handleDelete(scope.row,'attention')">取消同步 + @@ -277,6 +281,16 @@ export default { label: '全部检测记录' }, ], + isResiUserList: [ + { + value: '0', + label: '否' + }, + { + value: '1', + label: '是' + }, + ], timeRange: [], formData: { @@ -286,6 +300,7 @@ export default { idCard: '',//身份证号码 startTime: '',//检测开始时间yyyy-MM-dd HH:mm endTime: '',//检测结束时间yyyy-MM-dd HH:mm + isResiUser: ''//0:否 1:是 }, @@ -337,6 +352,8 @@ export default { this.tableData = data.list this.tableData.forEach(item => { + + item.isResiUserShow = item.isResiUser === '0' ? '否' : '是' if (item.natResult === '1') { item.natResultShow = '阳性' } else if (item.natResult === '0') { diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue index b554b665..1283bbb2 100644 --- a/src/views/modules/base/epidemic/travel.vue +++ b/src/views/modules/base/epidemic/travel.vue @@ -23,7 +23,7 @@ size="small" class="list_item_width_1" clearable - placeholder="请输入姓名"> + placeholder="请输入手机号"> @@ -44,13 +44,14 @@ - - - + --> + 新增 - 下载模板 @@ -96,16 +97,30 @@ accept=".xls,.xlsx" :limit="1" :on-exceed="handleExceed" - :http-request="uploadFile"> - 导入 + :http-request="uploadHttpRequest"> + {{importBtnTitle}} - 导出 + :loading="exportBtn" + @click="handleExport">{{ exportBtnTitle }} + 发送通知 + 加入关注 + 取消关注
+ style="width: 100%" + @selection-change="handleSelectionChange"> + + width="50" fixed="left"> + width="100" fixed="left"> - 查看 - 修改 - +
+ 通知记录 +
+ +
+ 随访记录 +
+
+ 删除 +
+ + 更多 + @@ -231,17 +275,55 @@ top="5vh" class="dialog-h" @closed="diaClose"> - - + + + + + + + + + + + +