From 088e45c9ee4633e543247ecf8675215e2119ac7d Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 21 四月 2025 18:11:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
src/views/hosp/order/index.vue | 271 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 203 insertions(+), 68 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index deb3d93..acae123 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -156,17 +156,28 @@
<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>
<el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-download"
size="mini"
@click="handleExport"
+ :disabled="singles"
+ v-hasPermi="['hosp:order:export']"
+ >瀵煎嚭</el-button
+ >
+ </el-col> -->
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="exportDialogVisible = true"
v-hasPermi="['hosp:order:export']"
>瀵煎嚭</el-button
>
@@ -178,7 +189,7 @@
size="mini"
@click="handleRevoke"
:loading="isLoading"
- :disabled="single"
+ :disabled="singles"
>鎾ら攢绛惧埌</el-button
>
</el-col>
@@ -263,6 +274,7 @@
border
v-loading="loading"
:data="orderList"
+ ref="tableRef"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -806,18 +818,21 @@
border
style="width: 100%; table-layout: fixed"
height="560"
- :span-method="objectspanmethod">
- <el-table-column
- prop="propinName"
+ :span-method="objectspanmethod"
+ >
+ <el-table-column
+ prop="propinName"
label="妫�鏌ラ」鐩�"
width="200px"
- :show-overflow-tooltip="true">
+ :show-overflow-tooltip="true"
+ >
</el-table-column>
- <el-table-column
- prop="proName"
+ <el-table-column
+ prop="proName"
label="鏄庣粏椤圭洰"
width="200px"
- :show-overflow-tooltip="true">
+ :show-overflow-tooltip="true"
+ >
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
@@ -960,7 +975,6 @@
<div class="tab8">
<el-row :gutter="20" style="width: 100%">
<el-col :span="22">
-
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
v-model="filterage"
@@ -1027,18 +1041,21 @@
border
style="width: 100%; table-layout: fixed"
height="560"
- :span-method="objectspanmethod">
- <el-table-column
- prop="propinName"
+ :span-method="objectspanmethod"
+ >
+ <el-table-column
+ prop="propinName"
label="妫�鏌ラ」鐩�"
width="200px"
- :show-overflow-tooltip="true">
+ :show-overflow-tooltip="true"
+ >
</el-table-column>
- <el-table-column
- prop="proName"
+ <el-table-column
+ prop="proName"
label="鏄庣粏椤圭洰"
width="200px"
- :show-overflow-tooltip="true">
+ :show-overflow-tooltip="true"
+ >
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
@@ -1239,49 +1256,109 @@
</el-dialog>
<el-dialog
- :title="title"
- :visible.sync="open"
- width="1400px"
- append-to-body
- :close-on-click-modal="false"
- class="custom-dialog"
->
- <el-tabs v-model="activeName1" type="card">
- <el-tab-pane label="椤圭洰姹囨��" name="second" style="height: 400px">
- <el-table :data="huizongList" style="width: 100%" max-height="350">
- <el-table-column align="center" type="index" label="搴忓彿" width="50"></el-table-column>
- <el-table-column align="center" prop="parent_pro_name" label="椤圭洰"></el-table-column>
- <el-table-column align="center" prop="ks" label="绉戝"></el-table-column>
- <el-table-column align="center" prop="price" label="璐圭敤鍚堣"></el-table-column>
- </el-table>
- <h3>浠樻璇︽儏</h3>
- <el-table :data="bill" style="width: 100%; margin-top: 10px;">
- <el-table-column align="center" prop="copeWith" label="搴斾粯"></el-table-column>
- <el-table-column align="center" prop="discount" label="鎶樻墸"></el-table-column>
- <el-table-column align="center" prop="paidIn" label="瀹炰粯"></el-table-column>
- </el-table>
- </el-tab-pane>
- <el-tab-pane label="鏄庣粏椤圭洰" name="third" style="height: 450px;"> <!-- 绉婚櫎 overflow-y: auto -->
- <el-table
- :data="infoList"
- style="width: 100;"
- max-height="500"
- :span-method="objectSpanMethod1"
- >
- <el-table-column align="center" type="index" label="搴忓彿" width="50"></el-table-column>
- <el-table-column align="center" prop="parent_pro_name" label="鐖堕」"></el-table-column>
- <el-table-column align="center" prop="pro_name" label="瀛愰」"></el-table-column>
- <el-table-column align="center" prop="danjia" label="鍗曚环"></el-table-column>
- <el-table-column align="center" prop="num" label="鏁伴噺"></el-table-column>
- <el-table-column align="center" prop="zongjia" label="鎬讳环"></el-table-column>
- <el-table-column align="center" prop="time" label="寮�鍗曟椂闂�" width="180"></el-table-column>
- </el-table>
-</el-tab-pane>
- </el-tabs>
- <div slot="footer" class="dialog-footer">
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
-</el-dialog>
+ :title="title"
+ :visible.sync="open"
+ width="1400px"
+ append-to-body
+ :close-on-click-modal="false"
+ class="custom-dialog"
+ >
+ <el-tabs v-model="activeName1" type="card">
+ <el-tab-pane label="椤圭洰姹囨��" name="second" style="height: 400px">
+ <el-table :data="huizongList" style="width: 100%" max-height="350">
+ <el-table-column
+ align="center"
+ type="index"
+ label="搴忓彿"
+ width="50"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="parent_pro_name"
+ label="椤圭洰"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="ks"
+ label="绉戝"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="price"
+ label="璐圭敤鍚堣"
+ ></el-table-column>
+ </el-table>
+ <h3>浠樻璇︽儏</h3>
+ <el-table :data="bill" style="width: 100%; margin-top: 10px">
+ <el-table-column
+ align="center"
+ prop="copeWith"
+ label="搴斾粯"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="discount"
+ label="鎶樻墸"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="paidIn"
+ label="瀹炰粯"
+ ></el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="鏄庣粏椤圭洰" name="third" style="height: 450px">
+ <!-- 绉婚櫎 overflow-y: auto -->
+ <el-table
+ :data="infoList"
+ style="width: 100"
+ max-height="500"
+ :span-method="objectSpanMethod1"
+ >
+ <el-table-column
+ align="center"
+ type="index"
+ label="搴忓彿"
+ width="50"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="parent_pro_name"
+ label="鐖堕」"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="pro_name"
+ label="瀛愰」"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="danjia"
+ label="鍗曚环"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="num"
+ label="鏁伴噺"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="zongjia"
+ label="鎬讳环"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="time"
+ label="寮�鍗曟椂闂�"
+ width="180"
+ ></el-table-column>
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
<el-dialog
:title="title1"
@@ -1470,6 +1547,21 @@
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
</el-dialog>
+
+ <el-dialog
+ title="璇烽�夋嫨瀵煎嚭鑼冨洿"
+ :visible.sync="exportDialogVisible"
+ width="30%"
+ >
+ <el-radio-group v-model="exportType">
+ <el-radio :label="'0'">褰撳墠椤垫暟鎹�</el-radio>
+ <el-radio :label="'1'">鍏ㄩ儴鏁版嵁</el-radio>
+ </el-radio-group>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="exportDialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="confirmExport">纭畾</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -1497,7 +1589,7 @@
getaddtTransition,
getProParentIdDxList,
getProSonDxList,
- getaddtTransition1
+ getaddtTransition1,
} from "@/api/system/tijian";
import {
SubmitCompany,
@@ -1600,10 +1692,11 @@
dataObj: {},
// 闈炲崟涓鐢�
single: true,
+ singles: false,
activeNames: "first",
// 闈炲涓鐢�
multiple: true,
- tjNUms:[],
+ tjNUms: [],
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
userId: "",
@@ -1620,6 +1713,8 @@
// 鏃ユ湡鑼冨洿
datetimerange: [],
marryalls: 0,
+ exportDialogVisible: false, // 鎺у埗寮规
+ exportType: "0", // dqyorqbsj 鐨勫�硷紝榛樿褰撳墠椤�
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -1954,7 +2049,7 @@
});
},
- ResumeAppointment(){
+ ResumeAppointment() {
this.isLoading = true;
this.$confirm("鎮ㄧ‘璁よ鎭㈠棰勭害锛�", "纭淇℃伅", {
distinguishCancelAndClose: true,
@@ -2191,6 +2286,7 @@
this.ids = selection.map((item) => item.orderId);
this.single = selection.length !== 1;
this.multiple = !selection.length;
+ this.singles = selection.length !== 1;
if (tjNUms.length > 0) {
shijianzhou(tjNUms).then((res) => {
this.shijianlist = res.data;
@@ -2497,7 +2593,7 @@
renderContent(h, { node, data, store }) {
return (
<span class="custom-tree-node">
- <span>{node.label}</span>
+ <span>{node.label}</span>
<span>({data.proPrice}鍏�)</span>
</span>
);
@@ -2515,6 +2611,10 @@
this.cusId = row.tjCusIdCard;
this.userId = row.userId;
console.log(row, 666);
+ this.$nextTick(() => {
+ this.$refs.tableRef.clearSelection(); // 娓呴櫎鎵�鏈夐�変腑
+ this.$refs.tableRef.toggleRowSelection(row, true); // 閫変腑褰撳墠琛�
+ });
this.customer = {
cusIdcard: row.tjCusIdCard,
@@ -2961,6 +3061,8 @@
proIds: this.proIds,
};
getaddtTransition1(data).then((response) => {
+ console.log(123456789);
+
if (response.code === 200) {
// this.DataList3 = [];
// this.DataList = [];
@@ -3042,16 +3144,49 @@
this.Projectssopen = false;
});
},
-
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
+ this.$confirm("璇烽�夋嫨瀵煎嚭鑼冨洿", "瀵煎嚭鏁版嵁", {
+ distinguishCancelAndClose: true,
+ confirmButtonText: "瀵煎嚭鍏ㄩ儴",
+ cancelButtonText: "浠呭鍑哄綋鍓嶉〉",
+ type: "warning",
+ })
+ .then(() => {
+ // 鐢ㄦ埛鐐瑰嚮浜嗏�滃鍑哄叏閮ㄢ��
+ this.exportData(true);
+ })
+ .catch((action) => {
+ if (action === "cancel") {
+ // 鐢ㄦ埛鐐瑰嚮浜嗏�滀粎瀵煎嚭褰撳墠椤碘��
+ this.exportData(false);
+ }
+ });
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ /* handleExport() {
+ console.log(this.queryParams);
this.download(
- "hosp/order/export",
+ "/hosp/order/exportOrderList",
{
...this.queryParams,
},
`order_${new Date().getTime()}.xlsx`
);
+ }, */
+ confirmExport() {
+ this.exportDialogVisible = false;
+
+
+ const exportParams = {
+ ...this.queryParams,
+ dqyorqbsj: this.exportType, // 娣诲姞杩欎釜瀛楁
+ };
+
+ this.download(
+ "/hosp/order/exportOrderList",
+ exportParams,
+ `order_${new Date().getTime()}.xlsx`
+ );
},
},
};
--
Gitblit v1.8.0