持续集成分支

This commit is contained in:
aixianling
2024-10-31 14:34:57 +08:00
parent 6a833be062
commit 8c56cf808b
2165 changed files with 4116 additions and 8716 deletions

View File

@@ -0,0 +1,258 @@
<template>
<div class="Add">
<p class="title">已采样<span class="num">{{info.nucleicAcidSamplingCount}}</span></p>
<div class="item mar-b16">
<div class="label">
<span class="tips">*</span>管理区域
</div>
<div class="value color-999">{{info.areaName}}</div>
</div>
<div class="info mar-b16">
<div class="item solid">
<div class="label">
<span class="tips">*</span>管理对象
</div>
<div class="value color-999">{{info.name}}</div>
</div>
<div class="item solid">
<div class="label">
<span class="tips">*</span>身份证号
</div>
<div class="value color-999">{{info.idNumber}}</div>
</div>
<div class="item solid">
<div class="label">
<span class="tips">*</span>手机号码
</div>
<div class="value color-999">{{info.phone}}</div>
</div>
<div class="item solid">
<div class="label">
<span class="tips">*</span>居家状态
</div>
<div class="value color-999">{{ $dict.getLabel('EP_homeStatus2', info.homeStatus)}}</div>
</div>
<div class="item solid">
<div class="label">
<span class="tips">*</span>隔离时间
</div>
<div class="value color-999" v-if="info.quarantineBeginTime">{{info.quarantineBeginTime.substring(0, 10)}}{{info.quarantineEndTime.substring(0, 10)}}</div>
</div>
<div class="item">
<div class="label">
<span class="tips">*</span>隔离策略
</div>
<div class="value color-999">{{ $dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}</div>
</div>
</div>
<div class="info mar-b16">
<div class="item solid">
<div class="label">
<span class="tips">*</span>采样人员
</div>
<div class="value">
<u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.createUserName" :custom-style="{'font-size': '17px'}" />
</div>
</div>
<div class="item solid">
<div class="label">
<span class="tips">*</span>联系方式
</div>
<div class="value">
<u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.createUserPhone" :custom-style="{'font-size': '17px'}" />
</div>
</div>
<div class="item">
<div class="label">
<span class="tips">*</span>采样时间
</div>
<div class="value" @click="selectTime(form.createTime)">
<span :class="form.createTime === '' ? 'color-999' : ''">{{form.createTime || '请选择'}}</span>
<u-icon name="arrow-right" color="#cccccc" size="24"/>
</div>
</div>
</div>
<div class="btn-height"></div>
<div class="footer">
<div class="confirm" @click="submit">保存</div>
</div>
<u-picker mode="time" v-model="dateShow" :params="deteParams" start-year="2020" @confirm="dateConfirm"></u-picker>
</div>
</template>
<script>
import { mapState } from 'vuex'
export default {
data() {
return {
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(option) {
this.id = option.id
this.$dict.load('EP_homeStatus2', 'EP_quarantineStrategy').then(() => {
this.id = option.id
this.getDetail()
})
this.form.createUserName = this.user.name
this.form.createUserPhone = this.user.phone
var myDate = new Date();
this.form.createTime = `${myDate.getFullYear()}-${this.isNum(myDate.getMonth()+1)}-${this.isNum(myDate.getDate())} ${this.isNum(myDate.getHours())}:${this.isNum(myDate.getMinutes())}:${this.isNum(myDate.getSeconds())}`
},
onShow() {
document.title = '核酸采样'
},
methods: {
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.form.registerId = this.info.registerId
this.$http.post(`/app/appepidemicpreventioncommunitymanagement/nucleicAcidSamplin`, this.form).then((res) => {
if (res.code == 0) {
uni.$emit('updateDetail')
uni.$emit('updateList')
this.$u.toast('提交成功')
setTimeout(() => {
uni.navigateBack()
}, 600);
}
})
},
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
}
})
},
isNum(num) {
if(num < 10) {
num = '0'+`${num}`
}
return num
},
},
}
</script>
<style scoped lang="scss">
.Add {
background-color: #F3F6F9;
.title {
line-height: 96px;
padding-left: 32px;
font-size: 30px;
color: #666;
.num {
font-size: 32px;
font-weight: 700;
color: #f46;
}
}
.item {
background-color: #fff;
display: flex;
padding: 40px 0 40px 32px;
.label {
width: 200px;
line-height: 48px;
font-family: PingFangSC-Medium;
font-weight: 500;
font-size: 34px;
color: #666;
.tips {
display: inline-block;
font-family: PingFangSC-Medium;
font-weight: 700;
font-size: 34px;
color: #F46;
margin-right: 8px;
vertical-align: text-top;
}
}
.value {
width: calc(100% - 200px);
padding-right: 32px;
text-align: right;
font-family: PingFangSC-Regular;
font-size: 34px;
color: #333;
}
.color-999 {
color: #999;
}
.item-textarea {
width: calc(100% - 32px);
}
}
::v-deep uni-textarea{
width: calc(100% - 32px);
}
.info {
padding-left: 32px;
background-color: #fff;
.item {
padding-left: 0;
}
.solid {
border-bottom: 1px solid #ddd;
box-sizing: border-box;
}
}
.mar-b16 {
margin-bottom: 16px;
}
.btn-height{
height: 130px;
}
.footer {
width: 100%;
height: 112px;
position: fixed;
bottom: 0;
.confirm {
width: 100%;
height: 112px;
line-height: 112px;
text-align: center;
font-family: PingFangSC-Regular;
font-size: 32px;
background-color: #1365DD;
color: #fff;
}
}
}
</style>

