dist.zip | 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/api/doctor/check.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/router/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/doctor/check/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/hosp/order/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/jmreport/jmreport/budadaozhendan.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/jmreport/jmreport/view.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/reservation/resercopy/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
dist.zipBinary files differ
src/api/doctor/check.js
@@ -86,11 +86,12 @@ }) } export function getDeptAdvice(proId) { export function getDeptAdvice(data) { return request({ url: '/system/dept/getDeptAdvice/' + proId, url: '/system/dept/getDeptAdvice', method: 'get', // params:proId params:data }) } @@ -131,3 +132,12 @@ params:data }) } //点击父项目显示子项目详情 export function getAdviceByTjNumAndPro(data) { return request({ url: '/system/dept/getAdviceByTjNumAndPro', method: 'get', params:data }) } src/router/index.js
@@ -92,6 +92,12 @@ meta: { title: '导检单', activeMenu: '/bre/DailyReport' }, }, { path: 'budabreDailyReport', component: () => import('@/views/jmreport/jmreport/budadaozhendan'), name: 'DailyReportReport', meta: { title: '补打导检单', activeMenu: '/bre/DailyReport' }, }, { path: 'viewReport', component: () => import('@/views/jmreport/jmreport/view'), name: 'DailyReportReport', src/views/doctor/check/index.vue
@@ -648,12 +648,20 @@ 病种选择: </td> <td @click="bzxz" style=" border: 1px solid #dfe6ec; border-collapse: collapse; " > <el-select <el-input type="textarea" placeholder="请选择内容" v-model="proParentList.remark" rows="2" > </el-input> <!-- <el-select v-model="value" multiple placeholder="请选择" @@ -669,7 +677,7 @@ :value="item.id" > </el-option> </el-select> </el-select> --> </td> <td style=" @@ -757,10 +765,7 @@ v-hasPermi="['system:notice:add']" v-show="tjStatus == '1'" >会诊申请</el-button> --> <el-button type="primary" @click="determine" <el-button type="primary" @click="determine" >提 交</el-button > </div> @@ -938,7 +943,14 @@ border-collapse: collapse; " > <el-select <el-input type="textarea" placeholder="请选择内容" v-model="proParentList.remark" rows="2" > </el-input> <!-- <el-select v-model="value" multiple placeholder="请选择" @@ -954,7 +966,7 @@ :value="item.id" > </el-option> </el-select> </el-select> --> </td> <td style=" @@ -1042,9 +1054,7 @@ v-show="tjStatus == '1'" >会诊申请</el-button> --> <!-- v-show="tjStatus == '0'" --> <el-button type="primary" @click="determine" <el-button type="primary" @click="determine" >提 交</el-button > </div> @@ -1130,6 +1140,167 @@ </el-dialog> <proposal ref="proposal" :cusobj="cusobj" @event1="eventchange($event)" /> <createproposal ref="createproposal" :creatobj="creatobj" /> <el-dialog title="选择病种" :visible.sync="taocan" width="80%" height="700px" :close-on-click-modal="false" > <el-tabs type="border-card" style="min-height: 538px; margin: 0 10px; width: 100%" @tab-click="handleClick" v-model="activeNames" > <el-tab-pane label="病种" name="first"> <div class="tab8"> <div class="tab3"> <el-form :model="queryParam1" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px" > <el-form-item> <el-input placeholder="输入关键字进行过滤" v-model="queryParam1.nr" clearable > </el-input> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuerys" >搜索</el-button > </el-form-item> </el-form> <el-table ref="multipleTable" border :data="deptAdviceList" height="430px" @selection-change="handleSelectionChanges" > <el-table-column type="selection" width="40"> </el-table-column> <el-table-column prop="title" label="病种名称" align="center" width="130px"></el-table-column> <el-table-column prop="advice" label="建议" align="center" :show-overflow-tooltip="true"> </el-table-column> </el-table> <pagination v-show="total1 > 0" :total="total1" :page.sync="queryParam1.page" :limit.sync="queryParam1.pageSize" @pagination="getbzlist" /> </div> <div class="tab4"> <div class="tab4_txt"> <h4>已选病种</h4> </div> <el-table border :data="deptAdviceList1" height="430px" > <el-table-column prop="title" label="病种名称" align="center"> </el-table-column> <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="50px" > <template slot-scope="scope"> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" title="删除" ></el-button> </template> </el-table-column> </el-table> <!-- <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod" > <el-table-column prop="propinName" label="检查项目"> </el-table-column> <el-table-column prop="proName" label="明细项目" width="260px" > </el-table-column> <el-table-column prop="proPrice" label="原价" width="56px"> </el-table-column> <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="50px" > <template slot-scope="scope"> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" title="删除" ></el-button> </template> </el-table-column> </el-table> --> <!-- <el-collapse v-model="activeName" accordion v-if="list1"> <div> <el-collapse-item title="请选择项目"> <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod" > <el-table-column prop="proName" label="项目" width="180" > </el-table-column> <el-table-column prop="ordPrice" label="原价"> </el-table-column> </el-table> </el-collapse-item> </div> </el-collapse> --> </div> </div> </el-tab-pane> </el-tabs> <span slot="footer" class="dialog-footer"> <el-button @click="taocan = false">取 消</el-button> <el-button type="primary" @click="queding">确 定</el-button> </span> </el-dialog> </div> </template> @@ -1152,6 +1323,7 @@ getParentId, getDeptAdvice, reportHistory, getAdviceByTjNumAndPro, } from "@/api/doctor/check"; import { addBigPositive } from "@/api/doctor/bigPositive"; import { addReplylog, hzHasDept } from "@/api/hosp/replylog"; @@ -1170,6 +1342,11 @@ }, data() { return { idss:[], vaids: [], vaids1: [], activeNames: "first", taocan: false, creatobj: {}, dataText: [], propform: {}, @@ -1201,11 +1378,15 @@ rows: [], id: [], deptAdviceList: [], value: [], deptAdviceList1: [], deptAdviceList2: [], deptAdviceList3: [], value: {}, remark: "", //备注 remarks: "", // 总条数 total: 0, total1: 0, // 绑定单选按钮 tjStatus: "0", // 抽屉打开方式 @@ -1267,6 +1448,11 @@ type: "", name: null, }, queryParam1: { nr: null, page: 1, pageSize: 10, }, queryParam: { page: 1, pageSize: 1000, @@ -1304,9 +1490,117 @@ }, methods: { getbzlist() { getDeptAdvice(this.queryParam1).then((response) => { this.deptAdviceList = response.data.list; this.total1 = response.data.total; }); }, /** 搜索按钮操作 */ handleQuerys() { this.queryParam1.page = 1; this.getbzlist(); }, bzxz() { this.taocan = true; let data = { proId: this.proId, tjNum: this.tableAll.tjNumber, }; getAdviceByTjNumAndPro(data).then((res) => { console.log(res); if (res.data) { this.deptAdviceList3 = res.data; this.deptAdviceList1 = [ ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)), ]; this.deptAdviceList3.forEach(items=>{ this.idss.push(items.id) }) } }); }, handleSelectionChanges(val) { // this.deptAdviceList1 = val; if (val.length > 1) { let del_row = val.shift(); this.$refs.multipleTable.toggleRowSelection(del_row, false); val.forEach((item) => { this.deptAdviceList2.push(item); }); } else if ((val.length = 1)) { val.forEach((item) => { this.deptAdviceList2.push(item); }); } this.deptAdviceList1 = [ ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)), ]; }, queding() { if (this.proParentList.xiaoJie.length != 0) { // this.proParentList.remark = ""; console.log(this.deptAdviceList,111); this.deptAdviceList.forEach((item) => { this.ids = item.id; console.log(this.deptAdviceList1,222); this.deptAdviceList1.forEach((item1) => { if ( item1.id === item.id && !this.proParentList.remark.includes(item.title) ) { if (this.proParentList.remark) { this.proParentList.remark += item.title + ","; this.value += item.title + ","; this.vaids.push(item1.id); this.vaids1 = this.vaids.concat(this.idss) } else { this.proParentList.remark = item.title + ","; this.value += item.title + ","; this.vaids.push(item1.id); this.vaids1 = this.vaids.concat(this.idss) } } }); }); this.taocan = false; } else { this.proParentList.remark = ""; this.deptAdviceList.forEach((item) => { this.ids = item.id; this.deptAdviceList1.forEach((item1) => { if ( item1.id === item.id && !this.proParentList.remark.includes(item.title) ) { if (this.proParentList.remark) { this.proParentList.remark += item.title + ","; this.value += item.title + ","; console.log(item); this.vaids.push(item1.id); this.vaids1 = this.vaids.concat(this.idss) } else { this.proParentList.remark = item.title + ","; this.value += item.title + ","; this.vaids.push(item1.id); this.vaids1 = this.vaids.concat(this.idss) } } }); }); this.taocan = false; } }, /** 删除按钮操作 */ handleDelete(row) { this.deptAdviceList1.forEach((item, index) => { if (item.id == row.id) { this.deptAdviceList1.splice(index, 1); } }); }, /** 查询用户列表 */ getListUser() { getlistUser().then((response) => { this.userList = response.data; this.userList.forEach((element) => { @@ -1903,9 +2197,7 @@ // this.radioChange1(item.proId, item); this.getParentIdsss(); getDeptAdvice(this.proId).then((response) => { this.deptAdviceList = response.data; }); this.getbzlist(); } num = num + 1; }); @@ -1915,9 +2207,7 @@ this.$modal.msgError("该科室下无项目!"); } }); getDeptAdvice().then((response) => { this.deptAdviceList = response.data; }); this.getbzlist(); // getSons(this.tjNumber).then((response) => { // response.data.forEach(item1 => { @@ -2141,9 +2431,7 @@ } }); getDeptAdvice(this.proId).then((response) => { this.deptAdviceList = response.data; }); this.getbzlist(); }) .catch((action) => { if (action === "cancel") { @@ -2208,9 +2496,7 @@ } }); getDeptAdvice(this.proId).then((response) => { this.deptAdviceList = response.data; }); this.getbzlist(); }); }, @@ -2329,9 +2615,7 @@ } }); getDeptAdvice(this.proId).then((response) => { this.deptAdviceList = response.data; }); this.getbzlist(); }) .catch((action) => { if (action === "cancel") { @@ -2393,9 +2677,7 @@ } }); getDeptAdvice(this.proId).then((response) => { this.deptAdviceList = response.data; }); this.getbzlist(); }); }, handleInConfirm(row) { @@ -2448,7 +2730,7 @@ proId: this.proId, remark: this.proParentList.remark, // 备注 proName: this.proName, //父项 summaryList: this.value, //小结 summaryList: this.vaids1, //小结 doctorName: this.doctorName, tjOrderDetailList: this.tjOrderDetail, }, @@ -2518,4 +2800,21 @@ .el-message * { color: var(--white) !important; } .tab8 { width: 100%; display: flex; justify-content: space-between; } .tab3 { width: 68%; } .tab4 { margin-top: 6px; width: 30%; } .tab4_txt{ display: flex; justify-content: center; } </style> src/views/hosp/order/index.vue
@@ -157,6 +157,16 @@ >订单明细</el-button > </el-col> <el-col :span="1.5"> <el-button type="primary" size="mini" @click="budadzd" :disabled="single" v-hasPermi="['hosp:order:export']" >打印补录单</el-button > </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" @@ -1082,7 +1092,13 @@ </el-dialog> <!-- 添加或修改体检记录对话框 --> <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body :close-on-click-modal="false"> <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body :close-on-click-modal="false" > <el-tabs v-model="activeName1" type="card"> <!-- <el-tab-pane label="订单流水" name="first"> <el-table :data="numberList" style="width: 100%"> @@ -1277,6 +1293,100 @@ <!-- <el-button @click="cancel">取 消</el-button> --> </div> </el-dialog> <el-dialog :title="title1" :visible.sync="budadaozhen" width="1100px" style="height: 860px" append-to-body :close-on-click-modal="false" > <el-row type="flex" class="row-bg" justify="space-around"> <el-col :span="13"> <div style="text-align: center; margin-bottom: 10px; margin-top: 10px" > 补录列表 </div> <div class="tab3"> <el-table :data="DataLists" border style="width: 100%" height="400" @selection-change="handleProjectssChange" > <el-table-column type="selection" width="40" align="center" /> <el-table-column type="index" label="序号" align="center" width="49px" > </el-table-column> <el-table-column prop="blje" label="补录金额" align="center" width="74px" > </el-table-column> <el-table-column prop="bldh" label="补录单号" align="center" width="155px" > </el-table-column> <el-table-column prop="blsj" label="补录时间" align="center" width="156px" > </el-table-column> <el-table-column prop="blrmc" label="补录人" align="center" width="96px" > </el-table-column> </el-table> </div> </el-col> <el-col :span="10"> <div class="grid-content bg-purple"> <div style="text-align: center; margin-bottom: 10px; margin-top: 10px" > 补录项目 </div> <el-table :data="DataListss" border style="width: 100%" height="400" :span-method="objectSpanMethod2" > <el-table-column prop="propinName" label="检查项目"> </el-table-column> <el-table-column prop="proPrice" label="原价" width="56px"> </el-table-column> <el-table-column prop="proName" label="明细项目" width="260px"> </el-table-column> </el-table> </div> </el-col> </el-row> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="dayin">打 印</el-button> <!-- <el-button @click="cancel">取 消</el-button> --> </div> </el-dialog> </div> </template> @@ -1302,6 +1412,7 @@ getProParentIdDxList, getProSonDxList, } from "@/api/system/tijian"; import { createLogger } from "vuex"; export default { components: { ViewPdf, @@ -1310,6 +1421,8 @@ name: "Order", data() { return { bldhid: "", budadaozhen: false, huizongList: [], DataLists: [], infoList: [], @@ -1843,7 +1956,6 @@ discount: discount, }); console.log(this.bill); this.title = "订单流水"; }); getTransitionInfo(tjNumber).then((res) => { @@ -1863,6 +1975,44 @@ }); }); }, budadzd() { this.bldhs =[]; getBlproByTjh(this.tjnumbers).then((res) => { if (res.data) { this.DataLists = res.data; this.budadaozhen = true; this.title1 = "补打导诊单"; } else { this.$message({ type: "warning ", message: "该客户没有补录项目", }); } }); }, dayin() { console.log(this.bldhs); this.bldhid.toString(this.bldhs); this.bldhs.forEach((item) => { console.log(item, 666); this.bldhid += item + ","; }); // this.bldhid = this.bldhs.toString() console.log(this.bldhid); const tjNumber = this.tjnumbers; const viewNum = "983185234038140928"; const jxbz = this.bldhid; const params = { viewNum, tjNumber, jxbz }; console.log(params); hasReport(tjNumber).then((res) => { if (res == 1) { this.$tab.openPage("导诊单", "/report/budabreDailyReport", params); this.budadaozhen = false; } else { this.$message.error("该用户暂无项目!"); } }); }, handleClick(tab, event) { if (this.activeNames == "first") { @@ -1876,10 +2026,9 @@ this.loading = false; }); } else { console.log(111) this.TotalPrice1 = 0; this.checkedkey =[] this.DataList = [] this.checkedkey = []; this.DataList = []; this.getDataList(); if (this.marryalls != 0) { this.TotalPrice1 += this.marryalls; src/views/jmreport/jmreport/budadaozhendan.vue
New file @@ -0,0 +1,57 @@ <template> <div v-loading="loading" :style="'height:' + height" class="app-container"> <!-- <el-row style="margin-bottom: 10px;"> <el-col :span="1.5"> <el-button type="primary" plain icon="el-icon-refresh-right" size="mini" @click="handleRefresh">刷新</el-button> </el-col> </el-row> --> <iframe :src="src" id="reportView" frameborder="no" style="width: 100%; height: 100%" scrolling="auto" /> </div> </template> <script> import { getToken } from "@/utils/auth"; import { view } from "@/api/jmreport/jimu"; export default { name: "Ureport", data() { return { src: "", height: document.documentElement.clientHeight - 94.5 + "px;", loading: true, viewNum: "", reportId: "", jxbz:"", }; }, created() { //报表模板编号 this.viewNum = this.$route.query.viewNum; //体检号 this.tjNumber = this.$route.query.tjNumber; this.jxbz = this.$route.query.jxbz; view().then((res) => {this.src =res +"/" +this.viewNum +"?tjNumber=" +this.tjNumber +"&jxbz="+this.jxbz +"&token=Bearer " +getToken();}); }, methods: { handleRefresh() { document.getElementById("reportView").src = document.getElementById("reportView").src; }, }, mounted: function () { setTimeout(() => { this.loading = false; }, 230); const that = this; window.onresize = function temp() { that.height = document.documentElement.clientHeight - 94.5 + "px;"; }; }, }; </script> src/views/jmreport/jmreport/view.vue
@@ -6,17 +6,18 @@ </el-col> </el-row> --> <iframe :src="src" id="reportView" frameborder="no" style="width: 100%;height: 100%" scrolling="auto" /> <iframe :src="src" id="reportView" frameborder="no" style="width: 100%; height: 100%" scrolling="auto" /> </div> </template> <script> import { getToken } from '@/utils/auth' import { view } from '@/api/jmreport/jimu' import { getToken } from "@/utils/auth"; import { view } from "@/api/jmreport/jimu"; export default { name: "Ureport", data() { @@ -30,16 +31,24 @@ }, created() { //报表模板编号 this.viewNum = this.$route.query.viewNum this.viewNum = this.$route.query.viewNum; //体检号 this.tjNumber = this.$route.query.tjNumber view().then(res => { this.src = res + "/"+this.viewNum+"?tjNumber=" + this.tjNumber + "&token=Bearer " + getToken(); }) this.tjNumber = this.$route.query.tjNumber; view().then((res) => { this.src = res + "/" + this.viewNum + "?tjNumber=" + this.tjNumber + "&token=Bearer " + getToken(); }); }, methods: { handleRefresh() { document.getElementById("reportView").src = document.getElementById("reportView").src; document.getElementById("reportView").src = document.getElementById("reportView").src; }, }, mounted: function() { @@ -50,6 +59,6 @@ window.onresize = function temp() { that.height = document.documentElement.clientHeight - 94.5 + "px;"; }; } }, }; </script> src/views/reservation/resercopy/index.vue
@@ -876,6 +876,12 @@ }, // 文件上传成功处理 handleFileSuccess(response, file, fileList) { console.log(response,666666); if (response.code == 500) { console.log(22222222222); // Message.warning(response.msg); this.$modal.msgError(response.msg); } this.ListObj = response.data; this.userList = response.data.list; this.userList.forEach((item) => { @@ -889,6 +895,8 @@ this.upload.isUploading = false; this.$refs.upload.clearFiles(); this.leftList = response.msg; console.log(response.code); if (this.leftList == "操作失败") { this.isdisabled = true; this.$alert(