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 390d0cb5..3eecb4fe 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue @@ -127,14 +127,29 @@ - + + + + + + label="核酸检测次数小于"> - -
+
通知记录
-
+
{ - this.$refs.ref_sendnotice.initForm(this.selectionAll) + this.$refs.ref_sendnotice.initForm(this.selectionAll, '2') }) }, @@ -513,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') }) }, diff --git a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue index 664e3ab6..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() }, @@ -95,7 +96,7 @@ export default { idCard: this.idCard, pageNo: this.pageNo, pageSize: this.pageSize, - origin: '2' + 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 beec2e63..0626a739 100644 --- a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue +++ b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue @@ -8,7 +8,7 @@ :rules="dataRule" class="form"> - --> - { @@ -130,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 70fcf372..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,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 d816136f..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 @@ - - - + --> + 发送通知 + 加入关注 + width="55" fixed="left"> + width="50" fixed="left"> + width="100" fixed="left"> { + + // }, 1000) + }, handleSearch () { this.loadTable() }, @@ -391,7 +407,31 @@ export default { console.log('val----', val) this.selectionAll = val }, + async getArea (node, resolve) { + + const url = "/commonservice/areacode/nextarea" + let params = { + parentLevel: node.data ? node.data.level : '', + parentAreaCode: node.data ? node.data.code : '' + } + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + const nodes = data.map(item => ({ + value: item.areaCode, // + label: item.areaName, + code: item.areaCode, + level: item.level, + leaf: node.level >= 4 // 5层级 + })) + resolve(nodes) + + } else { + this.$message.error(msg) + } + + }, async loadTable () { this.tableLoading = true @@ -421,7 +461,13 @@ export default { } this.tableLoading = false }, - + handleAreaChange(val) { + + if (val.length > 0) { + const len = val.length - 1 + this.formData.sourceAddressCode = val[len] + } else this.formData.sourceAddressCode = '' + }, handleScheduledTimeChange (time) { if (time) { this.formData.startDate = time[0] @@ -445,7 +491,7 @@ export default { handleNoticeList (row) { this.noticeListFormShow = true this.$nextTick(() => { - this.$refs.ref_noticelist.initTable(row.idCard) + this.$refs.ref_noticelist.initTable(row.idCard, '0') }) }, @@ -465,10 +511,36 @@ export default { } this.sendNoticeFormShow = true this.$nextTick(() => { - this.$refs.ref_sendnotice.initForm(this.selectionAll) + const arr = this.selectionAll.map(item => { + return { + userId: item.userId, + idCard: item.idCard, + mobile: item.mobile + } + }) + this.$refs.ref_sendnotice.initForm(arr, '0') }) }, + handleAttention(row) { + if (this.selectionAll.length === 0) { + this.$message.info('请选择要加入关注的名单') + return false + } + this.$confirm("确认选择的名单加入关注?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }) + .then(() => { + this.saveFocus(row) + }) + .catch(err => { + console.log('err-----', err) + + }); + }, + async handleDeletes (row) { if (this.selectionAll.length === 0) { this.$message.info('请选择要取消关注的名单') @@ -489,6 +561,37 @@ export default { }); }, + async saveFocus (row) { + const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-add" + // let idCards = [] + + // this.selectionAll.forEach(element => { + // idCards.push(element.idCard) + // }); + let params = { + list: this.selectionAll.map(item => { + return { + name: item.name, + mobile: item.mobile, + idCard: item.idCard, + attentionType: 2 + } + }) + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + this.$message({ + type: "success", + message: "操作成功" + }); + + this.loadTable() + } else { + this.$message.error(msg) + } + }, async deleteFocus (row) { const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention" // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del" @@ -498,7 +601,7 @@ export default { idCards.push(element.idCard) }); let params = { - attentionType: 0, + attentionType: 2, idCards: idCards } @@ -592,6 +695,7 @@ export default { this.$refs.ref_searchform.resetFields() this.formData.startDate = '' this.formData.endDate = '' + this.searchAreacode = [] this.timeRange = [] this.pageSize = 20 this.pageNo = 1 diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue index 631a8c49..fa874c81 100644 --- a/src/views/modules/base/epidemic/travelForm.vue +++ b/src/views/modules/base/epidemic/travelForm.vue @@ -155,7 +155,7 @@ style="display: block"> -
+
通知记录
-
+
复查记录 - 删除 + :disabled="true" + @click="handleEdit(scope.row)">修改 + + +
+ 复查记录 +
+ +
+ 删除 +
+ + 更多 + @@ -428,6 +450,14 @@ export default { }) }, + handleEdit (row) { + this.formTitle = '编辑' + this.formShow = true + this.$nextTick(() => { + this.$refs.ref_form.initForm('edit', row) + }) + }, + handleReview (row) { this.reviewShow = true this.$nextTick(() => { diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue index 98947245..54e8a575 100644 --- a/src/views/modules/shequ/index.vue +++ b/src/views/modules/shequ/index.vue @@ -10,12 +10,10 @@
- + {{ { jumin: "居民", fangwu: "房屋", xuqiu: "需求" }[ @@ -30,289 +28,240 @@ - - -
+ + +
-
搜索
+
搜索
-
+ ">
- - - + + + "> - +
- +
-
+ ">
- - - + + + - + - + - + - + - + - + - + - + - + - + - +
- +
-
+ ">
- - - - + + + + - +
- +
-
+ ">
-
+
常用功能
-
+
-

{{ item.menuName }}

-
+
- +

添加应用

@@ -321,21 +270,22 @@
-
+
人员预警
-
-
通知
+
+
通知
- + {{ item.noticeContent }} @@ -345,59 +295,55 @@
- +
- - - + + + - + - - + + - + - +
- +
@@ -407,35 +353,27 @@
-
+ ">
-
+
常用功能
-
+
-
@@ -447,33 +385,25 @@
所有功能
-
+
{{ menu.name }}
-
-
+
+ }">
-
@@ -484,10 +414,11 @@
- 返回 - 确认 + 返回 + 确认
@@ -500,47 +431,35 @@ 人员预警
- +
- + - - + + - - + +
@@ -566,7 +485,7 @@ export default { scrollNotice, }, - data() { + data () { return { searchStatus: "ini", //ing over searchData: { @@ -763,7 +682,7 @@ export default { }; }, computed: { - selectedFuncList() { + selectedFuncList () { const { selectedFuncIdList, $store: { @@ -795,7 +714,7 @@ export default { }); return selectedFuncIdList.map((id) => obj[id]); }, - maxTableHeight() { + maxTableHeight () { // return this.clientHeight - 450; return 420; }, @@ -808,7 +727,7 @@ export default { } }, }, - mounted() { + mounted () { this.getApiData(); console.log( "dynamicMenuRoutes----------------------------", @@ -816,18 +735,18 @@ export default { ); }, methods: { - changeCategoryCode({ code }) { + changeCategoryCode ({ code }) { this.currentCategoryCode = code || ""; this.warningTb.pageNo = 1; this.getWarningTb(); }, - computedWidth(label) { + computedWidth (label) { const wd = 20 * label.length; return wd > 80 ? wd : 80; }, - handleFilterSpan(row, item) { + handleFilterSpan (row, item) { let _val = ""; if (item.options && item.options.length > 0) { item.options.forEach((n) => { @@ -837,7 +756,7 @@ export default { return _val || row[item.columnName]; }, - handleClickSearchBtn() { + handleClickSearchBtn () { const { searchData: { type, keyword }, } = this; @@ -858,18 +777,18 @@ export default { this.searchStatus = "ing"; }, - handleSizeChangeWarning(val) { + handleSizeChangeWarning (val) { console.log(`每页 ${val} 条`); this.warningTb.pageSize = val; window.localStorage.setItem("pageSize", val); this.getWarningTb(); }, - handleCurrentChangeWarning(val) { + handleCurrentChangeWarning (val) { console.log(`当前页: ${val}`); this.warningTb.pageNo = val; this.getWarningTb(); }, - async handleWatchWarning(rowIndex) { + async handleWatchWarning (rowIndex) { let item = this.warningTb.list[rowIndex]; this.currentPepeleId = item.userId; this.currentPepeleGridName = item.gridName; @@ -877,18 +796,18 @@ export default { this.showedPeopleMoreInfo = true; }, - handleSizeChangeSearchJumin(val) { + handleSizeChangeSearchJumin (val) { console.log(`每页 ${val} 条`); this.searchJumin.pageSize = val; window.localStorage.setItem("pageSize", val); this.getSearchJumin(); }, - handleCurrentChangeSearchJumin(val) { + handleCurrentChangeSearchJumin (val) { console.log(`当前页: ${val}`); this.searchJumin.pageNo = val; this.getSearchJumin(); }, - async handleWatchSearchJumin(rowIndex) { + async handleWatchSearchJumin (rowIndex) { let item = this.searchJumin.list[rowIndex]; this.currentPepeleId = item.icResiUserId; this.currentPepeleGridName = item.GRID_ID; @@ -896,41 +815,41 @@ export default { this.showedPeopleMoreInfo = true; }, - handleSizeChangeSearchFangwu(val) { + handleSizeChangeSearchFangwu (val) { console.log(`每页 ${val} 条`); this.searchFangwu.pageSize = val; window.localStorage.setItem("pageSize", val); this.getSearchFangwu(); }, - handleCurrentChangeSearchFangwu(val) { + handleCurrentChangeSearchFangwu (val) { console.log(`当前页: ${val}`); this.searchFangwu.pageNo = val; this.getSearchFangwu(); }, - async handleWatchSearchFangwu(row) { + async handleWatchSearchFangwu (row) { this.showedFangwuInfo = true; await nextTick(); this.$refs.fangwu_info.initForm("detail", row); }, - handleSizeChangeSearchXuqiu(val) { + handleSizeChangeSearchXuqiu (val) { console.log(`每页 ${val} 条`); this.searchXuqiu.pageSize = val; window.localStorage.setItem("pageSize", val); this.getSearchXuqiu(); }, - handleCurrentChangeSearchXuqiu(val) { + handleCurrentChangeSearchXuqiu (val) { console.log(`当前页: ${val}`); this.searchXuqiu.pageNo = val; this.getSearchXuqiu(); }, - async handleWatchSearchXuqiu(row) { + async handleWatchSearchXuqiu (row) { this.showedXuqiuInfo = true; await nextTick(); this.$refs.xuqiu_info.initForm("detail", row); }, - handleClickFunc(menu) { + handleClickFunc (menu) { const menuId = menu.menuId; var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter( (item) => item.meta.menuId === menuId @@ -940,7 +859,7 @@ export default { } }, - getApiData() { + getApiData () { this.getFuncList(); this.getWarningList(); this.getWarningTb(); @@ -948,7 +867,7 @@ export default { this.getNoticeList(); }, - selectFuncItem(id) { + selectFuncItem (id) { let index = this.selectedFuncIdList.indexOf(id); if (index === -1) { this.selectedFuncIdList.push(id); @@ -957,7 +876,7 @@ export default { } }, - toNoticeInfo(item) { + toNoticeInfo (item) { console.log(item); this.currentPage = "yujing"; if (item) { @@ -969,7 +888,7 @@ export default { } }, - async getNoticeList() { + async getNoticeList () { const url = "/epmetuser/statsresiwarn/queryuserwarnnotice"; const { data, code, msg } = await requestPost(url, { agencyId: this.$store.state.user.agencyId, @@ -981,7 +900,7 @@ export default { } }, - async getSearchJuminHeader() { + async getSearchJuminHeader () { const url = "/oper/customize/icform/tableheaders"; const { data, code, msg } = await requestPost(url, { formCode: "resi_base_info", @@ -994,7 +913,7 @@ export default { } }, - async getSearchXuqiu() { + async getSearchXuqiu () { const url = "/heart/userdemand/search"; const { searchData: { keyword }, @@ -1010,14 +929,14 @@ export default { this.searchXuqiu.total = data.total || 0; this.searchXuqiu.list = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; } else { } }, - async getSearchJumin() { + async getSearchJumin () { const url = "/epmetuser/icresiuser/search"; const { searchData: { keyword }, @@ -1033,14 +952,14 @@ export default { this.searchJumin.total = data.total || 0; this.searchJumin.list = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; } else { } }, - async getSearchFangwu() { + async getSearchFangwu () { const url = "/gov/org/house/search"; const { searchData: { keyword }, @@ -1056,14 +975,14 @@ export default { this.searchFangwu.total = data.total || 0; this.searchFangwu.list = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; } else { } }, - async getWarningTb() { + async getWarningTb () { const url = "/epmetuser/icresiuser/personwarn/rightlist"; const { warningTb: { pageSize, pageNo }, @@ -1078,16 +997,16 @@ export default { this.warningTb.total = data.total || 0; this.warningTb.list = data.list ? data.list.map((item) => { - item.typeName = item.type.join("、"); - return item; - }) + item.typeName = item.type.join("、"); + return item; + }) : []; } else { } }, //加载组织数据 - async getWarningList() { + async getWarningList () { const url = "/epmetuser/icstatsresiwarn/personwarn/leftpie"; let params = {}; @@ -1110,7 +1029,7 @@ export default { }, //加载组织数据 - async getFuncList() { + async getFuncList () { const url = "/gov/access/icoftenusefunction/oftenusefunctionlist"; let params = {}; @@ -1125,7 +1044,7 @@ export default { }, //加载组织数据 - async editFuncList() { + async editFuncList () { const url = "/gov/access/icoftenusefunction/addoftenusefunction"; const { selectedFuncIdList } = this; let params = selectedFuncIdList.map((menuId, sort) => {