suojin
/
physical_examination_front
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://42.192.7.176:3000/suojin/physical_examination_front into main

Browse Source
main
xuechunyuan 3 years ago
parent e201a35edc fec97a9139
commit 3a1dd5f2b1
3 changed files with 122 additions and 76 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. 18
      src/api/booklist/booklist.js
  2. 145
      src/views/booklist/index.vue
  3. 35
      src/views/booknumber/index.vue

18
src/api/booklist/booklist.js
Unescape View File

@ -12,22 +12,30 @@ export const getList = (current, size, params) => {
}, },
}); });
}; };
export const getStatus = (id) => { export const getStatus = (ids) => {
return request({ return request({
url: "/api/blade-business/apm-record/register", url: "/api/blade-business/apm-record/register",
method: "get", method: "post",
params: { params: {
id, ids,
}, },
}); });
}; };
//预约当个详情 //预约当个详情
export const queryBookDetail = (ids) => { export const queryBookDetail = (id) => {
return request({ return request({
url: "/api/blade-business/apm-record/detail-by-id", url: "/api/blade-business/apm-record/detail-by-id",
method: "get", method: "get",
params: { params: {
ids, id,
}, },
}); });
}; };
//系统时间
export const getSystemTime = () => {
return request({
url: "/api/blade-business/common-api/get-system-datetime",
method: "get",
});
};

145
src/views/booklist/index.vue
Unescape View File