View File

@@ -0,0 +1,276 @@
<template>
<div class="AppNucleicAcidSampling">
<AiTopFixed>
<u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6"
inactive-color="#A1C1E8" :bar-style="barStyle" :active-item-style="activeStyle" active-color="#ffffff " @change="change">
</u-tabs>
<div class="top-search">
<div class="left">
<AiAreaPicker v-model="areaId" :areaId="cropAreaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
<u-icon name="map-fill" color="#3192F4" size="20px" style="vertical-align: text-bottom"></u-icon>
<span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
<span v-else>请选择</span>
<u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
</AiAreaPicker>
</div>
<u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/手机号/身份证号" :show-action="false" bg-color="#F5F5F5"
search-icon-color="#999" color="#999" height="58" @search="getListInit" @clear="getListInit">
</u-search>
</div>
</AiTopFixed>
<div class="data-list" v-if="list && list.length">
<div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item.id)">
<div class="top">
<div class="title">
<div class="name">
{{item.name}}
<span class="type">{{$dict.getLabel('EP_registerInfoType', item.infoType)}}</span>
</div>
<div class="status" :class="item.nucleicAcidSamplingCount >0 ? 'status1' : 'status0'">
<span class="cir"></span>
<span v-if="item.nucleicAcidSamplingCount >0">核酸采样{{item.nucleicAcidSamplingCount}}</span>
<span v-else>核酸未采样</span>
</div>
</div>
<p> {{item.idNumberText}}</p>
<p> {{item.phone}}</p>
<div class="btn" @click.stop="toEdit(item.id)" v-if="item.status != 2">采样</div>
</div>
</div>
</div>
<AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
</div>
</template>
<script>
import { mapState } from 'vuex'
export default {
appName: '核酸采样',
data() {
return {
areaId: '',
areaName: '',
current: 1,
keyword: '',
currentTabs: 0,
tabList: [
{
name: '待采样',
},
{
name: '已采样',
},
],
barStyle: {
'width': '24px',
'height': '2px',
'border-radius': '0',
'bottom': '5px'
},
activeStyle: {
'font-weight' : '400',
},
list: [],
cropAreaId: ''
}
},
computed: {
...mapState(['user']),
},
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()
})
this.getCropAreaId()
},
onShow() {
document.title = '核酸采样'
},
methods: {
getCropAreaId() {
this.$http.post(`/app/appdvcpconfig/getCorpArea`).then((res) => {
if (res.code == 0) {
this.areaId = res.data
this.cropAreaId = res.data
}
})
},
getListInit() {
this.current = 1
this.list = []
this.getList()
},
getList() {
this.$http.post('/app/appepidemicpreventioncommunitymanagement/list', null, {
params: { size: 10, current: this.current, queryType: this.currentTabs, areaId: this.areaId, name: this.keyword},
}).then((res) => {
if (res.code == 0) {
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
}
})
},
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++
this.getList()
},
}
</script>
<style scoped lang="scss">
.AppNucleicAcidSampling {
height: 100%;
::v-deep .AiTopFixed {
.placeholder {
.content {
padding: 0 !important;
}
}
.fixed {
margin: 0 !important;
.content {
padding: 0 !important;
}
}
}
.top-search {
padding: 20px 32px;
display: flex;
.left{
width: calc(100% - 402px);
}
}
.data-list {
padding: 32px 32px 0;
.item {
width: 100%;
background: #FFF;
border-radius: 16px;
margin-bottom: 24px;
.top {
padding: 32px 32px 24px 32px;
position: relative;
.title {
display: flex;
justify-content: space-between;
margin-bottom: 24px;
.name {
font-family: PingFangSC-Regular;
font-weight: 400;
font-size: 32px;
color: #000;
.type {
line-height: 34px;
font-family: PingFangSC-Regular;
font-weight: 400;
font-size: 24px;
color: #3975C6;
padding: 2px 4px;
background-color: #F6F9F5;
margin-left: 24px;
}
}
.status {
line-height: 20px;
font-family: PingFangSC-Regular;
font-size: 28px;
.cir {
display: inline-block;
width: 8px;
height: 8px;
border-radius: 50%;
margin-right: 8px;
}
}
.status0 {
color: #FFA938;
.cir {
background-color: #FFA938;
}
}
.status1 {
color: #1CCEB0;
.cir {
background-color: #1CCEB0;
}
}
}
p {
line-height: 40px;
font-family: PingFangSC-Regular;
font-size: 28px;
color: #666;
margin-bottom: 8px;
}
.btn {
width: 160px;
height: 56px;
text-align: center;
line-height: 54px;
background: #FFF;
border: 1px solid #1365DD;
border-radius: 4px;
box-sizing: border-box;
position: absolute;
bottom: 32px;
right: 32px;
font-family: PingFangSC-Regular;
font-size: 28px;
color: #1365DD;
}
.status-img {
position: absolute;
bottom: 0;
right: 32px;
width: 160px;
height: 160px;
}
}
.bottom {
border-top: 2px solid #D8DDE6;
padding: 32px;
.text {
line-height: 40px;
font-family: PingFangSC-Regular;
font-size: 28px;
color: #666;
letter-spacing: 0.58px;
}
span {
display: inline-block;
color: #3975C6;
margin-right: 32px;
}
}
}
}
}
</style>

