pengqiang
/
xiangan_pc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

360view
bianyaqi 3 years ago
parent
845cb4be1d 466c071a26
commit
1547342e79
3 changed files with 29 additions and 30 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. 5
      src/components/360View/commonForm/eyesVision.vue
  2. 52
      src/components/360View/commonForm/optometryForm.vue
  3. 2
      src/components/360View/commonForm/threeVision.vue

5
src/components/360View/commonForm/eyesVision.vue
View File

@ -46,11 +46,8 @@
</div> </div>
<div v-else-if="scope.row.name == '签名'" style="display: flex;justify-content: space-between"> <div v-else-if="scope.row.name == '签名'" style="display: flex;justify-content: space-between">
<div class="width-180" style="text-align: left"> <div class="width-180" style="text-align: left">
<!-- <el-input v-model="scope.row.a" placeholder="">-->
<!-- <template slot="prepend">视光师:</template>-->
<!-- </el-input>-->
<span style="display: inline-block;margin-top: 16px">视光师:</span> <span style="display: inline-block;margin-top: 16px">视光师:</span>
<img v-if="scope.row.a" :src="scope.row.a" alt="" style="width: 80px;height: 60px">
<img v-if="scope.row.a" :src="scope.row.a" alt="" style="width: 80px;height: 60px;border-style:none;">
</div> </div>
<div class="width-180" style="text-align: left;margin-top: 16px"> <div class="width-180" style="text-align: left;margin-top: 16px">
<el-input v-model="scope.row.b" placeholder=""> <el-input v-model="scope.row.b" placeholder="">

52
src/components/360View/commonForm/optometryForm.vue
View File

