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

11

shibei_master
jiangyy 3 years ago
parent
f3da964aa3
commit
bd14b36bbd
9 changed files with 461 additions and 466 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. 7
      src/App.vue
  2. 5
      src/assets/scss/modules/management/epidemic.scss
  3. 56
      src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
  4. 4
      src/views/modules/base/epidemic/natFocus/natFocusList.vue
  5. 145
      src/views/modules/base/epidemic/natInfo/natList.vue
  6. 3
      src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
  7. 4
      src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
  8. 40
      src/views/modules/communityService/ninePlaces/inspect/inspect.vue
  9. 663
      src/views/modules/shequ/index.vue

7
src/App.vue
View File

@ -187,4 +187,11 @@ export default {
padding: 6px !important;
background-color: rgb(247, 250, 253);
}
//列表操作列，更多
.table-more-btn {
display: flex;
flex-direction: column;
justify-content: center;
}
</style>

5
src/assets/scss/modules/management/epidemic.scss
View File

@ -75,11 +75,6 @@
}
}
.more-btn {
display: flex;
flex-direction: column;
justify-content: center;
}
.div-mult-form {
margin-top: 20px;

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

@ -127,14 +127,29 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="疫苗接种次数小于"
<el-form-item label="检测时间"
prop="startTime">
<el-date-picker v-model="timeRange"
size="mini"
type="daterange"
@change="handleTimeChange"
format="yyyy-MM-dd"
value-format="yyyyMMdd"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="核酸检测次数小于"
label-width="150px">
<el-input-number class="item_width_3"
v-model="formDataSearch.vaccineCount"
v-model="formDataSearch.natCount"
size="mini"
:min="0"
:max="20"
label="疫苗接种次数小于"></el-input-number>
label="核酸检测次数小于"></el-input-number>
</el-form-item>
<el-button style="margin-left:30px"
size="mini"
@ -183,7 +198,7 @@
label="身份证"
min-width="170">
</el-table-column>
<el-table-column prop="vaccineCount"
<el-table-column prop="natCount"
header-align="center"
align="center"
label="疫苗接种次数"
@ -324,8 +339,12 @@ export default {
formDataSearch: {
gridId: '',
vaccineCount: undefined,
natCount: undefined,
startDate: '',
endDate: '',
attentionType: 2
},
timeRange: [],
formData1: {
attentionType: 2,
@ -384,7 +403,7 @@ export default {
async loadTable () {
this.tableLoading = true
const url = "/epmetuser/epidemicPrevention/page"
const url = "/epmetuser/epidemicPrevention/user-list"
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
let params = {
pageSize: this.pageSize,
@ -410,6 +429,19 @@ export default {
this.tableLoading = false
},
handleTimeChange (time) {
if (time) {
this.formData.startDate = time[0]
this.formData.endDate = time[1]
} else {
this.formData.startDate = ''
this.formData.endDate = ''
}
},
handleSelectTable (selection, row) {
row.isSel = !row.isSel
@ -656,14 +688,9 @@ export default {
resetSearch () {
this.formDataSearch = {
gridId: '',
vaccineCount: undefined,
natCount: undefined,
}
},
destroyed () {
console.log(11111111)
this.timeRange = []
},
resetData () {
@ -690,12 +717,11 @@ export default {
}
this.formDataSearch = {
gridId: '',
vaccineCount: undefined,
natCount: undefined,
}
this.selectionAll = []//选中的人员
},
handleSizeChange (val) {

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

@ -189,14 +189,14 @@
style="margin-left:10px"
width="20"
trigger="click">
<div class="more-btn">
<div class="table-more-btn">
<el-button type="text"
class="div-table-button--detail--noline"
size="small"
@click="handleNoticeList(scope.row)">通知记录</el-button>
</div>
<div class="more-btn">
<div class="table-more-btn">
<el-button type="text"
class="div-table-button--detail--noline"
size="small"

145
src/views/modules/base/epidemic/natInfo/natList.vue
View File

@ -19,51 +19,65 @@
</el-select>
</el-form-item>
<el-form-item label="姓名"
prop="name">
<el-input v-model="formData.name"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入姓名">
</el-input>
<el-form-item label="本辖区居民">
<el-select class="list_item_width_1"
size="small"
:disabled="formData.orgType!='current'"
v-model.trim="formData.isResiUser"
placeholder="请选择">
<el-option v-for="item in isResiUserList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="手机号"
prop="mobile">
<el-input v-model="formData.mobile"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入手机号">
</el-input>
<el-form-item label="接种时间"
prop="startTime">
<el-date-picker v-model="timeRange"
size="small"
type="datetimerange"
@change="handleTimeChange"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="身份证"
prop="idCard">
<el-input v-model="formData.idCard"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
</el-input>
</el-form-item>
<div>
<el-form-item label="姓名"
prop="name">
<el-input v-model="formData.name"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="接种时间"
prop="startTime">
<el-date-picker v-model="timeRange"
size="small"
type="datetimerange"
@change="handleTimeChange"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间">
</el-date-picker>
<el-form-item label="手机号"
prop="mobile">
<el-input v-model="formData.mobile"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入手机号">
</el-input>
</el-form-item>
<el-form-item label="身份证"
prop="idCard">
<el-input v-model="formData.idCard"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
</el-input>
</el-form-item>
@ -160,6 +174,14 @@
label="检测结果"
width="100">
</el-table-column>
<el-table-column v-if="formData.orgType==='current'"
prop="isResiUserShow"
header-align="center"
align="center"
show-overflow-tooltip
label="是否本辖区居民"
width="120">
</el-table-column>
<el-table-column label="操作"
fixed="right"
@ -174,48 +196,30 @@
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="scope.row.userType==='resi'||scope.row.userType==='icresi'"
type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button v-if="scope.row.userType==='resi'||scope.row.userType==='icresi'"
type="text"
class="div-table-button--delete "
size="small"
@click="handleDelete(scope.row,'delete')">删除</el-button>
<el-button v-if="scope.row.userType==='import'&&scope.row.agencyId!==agencyId"
<el-button v-if="formData.orgType==='all'"
type="text"
class="div-table-button--edit"
size="small"
@click="handleAttention(scope.row)">同步</el-button>
<el-button v-if="scope.row.userType==='synchro'&&scope.row.agencyId===agencyId"
<el-button v-if="formData.orgType==='current'&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text"
class="div-table-button--delete "
size="small"
@click="handleDelete(scope.row,'attention')">取消同步</el-button>
<!-- <el-button type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button type="text"
<el-button v-if="formData.orgType==='current'&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text"
class="div-table-button--delete "
size="small"
@click="handleDelete(scope.row,'delete')">删除</el-button>
<el-button type="text"
class="div-table-button--edit"
size="small"
@click="handleAttention(scope.row)">关注</el-button>
<el-button type="text"
<el-button v-if="formData.orgType==='current'&&scope.row.userType==='synchro'&&scope.row.agencyId===agencyId"
type="text"
class="div-table-button--delete "
size="small"
@click="handleDelete(scope.row,'attention')">取消关注</el-button> -->
@click="handleDelete(scope.row,'attention')">取消同步</el-button>
</template>
</el-table-column>
</el-table>
@ -277,6 +281,16 @@ export default {
label: '全部检测记录'
},
],
isResiUserList: [
{
value: '0',
label: '否'
},
{
value: '1',
label: '是'
},
],
timeRange: [],
formData: {
@ -286,6 +300,7 @@ export default {
idCard: '',//身份证号码
startTime: '',//检测开始时间yyyy-MM-dd HH:mm
endTime: '',//检测结束时间yyyy-MM-dd HH:mm
isResiUser: ''//0:否 1:是
},
@ -337,6 +352,8 @@ export default {
this.tableData = data.list
this.tableData.forEach(item => {
item.isResiUserShow = item.isResiUser === '0' ? '否' : '是'
if (item.natResult === '1') {
item.natResultShow = '阳性'
} else if (item.natResult === '0') {

3
src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
View File

@ -303,6 +303,7 @@ export default {
formDataSearch: {
gridId: '',
vaccineCount: undefined,
attentionType: 1
},
formData1: {
@ -361,7 +362,7 @@ export default {
async loadTable () {
this.tableLoading = true
const url = "/epmetuser/epidemicPrevention/page"
const url = "/epmetuser/epidemicPrevention/user-list"
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
let params = {
pageSize: this.pageSize,

4
src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
View File

@ -184,14 +184,14 @@
style="margin-left:10px"
width="20"
trigger="click">
<div class="more-btn">
<div class="table-more-btn">
<el-button type="text"
class="div-table-button--detail--noline"
size="small"
@click="handleNoticeList(scope.row)">通知记录</el-button>
</div>
<div class="more-btn">
<div class="table-more-btn">
<el-button type="text"
class="div-table-button--detail--noline"
size="small"

40
src/views/modules/communityService/ninePlaces/inspect/inspect.vue
View File

@ -186,11 +186,33 @@
<el-button type="text"
class="div-table-button--edit"
size="small"
@click="handleReview(scope.row)">复查记录</el-button>
<el-button type="text"
class="div-table-button--delete"
size="small"
@click="handleDelete(scope.row)">删除</el-button>
:disabled="true"
@click="handleEdit(scope.row)">修改</el-button>
<el-popover popper-class="btn-popper"
placement="bottom"
style="margin-left:10px"
width="20"
trigger="click">
<div class="table-more-btn">
<el-button type="text"
class="div-table-button--edit"
size="small"
@click="handleReview(scope.row)">复查记录</el-button>
</div>
<div class="table-more-btn">
<el-button type="text"
class="div-table-button--delete"
size="small"
@click="handleDelete(scope.row)">删除</el-button>
</div>
<el-button type="text"
size="small"
class="div-table-button--more"
slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
</el-popover>
</template>
</el-table-column>
@ -428,6 +450,14 @@ export default {
})
},
handleEdit (row) {
this.formTitle = '编辑'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('edit', row)
})
},
handleReview (row) {
this.reviewShow = true
this.$nextTick(() => {

663
src/views/modules/shequ/index.vue
View File

File diff suppressed because it is too large
Write Preview
Loading…
Cancel
Save