From 955a8eeb4a139783dea7ce656026e7916b0b4801 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 27 六月 2025 17:49:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/reservation/reservations/index.vue | 524 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 349 insertions(+), 175 deletions(-)
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 5d3052d..76e2459 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -99,81 +99,126 @@
v-show="showSearch"
label-width="68px"
>
- <el-form-item label="濮撳悕" prop="name">
- <el-input
- style="width: 120px"
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="韬唤璇佸彿" prop="idCard">
- <el-input
- v-model="queryParams.idCard"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鑱旂郴鐢佃瘽" prop="phoe">
- <el-input
- v-model="queryParams.phoe"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 140px"
- />
- </el-form-item>
- <el-form-item label="鍗曚綅鍚嶇О" prop="company">
- <el-select
- :remote-method="getRemoteData"
- v-model="queryParams.company"
- remote
- default-first-option
- allow-create
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
- clearable
- @change="idFn1"
- >
- <el-option
- v-for="dict in CompanyList"
- :key="dict.cnName"
- :label="dict.cnName"
- :value="dict.drugManufacturerId"
- />
- </el-select>
- <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
- </el-form-item>
- <el-form-item label="棰勭害瓒呮湡" prop="isExpire">
- <el-select
- v-model="queryParams.isExpire"
- placeholder="璇烽�夋嫨鏄惁瓒呮湡"
- clearable
- style="width: 140px"
- >
- <el-option
- v-for="dict in options"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲嶇疆</el-button
- >
- </el-form-item>
+ <el-row>
+ <el-col>
+ <el-form-item label="濮撳悕" prop="name">
+ <el-input
+ style="width: 120px"
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="韬唤璇佸彿" prop="idCard">
+ <el-input
+ v-model="queryParams.idCard"
+ placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍗曚綅鍚嶇О" prop="company">
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="queryParams.company"
+ remote
+ default-first-option
+ allow-create
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+ clearable
+ @change="idFn1"
+ >
+ <el-option
+ v-for="dict in CompanyList"
+ :key="dict.cnName"
+ :label="dict.cnName"
+ :value="dict.drugManufacturerId"
+ />
+ </el-select>
+ <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
+ </el-form-item>
+
+ <el-form-item label="濂楅鍚嶇О" prop="dwDeptName">
+ <el-select v-model="queryParams.dwDeptName" placeholder="璇烽�夋嫨濂楅鍚嶇О" clearable style="width: 100%"
+ @change="idFn2">
+ <el-option v-for="dict in deptList" :key="dict.id" :label="dict.dwDeptName" :value="dict.id" />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="鍒嗙粍鍚嶇О" prop="groupingName">
+ <el-select v-model="queryParams.groupingName" placeholder="璇烽�夋嫨鍒嗙粍鍚嶇О" clearable style="width: 100%">
+ <el-option v-for="dict in groupingList" :key="dict.id" :label="dict.pacName" :value="dict.id" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="棰勭害鏃堕棿">
+ <el-date-picker
+ clearable
+ v-model="createTimeList"
+ @change="dateChangebirthday2"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :picker-options="pickerOptions"
+ value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鍑洪绾︽椂闂�"
+ style="width: 300px"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="phoe">
+ <el-input
+ v-model="queryParams.phoe"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ style="width: 140px"
+ />
+ </el-form-item>
+ <el-form-item label="鎵�鍦ㄥ湴" prop="szd">
+ <el-input
+ style="width: 120px"
+ v-model="queryParams.szd"
+ placeholder="璇疯緭鍏ユ墍鍦ㄥ湴"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+
+ <el-form-item label="棰勭害瓒呮湡" prop="isExpire">
+ <el-select
+ v-model="queryParams.isExpire"
+ placeholder="璇烽�夋嫨鏄惁瓒呮湡"
+ clearable
+ style="width: 140px"
+ >
+ <el-option
+ v-for="dict in options"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handleQuery"
+ >鎼滅储</el-button
+ >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<el-row :gutter="10" style="margin: 10px 15px">
<el-col :span="1.5">
@@ -295,7 +340,7 @@
<span>{{ parseTime(scope.row.reservationTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="浣撴绫诲瀷"
align="center"
prop="tjType"
@@ -305,7 +350,7 @@
<template slot-scope="scope">
<dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="濠氬Щ"
align="center"
@@ -354,10 +399,24 @@
prop="company"
:show-overflow-tooltip="true"
/>
- <el-table-column
+ <!-- <el-table-column
label="閭"
align="center"
prop="email"
+ :show-overflow-tooltip="true"
+ width="160px"
+ /> -->
+ <el-table-column
+ label="濂楅鍚嶇О"
+ align="center"
+ prop="tcmc"
+ :show-overflow-tooltip="true"
+ width="160px"
+ />
+ <el-table-column
+ label="鍒嗙粍鍚嶇О"
+ align="center"
+ prop="fzmc"
:show-overflow-tooltip="true"
width="160px"
/>
@@ -365,6 +424,13 @@
label="鍦板潃"
align="center"
prop="address"
+ :show-overflow-tooltip="true"
+ width="160px"
+ />
+ <el-table-column
+ label="鎵�鍦ㄥ湴"
+ align="center"
+ prop="szd"
:show-overflow-tooltip="true"
width="160px"
/>
@@ -857,9 +923,19 @@
"
>
<el-table :data="tableData1" border style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰" width="180" align="center">
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ align="center"
+ >
</el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="50" align="center">
+ <el-table-column
+ prop="proType"
+ label="鎬у埆"
+ width="50"
+ align="center"
+ >
<template slot-scope="scope">
<template v-if="isAll(scope.row.proType)">
鍏ㄩ儴
@@ -873,7 +949,11 @@
</template>
</el-table-column>
- <el-table-column prop="ordPrice" label="搴旀敹閲戦" align="center">
+ <el-table-column
+ prop="ordPrice"
+ label="搴旀敹閲戦"
+ align="center"
+ >
</el-table-column>
<el-table-column label="鎶樻墸" width="160px" align="center">
<template slot-scope="scope">
@@ -887,14 +967,22 @@
:step="0.1"
:max="10"
:min="0"
- :disabled="true"
+ :disabled="true"
>
</el-input-number>
</template>
</el-table-column>
- <el-table-column prop="nowPrice" label="瀹炴敹閲戦" align="center">
+ <el-table-column
+ prop="nowPrice"
+ label="瀹炴敹閲戦"
+ align="center"
+ >
</el-table-column>
- <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂" align="center">
+ <el-table-column
+ prop="proCheckMethod"
+ label="鏄惁绌鸿吂"
+ align="center"
+ >
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
@@ -1079,7 +1167,7 @@
</div>
</el-col>
</el-row>
-
+
<el-dialog
title="瀵兼鍗曢瑙�"
:visible.sync="dialogVisibles"
@@ -1097,7 +1185,6 @@
</div>
</template>
</el-drawer>
-
<el-dialog
title="PDF 棰勮"
@@ -1137,7 +1224,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer2">
- <el-button type="primary" @click="submitType" >纭� 瀹�</el-button>
+ <el-button type="primary" @click="submitType">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -1611,9 +1698,19 @@
"
>
<el-table :data="tableData1" border style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰" width="180" align="center">
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ align="center"
+ >
</el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="50" align="center">
+ <el-table-column
+ prop="proType"
+ label="鎬у埆"
+ width="50"
+ align="center"
+ >
<template slot-scope="scope">
<template v-if="isAll(scope.row.proType)">
鍏ㄩ儴
@@ -1627,7 +1724,11 @@
</template>
</el-table-column>
- <el-table-column prop="ordPrice" label="搴旀敹閲戦" align="center">
+ <el-table-column
+ prop="ordPrice"
+ label="搴旀敹閲戦"
+ align="center"
+ >
</el-table-column>
<el-table-column label="鎶樻墸" width="160px" align="center">
<template slot-scope="scope">
@@ -1641,14 +1742,22 @@
:step="0.1"
:max="10"
:min="0"
- :disabled="true"
+ :disabled="true"
>
</el-input-number>
</template>
</el-table-column>
- <el-table-column prop="nowPrice" label="瀹炴敹閲戦" align="center">
+ <el-table-column
+ prop="nowPrice"
+ label="瀹炴敹閲戦"
+ align="center"
+ >
</el-table-column>
- <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂" align="center">
+ <el-table-column
+ prop="proCheckMethod"
+ label="鏄惁绌鸿吂"
+ align="center"
+ >
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
@@ -1853,10 +1962,10 @@
</template>
<script>
-import { addComp,
- addPlOrderAndDetail } from "@/api/system/comp";
+import { addComp, addPlOrderAndDetail, Deptlist,
+ getDwAndDwDept, } from "@/api/system/comp";
import Big from "big.js";
-import { Loading } from 'element-ui';
+import { Loading } from "element-ui";
import {
listReservation,
gettjCancel,
@@ -1923,6 +2032,8 @@
taocan: false,
webSocket: null,
defaultKeys: [],
+ deptList: [],
+ groupingList: [],
value1: "",
pacName: "",
hides: false,
@@ -1934,7 +2045,7 @@
url: "",
open2: false,
forms: {
- tjCategory:"12"
+ tjCategory: "12",
},
dialogVisible: false,
/** 鐓х浉鏈哄脊绐楁ā鍧�-start */
@@ -1993,7 +2104,7 @@
// 鏄惁鏄剧ず寮瑰嚭灞�
pacId: "",
- cusIds:[],
+ cusIds: [],
// 缁撴灉
result: "",
proIds: [],
@@ -2006,6 +2117,8 @@
label: "proName",
},
formPacId: "",
+ createTimeList: "",
+ startTime: "",
dXData: [],
// 鏌ヨ鍙傛暟
queryParam: {
@@ -2023,6 +2136,7 @@
pageNum: 1,
pageSize: 10,
cusName: null,
+ szd: null,
cusSex: null,
cusBrithday: null,
cusAddr: null,
@@ -2179,6 +2293,37 @@
// },
// ],
},
+ pickerOptions: {
+ shortcuts: [
+ {
+ text: "鏈�杩戜竴鍛�",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date(new Date().setHours(0, 0, 0, 0));
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "鏈�杩戜竴涓湀",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date(new Date().setHours(0, 0, 0, 0));
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "鏈�杩戜笁涓湀",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date(new Date().setHours(0, 0, 0, 0));
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ ],
+ },
};
},
created() {
@@ -2285,7 +2430,8 @@
this.open1 = true;
this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
},
- idFn1(value) {
+ idFn1(value) {
+ console.log(value)
if (value) {
this.form.dictCompId = value;
this.CompanyList.forEach((item) => {
@@ -2294,11 +2440,38 @@
this.queryParams.company = item.cnName;
}
});
+ Deptlist(value).then((response) => {
+ this.deptList = response.data;
+ });
}
+ },
+ idFn2(value) {
+ let data = {
+ deptId: value,
+ dwId: this.form.dictCompId,
+ };
+ getDwAndDwDept(data).then((response) => {
+ // 閮ㄩ棬鍚嶇О
+ this.groupingList = response.data;
+
+ });
+ },
+ dateChangebirthday2(val) {
+ this.startTime = val;
},
/** 鏌ヨ浣撴棰勭害鍒楄〃 */
getList() {
this.loading = true;
+ if (this.startTime) {
+ this.queryParams.yykssj = this.startTime[0];
+ this.queryParams.yyjssj = this.startTime[1];
+ } else if (this.createTimeList) {
+ this.queryParams.yykssj = this.createTimeList[0];
+ this.queryParams.yyjssj = this.createTimeList[1];
+ } else if (this.createTimeList == null) {
+ this.queryParams.yykssj = null;
+ this.queryParams.yyjssj = null;
+ }
listReservation(this.queryParams).then((response) => {
this.reservationList = response.rows;
// response.rows.forEach((item, index) =>
@@ -2332,6 +2505,8 @@
});
}
},
+
+
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
@@ -2682,104 +2857,105 @@
this.open2 = true;
},
-
submitType() {
// let cusIds = [];
// this.selectList.forEach((item) => {
// cusIds.push(item.idCard);
// });
- let loadingInstance1 = Loading.service({ fullscreen: true,text:"绛惧埌涓�" });
+ let loadingInstance1 = Loading.service({
+ fullscreen: true,
+ text: "绛惧埌涓�",
+ });
let data = {
cusIds: this.cusIds,
tjCategory: this.forms.tjCategory,
};
this.open2 = false;
addPlOrderAndDetail(data).then((res) => {
- if(res.code == 200){
+ if (res.code == 200) {
this.open2 = false;
- this.$modal.msgSuccess("绛惧埌鎴愬姛");
- if (res.file) {
- let base64 = res.file;
- this.base64ToBlob({
- b64data: base64,
- contentType: "application/pdf",
- }).then((res) => {
- this.dialogVisible = true;
- // 杞悗鍚庣殑blob瀵硅薄
- try {
- this.url = res.preview;
- } catch (error) {
- this.url = window.webkitURL.createObjectURL(res.preview);
+ this.$modal.msgSuccess("绛惧埌鎴愬姛");
+ if (res.file) {
+ let base64 = res.file;
+ this.base64ToBlob({
+ b64data: base64,
+ contentType: "application/pdf",
+ }).then((res) => {
+ this.dialogVisible = true;
+ // 杞悗鍚庣殑blob瀵硅薄
+ try {
+ this.url = res.preview;
+ } catch (error) {
+ this.url = window.webkitURL.createObjectURL(res.preview);
+ }
+ });
+ } else {
+ let _this = this;
+ this.$nextTick(() => {
+ // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
+ loadingInstance1.close();
+ });
+ var websocket = null;
+ var url = _this.valueUrls;
+ if ("WebSocket" in window) {
+ websocket = new WebSocket(url);
+ } else if ("MozWebSocket" in window) {
+ websocket = new MozWebSocket(url);
+ } else {
}
- });
- }else{
- let _this = this;
- this.$nextTick(() => { // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
- loadingInstance1.close();
-});
- var websocket = null;
- var url = _this.valueUrls;
- if ("WebSocket" in window) {
- websocket = new WebSocket(url);
- } else if ("MozWebSocket" in window) {
- websocket = new MozWebSocket(url);
- } else {
- }
- if (websocket == null) {
- alert("11111");
- }
- websocket.onopen = function () {
- try {
- // 杩炴帴璁惧
- var jsonObjs = {
- type: 4,
- data: res,
- };
- var jStrs = JSON.stringify(jsonObjs);
- websocket.send(jStrs);
- } catch (err) {
- var tryTime = 0;
- // 閲嶈瘯10娆★紝姣忔涔嬮棿闂撮殧3绉�
- if (tryTime < 1) {
- var t1 = setTimeout(function () {
- tryTime++;
+ if (websocket == null) {
+ alert("11111");
+ }
+ websocket.onopen = function () {
+ try {
+ // 杩炴帴璁惧
var jsonObjs = {
type: 4,
data: res,
};
var jStrs = JSON.stringify(jsonObjs);
websocket.send(jStrs);
- }, 1 * 1000);
- } else {
- console.error("閲嶈繛澶辫触.");
- }
- }
- };
- websocket.onclose = function () {
- alert("杩炴帴鍏抽棴");
- };
- websocket.onmessage = function (event) {
- var resultObj = JSON.parse(event.data);
- _this.cardreader = false;
- };
+ } catch (err) {
+ var tryTime = 0;
+ // 閲嶈瘯10娆★紝姣忔涔嬮棿闂撮殧3绉�
+ if (tryTime < 1) {
+ var t1 = setTimeout(function () {
+ tryTime++;
+ var jsonObjs = {
+ type: 4,
+ data: res,
+ };
+ var jStrs = JSON.stringify(jsonObjs);
+ websocket.send(jStrs);
+ }, 1 * 1000);
+ } else {
+ console.error("閲嶈繛澶辫触.");
+ }
+ }
+ };
+ websocket.onclose = function () {
+ alert("杩炴帴鍏抽棴");
+ };
+ websocket.onmessage = function (event) {
+ var resultObj = JSON.parse(event.data);
+ _this.cardreader = false;
+ };
- //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
- websocket.onerror = function () {
- alert("璇锋鏌ヨ繛鎺ユ槸鍚︽甯�");
- };
-
-
- this.getList()
- }
- }else{
- this.$nextTick(() => { // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
+ //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
+ websocket.onerror = function () {
+ alert("璇锋鏌ヨ繛鎺ユ槸鍚︽甯�");
+ };
+
+ this.getList();
+ }
+ } else {
+ this.$nextTick(() => {
+ // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
loadingInstance1.close();
-});
+ });
}
-
});
},
-
base64ToBlob({ b64data = "", contentType = "", sliceSize = 512 } = {}) {
return new Promise((resolve, reject) => {
@@ -3206,8 +3382,6 @@
height: 700px;
overflow: hidden;
}
-
-
#printIframe::-webkit-scrollbar {
width: 6px;
--
Gitblit v1.8.0