elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-fangyi' into test

shibei_master
13176889840 3 years ago
parent
c981459d06 e12336c496
commit
d0dd38f9c9
2 changed files with 126 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/views/modules/base/epidemic/antiInfo.vue
  2. 119
      src/views/modules/shequ/cpts/people-more.vue

12
src/views/modules/base/epidemic/antiInfo.vue
View File

@ -185,7 +185,7 @@
header-align="center" header-align="center"
align="center" align="center"
label="姓名" label="姓名"
width="100"> width="120">
</el-table-column> </el-table-column>
<el-table-column prop="gridName" <el-table-column prop="gridName"
header-align="center" header-align="center"
@ -199,13 +199,13 @@
align="center" align="center"
label="所属房屋" label="所属房屋"
show-overflow-tooltip show-overflow-tooltip
width="240"> min-width="180">
</el-table-column> </el-table-column>
<el-table-column prop="mobile" <el-table-column prop="mobile"
header-align="center" header-align="center"
align="center" align="center"
label="手机号" label="手机号"
width="110"> width="180">
</el-table-column> </el-table-column>
<el-table-column prop="idCard" <el-table-column prop="idCard"
header-align="center" header-align="center"
@ -434,7 +434,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="行程信息" name="third"> <el-tab-pane label="行程信息" name="third">
<el-table class="table" <el-table class="table"
:data="tripList" :data="tripList"
border border
@ -451,6 +451,7 @@
header-align="center" header-align="center"
align="center" align="center"
label="来自地区" label="来自地区"
show-overflow-tooltip
min-width="100"> min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="arrivalTime" <el-table-column prop="arrivalTime"
@ -475,10 +476,11 @@
header-align="center" header-align="center"
align="center" align="center"
label="备注" label="备注"
show-overflow-tooltip
width="120"> width="120">
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> --> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</div> </div>

119
src/views/modules/shequ/cpts/people-more.vue
View File

@ -136,6 +136,87 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="group.tableName == 'ic_hs'" style="margin-top:10px; padding: 0 20px;">
<el-table class="table"
:data="natList"
border
height="400"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%">
<el-table-column label="序号"
header-align="center"
align="center"
type="index"
width="50"></el-table-column>
<el-table-column prop="testTime"
header-align="center"
align="center"
label="检测时间"
width="150">
</el-table-column>
<el-table-column prop="address"
header-align="center"
align="center"
label="检测机构"
show-overflow-tooltip
min-width="180">
</el-table-column>
<el-table-column prop="result"
header-align="center"
align="center"
label="检测结果"
width="240">
</el-table-column>
</el-table>
</div>
<div v-if="group.tableName == 'ic_xc'" style="margin-top:10px; padding: 0 20px;">
<el-table class="table"
:data="tripList"
border
height="400"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%">
<el-table-column label="序号"
header-align="center"
align="center"
type="index"
width="50"></el-table-column>
<el-table-column prop="fromRegion"
header-align="center"
align="center"
label="来自地区"
show-overflow-tooltip
min-width="100">
</el-table-column>
<el-table-column prop="arrivalTime"
header-align="center"
align="center"
label="来到本地时间"
width="140">
</el-table-column>
<el-table-column prop="leaveTime"
header-align="center"
align="center"
label="离开本地时间"
width="140">
</el-table-column>
<el-table-column prop="noticeTime"
header-align="center"
align="center"
label="最近一次通知时间"
width="140">
</el-table-column>
<el-table-column prop="remark"
header-align="center"
align="center"
label="备注"
show-overflow-tooltip
width="120">
</el-table-column>
</el-table>
</div>
<div class="list" v-else> <div class="list" v-else>
<div <div
class="item" class="item"
@ -210,6 +291,8 @@ export default {
louList: [], louList: [],
danyuanList: [], danyuanList: [],
homeList: [], homeList: [],
natList: [], // 核酸检测
tripList: [], // 行程信息
}; };
}, },
@ -315,6 +398,7 @@ export default {
async getApiData() { async getApiData() {
await this.getField(); await this.getField();
await this.getInfo(); await this.getInfo();
this.getDetailList()
this.getXiaoquList(); this.getXiaoquList();
this.getLouList(); this.getLouList();
this.getDanyuanList(); this.getDanyuanList();
@ -364,6 +448,7 @@ export default {
}); });
if (code === 0) { if (code === 0) {
this.groupList = data.groupList; this.groupList = data.groupList;
this.fieldList = (function (arr) { this.fieldList = (function (arr) {
let col = []; let col = [];
@ -429,6 +514,22 @@ export default {
} }
}); });
}); });
const arr = [{
groupId: "hs123",
itemList: [],
label: "核酸检测信息",
sort: 998,
supportAdd: false,
tableName: "ic_hs",
}, {
groupId: "hs124",
itemList: [],
label: "行程信息",
sort: 999,
supportAdd: false,
tableName: "ic_xc",
}]
this.groupList = [...this.groupList, ...arr]
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -500,6 +601,24 @@ export default {
this.$message.error(msg); this.$message.error(msg);
} }
}, },
async getDetailList () {
const url = "/epmetuser/epidemicPrevention/info"
let params = {
id: this.userId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
const { vaccineList, natList, tripList } = data
this.vaccineList = vaccineList
this.natList = natList
this.tripList = tripList
} else {
this.$message.error(msg)
}
},
}, },
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save