罗斌杰 1 year ago
parent
commit
d0b3c328b5
  1. 6
      src/components/doctorCheck/QueueCheckList.vue
  2. 40
      src/components/report/CusOrgOCX.vue
  3. 18
      src/views/report/unCheckAsbitem.vue

6
src/components/doctorCheck/QueueCheckList.vue

@ -28,7 +28,7 @@
:row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)">
<el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
<el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
<el-table-column prop="isVip" label="isVip" min-width="40" align="center">
<el-table-column prop="isVip" label="Vip" min-width="40" align="center">
<template slot-scope="scope">
<div style="font-family: 'Microsoft YaHei';">
{{ scope.row.isVip == 'Y' ? '√' : '' }}
@ -58,7 +58,7 @@
@row-click="rowClickAlready" :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)">
<el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
<el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
<el-table-column prop="isVip" label="isVip" min-width="40" align="center">
<el-table-column prop="isVip" label="Vip" min-width="40" align="center">
<template slot-scope="scope">
<div style="font-family: 'Microsoft YaHei';">
{{ scope.row.isVip == 'Y' ? '√' : '' }}
@ -79,7 +79,7 @@
:row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)">
<el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
<el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
<el-table-column prop="isVip" label="isVip" min-width="40" align="center">
<el-table-column prop="isVip" label="Vip" min-width="40" align="center">
<template slot-scope="scope">
<div style="font-family: 'Microsoft YaHei';">
{{ scope.row.isVip == 'Y' ? '√' : '' }}

40
src/components/report/CusOrgOCX.vue

@ -1,12 +1,15 @@
<template>
<div style="display: flex;">
<div v-if="useCusOrg" style="width: 258px;height:520px;border: 1px solid #EEE;">
<div style="margin:2px 2px 2px 2px;">
<div style="margin:2px 2px 2px 2px;display: flex;">
<el-checkbox style="margin-top: 6px;" v-model="isOnlyCus" true-label="Y" false-label="N" size="small">
仅单位
</el-checkbox>
<el-input placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
</div>
<div>
<el-tree style="overflow: scroll;width: 200px;height:480px;" :data="patientRegister.customerOrgTreeAll"
:props="treeprops" @node-click="handleNode" :filter-node-method="filterNode"
:props="treeprops" node-key="id" @node-click="handleNode" :filter-node-method="filterNode"
ref="customerOrgTree">
<span class="custom-tree-node" slot-scope="{ node, data }">
<div>
@ -114,6 +117,7 @@ export default {
props: ["useCustomerOrg", "initDateType", "isUnit"],
data() {
return {
isOnlyCus: 'Y',
filterText: '',
preNodeId: '', //
curNodeId: '', //
@ -169,17 +173,28 @@ export default {
methods: {
//
filterNode(value, data) {
//console.log(value,data)
filterNode(value, data,node) {
if (!value) return true;
return data['displayName'].indexOf(value) !== -1 || data['simpleCode'].indexOf(value.toUpperCase()) !== -1;
},
//
filterParentNode(value) {
// console.log(value, data)
// if (!value) return true;
// return data['displayName'].indexOf(value) > -1 || data['simpleCode'].indexOf(value.toUpperCase()) > -1 || data['shortName'].indexOf(value) > -1 || data['customerOrgCode'].indexOf(value) > -1;
console.log(this.patientRegister.customerOrgs)
this.patientRegister.customerOrgTreeAll = this.patientRegister.customerOrgs.filter(e => {
console.log(e)
return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1 || e.shortName.indexOf(value) > -1
})
},
//
getCustomerOrgTree() {
getapi("/api/app/customerorg/getbycodeall").then((res) => {
if (res.code > -1) {
this.patientRegister.customerOrgTreeAll = reMadeOrgTree(deepCopy(res.data));
this.patientRegister.customerOrgs = deepCopy(this.patientRegister.customerOrgTreeAll)
//tcdate(this.patientRegister.customerOrgTreeAll)
}
});
@ -447,8 +462,21 @@ export default {
},
},
watch: {
"filterText"(newVal, oldVal) {
this.$refs['customerOrgTree'].filter(newVal);
"filterText"(newVal, oldVal) {
if (newVal != oldVal) {
if (this.isOnlyCus == 'N') {
this.$refs['customerOrgTree'].filter(newVal);
} else {
this.filterParentNode(newVal)
}
}
},
"isOnlyCus"(newVal, oldVal) {
if (newVal == 'N') {
this.$refs['customerOrgTree'].filter(this.filterText);
} else {
this.filterParentNode(this.filterText)
}
}
},
};

18
src/views/report/unCheckAsbitem.vue

@ -31,18 +31,25 @@
<div class="query">
<el-button type="primary" @click="btnQuery" size="small" class="commonbutton">查询</el-button>
</div>
<div class="query">
<el-button @click="handleExport" size="small" class="commonbutton"
>导出excel</el-button
>
</div>
</div>
<div style="background-color: #fff; padding: 15px; border-radius: 8px;">
<el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 415 : window.pageHeight - 185-20"
<el-table :data="dataList" border width="100%" id="table" :height="window.pageHeight < 600 ? 415 : window.pageHeight - 185-20"
row-key="id" size="small" highlight-current-row ref="dataList" >
<el-table-column label="未检项目" width="300">
<template slot-scope="scope">
<div style="display: flex; flex-wrap: wrap;">
<el-tag type="danger" style="margin-left: 5px;" v-for="item in scope.row.unCheckAsbitems" :key="item"
<span v-for="(item,index) in scope.row.unCheckAsbitems" :key="item">{{index==0?'':''}}{{ item }}</span>
<span v-for="(item,index) in scope.row.giveUpAsbitems" :key="item">{{ item }}</span>
<!-- <el-tag type="danger" style="margin-left: 5px;" v-for="item in scope.row.unCheckAsbitems" :key="item"
size="mini">{{ item }}</el-tag>
<el-tag type="info" style="margin-left: 5px;" v-for="item in scope.row.giveUpAsbitems" :key="item"
size="mini">{{ item }}</el-tag>
size="mini">{{ item }}</el-tag> -->
</div>
</template>
</el-table-column>
@ -112,6 +119,7 @@ import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { dddw, objCopy, arrayReduce, arrayExistObj,tcdate } from "@/utlis/proFunc";
import CusOrgOCX from "../../components/report/CusOrgOCX.vue"
import { exportToExcel } from "../../utlis/Export2Excel";
export default {
components: {
CusOrgOCX,
@ -241,7 +249,9 @@ export default {
}
});
},
handleExport() {
exportToExcel("#table", "人员未检组合项目", false);
},
//
btnQuery() {
let body = {}, customerOrgs = [];

Loading…
Cancel
Save