@ -4,15 +4,26 @@
:permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" @search-change="searchChange" :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" @search-change="searchChange"
@search-reset="searchReset" @current-change="currentChange" @size-change="sizeChange" @search-reset="searchReset" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad"> @refresh-change="refreshChange" @on-load="onLoad">
<template slot-scope="{row}" slot="examDate">
<div v-for="item1 in row.details.map(item => item.period + item.timeFrame)" :key="item1">{{item1}}</div>
</template>
<template slot-scope="{row}" slot="examPro">
<div v-for="item1 in row.details.map(item => item.project)" :key="item1">{{item1}}</div>
</template>
<template slot-scope="{row}" slot="apmStatus"> <template slot-scope="{row}" slot="apmStatus">
<el-tag size="small" <div v-for="item1 in row.details.map(item => item.apmStatus)" :key="item1">
:type="row.apmStatus == 3 ? 'success' : row.apmStatus == 2 ? 'warning' : row.apmStatus == 3 ? 'danger' : 'info'">{{ <el-tag size="small"
row.apmStatus == 3 ? '已报道' : row.apmStatus == 2 ? '未报道' : row.apmStatus == 1 ? '已取消' : '未报到' :type="item1 == 3 ? 'success' : item1 == 2 ? 'warning' : item1 == 3 ? 'danger' : 'info'"
}}</el-tag> >
{{
item1 == 3 ? '已报道' : item1 == 2 ? '未报道' : item1 == 1 ? '已取消' : '未报到'
}}
</el-tag>
</div>
</template> </template>
<template slot-scope="{row}" slot="menu"> <template slot-scope="{row}" slot="menu">
<el-button type="text" @click="handleRegister(row)" <el-button type="text" @click="handleRegister(row)"
:disabled="row.apmStatus == 2 ? false : true">预约报道</el-button> :disabled="(row.details.find(item => item.apmStatus == 2) && row.apmDay > systemTime) ? false : true">预约报道</el-button>
</template> </template>
</avue-crud> </avue-crud>
<el-drawer <el-drawer
@ -29,35 +40,34 @@
</div> </div>
<div style="padding:0 40px;"> <div style="padding:0 40px;">
<div class="tip_box"> <div class="tip_box">
<img v-show="regData.status == 1" src="~@/assets/image/succ.png" alt=""> <img v-show="regData.resStatus == 1" src="~@/assets/image/succ.png" alt="">
<img v-show="regData.status == 2" src="~@/assets/image/fail.png" alt=""> <img v-show="regData.resStatus == 0" src="~@/assets/image/fail.png" alt="">
<img v-show="regData.status == 3" src="~@/assets/image/warn.png" alt=""> <!-- <img v-show="regData.resStatus == 3" src="~@/assets/image/warn.png" alt=""> -->
<div class="tip_txt" :class="regData.status == 2 ? 'fail_txt' : regData.status == 3 ? 'warn_txt' : ''"> <div class="tip_txt" :class="regData.resStatus == 0 ? 'fail_txt' : ''">
{{ regData.status == 1 ? '报道成功' : '报道失败' }}</div> {{ regData.resStatus == 1 ? '报道成功' : '报道失败' }}</div>
</div> </div>
<div class="tips_txt" v-show="regData.status == 2">无此人员预约检测项目，请预约后按时间报道</div> <div class="tips_txt">{{regData.resMsg}}</div>
<div class="tips_txt tips_warn" v-show="regData.status == 3">报到时间与预约时间不符，请按预约时间报道</div>
<div class="account_mess"> <div class="account_mess">
<div class="mess_tit">账号信息</div> <div class="mess_tit">账号信息</div>
<div class="mess_box"> <div class="mess_box">
<div class="left_box" :class="regData.status == 2 ? 'fail_box' : regData.status == 3 ? 'warn_box' : ''"> <div class="left_box" :class="regData.resStatus == 0 ? 'fail_box' : ''">
<div class="acc_text">姓名</div> <div class="acc_text">姓名</div>
<div class="acc_txt">{{ regData.name }}</div> <div class="acc_txt">{{regData.resData ? regData.resData.cupName : '' }}</div>
</div> </div>
<div class="right_box" <div class="right_box"
:class="regData.status == 2 ? 'fail_right' : regData.status == 3 ? 'warn_right' : ''"> :class="regData.resStatus == 0 ? 'fail_right' : ''">
<div class="acc_box"> <div class="acc_box">
<div class="acc_text">身份证号</div> <div class="acc_text">身份证号</div>
<div class="acc_txt">{{ regData.cardId }}</div> <div class="acc_txt">{{ regData.resData ? regData.resData.cupCardNo : '' }}</div>
</div> </div>
<div class="acc_box"> <div class="acc_box">
<div class="acc_text">联系方式</div> <div class="acc_text">联系方式</div>
<div class="acc_txt">{{ regData.phone }}</div> <div class="acc_txt">{{ regData.resData ? regData.resData.cupPhone : '' }}</div>
</div> </div>
<div class="img_box"> <div class="img_box">
<img v-show="regData.status == 1" src="~@/assets/image/succ_img.png" alt=""> <img v-show="regData.status == 1" src="~@/assets/image/succ_img.png" alt="">
<img v-show="regData.status == 2" src="~@/assets/image/fail_img.png" alt=""> <img v-show="regData.status == 0" src="~@/assets/image/fail_img.png" alt="">
<img v-show="regData.status == 3" src="~@/assets/image/warn_img.png" alt=""> <!-- <img v-show="regData.status == 3" src="~@/assets/image/warn_img.png" alt=""> -->
</div> </div>
</div> </div>
</div> </div>
@ -67,23 +77,27 @@
<div class="mess_box reg_box"> <div class="mess_box reg_box">
<div class="left_box"> <div class="left_box">
<div class="acc_text">体检项目</div> <div class="acc_text">体检项目</div>
<div class="acc_txt">{{ regData.project }}</div> <div class="acc_txt" v-for="item in regData.resData ? regData.resData.details : []" :key="item">{{ item.project }}</div>
<!-- <div class="acc_txt">{{ regData.resData.details.map(item => item.project) }}</div> -->
</div> </div>
<div class="right_box"> <div class="right_box">
<div class="acc_box"> <div class="acc_box">
<div class="acc_text">预约时间</div> <div class="acc_text">预约时间</div>
<div class="acc_txt" :class="regData.status == 3 ? 'acc_warn' : ''">{{ regData.time }}</div> <div class="acc_txt" v-for="item in regData.resData ? regData.resData.details : []" :key="item">{{regData.resData ? regData.resData.apmDay.substring(0,10) : ''}} {{item.period}}{{item.timeFrame}}</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="btn" v-print="printObj"> <div class="btn" v-print="printObj" v-show="regData.resStatus == 1">
签到并打印 签到并打印
</div> </div>
<div class="btn" v-show="regData.resStatus == 0" @click="closeDraw">
关闭
</div>
</div> </div>
</el-drawer> </el-drawer>
<!-- 打印 --> <!-- 打印 -->
<div style="margin-left:-9999px;"> <!-- <div style="margin-left:-9999px;">
<div id="pintHtml" class="prin_table" <div id="pintHtml" class="prin_table"
style="font-family: SimSun;font-size:12px;letter-spacing: 2px;line-height:16px;display: inline-block;overflow: hidden;"> style="font-family: SimSun;font-size:12px;letter-spacing: 2px;line-height:16px;display: inline-block;overflow: hidden;">
<div style="line-height:40px;font-size:22pt;text-align:center;">机动车驾驶人身体条件证明</div> <div style="line-height:40px;font-size:22pt;text-align:center;">机动车驾驶人身体条件证明</div>
@ -291,7 +305,7 @@
</tr> </tr>
</table> </table>
</div> </div>
</div> </div> -->
</basic-container> </basic-container>
</template> </template>
@ -299,7 +313,8 @@
import { import {
getList, getList,
queryBookDetail, queryBookDetail,
getStatus getStatus,
getSystemTime
} from "@/api/booklist/booklist"; } from "@/api/booklist/booklist";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import print from "vue-print-nb"; import print from "vue-print-nb";
@ -361,23 +376,22 @@ export default {
hide: true, hide: true,
}, },
{ {
label: "预约时间", label: "预约日期",
prop: "timeFrame", prop: "apmDay",
html: true, html: true,
formatter: value => { formatter: value => {
return `<div>${value.apmDay.substring(0, 10)}</div>${value.period}${value.timeFrame}` return `<div>${value.apmDay.substring(0, 10)}</div>`
} }
}, },
{
label: "预约时间",
prop: "examDate",
slot:true
},
{ {
label: "预约项目", label: "预约项目",
prop: "project", prop: "examPro",
type: "select", slot:true
dicUrl: "/api/blade-system/dict-biz/dictionary?code=hc_project",
props: {
label: "dictValue",
value: "dictValue"
},
search: true
}, },
{ {
label: "状态", label: "状态",
@ -387,15 +401,8 @@ export default {
] ]
}, },
data: [], data: [],
regData: { regData: {},
status: 3, systemTime:''
name: '张三',
sex: '男',
cardId: '371322198805052320',
phone: '/',
project: '/',
time: '/'
}
}; };
}, },
directives: { directives: {
@ -403,7 +410,7 @@ export default {
}, },
computed: { computed: {
...mapGetters(["userInfo", "permission"]), ...mapGetters(["userInfo", "permission","systemTime"]),
permissionList() { permissionList() {
return { return {
addBtn: this.vaildData(this.permission.notice_add, false), addBtn: this.vaildData(this.permission.notice_add, false),
@ -414,35 +421,37 @@ export default {
}, },
}, },
created() { created() {
// this.getCard()
},
mounted() {
getSystemTime().then(res =>{
this.systemTime = res.data.data
})
}, },
methods: { methods: {
// 获取身份证后打开弹窗
getCard(number){
number = '3702120000618034X';
this.option.column.find(item => item.label == '身份证号码').searchValue = number
},
handleRegister(row) { handleRegister(row) {
console.log(row) console.log(row)
this.isRegister = true let ids = []
getStatus(row.id).then(res =>{ row.details.map(item =>{
ids.push(item.id)
})
let val = ids.join(',');
getStatus(val).then(res =>{
console.log(res) console.log(res)
this.regData = res.data.data;
this.isRegister = true
}) })
// queryBookDetail(row.id).then(res =>{
// console.log(res)
// })
}, },
beforeOpen(done, type) { beforeOpen(done, type) {
// if (["add", "edit"].includes(type)) {
// this.initData();
// }
// if (["edit", "view"].includes(type)) {
// getDept(this.form.id).then(res => {
// this.form = res.data.data;
// });
// }
done(); done();
}, },
beforeClose(done) { beforeClose(done) {
// this.parentId = "";
// const column = this.findObject(this.option.column, "parentId");
// // column.value = "";
// column.addDisabled = false;
done(); done();
}, },
searchReset() { searchReset() {
@ -468,6 +477,8 @@ export default {
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
console.log(this.systemTime)
this.loading = true; this.loading = true;
const { releaseTimeRange, cupCardNo } = this.query; const { releaseTimeRange, cupCardNo } = this.query;
let values = { let values = {
@ -477,16 +488,16 @@ export default {
if (releaseTimeRange) { if (releaseTimeRange) {
values = { values = {
...values, ...values,
startTime: releaseTimeRange[0], startTime: releaseTimeRange,
endTime: releaseTimeRange[1], endTime: releaseTimeRange,
}; };
values.releaseTimeRange = null;
} else { } else {
values.startTime = ''; values.startTime = '';
values.endTime = ''; values.endTime = '';
} }
values.createDept = this.userInfo.dept_id; values.createDept = this.userInfo.dept_id;
values.cupCardNo = cupCardNo ? cupCardNo : ''; values.cupCardNo = cupCardNo ? cupCardNo : '';
console.log(values)
this.loading = true; this.loading = true;
getList(page.currentPage, page.pageSize, values).then(res => { getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data; const data = res.data.data;
@ -716,7 +727,9 @@ export default {
font-family: Microsoft YaHei-Regular, Microsoft YaHei; font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
cursor: pointer;
margin-top: 50px; margin-top: 50px;
} }
} }

35
src/views/booknumber/index.vue
Unescape View File

@ -55,7 +55,7 @@
</el-calendar> </el-calendar>
</div> </div>
<div class="button_box" v-show="!isShow"> <div class="button_box" v-show="!isShow">
<el-button>取消</el-button> <el-button @click="closeDraw">取消</el-button>
<el-button type="primary" @click="clickSubmit">提交</el-button> <el-button type="primary" @click="clickSubmit">提交</el-button>
</div> </div>
</el-drawer> </el-drawer>
@ -68,6 +68,7 @@ import {getUserInfo,getList} from '@/api/system/user'
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
export default { export default {
data() { data() {
return { return {
form: {}, form: {},
selectionList: [], selectionList: [],
@ -121,6 +122,10 @@ export default {
{ {
label: "日期", label: "日期",
prop: "apmDay", prop: "apmDay",
html: true,
formatter: value => {
return `<div>${value.apmDay.substring(0, 10)}</div>`
}
}, },
{ {
label: "日期", label: "日期",
@ -188,7 +193,8 @@ export default {
roleName:'', roleName:'',
isSelect:false, isSelect:false,
hospitalArr:[], hospitalArr:[],
isEdit:false isEdit:false,
valTime:''
}; };
}, },
computed: { computed: {
@ -201,6 +207,22 @@ export default {
}else{ }else{
this.option.column.find(item => item.prop == "hosId").search = false this.option.column.find(item => item.prop == "hosId").search = false
} }
var validateTime = (rule, value, callback)=>{
if (value == this.valTime) {
callback(new Error('该放号时段已被设置,请重新选择放号时段'));
} else {
this.valTime = value
callback();
}
};
var validateTime1 = (rule, value, callback)=>{
if (value == this.valTime) {
callback(new Error('该放号时段已被设置,请重新选择放号时段'));
} else {
this.valTime = value
callback();
}
};
getExamProject().then(res =>{ getExamProject().then(res =>{
res.data.data.map((item,index) =>{ res.data.data.map((item,index) =>{
this.option.column.find(item => item.prop == "projectName").dicData.push({ this.option.column.find(item => item.prop == "projectName").dicData.push({
@ -233,7 +255,8 @@ export default {
required: true, required: true,
message: '请选择放号时段', message: '请选择放号时段',
trigger: 'blur' trigger: 'blur'
} },
{ validator: validateTime, trigger: 'blur' }
] ]
}, },
{ {
@ -276,7 +299,8 @@ export default {
required: true, required: true,
message: '请选择放号时段', message: '请选择放号时段',
trigger: 'blur' trigger: 'blur'
} },
{ validator: validateTime1, trigger: 'blur' }
] ]
}, },
{ {
@ -502,7 +526,7 @@ export default {
this.count = 0; this.count = 0;
value.addData.map(item => this.count += item.num) value.addData.map(item => this.count += item.num)
value.addData1.map(item => this.count += item.num) value.addData1.map(item => this.count += item.num)
console.log(this.count) this.dayArr = []
if(JSON.stringify(value) === '{}'){ if(JSON.stringify(value) === '{}'){
this.$message.error('请至少添加一条数据'); this.$message.error('请至少添加一条数据');
done() done()
@ -575,6 +599,7 @@ export default {
console.log(res) console.log(res)
if(res.data.code == 200){ if(res.data.code == 200){
this.$message.success('放号成功'); this.$message.success('放号成功');
this.onLoad(this.page)
this.isNumber = false this.isNumber = false
} }
}) })

Write Preview
Loading…
Cancel
Save