From c7b33db117fd2893d7d1c93bf5d46e87d33e44d0 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 16 十二月 2024 16:08:51 +0800
Subject: [PATCH] 初审结果查询
---
src/views/hosp/order/index.vue | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 156 insertions(+), 11 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 6ecf0c3..940c2db 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -13,7 +13,7 @@
ref="inputName"
v-model="queryParams.name"
placeholder="璇疯緭鍏ュ鍚�"
- style="width: 200px"
+ style="width: 150px"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -23,7 +23,7 @@
ref="inputName"
v-model="queryParams.tjNum"
placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- style="width: 200px"
+ style="width: 150px"
clearable
@keyup.enter.native="handleQuery"
@blur="hb"
@@ -34,7 +34,7 @@
ref="inputName"
v-model="queryParams.xmmc"
placeholder="璇疯緭鍏ヤ綋妫�椤圭洰"
- style="width: 300px"
+ style="width: 150px"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -42,13 +42,13 @@
<el-form-item
label="鍗曚綅鍚嶇О"
prop="tjCompName"
- style="margin-left: 20px"
+ style="margin-left: 20px;margin-right: 500px;"
>
<el-select
:remote-method="getRemoteData"
v-model="queryParams.tjCompName"
value-key="drugManufacturerId"
- style="width: 300px"
+ style="width: 200px"
remote
filterable
placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
@@ -64,7 +64,30 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
+ <el-form-item
+ label="鐘舵��"
+ prop="zt"
+ >
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="queryParams.zt"
+ style="width: 150px"
+ remote
+ filterable
+ placeholder="璇烽�夋嫨鐘舵��"
+ clearable
+ @change="searchSelect"
+
+ >
+ <el-option
+ v-for="item in ztList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐧昏鏃堕棿" prop="createTimeList" style="margin-right: 107px;" >
<el-date-picker
v-model="createTimeList"
type="datetimerange"
@@ -119,7 +142,20 @@
>
</el-form-item>
</el-form>
-
+ <!-- <div class="timeline-wrapper">
+ <el-timeline :reverse="false" class="horizontal-timeline">
+ <el-timeline-item
+ v-for="(item, index) in timelineData"
+ :key="index"
+ :timestamp="item.timestamp"
+ :position="index % 2 === 0 ? 'left' : 'right'">
+ <el-card :body-style="{ padding: '20px' }">
+ <h3>{{ item.title }}</h3>
+ <p>{{ item.description }}</p>
+ </el-card>
+ </el-timeline-item>
+ </el-timeline>
+ </div> -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -302,7 +338,7 @@
<el-table-column
label="鐘舵��"
align="center"
- prop="tjtype"
+ prop="zt"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column label="娴佹按鍙�" align="center" prop="tjSerialNumber" /> -->
@@ -1473,7 +1509,7 @@
import { getInfo } from "@/api/login";
import ViewPdf from "@/components/ViewPdf";
import {
- projectGetList,
+ shijianzhou,
getaddtTransition,
getProParentIdDxList,
getProSonDxList,
@@ -1493,6 +1529,18 @@
name: "Order",
data() {
return {
+ ztList: [
+ {name:'鏈',id: 0},{name:'鍦ㄦ',id: 1},{name:'宸插畬鎴�',id: 2},{name:'宸插鏍�',id: 3},{name:'鐢熸垚鎶ュ憡',id: 4},{name:'鎶ュ憡鏍告敹',id: 5},{name:'宸插嚭鎶ュ憡',id: 6},
+ ],
+ timelineData: [
+ { timestamp: '2024-01-01', title: '鏈', description: 'This is event 1 description' },
+ { timestamp: '2024-01-05', title: '鍦ㄦ', description: 'This is event 2 description' },
+ { timestamp: '2024-01-10', title: '宸插畬鎴�', description: 'This is event 3 description' },
+ { timestamp: '2024-01-15', title: '宸插鏍�', description: 'This is event 4 description' },
+ { timestamp: '2024-01-15', title: '鐢熸垚鎶ュ憡', description: 'This is event 4 description' },
+ { timestamp: '2024-01-15', title: '鎶ュ憡鏍告敹', description: 'This is event 4 description' },
+ { timestamp: '2024-01-15', title: '宸插嚭鎶ュ憡', description: 'This is event 4 description' },
+ ],
DataList3: [],
bldhid: "",
budadaozhen: false,
@@ -1548,6 +1596,7 @@
TreedataList: [],
discount: 10,
DataList: [],
+ tjNUms: [],
// 濂楅鎻愪氦鎸夐挳
confirm: false,
list1: true,
@@ -1595,6 +1644,8 @@
bgbeginTime: null,
bgendTime: null,
xmmc: null,
+ tjCompName:'',
+ dw:null
},
startTime: "",
startTime1: "",
@@ -1672,6 +1723,7 @@
// 閫夋鏁版嵁
searchSelect(val) {
this.CheckBox = val;
+ this.queryParams.dw = this.CheckBox.cnName;
console.log(this.CheckBox,9999);
},
@@ -1778,6 +1830,39 @@
this.CompanyList = response.data;
console.log( this.CompanyList,555);
+ this.loading = false;
+ });
+ },
+
+ sub() {
+ this.queryParams.compId = this.CheckBox.drugManufacturerId;
+ if (this.startTime) {
+ this.queryParams.djbeginTime = this.startTime[0];
+ this.queryParams.djendTime = this.startTime[1];
+ } else if (this.createTimeList) {
+ this.queryParams.djbeginTime = this.createTimeList[0];
+ this.queryParams.djendTime = this.createTimeList[1];
+ } else if (this.createTimeList == null) {
+ this.queryParams.djbeginTime = null;
+ this.queryParams.djendTime = null;
+ }
+ if (this.startTime1) {
+ this.queryParams.bgbeginTime = this.startTime1[0];
+ this.queryParams.bgendTime = this.startTime1[1];
+ }
+
+ this.loading = true;
+ getOrderList(this.queryParams).then((response) => {
+ this.orderList = response.data.list;
+ if (this.orderList) {
+ this.orderList.forEach((item, index) => {
+ item.newID =
+ (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
+ index +
+ 1;
+ });
+ }
+ this.total = response.data.total;
this.loading = false;
});
},
@@ -1942,6 +2027,7 @@
djendTime: null,
bgbeginTime: null,
bgendTime: null,
+ dw: null
};
this.resetForm("form");
},
@@ -1953,7 +2039,8 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
- this.getList();
+ // this.getList();
+ this.sub();
},
renderContents(h, { node, data, store }) {
return (
@@ -2008,10 +2095,23 @@
this.startTime1 = [];
this.createTimeList = [];
this.resetForm("queryForm");
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ djbeginTime: null,
+ djendTime: null,
+ tjNum: null,
+ bgbeginTime: null,
+ bgendTime: null,
+ xmmc: null,
+ tjCompName:'',
+ dw:null
+ }
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ this.tjNUms = selection.map(item => item.tjNumber);
selection.forEach((item) => {
this.orderIds = item.orderId;
this.tjnumbers = item.tjNumber;
@@ -2025,9 +2125,13 @@
});
this.ids = selection.map((item) => item.orderId);
- // this.tjNumbers = selection.map((item) => item.tjNumber);
this.single = selection.length !== 1;
this.multiple = !selection.length;
+ shijianzhou({
+ tjNUms: this.tjNUms
+ }).then((res) => {
+ console.log(res)
+ })
},
/** 鏂板鎸夐挳鎿嶄綔 */
// handleAdd() {
@@ -2653,6 +2757,7 @@
handleProjectssChange(selection) {
this.DataListss = [];
this.selection = [];
+
this.bldhs = selection.map((item) => item.bldh);
selection.forEach((item) => {
item.projectList.forEach((item1) => {
@@ -2805,5 +2910,45 @@
display: flex;
flex-direction: column;
}
+.timeline-wrapper {
+ overflow-x: auto;
+ padding: 20px;
+ width: 100%;
+}
+.horizontal-timeline {
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ flex-wrap: nowrap;
+ padding: 20px 0;
+ width: 100%;
+}
+
+.el-timeline-item {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ margin: 0 20px;
+}
+
+.el-timeline-item .el-card {
+ width: 150px;
+ border-radius: 10px;
+}
+
+.el-timeline-item .el-timeline-item-tail {
+ display: none;
+}
+
+.el-timeline-item .el-timeline-item-dot {
+ position: absolute;
+ top: 10px;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 12px;
+ height: 12px;
+ background-color: #409EFF;
+ border-radius: 50%;
+}
</style>
--
Gitblit v1.8.0