pengjun 3 years ago
parent
commit
134c0a239a
  1. 6
      src/components/patientRegister/PatientRegisterRecoverList.vue
  2. 4
      src/components/patientRegister/PatientRegisterRefuseList.vue
  3. 10
      src/views/charge/charge.vue
  4. 47
      src/views/customerOrg/patientRegisterRecover.vue
  5. 2
      src/views/customerOrg/patientRegisterSign.vue

6
src/components/patientRegister/PatientRegisterRecoverList.vue

@ -1,9 +1,9 @@
<template> <template>
<div style="display: flex">
<div style="display: flex;margin-left: 5px;">
<div :style="'width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
<div :style="'width:' + (window.pageWidth - 5 - 200 - 120 - 80 ) + 'px;'">
<el-table :data="dataList" border width="100%" <el-table :data="dataList" border width="100%"
:height="window.pageHeight < 600 ? 350:window.pageHeight-250"
:height="window.pageHeight < 600 ? 310:window.pageHeight-290"
row-key="id" size="small" row-key="id" size="small"
highlight-current-row ref="dataList" highlight-current-row ref="dataList"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">

4
src/components/patientRegister/PatientRegisterRefuseList.vue

@ -2,7 +2,7 @@
<div style="display: flex"> <div style="display: flex">
<div :style="'width:' + Math.floor((window.pageWidth - 120 - 86)/2) + 'px;'"> <div :style="'width:' + Math.floor((window.pageWidth - 120 - 86)/2) + 'px;'">
<el-table :data="dataList" border <el-table :data="dataList" border
:height="window.pageHeight < 600 ? 350:window.pageHeight-250"
:height="window.pageHeight < 600 ? 310:window.pageHeight-290"
row-key="id" size="small" highlight-current-row ref="dataList" row-key="id" size="small" highlight-current-row ref="dataList"
@row-click="rowClick"> @row-click="rowClick">
<el-table-column type="index" width="50" label="序号" /> <el-table-column type="index" width="50" label="序号" />
@ -129,7 +129,7 @@
</div> </div>
</div> </div>
<el-table :data="doctorCheck.RegisterCheckList" <el-table :data="doctorCheck.RegisterCheckList"
:height="window.pageHeight < 600 ? 310:window.pageHeight-290"
:height="window.pageHeight < 600 ? 270:window.pageHeight-330"
border highlight-current-row border highlight-current-row
size="small" @selection-change="handleSelectionChange"> size="small" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="40" /> <el-table-column type="selection" width="40" />

10
src/views/charge/charge.vue

