From 44abccb72072ef05474b06ed790f069c85c24faf Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 28 十月 2024 15:35:02 +0800
Subject: [PATCH] 10.28
---
src/views/hosp/order/index.vue | 139 +++++++++++++++++++++++++++++++--------------
1 files changed, 95 insertions(+), 44 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index a2d0947..3a7b1ce 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -246,7 +246,10 @@
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
- <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
+ <dict-tag
+ :options="dict.type.dict_team"
+ :value="scope.row.tjType"
+ />
<!-- <span v-if="scope.row.tjType == '2'">涓汉</span>
<span v-if="scope.row.tjType == '1'">鍥㈤槦</span> -->
</template>
@@ -857,9 +860,9 @@
</el-tab-pane>
<el-tab-pane label="鍗曢」" name="third">
<div class="tab8">
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="22">
- <!-- <div
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="22">
+ <!-- <div
style="
text-align: center;
margin-bottom: 10px;
@@ -868,29 +871,29 @@
>
椤圭洰鍒楄〃
</div> -->
- <el-input
- placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
- v-model="filterText"
- >
- </el-input>
- <div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="Treedata"
- :props="defaultProps"
- show-checkbox
- node-key="proId"
- @check="handleCurrentChecked"
- :default-checked-keys="checkedkey"
- :filter-node-method="filterNode"
- ref="tree"
- :render-content="renderContent"
+ <el-input
+ placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+ v-model="filterText"
>
- </el-tree>
- </div>
- </el-col>
- <!-- <el-col :span="11">
+ </el-input>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="Treedata"
+ :props="defaultProps"
+ show-checkbox
+ node-key="proId"
+ @check="handleCurrentChecked"
+ :default-checked-keys="checkedkey"
+ :filter-node-method="filterNode"
+ ref="tree"
+ :render-content="renderContent"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <!-- <el-col :span="11">
<div
style="
text-align: center;
@@ -918,7 +921,7 @@
</div>
</div>
</el-col> -->
- <!-- <el-col :span="11">
+ <!-- <el-col :span="11">
<div class="grid-content bg-purple">
<div
style="
@@ -966,7 +969,7 @@
</template>
</el-table-column>
</el-table> -->
- <!-- <el-collapse v-model="activeName" accordion v-if="list1">
+ <!-- <el-collapse v-model="activeName" accordion v-if="list1">
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
<el-table
@@ -988,16 +991,16 @@
</el-collapse-item>
</div>
</el-collapse> -->
- <!-- </div>
+ <!-- </div>
</el-col> -->
- </el-row>
+ </el-row>
</div>
</el-tab-pane>
</el-tabs>
</div>
<div class="grid-content bg-purple">
- <div style="text-align: center; margin-bottom: 10px;margin-top:9px">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 9px">
宸查�夐」鐩垪琛�
</div>
<el-table
@@ -1414,6 +1417,7 @@
import moment from "moment";
import { getZhList, getlistByZhId } from "@/api/system/package";
import { getwater } from "@/api/hosp/customer";
+import { getInfo } from "@/api/login";
import ViewPdf from "@/components/ViewPdf";
import {
projectGetList,
@@ -1426,7 +1430,7 @@
components: {
ViewPdf,
},
- dicts: ["dict_pay_type","dict_team"],
+ dicts: ["dict_pay_type", "dict_team"],
name: "Order",
data() {
return {
@@ -1697,9 +1701,13 @@
});
},
/** 鐐瑰嚮鏄剧ず瀵兼鍗曟姤琛�*/ //lige 寮�濮�
- handleReport1(row) {
+ /* handleReport1(row) {
const tjNumber = this.tjnumbers;
const viewNum = "792931586196398080";
+ getInfo().then(((res)=>{
+ console.log(res,123);
+
+ }))
const params = { viewNum, tjNumber };
hasReport(tjNumber).then((res) => {
if (res == 1) {
@@ -1708,6 +1716,31 @@
this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒");
}
});
+ }, */
+ handleReport1(row) {
+ const tjNumber = this.tjnumbers;
+ const viewNum = "792931586196398080";
+ // 鍏堣皟鐢� getInfo 鑾峰彇 userId
+ getInfo()
+ .then((res) => {
+ console.log(res, 1111);
+
+ const dqdlr = res.user.userId; // 鑾峰彇 userId
+ console.log("User ID:", dqdlr);
+ const params = { viewNum, tjNumber, dqdlr }; // 灏� userId 鍔犲叆 params
+
+ // 鍐嶈皟鐢� hasReport 妫�鏌ユ姤鍛婄姸鎬�
+ hasReport(tjNumber).then((reportRes) => {
+ if (reportRes === 1) {
+ this.$tab.openPage("瀵艰瘖鍗�", "/report/breDailyReport", params);
+ } else {
+ this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒");
+ }
+ });
+ })
+ .catch(() => {
+ this.$message.error("鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅锛�");
+ });
},
handleRevoke() {
@@ -2016,16 +2049,35 @@
const tjNumber = this.tjnumbers;
const viewNum = "983185234038140928";
const jxbz = this.bldhid;
- const params = { viewNum, tjNumber, jxbz };
- console.log(params);
- hasReport(tjNumber).then((res) => {
+ // const params = { viewNum, tjNumber, jxbz };
+ // console.log(params);
+ getInfo()
+ .then((res) => {
+ console.log(res, 1111);
+ const dqdlr = res.user.userId; // 鑾峰彇 userId
+ const params = { viewNum, tjNumber, jxbz, dqdlr };
+
+ hasReport(tjNumber).then((res) => {
+ if (res == 1) {
+ this.$tab.openPage(
+ "瀵艰瘖鍗�",
+ "/report/budabreDailyReport",
+ params
+ );
+ this.budadaozhen = false;
+ } else {
+ this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒");
+ }
+ });
+ })
+ /* hasReport(tjNumber).then((res) => {
if (res == 1) {
this.$tab.openPage("瀵艰瘖鍗�", "/report/budabreDailyReport", params);
this.budadaozhen = false;
} else {
this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒");
}
- });
+ }); */
},
handleClick(tab, event) {
@@ -2319,9 +2371,9 @@
}
});
this.TotalPrice1 = 0;
- this.DataList3.forEach(item=>{
+ this.DataList3.forEach((item) => {
this.TotalPrice1 += item.proPrice;
- })
+ });
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -2423,9 +2475,9 @@
getaddtTransition(data).then((response) => {
if (response.code === 200) {
this.DataList = [];
- this.DataList3 = [];
- this.DataLists = [];
- this.TotalPrice1 = 0;
+ this.DataList3 = [];
+ this.DataLists = [];
+ this.TotalPrice1 = 0;
let tjType = this.form.tjType;
let copeWith = this.TotalPrice1;
let paidIn = copeWith * (this.discount / 10);
@@ -2647,11 +2699,10 @@
margin-top: 10px;
}
.box {
-
display: flex;
justify-content: space-between;
}
-.box1{
+.box1 {
width: 50%;
display: flex;
flex-direction: column;
--
Gitblit v1.8.0