diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index 31f16237f..0767b7768 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -147,6 +147,9 @@
.info-title-5{
flex: 0 0 130px;
}
+ .info-title-6{
+ flex: 0 0 240px;
+ }
> span,
> div {
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
index 1912e820b..9be0bccf6 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
@@ -1,129 +1,225 @@
@@ -554,7 +699,7 @@ import inputRange from "@/views/components/rangeInput.vue";
let loading; // 加载动画
export default {
- data() {
+ data () {
return {
activeName: "first",
@@ -597,7 +742,21 @@ export default {
channel: [],
content: "",
isolatedState: "",
+ gkStartTime: '',
+ gkEndTime: '',
+ gbName: '',
+ gbMobile: '',
+ gridManager: '',
+ gridManagerMobile: '',
+ healthWorker: '',
+ healthWorkerMobile: '',
+ policeName: '',
+ policeMobile: '',
+ volunteerName: '',
+ volunteerMobile: '',
},
+ gkTimeRange1: [],
+ gkTimeRange2: [],
formData2: {
attentionType: 2,
@@ -607,6 +766,18 @@ export default {
channel: [],
content: "",
isolatedState: "",
+ gkStartTime: '',
+ gkEndTime: '',
+ gbName: '',
+ gbMobile: '',
+ gridManager: '',
+ gridManagerMobile: '',
+ healthWorker: '',
+ healthWorkerMobile: '',
+ policeName: '',
+ policeMobile: '',
+ volunteerName: '',
+ volunteerMobile: '',
},
tableData: [],
total: 0,
@@ -624,7 +795,7 @@ export default {
components: { inputRange },
- async mounted() {
+ async mounted () {
const { user } = this.$store.state;
this.agencyId = user.agencyId;
//获取网格下拉框数据
@@ -636,14 +807,32 @@ export default {
},
methods: {
- handleChannelChange1(val) {
+ handleGkTimeChange1 (time) {
+ if (time) {
+ this.formData1.gkStartTime = time[0];
+ this.formData1.gkEndTime = time[1];
+ } else {
+ this.formData1.gkStartTime = "";
+ this.formData1.gkEndTime = "";
+ }
+ },
+ handleGkTimeChange2 (time) {
+ if (time) {
+ this.formData2.gkStartTime = time[0];
+ this.formData2.gkEndTime = time[1];
+ } else {
+ this.formData2.gkStartTime = "";
+ this.formData2.gkEndTime = "";
+ }
+ },
+ handleChannelChange1 (val) {
this.formData1.content = "";
},
- handleChannelChange2(val) {
+ handleChannelChange2 (val) {
this.formData2.content = "";
},
- async initForm() {
+ async initForm () {
this.tableData = [];
this.$refs["ref_form1"].resetFields();
this.$refs["ref_form2"].resetFields();
@@ -651,12 +840,12 @@ export default {
// await this.loadTable()
},
- handleSearch() {
+ handleSearch () {
this.selectionAll = [];
this.loadTable();
},
- async loadTable() {
+ async loadTable () {
this.tableLoading = true;
const url = "/epmetuser/epidemicPrevention/user-list";
@@ -683,7 +872,7 @@ export default {
this.tableLoading = false;
},
- handleTimeChange(time) {
+ handleTimeChange (time) {
if (time) {
this.formData.startDate = time[0];
this.formData.endDate = time[1];
@@ -693,7 +882,7 @@ export default {
}
},
- handleSelectTable(selection, row) {
+ handleSelectTable (selection, row) {
row.isSel = !row.isSel;
if (row.isSel) {
@@ -709,7 +898,7 @@ export default {
}
},
- handleSelAll(selection) {
+ handleSelAll (selection) {
let selFlag = selection.length > 0; //全选选中 还是 全选不选中
for (let i = 0; i < this.tableData.length; i++) {
let tableItem = this.tableData[i];
@@ -733,7 +922,7 @@ export default {
},
//删除标签
- handleCloseTag(tag, index) {
+ handleCloseTag (tag, index) {
for (let i = 0; i < this.tableData.length; i++) {
let tableItem = this.tableData[i];
if (tag.idCard === tableItem.idCard) {
@@ -754,7 +943,7 @@ export default {
},
//回显列表选中的行
- analysisTableSelection() {
+ analysisTableSelection () {
this.$nextTick(() => {
this.tableData.forEach((tableItem) => {
for (let j = 0; j < this.selectionAll.length; j++) {
@@ -772,9 +961,9 @@ export default {
});
},
- handleClick() {},
+ handleClick () { },
- handleAgeChange(val) {
+ handleAgeChange (val) {
console.log("val----age---", val);
if (val.start) {
const e = this.computedBirth(val.start);
@@ -790,7 +979,7 @@ export default {
}
},
- computedBirth(age) {
+ computedBirth (age) {
let now = new Date();
let nowYear = now.getFullYear();
let nowMonth = now.getMonth() + 1;
@@ -806,21 +995,21 @@ export default {
return subYear + "-" + nowMonth + "-" + nowDay;
},
- handleClearVillage() {
+ handleClearVillage () {
this.formDataSearch.buildingId = "";
this.formDataSearch.unitId = "";
this.formDataSearch.houseId = "";
},
- handleClearBuild() {
+ handleClearBuild () {
this.formDataSearch.buildingId = "";
this.formDataSearch.unitId = "";
this.formDataSearch.houseId = "";
},
- handleClearDan() {
+ handleClearDan () {
this.formDataSearch.unitId = "";
this.formDataSearch.houseId = "";
},
- handleChangeGrid(val) {
+ handleChangeGrid (val) {
console.log("val", val);
this.formDataSearch.neighborId = "";
this.formDataSearch.buildingId = "";
@@ -828,26 +1017,26 @@ export default {
this.formDataSearch.houseId = "";
this.getValiheList();
},
- handleChangeV(val) {
+ handleChangeV (val) {
console.log("val", val);
this.formDataSearch.buildingId = "";
this.formDataSearch.unitId = "";
this.formDataSearch.houseId = "";
this.getBuildList();
},
- handleChangeB(val) {
+ handleChangeB (val) {
console.log("val", val);
this.formDataSearch.unitId = "";
this.formDataSearch.houseId = "";
this.getUniList();
},
- handleChangeD(val) {
+ handleChangeD (val) {
console.log("val", val);
this.formDataSearch.houseId = "";
this.getHouseList();
},
- async loadGrid() {
+ async loadGrid () {
const url = "/gov/org/customergrid/gridoption";
let params = {
@@ -862,7 +1051,7 @@ export default {
this.$message.error(msg);
}
},
- getValiheList() {
+ getValiheList () {
const { user } = this.$store.state;
this.$http
.post("/gov/org/icneighborhood/neighborhoodoption", {
@@ -882,7 +1071,7 @@ export default {
return this.$message.error("网络错误");
});
},
- getBuildList() {
+ getBuildList () {
this.$http
.post("/gov/org/icbuilding/buildingoption", {
neighborHoodId: this.formDataSearch.neighborId,
@@ -899,7 +1088,7 @@ export default {
return this.$message.error("网络错误");
});
},
- getUniList() {
+ getUniList () {
this.$http
.post("/gov/org/icbuildingunit/unitoption", {
buildingId: this.formDataSearch.buildingId,
@@ -916,7 +1105,7 @@ export default {
return this.$message.error("网络错误");
});
},
- getHouseList() {
+ getHouseList () {
this.$http
.post("/gov/org/ichouse/houseoption", {
unitId: this.formDataSearch.unitId,
@@ -934,7 +1123,7 @@ export default {
});
},
- handleComfirm() {
+ handleComfirm () {
if (this.activeName === "first") {
this.$refs["ref_form1"].validate((valid, messageObj) => {
if (!valid) {
@@ -954,7 +1143,7 @@ export default {
}
},
- async handleVero() {
+ async handleVero () {
let list = [];
if (this.activeName === "first") {
list.push(this.formData1);
@@ -1051,7 +1240,7 @@ export default {
}
},
- async getFmOptions(field, url, params, cookFn) {
+ async getFmOptions (field, url, params, cookFn) {
const { data, code, msg } = await requestPost(url, {
...params,
});
@@ -1064,12 +1253,12 @@ export default {
}
},
- handleCancle() {
+ handleCancle () {
this.resetData();
this.$emit("dialogCancle");
},
- resetSearch() {
+ resetSearch () {
this.formDataSearch = {
gridId: "",
natCount: undefined,
@@ -1080,7 +1269,7 @@ export default {
this.timeRange = [];
},
- resetData() {
+ resetData () {
this.formData1 = {
name: "",
idCard: "",
@@ -1092,7 +1281,20 @@ export default {
content: "",
attentionType: 2,
isolatedState: "",
+ gkStartTime: '',
+ gkEndTime: '',
+ gbName: '',
+ gbMobile: '',
+ gridManager: '',
+ gridManagerMobile: '',
+ healthWorker: '',
+ healthWorkerMobile: '',
+ policeName: '',
+ policeMobile: '',
+ volunteerName: '',
+ volunteerMobile: '',
};
+ this.gkTimeRange1 = [];
this.formData2 = {
attentionType: 2,
@@ -1102,7 +1304,20 @@ export default {
channel: [],
content: "",
isolatedState: "",
+ gkStartTime: '',
+ gkEndTime: '',
+ gbName: '',
+ gbMobile: '',
+ gridManager: '',
+ gridManagerMobile: '',
+ healthWorker: '',
+ healthWorkerMobile: '',
+ policeName: '',
+ policeMobile: '',
+ volunteerName: '',
+ volunteerMobile: '',
};
+ this.gkTimeRange2 = [];
this.formDataSearch = {
gridId: "",
natCount: undefined,
@@ -1111,18 +1326,18 @@ export default {
this.selectionAll = []; //选中的人员
},
- handleSizeChange(val) {
+ handleSizeChange (val) {
this.pageSize = val;
this.pageNo = 1;
this.loadTable();
},
- handleCurrentChange(val) {
+ handleCurrentChange (val) {
this.pageNo = val;
this.loadTable();
},
// 开启加载动画
- startLoading() {
+ startLoading () {
loading = Loading.service({
lock: true, // 是否锁定
text: "正在加载……", // 加载中需要显示的文字
@@ -1130,7 +1345,7 @@ export default {
});
},
// 结束加载动画
- endLoading() {
+ endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close();
@@ -1138,12 +1353,12 @@ export default {
},
},
computed: {
- tableHeight() {
+ tableHeight () {
return 300;
},
...mapGetters(["clientHeight", "iframeHeight"]),
- dataRule1() {
+ dataRule1 () {
return {
name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
idCard: [
@@ -1159,10 +1374,10 @@ export default {
},
},
props: {
- // serviceList: {
- // type: Array,
- // default: []
- // },
+ isPanshi: {
+ type: Boolean,
+ default: false
+ },
},
};
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
index c80f883ed..08ae1690e 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
@@ -7,148 +7,305 @@
class="diy-button--search"
@click="handleTuomin">显示脱敏信息
-
-
- {{ formData.name }}
-
-
-
-
- {{ formData.mobile }}
-
-
-
- {{ formData.idCard }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 小程序通知
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
- 姓名:
+ 姓名:
{{ formData.name||'--' }}
- 手机号:
+ 手机号:
{{ formData.showMobile||'--' }}
- 证件号:
+ 证件号:
{{ formData.showIdCard||'--' }}
- 关注原因:
+ 关注原因:
{{ formData.reason||'--' }}
- 隔离状态:
+ 隔离状态:
{{ formData.isolatedStateShow||'--' }}
+
+ 管控时间:
+ {{ formData.gkTime||'--' }}
+
+
+ 镇(街)干部及联系方式:
+ {{ formData.gb||'--' }}
+
+
+ 村(社区)网格管理员及联系方式:
+ {{ formData.gridManagerShow||'--' }}
+
+
+ 基层医务工作者及联系方式:
+ {{ formData.healthWorkerShow||'--' }}
+
+
+ 民警及联系方式:
+ {{ formData.policeShow||'--' }}
+
+
+ 志愿者及联系方式:
+ {{ formData.volunteerShow||'--' }}
+
- 备注:
+ 备注:
{{ formData.remark||'--' }}
@@ -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
+ },
},
};
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index bf4ff1a2e..72d6abd1c 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -265,6 +265,50 @@
label="最后一次核酸时间"
width="170">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -362,6 +407,7 @@
@@ -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;
},
@@ -878,27 +935,27 @@ export default {
type: "warning",
}).then(async () => {
- let delUrl = "/epmetuser/icEpidemicSpecialAttention/delete";
- const { data, code, msg } = await requestPost(delUrl, [row.id]);
-
- if (code === 0) {
- this.$message({
- type: "success",
- message: "删除成功",
- });
- this.loadTable();
- } else {
- this.$message.error(msg);
- }
- })
- .catch((err) => {
- if (err == "cancel") {
- // this.$message({
- // type: "info",
- // message: "已取消删除"
- // });
- }
+ let delUrl = "/epmetuser/icEpidemicSpecialAttention/delete";
+ const { data, code, msg } = await requestPost(delUrl, [row.id]);
+
+ if (code === 0) {
+ this.$message({
+ type: "success",
+ message: "删除成功",
});
+ this.loadTable();
+ } else {
+ this.$message.error(msg);
+ }
+ })
+ .catch((err) => {
+ if (err == "cancel") {
+ // this.$message({
+ // type: "info",
+ // message: "已取消删除"
+ // });
+ }
+ });
},
async deleteFocus (row) {
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
index 6474e636e..8fb618fde 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
@@ -222,6 +222,51 @@
width="170">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -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++) {
diff --git a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
index 6f5160611..54c714ea2 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
@@ -26,6 +26,10 @@
{{ formData.idCard||'--' }}
+
+ 采样时间:
+ {{ formData.latestCyTime||'--' }}
+
检测时间:
{{ formData.latestNatTime||'--' }}
diff --git a/src/views/modules/base/epidemic/natInfo/noNatList.vue b/src/views/modules/base/epidemic/natInfo/noNatList.vue
index 30e32cd7f..06684267c 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatList.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatList.vue
@@ -75,6 +75,17 @@
placeholder="选择时间">
+
+
+
+
+
+
3) {
+ this.nowAllCode = [user.areaCodePath[0], user.areaCodePath[1], user.areaCodePath[2]]
+ } else {
+ this.nowAllCode = user.areaCodePath
+ }
+
}
// this.$refs['ref_form'].resetFields();
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
index 59d18f19a..41866e7f0 100644
--- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
@@ -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",
});
diff --git a/src/views/modules/visual/shundeju/controlCount.vue b/src/views/modules/visual/shundeju/controlCount.vue
index ae3bb12ba..1c6a5928c 100644
--- a/src/views/modules/visual/shundeju/controlCount.vue
+++ b/src/views/modules/visual/shundeju/controlCount.vue
@@ -225,6 +225,7 @@ export default {
} else {
item.type = '未知'
}
+ item.villageName = '顺德居小区'
return {
...item,
index: index + 1