elink-star
/
epmet-oper-gov
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-磐石烟台1107' into dev

dev-用户反馈
jiangyy 3 years ago
parent
b667e73076 e716c4b712
commit
92e7dec209
11 changed files with 1149 additions and 605 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/assets/scss/modules/management/detail-main.scss
  2. 835
      src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
  3. 221
      src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
  4. 57
      src/views/modules/base/epidemic/natFocus/natFocusList.vue
  5. 54
      src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
  6. 4
      src/views/modules/base/epidemic/natInfo/noNatDetail.vue
  7. 23
      src/views/modules/base/epidemic/natInfo/noNatList.vue
  8. 6
      src/views/modules/base/epidemic/travelDetail.vue
  9. 6
      src/views/modules/base/epidemic/travelForm.vue
  10. 6
      src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
  11. 1
      src/views/modules/visual/shundeju/controlCount.vue

3
src/assets/scss/modules/management/detail-main.scss
View File

@ -147,6 +147,9 @@
.info-title-5{
flex: 0 0 130px;
}
.info-title-6{
flex: 0 0 240px;
}
> span,
> div {

835
src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
View File

File diff suppressed because it is too large

221
src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
View File

@ -7,6 +7,7 @@
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div>
<div class="epidemic-form">
<el-form v-if="formType !== 'detail'"
ref="ref_form1"
:inline="true"
@ -15,7 +16,7 @@
class="form">
<el-form-item label="姓名"
prop="name"
label-width="150px"
label-width="220px"
style="display: block">
<span>{{ formData.name }}</span>
<!-- <el-input class="item_width_2"
@ -28,7 +29,7 @@
<el-form-item label="手机号"
prop="mobile"
label-width="150px"
label-width="220px"
style="display: block">
<span>{{ formData.mobile }}</span>
<!-- <el-input class="item_width_2"
@ -39,7 +40,7 @@
</el-form-item>
<el-form-item label="证件号"
prop="idCard"
label-width="150px"
label-width="220px"
style="display: block">
<span>{{ formData.idCard }}</span>
<!-- <el-input class="item_width_2"
@ -50,9 +51,9 @@
</el-form-item>
<el-form-item label="关注原因"
prop="reason"
label-width="150px"
label-width="220px"
style="display: block">
<el-input class="item_width_1"
<el-input class="item_width_4"
placeholder="请输入关注原因"
clearable
v-model="formData.reason">
@ -60,9 +61,10 @@
</el-form-item>
<el-form-item label="隔离状态"
prop="isolatedState"
label-width="150px"
label-width="220px"
style="display: block">
<el-select v-model="formData.isolatedState"
class="item_width_4"
placeholder="请选择"
clearable>
<el-option v-for="item in options.isolatedState"
@ -72,11 +74,141 @@
</el-option>
</el-select>
</el-form-item>
<div v-if="isPanshi">
<el-form-item label="管控时间"
prop="gkStartTime"
label-width="220px"
style="display: block">
<el-date-picker v-model="gkTimeRange"
size="small"
type="daterange"
@change="handleGkTimeChange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="镇（街）干部"
prop="gbName"
label-width="220px"
style="display: block">
<el-input class="item_width_4"
placeholder="请输入镇（街）干部"
clearable
v-model="formData.gbName">
</el-input>
</el-form-item>
<el-form-item label="镇（街）干部联系方式"
prop="gbMobile"
label-width="220px"
style="display: block">
<el-input class="item_width_4"
placeholder="请输入镇（街）干部联系方式"
clearable
v-model="formData.gbMobile">
</el-input>
</el-form-item>
<el-form-item label="村（社区）网格管理员"
prop="gridManager"
label-width="220px"
style="display: block">
<el-input class="item_width_4"
placeholder="请输入村（社区）网格管理员"
clearable
v-model="formData.gridManager">
</el-input>
</el-form-item>
<el-form-item label="村（社区）网格管理员联系方式"
prop="gridManagerMobile"
label-width="220px"
style="display: block">
<el-input class="item_width_4"
placeholder="请输入村（社区）网格管理员联系方式"
clearable
v-model="formData.gridManagerMobile">
</el-input>
</el-form-item>
<el-form-item label="基层医务工作者"
prop="healthWorker"
label-width="220px"
style="display: block">
<el-input class="item_width_4"
placeholder="请输入基层医务工作者"
clearable
v-model="formData.healthWorker">
</el-input>
</el-form-item>
<el-form-item label="基层医务工作者联系方式"
prop="healthWorkerMobile"
label-width="220px"
style="display: block">
<el-input class="item_width_4"
placeholder="请输入基层医务工作者联系方式"
clearable
v-model="formData.healthWorkerMobile">
</el-input>
</el-form-item>
<el-form-item label="民警"
prop="policeName"
label-width="220px"
style="display: block">
<el-input class="item_width_4"
placeholder="请输入民警"
clearable
v-model="formData.policeName">
</el-input>
</el-form-item>
<el-form-item label="民警及联系方式"
prop="policeMobile"
label-width="220px"
style="display: block">
<el-input class="item_width_4"
placeholder="请输入民警及联系方式"
clearable
v-model="formData.policeMobile">
</el-input>
</el-form-item>
<el-form-item label="志愿者"
prop="volunteerName"
label-width="220px"
style="display: block">
<el-input class="item_width_4"
placeholder="请输入志愿者"
clearable
v-model="formData.volunteerName">
</el-input>
</el-form-item>
<el-form-item label="志愿者联系方式"
prop="volunteerMobile"
label-width="220px"
style="display: block">
<el-input class="item_width_4"
placeholder="请输入志愿者联系方式"
clearable
v-model="formData.volunteerMobile">
</el-input>
</el-form-item>
</div>
<el-form-item label="备注"
prop="remark"
label-width="150px"
label-width="220px"
style="display: block">
<el-input class="item_width_1"
<el-input class="item_width_4"
type="textarea"
maxlength="500"
show-word-limit
@ -88,7 +220,7 @@
<el-form-item label="通知渠道"
prop="channel"
label-width="150px"
label-width="220px"
style="display: block">
<el-checkbox v-model="formData.isSelChannel"
@change="handleChannelChange"
@ -106,9 +238,9 @@
<el-form-item v-if="formData.isSelChannel"
label="通知内容"
prop="content"
label-width="150px"
label-width="220px"
style="display: block">
<el-input class="item_width_1"
<el-input class="item_width_4"
type="textarea"
maxlength="500"
show-word-limit
@ -119,36 +251,61 @@
</el-form-item>
</el-form>
</div>
<div v-if="formType === 'detail'"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-2">姓名：</span>
<span class="info-title-6">姓名：</span>
<span>{{ formData.name||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">手机号：</span>
<span class="info-title-6">手机号：</span>
<span>{{ formData.showMobile||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">证件号：</span>
<span class="info-title-6">证件号：</span>
<span>{{ formData.showIdCard||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">关注原因：</span>
<span class="info-title-6">关注原因：</span>
<span>{{ formData.reason||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">隔离状态：</span>
<span class="info-title-6">隔离状态：</span>
<span>{{ formData.isolatedStateShow||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-6">管控时间：</span>
<span>{{ formData.gkTime||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-6">镇（街）干部及联系方式：</span>
<span>{{ formData.gb||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-6">村（社区）网格管理员及联系方式：</span>
<span>{{ formData.gridManagerShow||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-6">基层医务工作者及联系方式：</span>
<span>{{ formData.healthWorkerShow||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-6">民警及联系方式：</span>
<span>{{ formData.policeShow||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-6">志愿者及联系方式：</span>
<span>{{ formData.volunteerShow||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">备注：</span>
<span class="info-title-6">备注：</span>
<span>{{ formData.remark||'--' }}</span>
</div>
@ -189,8 +346,19 @@ function iniGetFmData () {
isSelChannel: false,
channel: [],
content: "",
isolatedState: "", //隔离状态
gkStartTime: '',
gkEndTime: '',
gbName: '',
gbMobile: '',
gridManager: '',
gridManagerMobile: '',
healthWorker: '',
healthWorkerMobile: '',
policeName: '',
policeMobile: '',
volunteerName: '',
volunteerMobile: '',
};
}
@ -208,6 +376,7 @@ export default {
options: {
isolatedState: [],
},
gkTimeRange: [],
};
},
@ -238,6 +407,17 @@ export default {
}
},
handleGkTimeChange (time) {
if (time) {
this.formData.gkStartTime = time[0];
this.formData.gkEndTime = time[1];
} else {
this.formData.gkStartTime = "";
this.formData.gkEndTime = "";
}
},
handleChannelChange (val) {
this.formData.content = "";
},
@ -253,6 +433,7 @@ export default {
row.attentionType = 2;
row.isSelChannel = false;
this.formData = JSON.parse(JSON.stringify(row));
this.gkTimeRange = row.gkTimeRange
this.veroId = row.id
this.options.isolatedState.forEach(element => {
if (this.formData.isolatedState === element.value) {
@ -389,6 +570,10 @@ export default {
type: String,
default: '',
},
isPanshi: {
type: Boolean,
default: false
},
},
};
</script>

57
src/views/modules/base/epidemic/natFocus/natFocusList.vue
View File

@ -265,6 +265,50 @@
label="最后一次核酸时间"
width="170">
</el-table-column>
<template v-if="isPanshi">
<el-table-column prop="gkTime"
header-align="center"
align="center"
show-overflow-tooltip
label="管控时间"
min-width="180">
</el-table-column>
<el-table-column prop="gb"
header-align="center"
align="center"
show-overflow-tooltip
label="镇（街）干部"
min-width="180">
</el-table-column>
<el-table-column prop="gridManagerShow"
header-align="center"
align="center"
show-overflow-tooltip
label="村（社区）网格管理员"
min-width="180">
</el-table-column>
<el-table-column prop="healthWorkerShow"
header-align="center"
align="center"
show-overflow-tooltip
label="基层医务工作者"
min-width="180">
</el-table-column>
<el-table-column prop="policeShow"
header-align="center"
align="center"
show-overflow-tooltip
label="民警"
min-width="180">
</el-table-column>
<el-table-column prop="volunteerShow"
header-align="center"
align="center"
show-overflow-tooltip
label="志愿者"
min-width="180">
</el-table-column>
</template>
<el-table-column prop="remark"
header-align="center"
@ -347,6 +391,7 @@
class="dialog-h"
@closed="diaClose">
<nat-focus-add ref="ref_form_add"
:isPanshi="isPanshi"
@dialogCancle="diaClose"
@dialogOk="addFormOk"></nat-focus-add>
</el-dialog>
@ -362,6 +407,7 @@
<nat-focus-edit ref="ref_form_edit"
:fromSource="'focusGroupSpecialAttentionQuarantine'"
:view_real_data="btnAuths.focus_groups_view_real_data"
:isPanshi="isPanshi"
@dialogCancle="diaClose"
@dialogOk="addFormOk"></nat-focus-edit>
</el-dialog>
@ -432,6 +478,8 @@ export default {
pageSize: 20,
pageNo: 1,
tableLoading: false,
customerId: '',
isPanshi: false,
selection: [],
@ -506,6 +554,13 @@ export default {
},
async mounted () {
//磐石街道：1580460084738760705
this.customerId = localStorage.getItem("customerId");
this.isPanshi = true
if (this.customerId === '1580460084738760705') {
this.isPanshi = true
}
console.log('customerId', this.customerId)
this.updateBtnAuths();
for (let i = 0; i < 11; i++) {
@ -811,6 +866,8 @@ export default {
row.idCard = data.idCard;
row.showMobile = data.showMobile;
row.showIdCard = data.showIdCard;
if (row.gkStartTime && row.gkEndTime)
row.gkTimeRange = [row.gkStartTime, row.gkEndTime]
}
return row;
},

54
src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
View File

@ -222,6 +222,51 @@
width="170">
</el-table-column>
<template v-if="isPanshi">
<el-table-column prop="gkTime"
header-align="center"
align="center"
show-overflow-tooltip
label="管控时间"
min-width="180">
</el-table-column>
<el-table-column prop="gb"
header-align="center"
align="center"
show-overflow-tooltip
label="镇（街）干部"
min-width="180">
</el-table-column>
<el-table-column prop="gridManagerShow"
header-align="center"
align="center"
show-overflow-tooltip
label="村（社区）网格管理员"
min-width="180">
</el-table-column>
<el-table-column prop="healthWorkerShow"
header-align="center"
align="center"
show-overflow-tooltip
label="基层医务工作者"
min-width="180">
</el-table-column>
<el-table-column prop="policeShow"
header-align="center"
align="center"
show-overflow-tooltip
label="民警"
min-width="180">
</el-table-column>
<el-table-column prop="volunteerShow"
header-align="center"
align="center"
show-overflow-tooltip
label="志愿者"
min-width="180">
</el-table-column>
</template>
<el-table-column prop="remark"
header-align="center"
align="center"
@ -308,6 +353,7 @@
<nat-focus-edit ref="ref_form_edit"
:fromSource="'focusGroupSpecialAttentionHistory'"
:view_real_data="btnAuths.focus_groups_his_view_real_data"
:isPanshi="isPanshi"
@dialogCancle="diaClose"
@dialogOk="addFormOk"></nat-focus-edit>
</el-dialog>
@ -378,6 +424,8 @@ export default {
pageSize: 20,
pageNo: 1,
tableLoading: false,
customerId: '',
isPanshi: false,
selection: [],
@ -449,6 +497,12 @@ export default {
},
async mounted () {
//磐石街道：1580460084738760705
this.customerId = localStorage.getItem("customerId");
this.isPanshi = true
if (this.customerId === '1580460084738760705') {
this.isPanshi = true
}
this.updateBtnAuths();
for (let i = 0; i < 11; i++) {

4
src/views/modules/base/epidemic/natInfo/noNatDetail.vue
View File

@ -26,6 +26,10 @@
<span>{{ formData.idCard||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">采样时间：</span>
<span>{{ formData.latestCyTime||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">检测时间：</span>
<span>{{ formData.latestNatTime||'--' }}</span>

23
src/views/modules/base/epidemic/natInfo/noNatList.vue
View File

@ -75,6 +75,17 @@
placeholder="选择时间">
</el-date-picker>
</el-form-item>
<el-form-item label="采样日期">
<el-date-picker class="list_item_width_1"
v-model="formData.cyDate"
format="yyyy-MM-dd"
value-format="yyyyMMdd"
type="date"
size="small"
clearable
placeholder="选择时间">
</el-date-picker>
</el-form-item>
<el-form-item label="检测状态">
<el-select class="list_item_width_1"
@ -168,6 +179,12 @@
label="证件号"
min-width="170">
</el-table-column>
<el-table-column prop="latestCyTime"
header-align="center"
align="center"
label="采样时间"
min-width="150">
</el-table-column>
<el-table-column prop="latestNatTime"
header-align="center"
align="center"
@ -318,7 +335,8 @@ export default {
idCard: '',//身份证号码
isResiUser: '',//是否客户下居民(0:否 1:是)
status: '',//1已检测；0未检测
natDate: ''
natDate: '',
cyDate: '',
},
@ -583,7 +601,8 @@ export default {
idCard: '',//身份证号码
importDate: '',
status: '',//1已检测；0未检测
natDate: ''
natDate: '',
cyDate: '',
}

6
src/views/modules/base/epidemic/travelDetail.vue
View File

@ -99,7 +99,7 @@ export default {
initLoading: false,
icNatId: '',
selId: '',
formData: {},
}
@ -125,7 +125,7 @@ export default {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.icNatId,
id: this.selId,
type: "routeFollow",
});
@ -142,7 +142,7 @@ export default {
console.log('row----', row)
this.formData.agencyId = this.agencyId
this.icNatId = row.id
this.selId = row.id
await this.loadFormData(row.id)
this.initLoading = true

6
src/views/modules/base/epidemic/travelForm.vue
View File

@ -498,8 +498,14 @@ export default {
} else {
const { user } = this.$store.state
if (user.areaCodePath.length > 3) {
this.nowAllCode = [user.areaCodePath[0], user.areaCodePath[1], user.areaCodePath[2]]
} else {
this.nowAllCode = user.areaCodePath
}
}
// this.$refs['ref_form'].resetFields();
console.log('formtype', type)

6
src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
View File

@ -129,7 +129,7 @@ export default {
initLoading: false,
icNatId: '',
selId: '',
formData: {},
}
@ -150,7 +150,7 @@ export default {
console.log('row----', row)
this.formData.agencyId = this.agencyId
this.selId = row.id
await this.loadFormData(row.id)
this.initLoading = true
@ -161,7 +161,7 @@ export default {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.icNatId,
id: this.selId,
type: "routeFollow",
});

1
src/views/modules/visual/shundeju/controlCount.vue
View File

@ -225,6 +225,7 @@ export default {
} else {
item.type = '未知'
}
item.villageName = '顺德居小区'
return {
...item,
index: index + 1

Write Preview
Loading…
Cancel
Save