@ -23,22 +23,22 @@
<el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 100%; margin-top: 5px"> <el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 100%; margin-top: 5px">
<el-table-column label="" width="" align="center" :resizable="false"> <el-table-column label="" width="" align="center" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.name == 1">
<div v-if="scope.row.name == '1'">
<div class="width-180 center"> <div class="width-180 center">
瞳孔 瞳孔
</div> </div>
</div> </div>
<div v-else-if="scope.row.name == 3">
<div v-else-if="scope.row.name == '3'">
<div class="width-180 center"> <div class="width-180 center">
右眼 右眼
</div> </div>
</div> </div>
<div v-else-if="scope.row.name == 4">
<div v-else-if="scope.row.name == '4'">
<div class="width-180 center"> <div class="width-180 center">
左眼 左眼
</div> </div>
</div> </div>
<div v-else-if="scope.row.name == 5">
<div v-else-if="scope.row.name == '5'">
<div class="width-180 center"> <div class="width-180 center">
右眼 右眼
</div> </div>
@ -48,17 +48,17 @@
<!-- 左眼--> <!-- 左眼-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<div v-else-if="scope.row.name == 7" style="display: flex;justify-content: space-between">
<div v-else-if="scope.row.name == '7'" style="display: flex;justify-content: space-between">
<div class="width-180" style="text-align: left"> <div class="width-180" style="text-align: left">
<span style="display: inline-block;margin-top: 16px">视光师:</span>
<img v-if="scope.row.a" :src="scope.row.a" alt="" style="width: 80px;height: 60px">
<span style="display: inline-block;margin-top: 12px">视光师:</span>
<img v-if="scope.row.a" :src="scope.row.a" alt="" style="width: 80px;height: 50px;border-style:none;">
</div> </div>
<div class="width-180" style="text-align: left"> <div class="width-180" style="text-align: left">
<el-input v-model="scope.row.b" placeholder="" style="margin-top: 16px">
<el-input v-model="scope.row.b" placeholder="" style="margin-top: 12px">
<template slot="prepend">医师:</template> <template slot="prepend">医师:</template>
</el-input> </el-input>
</div> </div>
<div class="width-180" style="text-align: left;margin-top: 16px">
<div class="width-180" style="text-align: left;margin-top: 12px">
日期：<el-date-picker 日期：<el-date-picker
v-model="scope.row.c" v-model="scope.row.c"
type="date" type="date"
@ -67,8 +67,8 @@
</div> </div>
</div> </div>
<div v-else-if="scope.row.name == '最终处方'"> <div v-else-if="scope.row.name == '最终处方'">
<div class="width-180 center" @click="copyData">
<el-button type="text" plain style="font-size: 14px">最终处方</el-button>
<div class="width-180 center">
<el-button type="text" plain style="font-size: 14px" @click="copyData">最终处方</el-button>
<div style="display: flex;flex-wrap: wrap"> <div style="display: flex;flex-wrap: wrap">
<div v-for="(item,index) in scope.row.value" :key="index" class="check" @click="item.isSelect = !item.isSelect" style="margin-left: 8px"> <div v-for="(item,index) in scope.row.value" :key="index" class="check" @click="item.isSelect = !item.isSelect" style="margin-left: 8px">
<input type="checkbox" :checked="item.isSelect"> <input type="checkbox" :checked="item.isSelect">
@ -130,7 +130,7 @@
</div> </div>
</div> </div>
<p style="margin-left: 16px"> <p style="margin-left: 16px">
<el-input v-model="scope.row.value" placeholder="" style="width: 280px">
<el-input v-model="scope.row.value" placeholder="" style="width: 315px">
<template slot="prepend">其他:</template> <template slot="prepend">其他:</template>
</el-input> </el-input>
</p> </p>
@ -694,7 +694,7 @@ export default {
const message = JSON.parse(msg.data) const message = JSON.parse(msg.data)
// const data = JSON.parse(msg.data) // const data = JSON.parse(msg.data)
// const message = JSON.parse(data.msgTxt) // const message = JSON.parse(data.msgTxt)
// console.log(message)
console.log(message)
self.tableData.forEach(item => { self.tableData.forEach(item => {
if (item.name == '3') { if (item.name == '3') {
item.a = message.RData.DS item.a = message.RData.DS
@ -791,18 +791,7 @@ export default {
} }
</script> </script>
<style lang="scss">
.flex{
display: flex;
}
.j-c{
justify-content: center;
}
#optomeFunc{
::v-deep .el-table__cell{
padding: 0 !important;
}
}
<style lang="scss" scoped>
.printBox{ .printBox{
page-break-inside: avoid !important; page-break-inside: avoid !important;
.el-input__inner { .el-input__inner {
@ -814,6 +803,12 @@ export default {
} }
} }
#operation-record { #operation-record {
.flex{
display: flex;
}
.j-c{
justify-content: center;
}
.operation-record-table { .operation-record-table {
width: 100%; width: 100%;
.operation-text { .operation-text {
@ -937,4 +932,11 @@ export default {
} }
} }
</style> </style>
<style lang="scss">
#optomeFunc{
.el-table__cell{
padding: 2px !important;
}
}
</style>

2
src/components/360View/commonForm/threeVision.vue
View File

@ -68,7 +68,7 @@
<!-- <span>视光师:</span>--> <!-- <span>视光师:</span>-->
<!-- <el-input v-model="scope.row.a" style="width: 160px" placeholder="" />--> <!-- <el-input v-model="scope.row.a" style="width: 160px" placeholder="" />-->
<span style="display: inline-block;margin-top: 16px">视光师:</span> <span style="display: inline-block;margin-top: 16px">视光师:</span>
<img v-if="scope.row.a" :src="scope.row.a" alt="" style="width: 80px;height: 60px">
<img v-if="scope.row.a" :src="scope.row.a" alt="" style="width: 80px;height: 60px;border-style:none;">
</div> </div>
<div class="width-180" style="text-align: left;margin-top: 16px"> <div class="width-180" style="text-align: left;margin-top: 16px">
<el-input v-model="scope.row.b" placeholder=""> <el-input v-model="scope.row.b" placeholder="">

Write Preview
Loading…
Cancel
Save