取 消
-
确 定
@@ -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 00000000..87b5f154
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
@@ -0,0 +1,338 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 小程序通知
+ 短信通知
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index abf5c153..c06d1e35 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -69,7 +69,7 @@
新增
+ @click="addFormShow=true">新增
导出
+
+ 发送通知
-