From 6bf0b65995f54e9ee85b9d6823b77fb355b2a47c Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 17 十二月 2024 14:39:10 +0800
Subject: [PATCH] 异常结果
---
src/views/hosp/order/index.vue | 166 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 141 insertions(+), 25 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index d31d550..4c6f0cf 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,19 +42,18 @@
<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="璇烽�夋嫨鍗曚綅鍚嶇О"
clearable
@change="searchSelect"
-
>
<el-option
v-for="dict in CompanyList"
@@ -64,7 +63,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 +141,20 @@
>
</el-form-item>
</el-form>
-
+ <template v-for="(item, index) in shijianlist" >
+ <div :key="index" style="margin-bottom: 20px" v-if="shijianlist.length > 0">
+ {{findNameByTjnum(item.tjNUm) }}
+ <el-steps :space="200" :active="item.sjz" finish-status="success" align-center>
+ <el-step title="鏈"></el-step>
+ <el-step title="鍦ㄦ"></el-step>
+ <el-step title="宸插畬鎴�"></el-step>
+ <el-step title="宸插鏍�"></el-step>
+ <el-step title="鐢熸垚鎶ュ憡"></el-step>
+ <el-step title="鎶ュ憡鏍告敹"></el-step>
+ <el-step title="宸插嚭鎶ュ憡"></el-step>
+ </el-steps>
+ </div>
+</template>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -302,7 +337,7 @@
<el-table-column
label="鐘舵��"
align="center"
- prop="tjtype"
+ prop="zt"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column label="娴佹按鍙�" align="center" prop="tjSerialNumber" /> -->
@@ -366,14 +401,14 @@
</el-table-column>
<!-- <el-table-column label="鍒涘缓浜�" align="center" prop="createBy" /> -->
<!-- <el-table-column label="鏇存柊浜�" align="center" prop="updateBy" /> -->
- <!-- <el-table-column
+ <!-- <el-table-column
label="鍗曚綅宸ュ彿"
align="center"
prop="firmWorkId"
width="100px"
:show-overflow-tooltip="true"
/> -->
-
+
<!-- <el-table-column label="閮ㄩ棬鍚�" align="center" prop="firmDeptName" /> -->
<!-- <el-table-column label="瀹㈡埛鐓х墖" align="center" prop="photo" /> -->
@@ -1473,7 +1508,7 @@
import { getInfo } from "@/api/login";
import ViewPdf from "@/components/ViewPdf";
import {
- projectGetList,
+ shijianzhou,
getaddtTransition,
getProParentIdDxList,
getProSonDxList,
@@ -1493,6 +1528,15 @@
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 },
+ ],
DataList3: [],
bldhid: "",
budadaozhen: false,
@@ -1548,6 +1592,7 @@
TreedataList: [],
discount: 10,
DataList: [],
+ shijianlist: [],
// 濂楅鎻愪氦鎸夐挳
confirm: false,
list1: true,
@@ -1595,8 +1640,8 @@
bgbeginTime: null,
bgendTime: null,
xmmc: null,
- tjCompName:'',
- dw:null
+ tjCompName: "",
+ dw: null,
},
startTime: "",
startTime1: "",
@@ -1659,6 +1704,10 @@
});
},
methods: {
+ findNameByTjnum(tjnum) {
+ const order = this.orderList.find(orderItem => orderItem.tjNumber === tjnum);
+ return order ? order.tjCustomerName : '鏈壘鍒�'; // 濡傛灉鎵句笉鍒板搴旂殑椤癸紝杩斿洖涓�涓粯璁ゅ��
+ },
// 鎼滅储
getRemoteData(query) {
if (query) {
@@ -1674,8 +1723,8 @@
// 閫夋鏁版嵁
searchSelect(val) {
this.CheckBox = val;
- console.log(this.CheckBox,9999);
-
+ this.queryParams.dw = this.CheckBox.cnName;
+ console.log(this.CheckBox, 9999);
},
onPayTypeChange() {
if (this.payType === "6" && this.form.tjType !== 3) {
@@ -1746,7 +1795,6 @@
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
this.queryParams.compId = this.CheckBox.drugManufacturerId;
- this.queryParams.dw = this.CheckBox.cnName;
if (this.startTime) {
this.queryParams.djbeginTime = this.startTime[0];
this.queryParams.djendTime = this.startTime[1];
@@ -1776,11 +1824,44 @@
this.total = response.data.total;
this.loading = false;
});
- // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
- getCompany(this.queryParams).then((response) => {
+ // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
+ getCompany(this.queryParams).then((response) => {
this.CompanyList = response.data;
- console.log( this.CompanyList,555);
-
+ 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;
});
},
@@ -1945,6 +2026,7 @@
djendTime: null,
bgbeginTime: null,
bgendTime: null,
+ dw: null,
};
this.resetForm("form");
},
@@ -1956,7 +2038,8 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
- this.getList();
+ // this.getList();
+ this.sub();
},
renderContents(h, { node, data, store }) {
return (
@@ -2011,10 +2094,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) {
+ let tjNUms = selection.map((item) => item.tjNumber);
selection.forEach((item) => {
this.orderIds = item.orderId;
this.tjnumbers = item.tjNumber;
@@ -2028,9 +2124,17 @@
});
this.ids = selection.map((item) => item.orderId);
- // this.tjNumbers = selection.map((item) => item.tjNumber);
this.single = selection.length !== 1;
this.multiple = !selection.length;
+ if (tjNUms.length > 0) {
+ shijianzhou(tjNUms).then((res) => {
+ this.shijianlist = res.data
+ });
+ } else{
+ this.shijianlist = []
+ }
+
+
},
/** 鏂板鎸夐挳鎿嶄綔 */
// handleAdd() {
@@ -2656,6 +2760,7 @@
handleProjectssChange(selection) {
this.DataListss = [];
this.selection = [];
+
this.bldhs = selection.map((item) => item.bldh);
selection.forEach((item) => {
item.projectList.forEach((item1) => {
@@ -2710,7 +2815,7 @@
},
};
</script>
-<style lang="scss">
+<style lang="scss" scoped>
.pag {
width: 100%;
display: flex;
@@ -2808,5 +2913,16 @@
display: flex;
flex-direction: column;
}
-
+::v-deep .el-step__title.is-process {
+ color: rgb(24, 144, 255);
+}
+::v-deep .el-step__head.is-process {
+ color: rgb(24, 144, 255);
+ border-color: rgb(24, 144, 255);
+}
+.shijian{
+ display: flex;
+ align-items: flex-start;
+
+}
</style>
--
Gitblit v1.8.0