View File

@@ -0,0 +1,217 @@
<template>
<div class="Detail">
<div class="info">
<div class="title">基本信息</div>
<div class="item-flex">
<div class="label">管理区域</div>
<div class="value">{{info.areaName}}</div>
</div>
<div class="item-flex">
<div class="label">管理对象</div>
<div class="value">{{info.name}}</div>
</div>
<div class="item-flex">
<div class="label">身份证号</div>
<div class="value">{{info.idNumberText}}</div>
</div>
<div class="item-flex">
<div class="label">手机号码</div>
<div class="value" style="color:#4181FF;" @click="callPhone(info.phone)">
<img :src="$cdn + 'common/phone.png'" alt="" class="phone-icon" >
{{info.phone}}</div>
</div>
<div class="item-flex">
<div class="label">居家状态</div>
<div class="value">{{$dict.getLabel('EP_homeStatus2', info.homeStatus)}}</div>
</div>
<div class="item-flex">
<div class="label">隔离时间</div>
<div class="value" v-if="info.quarantineBeginTime">{{info.quarantineBeginTime.substring(0, 10)}}{{info.quarantineEndTime.substring(0, 10)}}</div>
</div>
<div class="item-flex">
<div class="label">隔离策略</div>
<div class="value">{{$dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}</div>
</div>
</div>
<div class="line-bg"></div>
<div class="info" v-if="info.nucleicAcidSamplingCount>0">
<div class="title">核酸采集信息已采样<span style="color:#f46;">{{info.nucleicAcidSamplingCount}}</span></div>
<div class="error-list">
<div class="item" v-for="(item, index) in info.nucleicAcidSamplingList" :key="index">
<div>
<span>采样人{{item.createUserName}}</span>
<span>联系方式{{item.createUserPhone}}</span>
</div>
<p>采样时间{{item.createTime}}</p>
</div>
</div>
</div>
<div class="btn-height"></div>
<div class="footer" v-if="info.status != 2 && isHideBtn != 1" @click="toAdd">采样</div>
</div>
</template>
<script>
import { mapState } from 'vuex'
export default {
data() {
return {
id: '',
info: {},
isHideBtn: 0
}
},
computed: { ...mapState(['user']) },
onShow() {
document.title = '采样信息'
},
onLoad(option) {
this.$dict.load('EP_homeStatus2', 'EP_quarantineStrategy').then(() => {
this.id = option.id
this.getDetail()
})
uni.$on('updateDetail', () => {
this.getDetail()
})
this.isHideBtn = option.isHideBtn || 0
},
methods: {
getDetail() {
this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
if (res.code == 0) {
this.info = res.data
this.info.idNumberText = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
}
})
},
toAdd() {
uni.navigateTo({ url: `./Add?id=${this.id}` })
},
callPhone(phone) {
uni.makePhoneCall({phoneNumber: phone})
},
previewImage(images, img) {
uni.previewImage({
urls: images.map(v => v.url),
current: img
})
},
toEdit() {
uni.navigateTo({url: `./Add?id=${this.id}`})
}
},
}
</script>
<style lang="scss" scoped>
.Detail {
.info{
background-color: #fff;
padding: 0 32px;
.title{
line-height: 116px;
background: #FFF;
font-size: 38px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #333;
}
.item-flex{
padding: 34px 0;
border-bottom: 1px solid #ddd;
display: flex;
justify-content: space-between;
line-height: 44px;
font-size: 32px;
font-family: PingFangSC-Regular, PingFang SC;
.label{
width: 206px;
color: #999;
}
.value{
width: calc(100% - 206px);
word-break: break-all;
color: #333;
text-align: right;
.phone-icon{
width: 40px;
height: 40px;
vertical-align: middle;
margin-right: 8px;
}
}
.color-0{
color: #42D784;
}
.color-1{
color: #f46;
}
.color-2{
color: #1365DD;
}
}
.img-list{
padding-bottom: 32px;
img{
width: 320px;
height: 320px;
}
}
.item-flex:nth-last-of-type(1){
border-bottom: 0;
}
.error-list {
padding-bottom: 48px;
.item {
width: 100%;
background: #f4f7fe;
border-radius: 8px;
padding: 24px 24px 18px 24px;
box-sizing: border-box;
margin-bottom: 16px;
color: #343d65;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
line-height: 40px;
div {
display: flex;
justify-content: space-between;
margin-bottom: 16px;
}
}
}
.text-p{
line-height: 44px;
color: #333;
padding-bottom: 16px;
}
}
.line-bg{
width: 100%;
height: 24px;
background-color: #F3F6F9;
}
.btn-height{
height: 130px;
}
.footer{
width: 100%;
height: 112px;
line-height: 112px;
background: #1365DD;
box-shadow: inset 0px 1px 0px 0px #EEEEEE;
font-size: 32px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #FFF;
text-align: center;
position: fixed;
bottom: 0;
left: 0;
}
.border-none{
border-bottom: 0!important;
}
}
</style>