+
@@ -54,9 +60,13 @@ export default {
appName: '社区管理',
data() {
return {
+ areaId: '',
+ areaName: '',
current: 1,
keyword: '',
currentTabs: 0,
+ infoType: '',
+ showTypeSelect: false,
tabList: [
{
name: '待管理',
@@ -76,16 +86,22 @@ export default {
},
activeStyle: {
'font-weight' : '400',
- }
+ },
+ list: []
}
},
computed: {
...mapState(['user']),
},
- watch: {},
onLoad() {
this.areaId = this.user.areaId
this.areaName = this.user.areaName
+ this.$dict.load('EP_CM_status', 'EP_registerInfoType').then(() => {
+ this.getListInit()
+ })
+ uni.$on('updateList', () => {
+ this.getListInit()
+ })
},
onShow() {
document.title = '社区管理'
@@ -93,29 +109,40 @@ export default {
methods: {
getListInit() {
this.current = 1
- this.data = []
+ this.list = []
this.getList()
},
getList() {
this.$http.post('/app/appepidemicpreventioncommunitymanagement/list', null, {
- params: { size: 10, current: this.current, status: this.currentTabs, areaId: this.areaId, name: this.keyword },
+ params: { size: 10, current: this.current, status: this.currentTabs, areaId: this.areaId, name: this.keyword, infoType: this.infoType },
}).then((res) => {
if (res.code == 0) {
- this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
+ res.data.records.map((item) => {
+ item.idNumberText = item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+ })
+ this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
}
})
},
- toAdd() {
- uni.navigateTo({url: './Add'})
+ toDetail(id) {
+ uni.navigateTo({url: `./Detail?id=${id}`})
+ },
+ toEdit(id) {
+ uni.navigateTo({url: `./Add?id=${id}`})
},
change(index) {
this.keyword = ''
this.currentTabs = index
+ this.getListInit()
},
areaSelect(e) {
this.areaId = e
this.getListInit()
},
+ typeConfirm(e) {
+ this.infoType = e[0].value
+ this.getListInit()
+ }
},
onReachBottom() {
this.current++
@@ -193,7 +220,7 @@ export default {
line-height: 20px;
font-family: PingFangSC-Regular;
font-size: 28px;
- span {
+ .cir {
display: inline-block;
width: 8px;
height: 8px;
@@ -203,13 +230,13 @@ export default {
}
.status0 {
color: #FFA938;
- span {
+ .cir {
background-color: #FFA938;
}
}
.status0 {
color: #1CCEB0;
- span {
+ .cir {
background-color: #1CCEB0;
}
}
diff --git a/src/project/pingchang/AppCommunityManagement/Detail.vue b/src/project/pingchang/AppCommunityManagement/Detail.vue
new file mode 100644
index 00000000..005256bd
--- /dev/null
+++ b/src/project/pingchang/AppCommunityManagement/Detail.vue
@@ -0,0 +1,236 @@
+
+
+
- 
-
+
- 李主任
- 返乡登记
+ {{item.name}}
+ {{$dict.getLabel('EP_registerInfoType', item.infoType)}}
+
+
+
+ 核酸采样{{item.nucleicAcidSamplingCount}}次
+ 核酸未采样
- 核酸待采样
429012********2341
-1834912340
-排查
-
+ {{item.idNumberText}}
+{{item.phone}}
+排查
+
-
管控人：李在2023-05-04 09:23
+ 管控人： {{item.controllerUserName}} {{item.createTime}}
+
+
+
+
+
+
diff --git a/src/project/pingchang/AppNucleicAcidSampling/Add.vue b/src/project/pingchang/AppNucleicAcidSampling/Add.vue
index 576f9ce7..7e8a5f8a 100644
--- a/src/project/pingchang/AppNucleicAcidSampling/Add.vue
+++ b/src/project/pingchang/AppNucleicAcidSampling/Add.vue
@@ -1,63 +1,48 @@
+
+
+ 基本信息
+
+
+ 管理区域
+ {{info.areaName}}
+
+
+ 管理对象
+ {{info.name}}
+
+
+ 身份证号
+ {{info.idNumberText}}
+
+
+ 手机号码
+
+ ![]()
+ {{info.phone}}
+
+
+ 居家状态
+ {{$dict.getLabel('EP_homeStatus2', info.homeStatus)}}
+
+
+ 隔离时间
+ {{info.quarantineBeginTime}}至{{info.quarantineEndTime}}
+
+
+ 隔离策略
+ {{$dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}
+
+
+
+
+
+
+ 管控内容
+ {{info.controllerContent}}
+
+ ![]()
+
+
-
-
@@ -91,26 +84,72 @@
import { mapState } from 'vuex'
export default {
- data() {
+ data() {
return {
- areaId: '',
- areaName: '',
- files: []
+ id: '',
+ info: {},
+ form: {
+ createUserName: '',
+ createUserPhone: '',
+ createTime: ''
+ },
+ dateShow: false,
+ deteParams: {year: true, month: true, day: true, hour: true, minute: true, second: true},
}
},
computed: {
...mapState(['user']),
},
- onLoad() {
- this.areaId = this.user.areaId
- this.areaName = this.user.areaName
+ onLoad(option) {
+ this.id = option.id
+ this.$dict.load('EP_homeStatus2', 'EP_quarantineStrategy').then(() => {
+ this.id = option.id
+ this.getDetail()
+ })
+ var myDate = new Date();
+ this.form.createTime = `${myDate.getFullYear()}-${myDate.getMonth()+1}-${myDate.getDate()} ${myDate.getHours()}:${myDate.getMinutes()}:${myDate.getSeconds()}`
},
onShow() {
document.title = '核酸采样'
},
methods: {
- areaSelect(e) {
- this.areaId = e
+ submit() {
+ if(!this.form.createUserName) {
+ return this.$u.toast('请输入采样人员')
+ }
+ if(!this.form.createUserPhone) {
+ return this.$u.toast('请输入联系方式')
+ }
+ if(this.form.createUserPhone && !/^1[0-9]{10,10}$/.test(this.form.createUserPhone)) {
+ return this.$u.toast("请输入正确的手机号码");
+ }
+ if(!this.form.createTime) {
+ return this.$u.toast('请输入采样时间')
+ }
+ this.form.cmId = this.id
+
+ this.$http.post(`/app/appepidemicpreventioncommunitymanagement/nucleicAcidSamplin`, this.form).then((res) => {
+ if (res.code == 0) {
+ this.$u.toast('提交成功')
+ uni.$emit('updateDetail')
+ uni.$emit('updateList')
+ uni.navigateBack()
+ }
+ })
+
+ },
+ selectTime() {
+ this.dateShow = true
+ },
+ dateConfirm(e) {
+ this.form.createTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`
+ },
+ getDetail() {
+ this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
+ if (res.code == 0) {
+ this.info = res.data
+ }
+ })
},
},
}
diff --git a/src/project/pingchang/AppNucleicAcidSampling/AppNucleicAcidSampling.vue b/src/project/pingchang/AppNucleicAcidSampling/AppNucleicAcidSampling.vue
index aa5875f1..76d54686 100644
--- a/src/project/pingchang/AppNucleicAcidSampling/AppNucleicAcidSampling.vue
+++ b/src/project/pingchang/AppNucleicAcidSampling/AppNucleicAcidSampling.vue
@@ -13,29 +13,32 @@
已采样3次
+已采样{{info.nucleicAcidSamplingCount}}次
*管理区域
-
-
- {{ areaName }}
- 请选择
-
-
+ {{info.areaName}}
*管理对象
- 自动获取
+ {{info.name}}
*身份证号
- 自动获取
+ {{info.idNumber}}
*手机号码
- 自动获取
+ {{info.phone}}
*居家状态
-
- 请选择
-
+ {{ $dict.getLabel('EP_homeStatus2', info.homeStatus)}}
*隔离时间
-
- 请选择
-
+ {{info.quarantineBeginTime}}至{{info.quarantineEndTime}}
*隔离策略
-
- 请选择
-
+ {{ $dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}
@@ -65,25 +50,33 @@
*采样人员
- 自动获取
+
+
*联系方式
- 自动获取
+
+
+
+
*采样时间
- 自动获取
+
+ {{form.createTime || '请选择'}}
+