@ -35,7 +35,7 @@
<!-- 列表 --> <!-- 列表 -->
<div class="prListDivClass"> <div class="prListDivClass">
<el-table :data="patientList" border highlight-current-row <el-table :data="patientList" border highlight-current-row
:height="(window.pageHeight > 600 ? (window.pageHeight - 230) : 350)" @row-click="rowClick" size="small">
:height="(window.pageHeight > 600 ? (window.pageHeight - 270) : 310)" @row-click="rowClick" size="small">
<!-- <!--
<el-table-column prop="patientRegisterId" label="体检记录ID" /> <el-table-column prop="patientRegisterId" label="体检记录ID" />
--> -->
@ -142,7 +142,7 @@
<div> <div>
<div style="margin-top:5px;font-size:10px;">{{ query.chargeFlag == 'B' ? '退' : '收' }}费方式</div> <div style="margin-top:5px;font-size:10px;">{{ query.chargeFlag == 'B' ? '退' : '收' }}费方式</div>
<el-table :data="chargePays" border highlight-current-row size="small" <el-table :data="chargePays" border highlight-current-row size="small"
:height="window.pageHeight > 600 ? (window.pageHeight - 230 - 146) / 2 : 112">
:height="window.pageHeight > 600 ? (window.pageHeight - 270 - 146) / 2 : 92">
<el-table-column prop="payModeId" :label="(query.chargeFlag == 'B' ? '退' : '收') + '费方式'" width="180"> <el-table-column prop="payModeId" :label="(query.chargeFlag == 'B' ? '退' : '收') + '费方式'" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ dddw(dict.payMode, "id", scope.row.payModeId, "displayName") }}</div> <div>{{ dddw(dict.payMode, "id", scope.row.payModeId, "displayName") }}</div>
@ -169,7 +169,7 @@
<div style="margin-top:5px; font-size:10px;">{{ query.chargeFlag == 'N' ? '待收' : (query.chargeFlag == 'Y' ? <div style="margin-top:5px; font-size:10px;">{{ query.chargeFlag == 'N' ? '待收' : (query.chargeFlag == 'Y' ?
'已收' : '已退') }}费项目</div> '已收' : '已退') }}费项目</div>
<el-table :data="asbItemsForFee" border highlight-current-row <el-table :data="asbItemsForFee" border highlight-current-row
:height="window.pageHeight > 600 ? (window.pageHeight - 230 - 146) / 2 : 112" size="small"
:height="window.pageHeight > 600 ? (window.pageHeight - 270 - 146) / 2 : 92" size="small"
@selection-change="handleSelectionChange" ref="asbItemsForFeeTable"> @selection-change="handleSelectionChange" ref="asbItemsForFeeTable">
<el-table-column type="selection" align="center" v-if="query.chargeFlag == 'N'" /> <el-table-column type="selection" align="center" v-if="query.chargeFlag == 'N'" />
<el-table-column label="组合项目" width="120" prop="asbitemName" /> <el-table-column label="组合项目" width="120" prop="asbitemName" />
@ -1099,7 +1099,7 @@ input[type="number"]::-webkit-outer-spin-button {
.queryDivClass { .queryDivClass {
display: block; display: block;
width: v-bind("(window.pageWidth > 600 ? (window.pageWidth - 120 - 80) / 2 : 200) + 'px'"); width: v-bind("(window.pageWidth > 600 ? (window.pageWidth - 120 - 80) / 2 : 200) + 'px'");
height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 150) : 450) + 'px'");
height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 190) : 410) + 'px'");
} }
.query { .query {
@ -1107,7 +1107,7 @@ input[type="number"]::-webkit-outer-spin-button {
} }
.prListDivClass { .prListDivClass {
height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'");
height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 290) : 310) + 'px'");
} }
.btnDivClass { .btnDivClass {

47
src/views/customerOrg/patientRegisterRecover.vue

@ -1,13 +1,22 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<div class="publiccss">回收表格查询</div>
<div class="publiccss">体检表回收</div>
<div style="display: flex;margin-top:20px"> <div style="display: flex;margin-top:20px">
<!-- 单位树组件 --> <!-- 单位树组件 -->
<div :style="CustomerOrgTreeStyle">
<div :style="'overflow: scroll;border: 1px solid;width:200px; height:' +
(window.pageHeight < 600 ? 410 : window.pageHeight - 190) +
'px;'
">
<CustomerOrgTreeAll /> <CustomerOrgTreeAll />
</div> </div>
<div :style="CustomerOrgRightStyle">
<div :style="'display:block;width:' +
(window.pageWidth - 200 - 80) +
'px;height:' +
(window.pageHeight < 600 ? 410 : window.pageHeight - 190) +
'px;' +
(window.pageHeight < 600 ? 'overflow-y: scroll;' : '')
">
<!-- 查询条件 --> <!-- 查询条件 -->
<PatientRegisterQuery /> <PatientRegisterQuery />
@ -36,13 +45,13 @@ export default {
data() { data() {
return { return {
tabChoosed: "1", tabChoosed: "1",
CustomerOrgTreeStyle:'',
CustomerOrgRightStyle:'',
CustomerOrgTreeStyle: '',
CustomerOrgRightStyle: '',
}; };
}, },
created() { created() {
this.resize();
}, },
// //
@ -51,24 +60,12 @@ export default {
}, },
computed: { computed: {
...mapState(["window","dict", "patientRegister", "customerOrg"]),
...mapState(["window", "dict", "patientRegister", "customerOrg"]),
}, },
methods: { methods: {
...mapActions(["getCustomerOrgGroup"]), ...mapActions(["getCustomerOrgGroup"]),
resize() {
//console.log(this.window.pageHeight,this.window.pageWidth)
let headerHeight = Number(150);
this.CustomerOrgTreeStyle = "overflow: scroll;border: 1px solid;width:200px; height:" + (this.window.pageHeight - headerHeight) + "px;";
this.CustomerOrgRightStyle = "margin-left: 10px;width:" + (this.window.pageWidth - 200 - 60) + "px; height:" + (this.window.pageHeight - headerHeight) + "px;";
if (this.window.pageHeight < 600) {
this.CustomerOrgTreeStyle = "overflow: scroll;border: 1px solid;width:200px; height:" + (600 - headerHeight) + "px;";
}
},
// //
dictInit() { dictInit() {
// //
@ -134,7 +131,7 @@ export default {
if (res.code == 1) { if (res.code == 1) {
// this.dict.nation = res.data.items; // this.dict.nation = res.data.items;
this.dict.nation = res.data; this.dict.nation = res.data;
console.log(res,'名族');
console.log(res, '名族');
} }
}); });
@ -199,16 +196,6 @@ export default {
} }
}, },
"window.pageHeight"(newVal, oldVal) {
if (newVal != oldVal) {
this.resize();
}
},
"window.pageWidth"(newVal, oldVal) {
if (newVal != oldVal) {
this.resize();
}
},
}, },
}; };
</script> </script>

2
src/views/customerOrg/patientRegisterSign.vue

@ -4,7 +4,7 @@
<div class="publiccss">体检人员签到</div> <div class="publiccss">体检人员签到</div>
<div style="display: flex"> <div style="display: flex">
<!-- 单位树组件 --> <!-- 单位树组件 -->
<div style="'overflow: scroll;border: 1px solid;width:200px; height:' +
<div :style="'overflow: scroll;border: 1px solid;width:200px; height:' +
(window.pageHeight < 600 ? 410 : window.pageHeight - 190) + (window.pageHeight < 600 ? 410 : window.pageHeight - 190) +
'px;' 'px;'
"> ">

Loading…
Cancel
Save