From 942697763a76be6f6e9402d34015c8a94336406c Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 24 六月 2025 16:37:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
src/views/system/biol/index.vue | 391 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 236 insertions(+), 155 deletions(-)
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index 265edb9..88bc91b 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -1,6 +1,12 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="鎵撳嵃" prop="dyzt">
+ <el-select v-model="queryParams.dyzt" placeholder="璇烽�夋嫨" @change="handleDyztChange" style="width: 100px">
+ <el-option v-for="item in optionsOne" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="濮撳悕" prop="name">
<el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 100px"
@keyup.enter.native="handleQuery" />
@@ -9,7 +15,13 @@
<el-input style="width: 170px" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
@keyup.enter.native="handleQuery" ref="inputName" @blur="hb" />
</el-form-item>
- <el-form-item label="鎶ュ憡鏃堕棿" prop="createTimeList">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px">
+ <el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
+ style="width: 180px" remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
+ <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
<el-date-picker clearable v-model="createTimeList" type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions" :default-time="['00:00:00', '23:00:00']"
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�"
@@ -39,13 +51,17 @@
<el-button type="primary" size="mini" :disabled="multiple" @click="viewReport">鎵归噺浣撴鎶ュ憡鎵撳嵃</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" size="mini" :disabled="multiple" @click="jiankangReport">鍋ュ悍妫�鏌ヨ〃鎵撳嵃</el-button>
+ <el-button type="primary" size="mini" :disabled="single" @click="jiankangReport">鍋ュ悍妫�鏌ヨ〃鎵撳嵃</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" size="mini" :disabled="multiple" @click="jiankangReport">鎵归噺浣撴鎶ュ憡瀵煎嚭</el-button>
</el-col> -->
<el-col :span="1.5">
- <el-button type="primary" size="mini" :disabled="single" @click="baogaoyulan">鎶ュ憡棰勮</el-button>
+ <el-button type="primary" size="mini" :disabled="single" :loading="isLoading"
+ @click="baogaoyulan">鎶ュ憡棰勮</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" size="mini" :disabled="single" :loading="isChexiao" @click="chexiao">鎾ら攢鎶ュ憡</el-button>
</el-col>
<el-col :span="1.5">
<div id="main111">
@@ -65,7 +81,7 @@
</div> -->
<template>
- <el-table border style="margin: 14px; width: 99%" v-loading="loading"
+ <el-table border style="margin: 14px; width: 77%" v-loading="loading"
:default-sort="{ prop: 'reportTime', order: 'descending' }" :data="orderList"
@selection-change="handleSelectionChange" ref="multipleTable">
<el-table-column type="selection" width="40px" align="center" height="10px" fixed="left" />
@@ -87,9 +103,12 @@
<el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" height="10px" width="80px"
:show-overflow-tooltip="true">
<template slot-scope="scope">
+ <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
+ </template>
+ <!-- <template slot-scope="scope">
<span v-if="scope.row.tjType == '1'">鍥㈤槦</span>
<span v-if="scope.row.tjType == '2'">涓汉</span>
- </template>
+ </template> -->
</el-table-column>
<el-table-column label="浣撴鍙�" align="center" prop="tjNumber" :show-overflow-tooltip="true" width="160px" />
<el-table-column label="鎵�閫夊椁�" align="center" prop="pacName" height="10px" :show-overflow-tooltip="true"
@@ -109,13 +128,20 @@
<span>{{ parseTime(scope.row.reportTime) }}</span>
</template>
</el-table-column>
+
<el-table-column label="鎵撳嵃鏃堕棿" align="center" prop="printLastTime" width="155px" height="10px"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.printLastTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="澶囨敞" align="center" prop="remark" height="10px" :show-overflow-tooltip="true" />
+ <!-- <el-table-column
+ label="澶囨敞"
+ align="center"
+ prop="remark"
+ height="10px"
+ :show-overflow-tooltip="true"
+ /> -->
<!-- <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" height="10px"
width="60px">
@@ -268,10 +294,19 @@
</el-dialog>
<!--:before-close="handleClose" -->
<el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%">
- <el-radio v-model="radios" label="1">椋熷搧浠庝笟浜哄憳鍋ュ悍妫�鏌ヨ〃</el-radio>
- <el-radio v-model="radios" label="2">鍏叡鍦烘墍浠庝笟浜哄憳妫�鏌ヨ〃</el-radio>
+ <el-form :model="forms" ref="form" :inline="true" label-width="76px" style="margin-top: 10px">
+ <el-form-item label="" prop="radios">
+ <el-select filterable v-model="forms.radios" placeholder="璇烽�夋嫨鎵撳嵃鍋ュ悍妫�鏌ヨ〃绫诲瀷" clearable
+ >
+ <el-option v-for="dict in radiosList" :key="dict.dictValue" :label="dict.dictLabel"
+ :value="dict.dictValue" />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <!-- <el-radio v-model="radios" label="1">浠庝笟浜哄憳妫�鏌ヨ〃</el-radio>
+ <el-radio v-model="radios" label="2">鍏叡鍦烘墍妫�鏌ヨ〃</el-radio> -->
<span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button @click="dialogVisiblese = false">鍙� 娑�</el-button>
<el-button type="primary" @click="timjiao">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -279,34 +314,41 @@
</template>
<script>
-import print from "print-js";
import { getInfo } from "@/api/login";
+import { isPdfOrJimu } from "@/api/doctor/checkAll";
import {
- isPdfOrJimu
-} from "@/api/doctor/checkAll";
-import {
- listOrder,
- getNumber,
getPdf,
+ getPdfpre,
getprint,
hasReport,
hasPrintCode,
getOrderListOO,
- getNewDateList
+ getNewDateList,
+ getChexiao,
+ xiugaidayinzhuangtai,
} from "@/api/hosp/order";
import moment from "moment";
import ViewPdf from "@/components/ViewPdf";
-import { SubmitCompany, getCompany, queryCompany } from "@/api/team/tuanti";
+import {
+ SubmitCompany,
+ getCompany,
+ queryCompany,
+ addbatch,
+} from "@/api/team/tuanti";
+import { getDicts } from "@/api/system/dict/data";
import { chownSync } from "fs";
export default {
+ dicts: ["dict_team"],
components: {
ViewPdf,
},
name: "Order",
data() {
return {
- radios: '1',
+ radios: "1",
dialogVisiblese: false,
+ isLoading: false,
+ isChexiao: false,
createTimeList: "",
// printObj: {
// id: "box", //鎵撳嵃鐨勫尯鍩�
@@ -334,6 +376,16 @@
report: "",
gation: {},
drawer: false,
+ optionsOne: [
+ {
+ value: "1",
+ label: "宸叉墦鍗�",
+ },
+ {
+ value: "0",
+ label: "鏈墦鍗�",
+ },
+ ],
options: [
{
value: "閫夐」1",
@@ -371,6 +423,10 @@
discount: 100,
DataList: [],
DataList1: [],
+ CheckBox: {},
+ forms:{
+ radios:""
+ },
// 鎵撳嵃澶辫触
failList: [],
// 鎵撳嵃鎴愬姛
@@ -403,12 +459,14 @@
orderList: [],
CompanyList: [],
ordersList: [],
+ radiosList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
// 鏃ユ湡鑼冨洿
datetimerange: [],
+ seleList: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -425,6 +483,10 @@
djendTime: undefined,
name: undefined,
tjNum: undefined,
+ dyzt: "0",
+ compId: null,
+ dw: null,
+ tjCompName: "",
},
startTime: "",
// 琛ㄥ崟鍙傛暟
@@ -468,8 +530,12 @@
},
created() {
// this.getNowTime();
-
this.Company();
+ // if (this.queryParams.dyzt === "0") {
+ // this.createTimeList = [];
+ // } else {
+ // this.getdate();
+ // }
this.getdate();
},
mounted() {
@@ -479,6 +545,11 @@
},
methods: {
getdate() {
+ if (this.queryParams.dyzt === "0") {
+ this.createTimeList = [];
+ this.getList();
+ return;
+ }
getNewDateList().then((res) => {
this.createTimeList = [
moment(res.data).format("YYYY-MM-DD 00:00:00"),
@@ -518,41 +589,40 @@
this.add0(mm)
);
},
- /** 鐐瑰嚮鏄剧ず浣撴鎶ュ憡鎶ヨ〃*/
- // viewReport() {
- // const tjNumber = this.report;
- // const viewNum = "792997692059705344";
- // const params = { viewNum, tjNumber };
- // hasReportEnd(tjNumber).then((res) => {
- // if (res == 1) {
- // this.$tab.openPage('浣撴鎶ュ憡', '/report/viewReport', params);
- // } else {
- // this.$message.error("璇ョ敤鎴蜂綋妫�鏆傛湭瀹屾垚锛屾棤娉曟墦鍗颁綋妫�鎶ュ憡锛�");
- // }
- // });
- // },
jiankangReport() {
this.dialogVisiblese = true;
-
+ let dictType = "jimu_lx"
+ getDicts(dictType).then(res => {
+ console.log(res.data)
+ this.radiosList = res.data
+ })
},
timjiao() {
- if (this.radios == "1") {
- this.mobanId = "912502827716915200";
- } else {
- this.mobanId = "912519857543262208";
- }
+ // if (this.radios == "1") {
+ // this.mobanId = "912502827716915200";
+ // } else {
+ // this.mobanId = "912519857543262208";
+ // }
const tjNum = this.report;
- const viewNum = this.mobanId;
+ const viewNum = this.forms.radios;
const params = { viewNum, tjNum };
this.$tab.openPage("鍋ュ悍璇佹鏌ヨ〃", "/report/jiankangzheng", params);
+ let tjNumber = this.report[0];
+ xiugaidayinzhuangtai(tjNumber).then((response) => { });
+ this.dialogVisiblese = false;
+ this.getList();
},
baogaoyulan() {
const tjNumber = this.report[0];
+ this.isLoading = true;
+
isPdfOrJimu(tjNumber).then((response) => {
if (response.data.flag == "0") {
const flag = true;
- getPdf(tjNumber, flag).then((response) => {
+ this.isLoading = false;
+ let sfdy = this.queryParams.dyzt == 0 ? 1 : 0;
+ getPdfpre(tjNumber, flag, sfdy).then((response) => {
if (response.size === 0) {
const loading = this.$loading({
lock: true,
@@ -563,25 +633,41 @@
setTimeout(() => {
loading.close();
}, 3000);
- // this.$message.msgSuccess("鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
this.$message({
message: "鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�",
type: "warning",
});
} else {
- console.log(response)
this.dialogVisible = true;
-
this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
}
});
} else {
- let url = response.data.url
+ let url = response.data.url;
const params = { url };
- this.$tab.openPage("鍋ュ悍璇佹鏌ヨ〃", "/report/zongjianjiankangzheng", params);
+ this.$tab.openPage(
+ "鍋ュ悍璇佹鏌ヨ〃",
+ "/report/zongjianjiankangzheng",
+ params
+ );
}
- })
-
+ this.isLoading = false;
+ });
+ },
+ // 鎾ら攢鎵撳嵃
+ chexiao() {
+ const tjNUms = this.seleList.map((item) => item.tjNumber);
+ this.isChexiao = true;
+ getChexiao(tjNUms).then((res) => {
+ console.log(res, 6666);
+ if (res.code === 200) {
+ this.$modal.msgSuccess("鎾ら攢鎴愬姛锛�");
+ this.getList();
+ } else {
+ this.$modal.msgError("鎾ら攢澶辫触锛�");
+ }
+ this.isChexiao = false;
+ });
},
//鎵撳嵃灏忕エ
printHandle() {
@@ -598,113 +684,55 @@
}, 100);
},
- // 浣撴鎶ュ憡
- viewReport() {
- const flag = true;
- this.failList = [];
- this.form.name = "鎶ュ憡鎵撳嵃澶辫触锛�";
-
- if (this.report.length == 1) {
- this.report.forEach((item) => {
- this.tjNumber = item;
- });
- getPdf(this.tjNumber, flag).then((response) => {
- if (response.size == 0) {
- // this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
- this.dialogVisible = false;
- this.DataList1.forEach((item) => {
- if (item.tjNumber === this.tjNumber) {
- this.userId = item.tjCustomerName;
- this.form.name += item.tjCustomerName;
- }
- });
- this.failList.push({
- tjNumber: this.tjNumber,
- printStatus: 0,
- printBy: this.userId,
- createBy: this.userIds,
- });
- } else {
- this.dialogVisible = true;
- this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
- this.DataList1.forEach((item) => {
- if (item.tjNumber === this.tjNumber) {
- this.userId = item.tjCustomerName;
- // this.form.name += item.tjCustomerName
- }
- });
- this.failList.push({
- tjNumber: this.tjNumber,
- printStatus: 1,
- printBy: this.userId,
- createBy: this.userIds,
- });
+ base64ToBlob({ b64data = "", contentType = "", sliceSize = 512 } = {}) {
+ return new Promise((resolve, reject) => {
+ // 浣跨敤 atob() 鏂规硶灏嗘暟鎹В鐮�
+ let byteCharacters = atob(b64data);
+ let byteArrays = [];
+ for (
+ let offset = 0;
+ offset < byteCharacters.length;
+ offset += sliceSize
+ ) {
+ let slice = byteCharacters.slice(offset, offset + sliceSize);
+ let byteNumbers = [];
+ for (let i = 0; i < slice.length; i++) {
+ byteNumbers.push(slice.charCodeAt(i));
}
- this.joggle(this.failList);
- this.getList();
- });
- } else {
- for (let i = 0; i < this.report.length; i++) {
- if (i <= this.report.length) {
- this.tjNumber = this.report[i];
- getPdf(this.tjNumber, flag).then((response) => {
- if (response.size == 0) {
- this.failList = [];
- this.DataList1.forEach((item) => {
- if (item.tjNumber === this.report[i]) {
- this.userId = item.tjCustomerName;
- if (this.form.name) {
- this.form.name =
- this.form.name + "," + item.tjCustomerName;
- }
- }
- });
- this.failList.push({
- tjNumber: this.report[i],
- printStatus: 0,
- printBy: this.userId,
- createBy: this.userIds,
- });
- this.joggle(this.failList);
- this.getList();
- // this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
- this.dialogVisible = false;
- } else {
- this.failList = [];
- this.DataList1.forEach((item) => {
- if (item.tjNumber === this.report[i]) {
- this.userId = item.tjCustomerName;
- }
- });
- this.failList.push({
- tjNumber: this.report[i],
- printStatus: 1,
- printBy: this.userId,
- createBy: this.userIds,
- });
- this.joggle(this.failList);
- this.getList();
- // this.dialogVisible = true;
- // this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
- const newBlob = [];
- newBlob.push(response);
- const blob = new Blob(newBlob, { type: "application/pdf" });
- var date = new Date().getTime();
- var ifr = document.createElement("iframe");
- ifr.style.frameborder = "no";
- ifr.style.display = "none";
- ifr.style.pageBreakBefore = "always";
- ifr.setAttribute("id", "printPdf" + date);
- ifr.setAttribute("name", "printPdf" + date);
- ifr.src = window.URL.createObjectURL(blob);
- document.body.appendChild(ifr);
- this.doPrint("printPdf" + date);
- window.URL.revokeObjectURL(ifr.src); // 閲婃斁URL 瀵硅薄
- }
- });
- }
+ // 8 浣嶆棤绗﹀彿鏁存暟鍊肩殑绫诲瀷鍖栨暟缁勩�傚唴瀹瑰皢鍒濆鍖栦负 0銆�
+ // 濡傛灉鏃犳硶鍒嗛厤璇锋眰鏁扮洰鐨勫瓧鑺傦紝鍒欏皢寮曞彂寮傚父銆�
+ byteArrays.push(new Uint8Array(byteNumbers));
}
- }
+ let result = new Blob(byteArrays, {
+ type: contentType,
+ });
+ result = Object.assign(result, {
+ // jartto: 杩欓噷涓�瀹氳澶勭悊涓�涓� URL.createObjectURL
+ preview: URL.createObjectURL(result),
+ // name: `鍥剧墖绀轰緥.png`,
+ });
+ resolve(result);
+ });
+ },
+
+ /** 鐐瑰嚮鏄剧ず浣撴鎶ュ憡鎶ヨ〃*/
+ viewReport() {
+ let data = this.report.join(",");
+
+ addbatch(data).then((res) => {
+ let base64 = res.file;
+ this.base64ToBlob({
+ b64data: base64,
+ contentType: "application/pdf",
+ }).then((res) => {
+ this.dialogVisible = true;
+ try {
+ this.url = res.preview;
+ } catch (error) {
+ this.url = window.webkitURL.createObjectURL(res.preview);
+ }
+ });
+ });
},
doPrint(val) {
@@ -757,6 +785,11 @@
});
});
},
+ // 閫夋鏁版嵁
+ searchSelect(val) {
+ this.CheckBox = val;
+ console.log(this.CheckBox, 9999);
+ },
// onSubmit() {
// console.log("submit!");
@@ -766,20 +799,35 @@
},
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
+ console.log(this.CheckBox, 2323);
+
+ // this.queryParams.checkStatus = this.checkStatus;
+
+ this.queryParams.compId = this.CheckBox.drugManufacturerId;
+ this.queryParams.dw = this.CheckBox.cnName;
+
if (this.createTimeList) {
this.queryParams.djbeginTime = this.createTimeList[0];
this.queryParams.djendTime = this.createTimeList[1];
- }else if(this.createTimeList == null){
+ } else if (this.createTimeList == null) {
this.queryParams.djbeginTime = null;
- this.queryParams.djendTime =null;
+ this.queryParams.djendTime = null;
}
this.loading = true;
getInfo().then((response) => {
this.userIds = response.user.userId;
});
+ // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
+ getCompany(this.queryParams).then((response) => {
+ this.CompanyList = response.data;
+ console.log(this.CompanyList, 555);
+
+ this.loading = false;
+ });
getOrderListOO(this.queryParams).then((response) => {
this.orderList = response.data.list;
+
// if (this.orderList) {
// this.orderList.forEach((item, index) => {
// item.newID =
@@ -849,15 +897,48 @@
this.queryParams.pageNum = 1;
this.getList();
},
+ handleDyztChange(value) {
+ if (value === "0") {
+ // 纭涓�涓� "鏈墦鍗�" 鐨� value 鏄笉鏄� '0'
+ this.createTimeList = [];
+ } else {
+ // 宸叉墦鍗� -> 璁剧疆榛樿鐧昏鏃堕棿
+ this.getdate();
+ }
+ // this.handleQuery();
+ },
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.createTimeList = []
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ orderByColumn: "createTime",
+ isAsc: "desc",
+ tjType: undefined,
+ tjNumber: undefined,
+ firmId: undefined,
+ createTime: undefined,
+ finishTime: undefined,
+ reportTime: undefined,
+ djbeginTime: undefined,
+ djendTime: undefined,
+ name: undefined,
+ tjNum: undefined,
+ dyzt: "0",
+ compId: null,
+ dw: null,
+ tjCompName: "",
+ };
+ this.createTimeList = [];
this.resetForm("queryForm");
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.orderId);
+ this.seleList = selection;
+ console.log(this.seleList, 222333);
+
this.DataList1 = this.$refs.multipleTable.selection;
this.DataList1.forEach((item) => {
this.barcode = item.tjNumber;
--
Gitblit v1.8.0