+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+ {{ scope.row.houseType == '1' ? '自有' : '租住' }}
+
+
+
+
+
+ 全程接种
+ 未全程接种
+ 未接种
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 95870f081e9580f83a99ad2c722fe59c830c4afb Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 09:53:11 +0800
Subject: [PATCH 04/23] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/communityService/dqfwzx/index.vue | 244 ++++++++++--------
1 file changed, 131 insertions(+), 113 deletions(-)
diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index a042d1c40..344df3f9c 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -2,25 +2,26 @@
+
+ 导出
+
+
+
+
+
+
- 新增
+ 新增
-
+
-
-
- 修改
+
-
-
-
+
-
-
+
-
-
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 8f6c49af9..9d38bdb99 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -1,429 +1,582 @@
-
+
-
-
-
-
-
-
-
-
+
+
Date: Thu, 24 Mar 2022 17:00:43 +0800
Subject: [PATCH 06/23] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../base/epidemic/veroFocus/veroFocusForm.vue | 543 +++++++++---------
1 file changed, 259 insertions(+), 284 deletions(-)
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
index 64fa94c48..d00ef1ff7 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
@@ -1,185 +1,187 @@
+
+
-
+
+
+
+ computed: {
+ tableHeight () {
-
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
new file mode 100644
index 000000000..64fa94c48
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
@@ -0,0 +1,575 @@
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
- 查询
- 重置
-
-
-
-
-
-
+
-
- 导出
+
+ 查询
+ 重置
+
+
+
+
-
-
-
- {{ scope.row.houseType == '1' ? '自有' : '租住' }}
-
-
+
+
+
-
-
- 全程接种
- 未全程接种
- 未接种
-
+
+
+
+
+
+
+
+
+
-
-
+
-
+ 新增
+
+ 下载模板
+
+ 导入
+
+
+ 导出
-
-
+
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
new file mode 100644
index 000000000..49897bb18
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -0,0 +1,691 @@
+
+
+
+
+
+
+
+ 手动输入
+ 选择居民
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 阴性
+ 阳性
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+ 小程序通知
+ 短信通知
+
+
+
+
+
+
+
+
+
+
+ 最多三个附件，只能上传word、excel、pdf文件
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From bf2b563ba7495f794095e419487be0b4abc0339e Mon Sep 17 00:00:00 2001
From: jiangyy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 修改
+
+
+ 更多
+
+
+
+
+
+
+
+
+
+ 新增
+
+ 下载模板
+
+ 导入
+
+
+ 导出
+
+
+
+ 通知记录
+
+
+
+ 随访记录
+
+
+ 取消关注
+
+
+
+
+
+
+
+
+ 全选
+ 发送通知
+
+
-
-
-
-
-
- 手动输入
- 选择居民
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 阴性
- 阳性
-
-
-
-
-
-
-
- 点击上传
-
-
-
-
-
- 小程序通知
- 短信通知
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 小程序通知
+ 短信通知
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
最多三个附件，只能上传word、excel、pdf文件
-
+
+
+
+
+
@@ -207,32 +209,36 @@ export default {
data () {
return {
formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
- enterType: '1',//录入方式1 手动输入 2 选择居民
- isFromResi: false,//是否从已有居民信息中选择
+
+ activeName: "second",
gridList: [],
- personList: [],
+ selGridId: '',
+ veroNum: null,
+
btnDisable: false,
- natId: '',
- formData: {
+ formData1: {
name: '',
idCard: '',
phone: '',
- checkTime: '',
- address: '',
- result: '',
+ remark: '',
noticeWay: [],
noticeContent: '',
- attachmentList: []
+
},
+ formData2: {
+ personList: [],
+ remark: '',
+ noticeWay: [],
+ noticeContent: '',
+ },
+ tableData: [],
+ tableLoading: false,
- fileList: [],
- uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
- dialogImageUrl: '',
- dialogVisible: false,
+ selection: [],//选中的人员
}
@@ -261,73 +267,86 @@ export default {
},
- handleChangeEnterType (value) {
- this.formData.name = ''
- this.formData.phone = ''
- this.formData.idCard = ''
- this.formData.gridId = ''
- this.formData.personId = ''
- if (value === '2') {
- this.isFromResi = true
- } else {
- this.isFromResi = false
- }
-
+ handleSearch () {
+ this.loadTable()
},
- async loadGrid () {
- const url = "/gov/org/customergrid/gridoption"
+ async loadTable () {
+ this.tableLoading = true
+ const url = "/gov/org/placepatrolteam/getlist"
+ // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
let params = {
- agencyId: this.agencyId
+ pageSize: this.pageSize,
+ pageNo: this.pageNo,
+ ...this.formData
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- this.gridList = data
+ this.total = data.total
+ this.tableData = data.list
+ this.tableData.forEach(item => {
+ if (item.time) {
+ let timeArray = item.time.split(' ')
+ item.time = timeArray[0]
+ }
+
+ });
} else {
this.$message.error(msg)
}
+ this.tableLoading = false
+ },
+
+ handleSelectAll (selectAllFlag) {
+ this.$refs.ref_table.clearSelection();
+ if (selectAllFlag) {
+ this.tableData.forEach(row => {
+ if (row.showBtn) {
+ this.$refs.ref_table.toggleRowSelection(row);
+ }
+ });
+ }
+ },
+
+ selectAll (selection) {
+ this.selection = selection
+
+ if (selection.length === this.validTableDataNum) {
+ this.selAllFlag = true
+ } else {
+ this.selAllFlag = false
+ }
+
+ },
+
+
+ handleClick () {
},
- async handleSelGrid (value) {
- const url = "/epmetuser/icresiuser/demandusers"
+ async loadGrid () {
+ const url = "/gov/org/customergrid/gridoption"
let params = {
- agencyId: this.agencyId,
- gridId: value
+ agencyId: this.agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- this.personList = data
+ this.gridList = data
} else {
this.$message.error(msg)
}
},
- async handleSelPerson (personItem) {
- this.formData.name = personItem.demandUserName
- this.formData.phone = personItem.demandUserMobile
- this.formData.idCard = personItem.idCard
- },
-
-
- handleTime () {
- if (!this.formData.remindTime) return
- var startAt = new Date(this.formData.remindTime) * 1000 / 1000;
- if (startAt < Date.now()) {
- this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
- }
- },
-
async loadFormData () {
@@ -357,8 +376,6 @@ export default {
},
async handleComfirm () {
-
-
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
@@ -431,61 +448,7 @@ export default {
},
- beforeUpload (file) {
- const array = file.name.split('.')
- const extension = array[array.length - 1]
- const isLt1M = (file.size / 1024 / 1024) < 5
- if (extension !== 'xls'
- && extension !== 'xlsx'
- && extension !== 'doc'
- && extension !== 'docx'
- && extension !== 'pdf') {
- this.$message.error('只能上传word、excel、pdf文件！')
- return false
- }
- if (!isLt1M) {
- this.$message.error('上传文件大小不能超过 5MB!')
- }
- return isLt1M
-
- },
- handleFileRemove (file) {
-
- if (file && file.status === "success") {
- this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
- }
- },
-
- handleFileSuccess (res, file) {
-
- if (res.code === 0 && res.msg === 'success') {
- const array = file.name.split('.')
- const fileType = array[array.length - 1]
-
- file.fileName = file.name
- file.attachmentUrl = res.data.url
- file.attachmentSize = file.size
- file.attachmentType = 'doc'
- file.attachmentFormat = fileType
-
- this.fileList.push(file)
- console.log(this.fileList)
- } else this.$message.error(res.msg)
- },
-
- //下载
- handleFileDownload (file) {
-
- var a = document.createElement('a');
- var event = new MouseEvent('click');
- a.download = file.fileName;
- console.log(a)
- a.href = file.attachmentUrl;
- a.dispatchEvent(event);
-
-
- },
resetData () {
this.natId = ''
@@ -503,6 +466,18 @@ export default {
}
},
+
+ handleSizeChange (val) {
+ this.pageSize = val
+ this.pageNo = 1
+ this.loadTable()
+ },
+ handleCurrentChange (val) {
+ this.pageNo = val
+ this.loadTable()
+ },
+
+
// 开启加载动画
startLoading () {
loading = Loading.service({
From 9f323744b6784400418228b86680aa969817d732 Mon Sep 17 00:00:00 2001
From: jiangyy
Date: Thu, 24 Mar 2022 17:01:20 +0800
Subject: [PATCH 07/23] 11
---
src/assets/scss/modules/management/epidemic.scss | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index 993555d66..9d6e95807 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -14,6 +14,10 @@
text-align: center;
}
+.main_tab {
+ margin: 10px 35px;
+}
+
.div_main {
width: 100%;
From fbb6333b4a1a29de5e88e9d276e18af218c5ecb7 Mon Sep 17 00:00:00 2001
From: jiangyy
Date: Thu, 24 Mar 2022 17:02:25 +0800
Subject: [PATCH 08/23] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/base/community/community.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 7f91ed38c..1708c943d 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -307,7 +307,7 @@ export default {
.div_table {
margin-left: 15px;
// flex: 1;
- width: calc(100vw - 550px);
+ width: calc(100% - 300px);
background-color: #ffffff;
border-radius: 5px;
padding: 10px;
From f8c5dc1e96594da83deccefc49d813120aa25e4a Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:04:31 +0800
Subject: [PATCH 09/23] ss
---
src/views/modules/communityService/dqfwzx/index.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 344df3f9c..7075c8b1b 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -9,7 +9,7 @@
-
+
Date: Thu, 24 Mar 2022 17:08:26 +0800
Subject: [PATCH 10/23] ss2
---
src/views/modules/communityService/dqfwzx/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 7075c8b1b..81865803d 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -189,7 +189,7 @@ export default {
},
computed: {
maxTableHeight() {
- return this.clientHeight - 520;
+ return this.$store.state.inIframe ? this.clientHeight - 410 : this.clientHeight - 520;
},
...mapGetters(["clientHeight"]),
},
From 336ce024a9e6ae946420ce0712c5f2b86bbb0b40 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:24:16 +0800
Subject: [PATCH 11/23] ss3
---
src/views/modules/communityService/dqfwzx/index.vue | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 81865803d..302a0a04d 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -189,7 +189,9 @@ export default {
},
computed: {
maxTableHeight() {
- return this.$store.state.inIframe ? this.clientHeight - 410 : this.clientHeight - 520;
+ return this.$store.state.inIframe
+ ? this.clientHeight - 520 - 120
+ : this.clientHeight - 520;
},
...mapGetters(["clientHeight"]),
},
@@ -380,7 +382,7 @@ export default {
overflow-y: auto;
&.z-iframe {
- height: calc(100vh - 100px);
+ height: calc(100vh - 210px - 120px);
}
&::-webkit-scrollbar {
@@ -450,6 +452,7 @@ export default {
font-size: 16px;
font-weight: bold;
margin-bottom: 10px;
+ width: calc(100% - 70px);
}
.item-prop {
display: flex;
From 8ea96bc0d2c8b5e952acac8f8054e71b882a38f7 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:31:59 +0800
Subject: [PATCH 12/23] ss4
---
src/views/modules/communityService/dqfwzx/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 302a0a04d..8173f6524 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -190,7 +190,7 @@ export default {
computed: {
maxTableHeight() {
return this.$store.state.inIframe
- ? this.clientHeight - 520 - 120
+ ? this.clientHeight - 520 + 120
: this.clientHeight - 520;
},
...mapGetters(["clientHeight"]),
@@ -382,7 +382,7 @@ export default {
overflow-y: auto;
&.z-iframe {
- height: calc(100vh - 210px - 120px);
+ height: calc(100vh - 210px + 120px);
}
&::-webkit-scrollbar {
From 65fe89d28080e09fc6235e042f2ec02697fad599 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:42:13 +0800
Subject: [PATCH 13/23] ss5
---
.../modules/communityService/sqzzz/index.vue | 217 +++++++++++-------
1 file changed, 132 insertions(+), 85 deletions(-)
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index a12416698..9e347e835 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -1,44 +1,60 @@
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
新增
下载模板
+ class="diy-button--export"
+ size="small"
+ @click="handleExportModule('room')"
+ >下载模板
- {{
- importBtnTitle
- }}
+ {{ importBtnTitle }}
+
-
+
{{ scope.row.organizationName }}
-
+
+
+
-
-
+
+
-
+
@@ -121,7 +159,7 @@
type="text"
size="small"
class="div-table-button--delete"
- style="margin-left: 10px;"
+ style="margin-left: 10px"
>删除
@@ -218,7 +256,9 @@ export default {
},
computed: {
maxTableHeight() {
- return this.clientHeight - 360;
+ return this.$store.state.inIframe
+ ? this.clientHeight - 360 + 120
+ : this.clientHeight - 360;
},
...mapGetters(["clientHeight"]),
},
@@ -237,38 +277,41 @@ export default {
this.getTableData();
},
methods: {
- async handleExportModule () {
- let url = "/heart/iccommunityselforganization/import-template-download"
-
+ async handleExportModule() {
+ let url = "/heart/iccommunityselforganization/import-template-download";
- let params = {}
+ let params = {};
await this.$http({
- method: 'POST',
+ method: "POST",
url,
- responseType: 'blob',
- data: params
+ responseType: "blob",
+ data: params,
})
- .then(res => {
+ .then((res) => {
// this.download(res.data, title + '.xls')
if (res.headers["content-disposition"]) {
- let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
- console.log('filename', fileName)
- let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
- var url = window.URL.createObjectURL(blob)
- var aLink = document.createElement('a')
- aLink.style.display = 'none'
- aLink.href = url
- aLink.setAttribute('download', fileName)
- document.body.appendChild(aLink)
- aLink.click()
- document.body.removeChild(aLink) //下载完成移除元素
- window.URL.revokeObjectURL(url) //释放掉blob对象
- } else this.$message.error('下载失败')
- })
- .catch(err => {
- console.log('err', err)
- return this.$message.error('网络错误')
+ let fileName = window.decodeURI(
+ res.headers["content-disposition"].split(";")[1].split("=")[1]
+ );
+ console.log("filename", fileName);
+ let blob = new Blob([res.data], {
+ type: "application/vnd.ms-excel",
+ });
+ var url = window.URL.createObjectURL(blob);
+ var aLink = document.createElement("a");
+ aLink.style.display = "none";
+ aLink.href = url;
+ aLink.setAttribute("download", fileName);
+ document.body.appendChild(aLink);
+ aLink.click();
+ document.body.removeChild(aLink); //下载完成移除元素
+ window.URL.revokeObjectURL(url); //释放掉blob对象
+ } else this.$message.error("下载失败");
})
+ .catch((err) => {
+ console.log("err", err);
+ return this.$message.error("网络错误");
+ });
},
// 上传大图标成功
handleExcelSuccess(res, file) {
@@ -304,23 +347,28 @@ export default {
this.importBtnTitle = "正在上传中...";
this.$message({
showClose: true,
- message: '导入中，请到系统管理-导入记录中查看进度',
- duration: 0
- })
+ message: "导入中，请到系统管理-导入记录中查看进度",
+ duration: 0,
+ });
const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
formData.append("file", file.file); //添加文件对象
await this.$http
- .post('/heart/iccommunityselforganization/importcommunityselforganization', formData).then(res => {
- console.log('res-up', res)
- if (res.data.code == 0 && res.data.msg == 'success') {
+ .post(
+ "/heart/iccommunityselforganization/importcommunityselforganization",
+ formData
+ )
+ .then((res) => {
+ console.log("res-up", res);
+ if (res.data.code == 0 && res.data.msg == "success") {
// this.$message.success('导入成功')
- this.getTableData()
- } else this.$message.error(res.data.msg)
- }).catch(err => {
- console.log('失败', err)
- file.onError() //上传失败的文件会从文件列表中删除
- // this.$message.error('导入失败')
+ this.getTableData();
+ } else this.$message.error(res.data.msg);
})
+ .catch((err) => {
+ console.log("失败", err);
+ file.onError(); //上传失败的文件会从文件列表中删除
+ // this.$message.error('导入失败')
+ });
// axios({
// url:
// window.SITE_CONFIG["apiURL"] +
@@ -344,8 +392,8 @@ export default {
// .catch((err) => {
// console.log("失败", err);
// });
- this.importLoading = false
- this.importBtnTitle = '导入'
+ this.importLoading = false;
+ this.importBtnTitle = "导入";
this.$refs.upload.clearFiles();
},
@@ -370,8 +418,8 @@ export default {
this.getTableData();
},
resetForm(formName) {
- this.$refs[formName].resetFields()
- this.handleSearch()
+ this.$refs[formName].resetFields();
+ this.handleSearch();
},
async handleAdd() {
this.formShow = true;
@@ -521,5 +569,4 @@ export default {
position: relative;
overflow: visible;
}
-
From 55a8e5ac11a0d5abb97cd0b764b164aeaeb829ce Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 09:07:24 +0800
Subject: [PATCH 14/23] =?UTF-8?q?140=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.development b/.env.development
index de4725c1b..f3d7c10c1 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
NODE_ENV=development
-VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api
-# VUE_APP_API_SERVER = http://192.168.1.140/api
+# VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api
+VUE_APP_API_SERVER = http://192.168.1.140/api
#家中开发连级的后端服务
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api
From 48f019c8e89ef40c744950a13aabfdd09eec5b75 Mon Sep 17 00:00:00 2001
From: jiangyy
Date: Fri, 25 Mar 2022 09:54:42 +0800
Subject: [PATCH 15/23] =?UTF-8?q?table=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/js/store/modules/app.js | 6 ++++--
src/views/modules/base/community/buildTable.vue | 4 ++--
src/views/modules/base/community/communityTable.vue | 10 +++++-----
src/views/modules/base/community/roomTable.vue | 6 +++---
.../communityService/ninePlaces/inspect/inspect.vue | 8 +++-----
.../communityService/ninePlaces/places/places.vue | 8 +++-----
.../modules/communityService/ninePlaces/team/team.vue | 8 +++-----
7 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/src/js/store/modules/app.js b/src/js/store/modules/app.js
index b9a493a92..4384a1c18 100644
--- a/src/js/store/modules/app.js
+++ b/src/js/store/modules/app.js
@@ -5,13 +5,15 @@ export default {
clientHeight: document.documentElement.clientHeight,
size: 'medium',
resolution: 'medium',
- env: 'dev'
+ env: 'dev',
+ iframeHeight:120
},
getters: {
clientHeight: (state) => state.clientHeight,
size: (state) => state.size,
resolution: (state) => state.resolution,
- env: (state) => state.env
+ env: (state) => state.env,
+ iframeHeight: (state) => state.iframeHeight
},
mutations: {
[type.client_height](state, payload) {
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index f8e3dab5a..342ef30f3 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -235,11 +235,11 @@ export default {
computed: {
tableHeight () {
- return (this.clientHeight - 300)
+ return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
},
- ...mapGetters(['clientHeight'])
+ ...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
//重置搜索条件
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index cbe008371..27660e257 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -285,13 +285,13 @@ export default {
},
computed: {
tableHeight () {
- return (this.clientHeight - 300)
+
+ return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
+
},
- rowHeight () {
- return (this.clientHeight - 200) + 'px'
- },
- ...mapGetters(['clientHeight'])
+
+ ...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
//重置搜索条件
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 09909c8ac..92710ca28 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -131,7 +131,7 @@
@click="handleDetail(scope.row)">查看
修改
@@ -230,11 +230,11 @@ export default {
computed: {
tableHeight () {
- return (this.clientHeight - 300)
+ return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
},
- ...mapGetters(['clientHeight'])
+ ...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
//重置搜索条件
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index 0a75b1845..d2de837a2 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -529,13 +529,11 @@ export default {
computed: {
tableHeight () {
- return (this.clientHeight - 420)
+ return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420
},
- rowHeight () {
- return (this.clientHeight - 200) + 'px'
- },
- ...mapGetters(['clientHeight'])
+
+ ...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 888ae9a9b..0e356e9a5 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -464,13 +464,11 @@ export default {
computed: {
tableHeight () {
- return (this.clientHeight - 420)
+ return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
},
- rowHeight () {
- return (this.clientHeight - 200) + 'px'
- },
- ...mapGetters(['clientHeight'])
+
+ ...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index 4a29979c8..1b05e70de 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -441,13 +441,11 @@ export default {
computed: {
tableHeight () {
- return (this.clientHeight - 370)
+ return this.$store.state.inIframe ? this.clientHeight - 370 + this.iframeHeight : this.clientHeight - 370
},
- rowHeight () {
- return (this.clientHeight - 200) + 'px'
- },
- ...mapGetters(['clientHeight'])
+
+ ...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {
From b6b800f7cb165d5fc9a39385676c2c132b32ebab Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 10:31:25 +0800
Subject: [PATCH 16/23] dd
---
src/views/modules/base/epidemic/antiInfo.vue | 643 +++++++++++++++++++
src/views/modules/base/epidemic/travel.vue | 564 ++++++++++++++++
src/views/modules/base/epidemic/vaccin.vue | 564 ++++++++++++++++
3 files changed, 1771 insertions(+)
create mode 100644 src/views/modules/base/epidemic/antiInfo.vue
create mode 100644 src/views/modules/base/epidemic/travel.vue
create mode 100644 src/views/modules/base/epidemic/vaccin.vue
diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
new file mode 100644
index 000000000..48355e6f8
--- /dev/null
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -0,0 +1,643 @@
+
+
Date: Fri, 25 Mar 2022 10:33:30 +0800
Subject: [PATCH 17/23] =?UTF-8?q?=E7=96=AB=E8=8B=97=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scss/modules/management/epidemic.scss | 3 +
.../base/epidemic/veroFocus/veroFocusForm.vue | 154 +++++++++++-------
.../base/epidemic/veroFocus/veroFocusList.vue | 8 +-
3 files changed, 105 insertions(+), 60 deletions(-)
diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index 9d6e95807..2164e4206 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -4,6 +4,9 @@
.item_width_2 {
width: 220px;
}
+.item_width_3 {
+ width: 180px;
+}
.btn-selperson {
margin-left: 20px;
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
index d00ef1ff7..846c26b4b 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
@@ -96,14 +96,15 @@
-
+
-
查询
重置
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 小程序通知
+ 短信通知
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index 49897bb18..abf5c1535 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -233,7 +233,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
- width="850px"
+ width="1050px"
top="5vh"
class="dialog-h"
@closed="diaClose">
@@ -669,10 +669,8 @@ export default {
return (this.clientHeight - 360)
},
- rowHeight () {
- return (this.clientHeight - 200) + 'px'
- },
- ...mapGetters(['clientHeight'])
+
+ ...mapGetters(['clientHeight', ''])
},
watch: {
From 1fb0cf2007014d94bbd46c0fe0dd5bad3d74223a Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 14:48:05 +0800
Subject: [PATCH 18/23] dd
---
src/views/modules/base/epidemic/antiInfo.vue | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index 48355e6f8..866daaaa2 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -1,6 +1,6 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
new file mode 100644
index 000000000..bf63e0e6a
--- /dev/null
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -0,0 +1,564 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue
new file mode 100644
index 000000000..bf63e0e6a
--- /dev/null
+++ b/src/views/modules/base/epidemic/vaccin.vue
@@ -0,0 +1,564 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+ 新增
+
+ 下载模板
+
+ 导入
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From ed11f2124f3fe17e32a478f13306a78f13a4fca4 Mon Sep 17 00:00:00 2001
From: jiangyy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+ 新增
+
+ 下载模板
+
+ 导入
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
Date: Fri, 25 Mar 2022 15:00:04 +0800
Subject: [PATCH 19/23] dd
---
src/views/modules/base/epidemic/antiInfo.vue | 11 +++----
src/views/modules/base/epidemic/travel.vue | 15 +++++-----
src/views/modules/base/epidemic/vaccin.vue | 30 ++++++++++----------
3 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index 866daaaa2..8388bc4d8 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -341,7 +341,7 @@ export default {
this.getGridList()
this.getValiheList()
await this.loadTable()
- this.sHeight = this.$refs.div_search.offsetHeight + 240
+ this.sHeight = this.$refs.div_search.offsetHeight + 230
},
methods: {
@@ -605,12 +605,13 @@ export default {
},
computed: {
tableHeight () {
-
- return (this.clientHeight - this.sHeight)
+ const h = this.clientHeight - this.sHeight + this.iframeHeigh
+ const _h = this.clientHeight - this.sHeight
+ return this.$store.state.inIframe ? h : _h
},
-
- ...mapGetters(['clientHeight'])
+
+ ...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index bf63e0e6a..9091d65dd 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -1,6 +1,6 @@
-
+
-
-
-
-
+ label="接种针次"
+ width="100">
-
-
+ label="最后一次通知时间"
+ min-width="120">
通知记录
+ @click="handleNoticeList(scope.row)">通知记录
随访记录
-
-
{
this.$refs.ref_form_add.initForm(null, this.agencyId)
@@ -478,7 +474,6 @@ export default {
},
handleEdit (row) {
-
this.editFormShow = true
this.$nextTick(() => {
this.$refs.ref_form_edit.initForm('edit', row.veroFocusId)
@@ -492,7 +487,6 @@ export default {
})
},
-
handleSendNotice () {
if (this.selectionAll.length === 0) {
this.$message.info('请选择要通知的人员')
@@ -505,9 +499,26 @@ export default {
},
+ handleNoticeList (row) {
+ this.noticeListFormShow = true
+ this.$nextTick(() => {
+ this.$refs.ref_visitelist.initForm(row)
+ })
+
+ },
+ handleVisiteList (row) {
+
+ this.visiteListFormShow = true
+ this.$nextTick(() => {
+ this.$refs.ref_noticelist.initForm(row)
+ })
+
+ },
+
addFormOk () {
- this.formShow = false
+ this.addFormShow = false
+ this.editFormShow = false
this.loadTable()
},
@@ -555,13 +566,13 @@ export default {
//重置搜索条件
resetSearch () {
this.formData = {
- personInCharge: '',//负责人
- mobile: '',//联系电话
- gridId: '',//负责区域【网格Id】
- ninePlaceVal: '',//场所类型【九小场所Value值】
- isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是
+ attentionType: 1,//关注类型，核酸检测：2，疫苗接种：1
+ name: '',
+ mobile: '',
+ idCard: '',
+ vaccinationCount: '',
}
- this.pageSize = 10
+
this.pageNo = 0
this.loadTable()
},
diff --git a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
index 1825e7f1d..ade540583 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
@@ -75,6 +75,7 @@ export default {
noticeContent: '',
},
+ selectionAll: []
@@ -88,13 +89,11 @@ export default {
methods: {
- async initForm () {
- this.startLoading()
- this.$refs['ref_form1'].resetFields();
-
+ async initForm (selectionAll) {
+ this.$refs['ref_form1'].resetFields();
+ this.selectionAll = selectionAll
- this.endLoading()
},
@@ -112,27 +111,10 @@ export default {
console.log(this.formData)
return false
- const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
- // if (regPhone.test(this.formData.mobile) === false) {
- // this.btnDisable = false
- // this.$message({
- // type: 'warning',
- // message: '请输入正确的手机号码'
- // })
- // return false;
- // }
-
-
let url = ''
- if (this.formType === 'add') {
- url = '/gov/project/memoConcern/save'
- // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/save"
- this.formData.id = ''
- } else {
- url = '/gov/project/memoConcern/update'
- // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/update"
- }
+ url = '/gov/project/memoConcern/update'
+ // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/update"
const { data, code, msg } = await requestPost(url, this.formData)
@@ -143,10 +125,9 @@ export default {
message: '操作成功'
})
this.resetData()
- this.$emit('dialogOk')
+ this.$emit('dialogCancle')
this.btnDisable = false
- this.$store.dispatch('setTipsList')
- this.$store.dispatch('setTipsTime')
+
} else {
this.btnDisable = false
this.$message.error(msg)
From 6769be9bc24d950c6f8739bf7adab69a5e54f9db Mon Sep 17 00:00:00 2001
From: jiangyy
Date: Tue, 29 Mar 2022 10:39:40 +0800
Subject: [PATCH 22/23] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/base/epidemic/natInfo/natForm.vue | 15 +++--
.../modules/base/epidemic/natInfo/natList.vue | 30 +++++----
.../base/epidemic/veroFocus/veroFocusAdd.vue | 41 ++++++-------
.../base/epidemic/veroFocus/veroFocusEdit.vue | 2 +-
.../base/epidemic/veroFocus/veroFocusList.vue | 61 +++++++++++--------
.../base/epidemic/veroFocus/vfNoticeList.vue | 2 +-
.../base/epidemic/veroFocus/vfSendNotice.vue | 2 +-
7 files changed, 81 insertions(+), 72 deletions(-)
diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
index f332062a6..3f381f9eb 100644
--- a/src/views/modules/base/epidemic/natInfo/natForm.vue
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -149,8 +149,10 @@
:before-upload="beforeUpload"
:on-change="handleEditChange"
:file-list="fileList">
-
-
+
+ width="170">
+ label="疫苗厂家"
+ min-width="180">
查看
- 修改
@@ -156,7 +156,7 @@
删除
+ @click="handleDelete(scope.row)">删除 -->
@@ -206,7 +206,7 @@ export default {
pageSize: 10,
pageNo: 0,
tableLoading: false,
-
+ sHeight: 0,
agencyId: '',
timeRange: [],
@@ -241,6 +241,7 @@ export default {
await this.loadTable()
+ this.sHeight = this.$refs.div_search.offsetHeight + 270
},
methods: {
@@ -540,14 +541,13 @@ export default {
},
computed: {
tableHeight () {
-
- return (this.clientHeight - 360)
+ const h = this.clientHeight - this.sHeight + this.iframeHeigh
+ const _h = this.clientHeight - this.sHeight
+ return this.$store.state.inIframe ? h : _h
},
- rowHeight () {
- return (this.clientHeight - 200) + 'px'
- },
- ...mapGetters(['clientHeight'])
+
+ ...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {
From 5628ba2bec9b1558faf5d18231b53407ab52b5d0 Mon Sep 17 00:00:00 2001
From: jiangyy
Date: Fri, 25 Mar 2022 17:50:12 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?=
=?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/scss/buttonstyle.scss | 7 +
.../scss/modules/management/epidemic.scss | 29 ++
.../modules/base/epidemic/natInfo/natList.vue | 9 +-
.../{veroFocusForm.vue => veroFocusAdd.vue} | 492 ++++++++++--------
.../base/epidemic/veroFocus/veroFocusEdit.vue | 338 ++++++++++++
.../base/epidemic/veroFocus/veroFocusList.vue | 243 ++++++---
.../base/epidemic/veroFocus/vfNoticeList.vue | 447 ++++++++++++++++
.../base/epidemic/veroFocus/vfSendNotice.vue | 266 ++++++++++
.../base/epidemic/veroFocus/vfVisiteList.vue | 450 ++++++++++++++++
.../ninePlaces/inspect/inspectReview.vue | 4 +-
10 files changed, 1987 insertions(+), 298 deletions(-)
rename src/views/modules/base/epidemic/veroFocus/{veroFocusForm.vue => veroFocusAdd.vue} (51%)
create mode 100644 src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
create mode 100644 src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
create mode 100644 src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
create mode 100644 src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index 1e683d95a..7a60a21be 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -86,6 +86,13 @@
background-color: #4ec591 !important;
border-color: #4ec591 !important;
}
+//列表上方操作按钮，其他按钮
+.diy-button--more {
+ color: #fff !important;
+ background-color: #23c1c4 !important;
+ border-color: #23c1c4 !important;
+}
+
//table按钮样式
//查看
diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index 2164e4206..d20be0a20 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -70,3 +70,32 @@
flex-direction: column;
justify-content: center;
}
+.div-mult-form {
+ margin-top: 20px;
+
+ .div_person {
+ display: flex;
+ font-size: 14px;
+ padding-bottom: 20px;
+
+ .person_title {
+ text-align: right;
+ flex: 0 0 100px;
+
+ line-height: 36px;
+ padding: 0 12px 0 0;
+ }
+
+ .tag_item {
+ margin-right: 10px;
+ margin-top: 10px;
+ }
+ .tag_tip {
+ margin-top: 10px;
+ color: #9c9c9c;
+ }
+ }
+}
+.div-mult-table {
+ padding: 0 20px;
+}
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 9d38bdb99..bca48bb52 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -559,13 +559,12 @@ export default {
computed: {
tableHeight () {
- return (this.clientHeight - 360)
+ return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360
+
},
- rowHeight () {
- return (this.clientHeight - 200) + 'px'
- },
- ...mapGetters(['clientHeight'])
+
+ ...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
similarity index 51%
rename from src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
rename to src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
index 846c26b4b..8fdcfb3e6 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
@@ -8,11 +8,10 @@
@tab-click="handleClick">
-
@@ -35,7 +33,6 @@
@@ -46,7 +43,6 @@
@@ -95,42 +91,44 @@
-
-
-
-
-
-
-
-
-
- 查询
- 重置
+
@@ -231,8 +263,7 @@
取 消
- 确 定
@@ -245,24 +276,25 @@
import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost } from '@/js/dai/request'
-import { dateFormats } from '@/utils/index'
+import { mapGetters } from 'vuex'
let loading // 加载动画
export default {
data () {
return {
- formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
- activeName: "second",
+ activeName: "first",
gridList: [],
- selGridId: '',
- veroNum: null,
-
btnDisable: false,
+ formDataSearch: {
+ selGridId: '',
+ veroNum: undefined,
+ },
+
formData1: {
name: '',
idCard: '',
@@ -280,9 +312,12 @@ export default {
noticeContent: '',
},
tableData: [],
+ total: 0,
+ pageSize: 20,
+ pageNo: 0,
tableLoading: false,
- selection: [],//选中的人员
+ selectionAll: [],//选中的人员
}
@@ -297,17 +332,12 @@ export default {
methods: {
- async initForm (type, natId) {
- this.startLoading()
- this.$refs['ref_form'].resetFields();
+ async initForm () {
- this.formType = type
- if (natId) {
- this.natId = natId
- this.formData.id = natId
- await this.loadFormData()
- }
- this.endLoading()
+ this.$refs['ref_form1'].resetFields();
+ this.$refs['ref_form2'].resetFields();
+
+ await this.loadTable()
},
@@ -318,141 +348,184 @@ export default {
async loadTable () {
this.tableLoading = true
- const url = "/gov/org/placepatrolteam/getlist"
+ const url = "/epmetuser/icresiuser/listresi"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
- ...this.formData
+ formCode: 'resi_base_info',
+ ...this.formDataSearch
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.total = data.total
+ data.list.forEach(element => {
+ element.isSel = false
+ });
this.tableData = data.list
- this.tableData.forEach(item => {
- if (item.time) {
- let timeArray = item.time.split(' ')
- item.time = timeArray[0]
- }
+ this.analysisTableSelection()
+
- });
} else {
this.$message.error(msg)
}
this.tableLoading = false
},
- handleSelectAll (selectAllFlag) {
- this.$refs.ref_table.clearSelection();
- if (selectAllFlag) {
- this.tableData.forEach(row => {
- if (row.showBtn) {
- this.$refs.ref_table.toggleRowSelection(row);
+ handleSelectTable (selection, row) {
+
+ row.isSel = !row.isSel
+
+ if (row.isSel) {
+ this.selectionAll.push(row)
+ } else {
+ for (let i = 0; i < this.selectionAll.length; i++) {
+ let item = this.selectionAll[i]
+ if (item.ID_CARD === row.ID_CARD) {
+ this.selectionAll.splice(i, 1)
+ break
}
- });
+
+ }
}
+
},
- selectAll (selection) {
- this.selection = selection
+ handleSelAll (selection) {
+ let selFlag = selection.length > 0//全选选中 还是 全选不选中
+ for (let i = 0; i < this.tableData.length; i++) {
+ let tableItem = this.tableData[i]
+ tableItem.isSel = selFlag
+ let isHasItem = false
+ for (let j = 0; j < this.selectionAll.length; j++) {
+ let selectionItem = this.selectionAll[j]
+ if (selectionItem.ID_CARD === tableItem.ID_CARD) {
+ isHasItem = true
+ if (!selFlag) {
+ this.selectionAll.splice(j, 1)
+ break
+ }
+ }
+
+ }
+
+ if (!isHasItem && selFlag) {
+ this.selectionAll.push(tableItem)
+ }
- if (selection.length === this.validTableDataNum) {
- this.selAllFlag = true
- } else {
- this.selAllFlag = false
}
},
+ //删除标签
+ handleCloseTag (tag, index) {
+ for (let i = 0; i < this.tableData.length; i++) {
- handleClick () {
+ let tableItem = this.tableData[i]
+ if (tag.ID_CARD === tableItem.ID_CARD) {//如果表中存在这个数据
+ tableItem.isSel = false
+ this.$refs.ref_table.toggleRowSelection(tableItem);
+ break
+ }
- },
+ }
- async loadGrid () {
- const url = "/gov/org/customergrid/gridoption"
+ for (let i = 0; i < this.selectionAll.length; i++) {
+ let item = this.selectionAll[i]
+ if (item.ID_CARD === tag.ID_CARD) {
+ this.selectionAll.splice(i, 1)
+ break
+ }
- let params = {
- agencyId: this.agencyId
}
+ },
- const { data, code, msg } = await requestPost(url, params)
+ //回显列表选中的行
+ analysisTableSelection () {
+ this.$nextTick(() => {
+ this.tableData.forEach(tableItem => {
- if (code === 0) {
- this.gridList = data
- } else {
- this.$message.error(msg)
- }
+ for (let j = 0; j < this.selectionAll.length; j++) {
+ let selectionItem = this.selectionAll[j]
+
+ if (selectionItem.ID_CARD === tableItem.ID_CARD) {
+ tableItem.isSel = true
+ break
+
+ }
+ }
+ if (tableItem.isSel) {
+ this.$refs.ref_table.toggleRowSelection(tableItem);
+ }
+ });
+ })
+
},
+ handleClick () {
+ },
- async loadFormData () {
+ async loadGrid () {
+ const url = "/gov/org/customergrid/gridoption"
- // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern'
- const url = '/gov/project/memoConcern'
let params = {
- id: this.natId,
- readFlag: '0',
+ agencyId: this.agencyId
}
- const { data, code, msg } = await requestPost(url, params)
- if (code === 0) {
- this.formData = data
- if (data.attachmentList) {
- data.attachmentList.forEach(element => {
- element.name = element.fileName
- element.type = element.attachmentType
- element.size = element.attachmentSize
- });
- this.fileList = data.attachmentList
+ const { data, code, msg } = await requestPost(url, params)
- }
+ if (code === 0) {
+ this.gridList = data
} else {
this.$message.error(msg)
}
+
},
+
async handleComfirm () {
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
}, 5000)
- this.$refs['ref_form'].validate(async (valid, messageObj) => {
- if (!valid) {
- app.util.validateRule(messageObj)
- this.btnDisable = false
- } else {
- await this.addNat()
- }
- })
+ await this.addVero()
+
},
- async addNat () {
- console.log(this.formData)
- return false
+ async addVero () {
+ let formData = {}
+ if (this.activeName === 'first') {
+ formData = this.formData1
+ const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+ // if (regPhone.test(this.formData.mobile) === false) {
+ // this.btnDisable = false
+ // this.$message({
+ // type: 'warning',
+ // message: '请输入正确的手机号码'
+ // })
+ // return false;
+ // }
+ } else {
+ if (this.selectionAll.length === 0) {
+ this.$message.info('请选择批量添加的人员')
+ return false
+ }
- const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
- // if (regPhone.test(this.formData.mobile) === false) {
- // this.btnDisable = false
- // this.$message({
- // type: 'warning',
- // message: '请输入正确的手机号码'
- // })
- // return false;
- // }
-
- if (this.fileList.length > 0) {
- this.formData.attachmentList = this.fileList
+ formData = this.formData2
+ formData.personList = this.selectionAll
}
+ console.log(formData)
+ return false
+
let url = ''
if (this.formType === 'add') {
@@ -492,23 +565,41 @@ export default {
},
+ resetSearch () {
+ this.formDataSearch = {
+ selGridId: '',
+ veroNum: undefined,
+ }
+ },
+
resetData () {
- this.natId = ''
- this.formData = {
+ this.formData1 = {
name: '',
idCard: '',
phone: '',
- checkTime: '',
- address: '',
- result: '',
+ remark: '',
noticeWay: [],
noticeContent: '',
- attachmentList: []
}
+
+ this.formData2 = {
+ personList: [],
+ remark: '',
+ noticeWay: [],
+ noticeContent: '',
+ }
+ this.formDataSearch = {
+ selGridId: '',
+ veroNum: undefined,
+ }
+
+ this.selectionAll = []//选中的人员
+
+
},
handleSizeChange (val) {
@@ -539,7 +630,14 @@ export default {
}
},
computed: {
- dataRule () {
+ tableHeight () {
+ return 300
+
+ },
+ ...mapGetters(['clientHeight', 'iframeHeight']),
+
+ dataRule1 () {
+
return {
name: [
{ required: true, message: '姓名不能为空', trigger: 'blur' }
@@ -550,25 +648,9 @@ export default {
phone: [
{ required: true, message: '手机号不能为空', trigger: 'blur' },
],
- checkTime: [
- { required: true, message: '检测时间不能为空', trigger: 'blur' },
- ],
- address: [
- { required: false },
- ],
- result: [
- { required: true },
- ],
- address: [
- { required: false },
- ],
- noticeWay: [
- { required: false },
- ],
- noticeContent: [
- { required: false },
- ],
+
+
}
},
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
new file mode 100644
index 000000000..87b5f1540
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
@@ -0,0 +1,338 @@
+
+
新增
+ @click="addFormShow=true">新增
导出
+
+ 发送通知
-
+
+
+
-
+
+
+
-
+
+
+
+
+
+
@@ -247,7 +292,11 @@
+
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
new file mode 100644
index 000000000..1825e7f1d
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
@@ -0,0 +1,266 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
-
-
+
+
-
-
-
-
- 小程序通知
- 短信通知
-
-
-
-
-
-
-
-
+
+
@@ -181,48 +186,75 @@
-
+
+
+
+
+ {{selectionAll.length}}
+
+
+
+
+
+
+ 小程序通知
+ 短信通知
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index abf5c1535..c06d1e35d 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -69,7 +69,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 小程序通知
+ 短信通知
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
- 全选
- 发送通知
-
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
new file mode 100644
index 000000000..ec45e380c
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
@@ -0,0 +1,450 @@
+
+
+
+
+
+
+
+ 小程序通知
+ 短信通知
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
index a556aedc8..ec45e380c 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
@@ -1,8 +1,8 @@
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.reviewTime}}
+
+
+
+
+
+
+
+
+ {{scope.row.placePatrolTeamName}}
+
+
+
+ {{item.name}}
+
+
+
+ {{scope.row.inspectorsNames}}
+
+
+
+
+
+
+
+ {{scope.row.reviewResult==='0'?'合格':'不合格'}}
+
+
- 新增
Date: Mon, 28 Mar 2022 17:41:47 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scss/modules/management/epidemic.scss | 32 +-
.../modules/base/epidemic/natInfo/natForm.vue | 339 ++++++++++--------
.../modules/base/epidemic/natInfo/natList.vue | 283 ++++++++++-----
.../base/epidemic/veroFocus/veroFocusList.vue | 105 +++---
.../base/epidemic/veroFocus/vfSendNotice.vue | 35 +-
5 files changed, 453 insertions(+), 341 deletions(-)
diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index d20be0a20..5d00bb1e2 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -1,20 +1,22 @@
-.item_width_1 {
- width: 560px;
-}
-.item_width_2 {
- width: 220px;
-}
-.item_width_3 {
- width: 180px;
-}
+.epidemic-form {
+ .item_width_1 {
+ width: 560px;
+ }
+ .item_width_2 {
+ width: 220px;
+ }
+ .item_width_3 {
+ width: 180px;
+ }
-.btn-selperson {
- margin-left: 20px;
-}
+ .btn-selperson {
+ margin-left: 20px;
+ }
-.form_div_btn {
- margin-top: 20px;
- text-align: center;
+ .form_div_btn {
+ margin-top: 20px;
+ text-align: center;
+ }
}
.main_tab {
diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
index d9a21d5fb..f332062a6 100644
--- a/src/views/modules/base/epidemic/natInfo/natForm.vue
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -1,14 +1,15 @@
-
+ width="100">
-
+ width="170">
-
+ width="170">
-
-
+ width="100">
查看
- 修改
+
+ 删除
+
+ 关注
+
+ 取消关注
+
@@ -183,7 +241,7 @@
class="dialog-h"
@closed="diaClose">
-
+
+ prop="vaccinationCount">
发送通知
+ 取消关注
+
-
-
-
+ v-model="formData.mobile">
+ v-model="formData.natAddress">
@@ -121,10 +124,10 @@
prop="type"
label-width="150px"
style="display: block">
-
+
- 阴性
- 阳性
+ 阴性
+ 阳性
@@ -132,41 +135,42 @@
-
- 点击上传
+
+
-
+
+ 小程序通知
小程序通知
- 短信通知
+ label="1">短信通知
-
@@ -97,11 +122,11 @@
type="index"
width="50">
- 最多三个附件，只能上传word、excel、pdf文件
+ class="el-upload__tip">请选择1张图片，只能上传jpg、png、gif格式
+
取 消
- 确 定
+
+ ![]()
+
+
@@ -207,6 +220,8 @@ export default {
data () {
return {
formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+ hideUploadEdit: false, // 隐藏'上传按钮'
+ limitNum: 1,
enterType: '1',//录入方式1 手动输入 2 选择居民
isFromResi: false,//是否从已有居民信息中选择
@@ -215,46 +230,54 @@ export default {
btnDisable: false,
- natId: '',
+ icNatId: '',
formData: {
+ icNatId: '',
+ agencyId: '',//当前网格所属组织Id
+ userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
+ userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
name: '',
idCard: '',
- phone: '',
- checkTime: '',
- address: '',
- result: '',
- noticeWay: [],
- noticeContent: '',
- attachmentList: []
+ mobile: '',
+ natTime: '',
+ natAddress: '',
+ natResult: '',
+ channel: [],
+ content: '',
+
+ fileName: '',//附件名
+ attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+ attachmentUrl: '',//附件地址
},
-
fileList: [],
uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
dialogImageUrl: '',
dialogVisible: false,
-
}
},
components: {},
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
+ this.formData.agencyId = user.agencyId
//获取网格下拉框数据
await this.loadGrid()
},
methods: {
- async initForm (type, natId) {
+ async initForm (type, icNatId) {
this.startLoading()
this.$refs['ref_form'].resetFields();
this.formType = type
- if (natId) {
- this.natId = natId
- this.formData.id = natId
+
+ if (icNatId) {
+ this.icNatId = icNatId
+ this.formData.icNatId = icNatId
+ this.isFromResi = false
await this.loadFormData()
}
this.endLoading()
@@ -263,10 +286,10 @@ export default {
handleChangeEnterType (value) {
this.formData.name = ''
- this.formData.phone = ''
+ this.formData.mobile = ''
this.formData.idCard = ''
this.formData.gridId = ''
- this.formData.personId = ''
+ this.formData.userId = ''
if (value === '2') {
this.isFromResi = true
} else {
@@ -312,72 +335,52 @@ export default {
},
async handleSelPerson (personItem) {
+ this.formData.userId = personItem.demandUserId
this.formData.name = personItem.demandUserName
- this.formData.phone = personItem.demandUserMobile
+ this.formData.mobile = personItem.demandUserMobile
this.formData.idCard = personItem.idCard
-
-
},
-
- handleTime () {
- if (!this.formData.remindTime) return
- var startAt = new Date(this.formData.remindTime) * 1000 / 1000;
- if (startAt < Date.now()) {
- this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
- }
- },
-
-
async loadFormData () {
- // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern'
- const url = '/gov/project/memoConcern'
+ // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
+ const url = '/epmetuser/icNat/detail'
let params = {
- id: this.natId,
- readFlag: '0',
+ icNatId: this.icNatId,
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = data
-
- if (data.attachmentList) {
- data.attachmentList.forEach(element => {
- element.name = element.fileName
- element.type = element.attachmentType
- element.size = element.attachmentSize
- });
- this.fileList = data.attachmentList
+ this.formData.icNatId = this.icNatId
+ this.fileList = []
+ if (data.fileName) {
+ let obj = {
+ name: data.fileName,
+ type: data.attachmentType,
+ url: data.attachmentUrl,
+ }
+ // data.attachmentList.forEach(element => {
+ // element.name = element.fileName
+ // element.type = element.attachmentType
+ // element.size = element.attachmentSize
+ // });
+ this.fileList.push(obj)
}
+ this.hideUploadEdit = this.fileList.length >= this.limitNum;
+
} else {
this.$message.error(msg)
}
},
- async handleComfirm () {
-
+ async handleComfirm () {
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
}, 5000)
- this.$refs['ref_form'].validate(async (valid, messageObj) => {
- if (!valid) {
- app.util.validateRule(messageObj)
- this.btnDisable = false
- } else {
-
- await this.addNat()
- }
-
- })
-
- },
- async addNat () {
- console.log(this.formData)
- return false
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
// if (regPhone.test(this.formData.mobile) === false) {
@@ -387,21 +390,26 @@ export default {
// message: '请输入正确的手机号码'
// })
// return false;
- // }
-
- if (this.fileList.length > 0) {
- this.formData.attachmentList = this.fileList
- }
+ // }
+ const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+ // if (regCard.test(this.formData.idCard) === false) {
+ // this.btnDisable = false
+ // this.$message({
+ // type: 'warning',
+ // message: '请输入正确的身份证号码'
+ // })
+ // return false;
+ // }
let url = ''
if (this.formType === 'add') {
- url = '/gov/project/memoConcern/save'
- // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/save"
- this.formData.id = ''
+ url = '/epmetuser/icNat/add'
+ // url = "http://yapi.elinkservice.cn/mock/102/epmetuser/icNat/add"
+ this.formData.icNatId = ''
} else {
- url = '/gov/project/memoConcern/update'
- // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/update"
+ url = '/epmetuser/icNat/edit'
+ // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/edit"
}
@@ -415,8 +423,7 @@ export default {
this.resetData()
this.$emit('dialogOk')
this.btnDisable = false
- this.$store.dispatch('setTipsList')
- this.$store.dispatch('setTipsTime')
+
} else {
this.btnDisable = false
this.$message.error(msg)
@@ -425,81 +432,85 @@ export default {
},
handleCancle () {
-
this.resetData()
this.$emit('dialogCancle')
},
+ handleRemove (file, fileList) {
+ this.hideUploadEdit = fileList.length >= this.limitNum;
+ this.formData.fileName = ''
+ this.formData.attachmentUrl = ''
+ this.formData.attachmentType = ''
+ this.fileList = []
+
+ },
+ handlePictureCardPreview (file) {
+ this.dialogImageUrl = file.url;
+ this.dialogVisible = true;
+ },
+
+ handleEditChange (file, fileList) {
+ this.hideUploadEdit = fileList.length >= this.limitNum;
+
+ },
+
beforeUpload (file) {
const array = file.name.split('.')
const extension = array[array.length - 1]
- const isLt1M = (file.size / 1024 / 1024) < 5
- if (extension !== 'xls'
- && extension !== 'xlsx'
- && extension !== 'doc'
- && extension !== 'docx'
- && extension !== 'pdf') {
- this.$message.error('只能上传word、excel、pdf文件！')
+ // const isLt1M = (file.size / 1024 / 1024) < 5
+ if (extension !== 'jpg'
+ && extension !== 'png'
+ && extension !== 'gif'
+ ) {
+ this.$message.error('只能上传jpg、png、gif文件！')
return false
}
- if (!isLt1M) {
- this.$message.error('上传文件大小不能超过 5MB!')
- }
+ // if (!isLt1M) {
+ // this.$message.error('上传文件大小不能超过 5MB!')
+ // }
return isLt1M
},
- handleFileRemove (file) {
-
- if (file && file.status === "success") {
- this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
- }
- },
-
handleFileSuccess (res, file) {
if (res.code === 0 && res.msg === 'success') {
const array = file.name.split('.')
const fileType = array[array.length - 1]
- file.fileName = file.name
- file.attachmentUrl = res.data.url
- file.attachmentSize = file.size
- file.attachmentType = 'doc'
+ this.formData.fileName = file.name
+ this.formData.attachmentUrl = res.data.url
+ this.formData.attachmentType = 'image'
+
file.attachmentFormat = fileType
+ file.attachmentSize = file.size
- this.fileList.push(file)
- console.log(this.fileList)
} else this.$message.error(res.msg)
},
- //下载
- handleFileDownload (file) {
-
- var a = document.createElement('a');
- var event = new MouseEvent('click');
- a.download = file.fileName;
- console.log(a)
- a.href = file.attachmentUrl;
- a.dispatchEvent(event);
-
-
- },
-
resetData () {
- this.natId = ''
+ this.icNatId = ''
+ this.fileList = []
+ this.hideUploadEdit = false
this.formData = {
+ icNatId: '',
+ agencyId: '',//当前网格所属组织Id
+ userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
+ userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
name: '',
idCard: '',
- phone: '',
- checkTime: '',
- address: '',
- result: '',
- noticeWay: [],
- noticeContent: '',
- attachmentList: []
+ mobile: '',
+ natTime: '',
+ natAddress: '',
+ natResult: '',
+ channel: [],
+ content: '',
+
+ fileName: '',//附件名
+ attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+ attachmentUrl: '',//附件地址
}
},
@@ -528,26 +539,26 @@ export default {
idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'blur' }
],
- phone: [
+ mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' },
],
- checkTime: [
+ natTime: [
{ required: true, message: '检测时间不能为空', trigger: 'blur' },
],
- address: [
+ natAddress: [
{ required: false },
],
- result: [
+ natResult: [
{ required: true },
],
- address: [
+ natAddress: [
{ required: false },
],
- noticeWay: [
+ channel: [
{ required: false },
],
- noticeContent: [
+ content: [
{ required: false },
],
@@ -572,4 +583,16 @@ export default {
@import "@/assets/scss/modules/management/epidemic.scss";
+
+
+
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index bca48bb52..5057e6a42 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -6,10 +6,22 @@
ref="ref_searchform"
:label-width="'90px'">
+
+
+
+
+
+
-
+
-
+ placeholder="请输入手机号">
-
-
-
-
+
+
+
-
- 查询
- 重置
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
- 取消关注
+ @click="handleVisiteList(scope.row) ">随访记录