From 1b872f5fc748553c7a3d9e8758f2b498aae99e2a Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 07 七月 2025 10:10:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
src/views/doctor/checkAll/index.vue | 98 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 69 insertions(+), 29 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 82d066e..1365eaa 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -809,9 +809,10 @@
border
style="width: 100%"
:header-cell-style="{ background: '#67C23A' }"
- :expand-row-keys="expends"
+
:row-key="getRowKeys"
>
+ <!-- :expand-row-keys="expends" -->
<el-table-column type="expand">
<template slot-scope="props">
<div style="padding: 10px">
@@ -911,6 +912,23 @@
label="鍗曚綅"
width="78"
></el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ width="60"
+ fixed="right"
+ >
+ <template slot-scope="props">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="shanchu(props.row)"
+ >
+ </el-button>
+ </template>
+ </el-table-column>
</el-table>
</template>
<template v-if="item.jyjc == '1'">
@@ -921,9 +939,9 @@
border
style="width: 100%"
:header-cell-style="{ background: '#67C23A' }"
- :expand-row-keys="expends"
:row-key="getRowKeys"
>
+ <!-- :expand-row-keys="expends" -->
<el-table-column type="expand">
<template slot-scope="props">
<div style="padding: 10px">
@@ -1014,6 +1032,23 @@
label="妫�娴嬬粨鏋�"
width="403"
></el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ width="60"
+ fixed="right"
+ >
+ <template slot-scope="props">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="shanchu(props.row)"
+ >
+ </el-button>
+ </template>
+ </el-table-column>
</el-table>
</template>
</div>
@@ -2590,21 +2625,22 @@
yichanghuifu() {
this.loading = true;
let tjNum = this.tjNumber;
- huiFuyichangxiangmu(tjNum).then((res) => {
- this.status1 = 4;
- this.ychfList = res.data;
- if(this.ychfList.length == 0){
- this.message.success("鏆傛棤寮傚父鎭㈠椤圭洰")
- }
- })
- .catch((error)=>{
- console.error("鑾峰彇椤圭洰澶辫触锛�",error);
-
- this.$message.error("鑾峰彇椤圭洰澶辫触")
- })
- .finally(()=>{
- this.loading = false;
- })
+ huiFuyichangxiangmu(tjNum)
+ .then((res) => {
+ this.status1 = 4;
+ this.ychfList = res.data;
+ if (this.ychfList.length == 0) {
+ this.message.success("鏆傛棤寮傚父鎭㈠椤圭洰");
+ }
+ })
+ .catch((error) => {
+ console.error("鑾峰彇椤圭洰澶辫触锛�", error);
+
+ this.$message.error("鑾峰彇椤圭洰澶辫触");
+ })
+ .finally(() => {
+ this.loading = false;
+ });
},
hfyc(id) {
this.$confirm("纭瑕佹仮澶嶈椤瑰悧锛�", "鎻愮ず", {
@@ -3260,7 +3296,10 @@
getTjdetailList(data)
.then((response) => {
if (response.code === 200) {
- this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ // this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ this.$modal.msgSuccess(
+ response.msg
+ );
// 娓呯┖瀛楁
this.zhiyeJl = "";
this.zhiyeJg = "";
@@ -3275,17 +3314,18 @@
addOrder(dataList)
.then((res) => {
if (res.code == 200) {
- gettoPdf(tjNumber)
- .then((res) => {
- this.$modal.msgSuccess(
- "宸茬敓鎴愭姤鍛婏紒璇峰墠寰�鎶ュ憡鏍告敹椤甸潰纭锛�"
- );
- })
- .catch(() => {
- this.$modal.msgError(
- "鎵撳嵃鎶ュ憡澶辫触锛岃鍓嶅線鎶ュ憡鎵撳嵃椤甸潰琛ユ墦鎶ュ憡锛�"
- );
- });
+
+ // gettoPdf(tjNumber)
+ // .then((res) => {
+ // this.$modal.msgSuccess(
+ // "宸茬敓鎴愭姤鍛婏紒璇峰墠寰�鎶ュ憡鏍告敹椤甸潰纭锛�"
+ // );
+ // })
+ // .catch(() => {
+ // this.$modal.msgError(
+ // "鎵撳嵃鎶ュ憡澶辫触锛岃鍓嶅線鎶ュ憡鎵撳嵃椤甸潰琛ユ墦鎶ュ憡锛�"
+ // );
+ // });
const statePromise = getfiedState(reportData).then(() => {
this.drawer = false;
});
--
Gitblit v1.8.0