elink-star
/
epmet-oper-gov
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

11

feature/welfareImport
jiangyy 3 years ago
parent
51a4350fc9
commit
41d22b5284
3 changed files with 149 additions and 147 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. 16
      src/views/modules/base/epidemic/travelYantai/travelYantai.vue
  2. 181
      src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
  3. 99
      src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue

16
src/views/modules/base/epidemic/travelYantai/travelYantai.vue
View File

@ -187,7 +187,7 @@
show-overflow-tooltip
min-width="180">
</el-table-column>
<el-table-column prop="trafficTypeName"
<el-table-column prop="comeMode"
header-align="center"
align="center"
label="返回方式"
@ -200,7 +200,7 @@
width="160">
</el-table-column>
<el-table-column prop="natOutcomeName"
<el-table-column prop="carryHesuanProof"
header-align="center"
align="center"
label="48小时核酸"
@ -208,13 +208,13 @@
min-width="100">
</el-table-column>
<el-table-column prop="jian"
<el-table-column prop="healthCodeAbnormal"
header-align="center"
align="center"
label="健康码异常"
width="100">
</el-table-column>
<el-table-column prop="jian"
<el-table-column prop="travelCodeAbnormal"
header-align="center"
align="center"
label="行程码异常"
@ -517,7 +517,7 @@ export default {
async loadTable () {
this.tableLoading = true
const url = "/epmetuser/tripreport/page"
const url = "/epmetuser/tripreport/yt-page"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
let params = {
pageSize: this.pageSize,
@ -805,8 +805,8 @@ export default {
let params = {
isSync: '1',
dataCode: 'yimiaojiezhong',
jobType: 'vaccine',
// dataCode: 'yimiaojiezhong',
jobType: 'trip_report',
agencyId: this.agencyId
}
@ -874,7 +874,7 @@ export default {
// })
await this.$http({
method: 'POST',
url: '/epmetuser/tripreport/psexport',
url: 'epmetuser/tripreport/yt-export',
responseType: 'blob',
data: params
})

181
src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
View File

@ -41,7 +41,7 @@
<div class="info-prop">
<span class="info-title-3">详细地址：</span>
<span>{{ formData.sourceDetailAddress||'--' }}</span>
<span>{{ formData.comeAreaFull||'--' }}</span>
</div>
<div class="info-prop">
@ -51,95 +51,105 @@
<div class="info-prop">
<span class="info-title-3">返回方式：</span>
<span>{{ formData.trafficTypeName||'--' }}</span>
</div>
<div v-if="formData.trafficTypeExplain"
class="info-prop">
<span class="info-title-3">具体方式：</span>
<span>{{ formData.trafficTypeExplain||'--' }}</span>
<span>{{ formData.comeMode||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">班次：</span>
<span>{{ formData.trafficTypeName||'--' }}</span>
<span>{{ formData.shift||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">48小时核酸：</span>
<span>{{ formData.natOutcomeName||'--' }}</span>
<span>{{ formData.carryHesuanProof||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">健康码：</span>
<span>{{ formData.natOutcomeName||'--' }}</span>
<span class="info-title-3">健康码异常：</span>
<span>{{ formData.healthCodeAbnormal||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">行程码：</span>
<span>{{ formData.natOutcomeName||'--' }}</span>
<span class="info-title-3">行程码异常：</span>
<span>{{ formData.travelCodeAbnormal||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">核酸检测报告：</span>
<span>{{ formData.natOutcomeName||'--' }}</span>
<span class="info-title-3">核酸检测报告异常：</span>
<span>{{ formData.detectionAbnormal||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">两码一报告：</span>
<span>{{ formData.natOutcomeName||'--' }}</span>
<span class="info-title-3">两码一报告状态：</span>
<span>{{ formData.twoCodeOneReportStatus||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">是否有外地旅居史：</span>
<span>{{ formData.natOutcomeName||'--' }}</span>
<span>{{ formData.nonlocalResidenceHistory||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">途径地区：</span>
<span>{{ formData.natOutcomeName||'--' }}</span>
<span>{{ formData.viaAddressShow||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">同行人：</span>
<span>{{ formData.natOutcomeName||'--' }}</span>
<span>{{ formData.travelPersonnel||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">户籍地：</span>
<span>{{ formData.registeredResidence||'--' }}</span>
<span>{{ formData.registeredResidenceCity||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">户籍详细地址：</span>
<span>{{ formData.passBy||'--' }}</span>
<span>{{ formData.registeredResidenceAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">是否带车：</span>
<span>{{ formData.describeContent||'--' }}</span>
<span>{{ formData.carryVehicle||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">带车车牌号：</span>
<span>{{ formData.describeContent||'--' }}</span>
<span>{{ formData.carryVehicleNumber||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">车辆颜色：</span>
<span>{{ formData.describeContent||'--' }}</span>
<span>{{ formData.carryVehicleNumberColor||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">目的地交通场站：</span>
<span>{{ formData.describeContent||'--' }}</span>
<span>{{ formData.destinationStation||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">入鲁时间：</span>
<span>{{ formData.sojournHistoryName||'--' }}</span>
<span>{{ formData.arriveLuTime||'--' }}</span>
</div>
<div class="info-prop">
<div v-if="!formData.travelCodeImg"
class="info-prop">
<span class="info-title-3">行程码：</span>
<span>{{ formData.isolateTypeName||'--' }}</span>
<span>{{ '--' }}</span>
</div>
<div class="info-prop"
v-if="formData.travelCodeImg">
<span class="info-title-3">行程码：</span>
<div class="info-pics">
<img style="width:80px;height:80px"
:src="formData.travelCodeImg"
@click="watchImg(formData.travelCodeImg)">
</div>
</div>
<div class="info-prop">
<span class="info-title-3">离开本地时间：</span>
<span>{{ formData.isolateTypeName||'--' }}</span>
<span>{{ formData.invalidTime||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">备注：</span>
@ -187,11 +197,10 @@ export default {
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
//获取网格下拉框数据
// await this.loadGrid()
},
destroyed () {
this.nowAllCode = []
},
methods: {
@ -223,94 +232,9 @@ export default {
},
async loadGrid () {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
} else {
this.$message.error(msg)
}
},
async handleSelGrid (value) {
const url = "/epmetuser/icresiuser/demandusers"
let params = {
agencyId: this.agencyId,
gridId: value
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.personList = data
} else {
this.$message.error(msg)
}
},
async getArea (node, resolve) {
const url = "/commonservice/areacode/nextarea"
let params = {
parentLevel: node.data ? node.data.level : '',
parentAreaCode: node.data ? node.data.code : ''
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
const nodes = data.map(item => ({
value: item.areaCode, //
label: item.areaName,
code: item.areaCode,
level: item.level,
leaf: node.level >= 4 // 5层级
}))
resolve(nodes)
} else {
this.$message.error(msg)
}
},
async handleSelAddress (value) {
const url = "/gov/org/house/gethouseinfo/" + value
const { data, code, msg } = await requestPost(url)
if (code === 0) {
this.formData.presentAddress = data.agencyPathName
this.formData.presentAddressCode = data.areaCode
this.formData.detailAddress = data.allName
} else {
this.$message.error(msg)
}
},
async handleSelPerson (personItem) {
this.formData.userId = personItem.demandUserId
this.formData.name = personItem.demandUserName
this.formData.mobile = personItem.demandUserMobile
this.formData.idCard = personItem.idCard
this.handleSelAddress(personItem.houseId)
},
async loadFormData (id) {
const url = '/epmetuser/tripreport/detail'
const url = '/epmetuser/tripreport/yt-detail '
let params = {
id,
}
@ -318,15 +242,28 @@ export default {
if (code === 0) {
console.log('deda-------', data)
this.formData = { ...data, channel: [], content: '' }
this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
if (data.userType == 'icresi') this.isFromResi = true
else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
this.formData.viaAddressShow = ''
if (this.formData.viaProvince) {
this.formData.viaAddressShow = this.formData.viaAddressShow + this.formData.viaProvince
}
if (this.formData.viaCity) {
this.formData.viaAddressShow = this.formData.viaAddressShow + '-' + this.formData.viaCity
}
if (this.formData.viaCounty) {
this.formData.viaAddressShow = this.formData.viaAddressShow + '-' + this.formData.viaCounty
}
} else {
this.$message.error(msg)
}
},
watchImg (src) {
window.open(src);
},
handleCancle () {
// this.resetData()
this.$emit('dialogCancle')

99
src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
View File

@ -148,9 +148,9 @@
<el-form-item label="返回方式"
style="display: block"
prop="trafficType">
prop="comeMode">
<el-select class="item_width_4"
v-model.trim="formData.trafficType"
v-model.trim="formData.comeMode"
placeholder="请选择"
clearable>
<el-option v-for="item in trafficTypeList"
@ -285,12 +285,12 @@
</el-input>
</el-form-item>
<el-form-item label="车辆颜色"
prop="carryVehiclenumberColor"
prop="carryVehicleNumberColor"
style="display: block">
<el-input class="item_width_4"
placeholder="请输入车辆颜色"
clearable
v-model="formData.carryVehiclenumberColor">
v-model="formData.carryVehicleNumberColor">
</el-input>
</el-form-item>
<el-form-item label="目的地交通场站"
@ -481,7 +481,7 @@ export default {
content: '',
channel: [],
trafficType: '',//返回方式，前端写死下来框值，给后端直接传汉字，烟台的不使用字典表
comeMode: '',//返回方式，前端写死下来框值，给后端直接传汉字，烟台的不使用字典表
shift: '',//班次
carryHesuanProof: '',//48小时核算 ，传是/否
healthCodeAbnormal: '',//健康码异常，传是/否
@ -505,7 +505,7 @@ export default {
carryVehicle: '',//是否带车，传是/否
carryVehicleNumber: '',//带车车牌号
carryVehiclenumberColor: '',//车辆颜色
carryVehicleNumberColor: '',//车辆颜色
destinationStation: '',//目的地交通场站
arriveLuTime: '',//入鲁时间yyyy-MM-dd HH:mm:ss
@ -585,7 +585,7 @@ export default {
arriveDate: [
{ required: true, message: '来到本地时间不能为空', trigger: 'change' },
],
trafficType: [
comeMode: [
{ required: true, message: '返回方式不能为空', trigger: 'change' },
],
carryHesuanProof: [
@ -660,7 +660,7 @@ export default {
} else {
const { user } = this.$store.state
//默认：山东省37-菏泽市3717-曹县371721
this.nowAllCode = ['37', '3717', '371721']
// this.nowAllCode = ['37', '3717', '371721']
}
// this.$refs['ref_form'].resetFields();
@ -674,7 +674,7 @@ export default {
this.formData.idCard = ''
this.formData.gridId = ''
this.formData.userId = ''
this.resetData()
if (value === '2') {
this.isFromResi = true
this.formData.userType = 'icresi'
@ -849,7 +849,7 @@ export default {
async loadFormData (id) {
const url = '/epmetuser/tripreport/detail'
const url = '/epmetuser/tripreport/yt-detail '
let params = {
id,
}
@ -859,9 +859,22 @@ export default {
this.formData = { ...data, channel: [], content: '' }
this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
this.tujingAllCode = data.viaPathCode && data.viaPathCode.split(',')
this.hujiAllCode = data.registeredResidencePathCode && data.registeredResidencePathCode.split(',')
if (data.userType == 'icresi') this.isFromResi = true
if (this.formData.travelCodeImg) {
let obj = {
id: "111",
url: this.formData.travelCodeImg,
};
this.replayImgList = [];
this.replayImgList.push(obj);
this.hideUploadBtn = true
}
} else {
this.$message.error(msg)
}
@ -871,7 +884,7 @@ export default {
async handleComfirm (formName) {
console.log(' this.formData', this.formData)
console.log(' this.replayImgList', this.replayImgList)
return false
// return false
this.$refs[formName].validate(async (valid) => {
if (valid) {
if (this.formData.channel.length > 0 && !this.formData.content) {
@ -888,8 +901,8 @@ export default {
}, 5000)
let url = ''
if (this.formType === 'add') url = '/epmetuser/tripreport/save'
else url = '/epmetuser/tripreport/update'
if (this.formType === 'add') url = '/epmetuser/tripreport/yt-save'
else url = '/epmetuser/tripreport/yt-update'
const { data, code, msg } = await requestPost(url, this.formData)
@ -924,10 +937,62 @@ export default {
resetData () {
this.$refs.ref_form.resetFields()
this.formData.sourceAddressCode = ''
this.formData.presentAddressCode = ''
this.formData.sourceAddressPathCode = ''
this.formData.presentAddressPathCode = ''
this.formData = {
gridId: '',
agencyId: '',//当前网格所属组织Id
userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
userType: 'input',//从居民信息里选择居民时:icresi；默认传：input
name: '',
idCard: '',
mobile: '',
heSuanCheck: false,
presentAddress: '',
presentAddressCode: '',
presentAddressPathCode: '',
detailAddress: '',
sourceAddressCode: '',
sourceAddress: '',
sourceAddressPathCode: '',
comeAreaFull: '',//来源地--详细地址（必填）
arriveDate: '',//来到本地时间
remark: '',//备注
content: '',
channel: [],
comeMode: '',//返回方式，前端写死下来框值，给后端直接传汉字，烟台的不使用字典表
shift: '',//班次
carryHesuanProof: '',//48小时核算 ，传是/否
healthCodeAbnormal: '',//健康码异常，传是/否
travelCodeAbnormal: '',//行程码异常，传是/否
detectionAbnormal: '',//核酸检测报告异常，传是/否
twoCodeOneReportStatus: '',//两码一报告状态，传正常/异常
nonlocalResidenceHistory: '',//是否有外地旅居史，传是/否
viaProvince: '',//途径地-省
viaCity: '',//途径地-市
viaCounty: '',//途径地-县
viaCode: '',//途径地
viaPathCode: '',//途径地
travelPersonnel: '',//同行人
registeredResidenceCity: '',//户籍地
registeredResidenceCode: '',//户籍地
registeredResidencePathCode: '',//户籍地
registeredResidenceAddress: '',//户籍详细地址
carryVehicle: '',//是否带车，传是/否
carryVehicleNumber: '',//带车车牌号
carryVehicleNumberColor: '',//车辆颜色
destinationStation: '',//目的地交通场站
arriveLuTime: '',//入鲁时间yyyy-MM-dd HH:mm:ss
travelCodeImg: '',//行程码url
invalidTime: '',//离开本地时间yyyy-MM-dd HH:mm:ss
}
this.sourceAllCode = []
this.nowAllCode = []
this.tujingAllCode = []

Write Preview
Loading…
Cancel
Save