From 1e60adac102dc1665eaab39ae0f81bff7ccb351d Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期日, 18 二月 2024 18:04:49 +0800
Subject: [PATCH] qxtj
---
src/views/hosp/order/index.vue | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 12baa41..49bc5b0 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -7,7 +7,7 @@
</el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNum">
<el-input ref="inputName" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" style="width: 170px" clearable
- @keyup.enter.native="handleQuery" />
+ @keyup.enter.native="handleQuery" @blur="hb" />
</el-form-item>
<el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
<el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
@@ -69,6 +69,7 @@
<template slot-scope="scope">
<span v-if="scope.row.tjCustomerSex == '0'">鐢�</span>
<span v-if="scope.row.tjCustomerSex == '1'">濂�</span>
+ <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span>
</template>
</el-table-column>
<el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" width="55px" :show-overflow-tooltip="true" />
@@ -204,7 +205,7 @@
<div style="text-align: center; margin-bottom: 10px;margin-top:10px">椤圭洰鍒楄〃</div>
<div class="tab3">
<div class="outside1">
- <el-tree :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
+ <el-tree v-loading="loading" :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
@check-change="handleCurrentChecked">
</el-tree>
</div>
@@ -293,18 +294,18 @@
<!-- 娣诲姞琛ュ綍椤圭洰 -->
<el-dialog :title="title" :visible.sync="Projectopen1" width="980px" style="height: 860px" append-to-body>
<el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="6">
+ <el-col :span="8">
<div style="text-align: center; margin-bottom: 10px;margin-top:10px">椤圭洰鍒楄〃</div>
<div class="tab3">
- <div class="outside1">
- <el-tree :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
+ <div class="outside1" >
+ <el-tree v-loading="loading" :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
@check-change="handleCurrentChecked">
</el-tree>
</div>
</div>
</el-col>
- <el-col :span="18">
+ <el-col :span="15">
<div class="grid-content bg-purple">
<template>
<el-form :model="form">
@@ -736,6 +737,11 @@
};
this.resetForm("form");
},
+ hb(){
+ if (this.queryParams.tjNum != undefined) {
+ this.handleQuery();
+ }
+ },
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
@@ -795,6 +801,7 @@
// 琛ュ綍椤圭洰
handleProject(row) {
+ this.loading = true;
this.orderId = row.orderId;
this.cusId = row.tjCusIdCard;
this.userId = row.userId;
@@ -812,12 +819,14 @@
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
projectGetList().then((response) => {
this.Treedata = response.data.list;
+ this.loading = false;
});
this.Projectopen = true;
this.title = "琛ュ綍椤圭洰";
},
// 琛ュ綍椤圭洰
handleProject1(row) {
+ this.loading = true;
this.orderId = this.ids;
this.cusId = this.cusIds;
this.userId = this.userIds;
@@ -835,6 +844,7 @@
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
projectGetList().then((response) => {
this.Treedata = response.data.list;
+ this.loading = false;
});
this.Projectopen1 = true;
this.title = "琛ュ綍椤圭洰";
@@ -870,7 +880,10 @@
this.list1 = false;
this.DataList.forEach((item) => {
this.TotalPrice1 = item.proPrice + this.TotalPrice1;
- this.proIds.push(item.proId);
+ item.tjProjectList.forEach(item1 => {
+ this.proIds.push(item1.proId);
+ })
+
});
}
},
@@ -1046,7 +1059,10 @@
display: flex;
margin-top: 8px;
}
-
+.tab3{
+ max-height: 500px;
+ overflow-y:auto;
+}
.outside1 {
width: 700px;
display: flex;
--
Gitblit v1.8.0