From d0ba1fd79cf71e389a95123358ce951b34811454 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 15 七月 2025 15:56:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
src/views/doctor/checkAll/index.vue | 48 ++++++++++++++++++++----
src/components/proposal/index.vue | 23 +++++++++++
src/views/system/keyword/index.vue | 13 ++++++
src/api/doctor/checkAll.js | 10 +++++
4 files changed, 84 insertions(+), 10 deletions(-)
diff --git a/src/api/doctor/checkAll.js b/src/api/doctor/checkAll.js
index b3622e0..f40602c 100644
--- a/src/api/doctor/checkAll.js
+++ b/src/api/doctor/checkAll.js
@@ -186,3 +186,13 @@
})
}
+// 鎾ら攢鎸夐挳
+export function chexiao(tjNUm,proId) {
+ return request({
+ url: '/hosp/order/chushenyemianchexiaojiekou',
+ method: 'get',
+ params: { tjNUm: tjNUm, proId: proId }
+ })
+}
+
+
diff --git a/src/components/proposal/index.vue b/src/components/proposal/index.vue
index 61d0bb6..5a9e021 100644
--- a/src/components/proposal/index.vue
+++ b/src/components/proposal/index.vue
@@ -81,6 +81,12 @@
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column label="缂栫爜" width="70" align="center" prop="id" />
+ <el-table-column
+ label="鐢ㄦ埛鍚�"
+ width="70"
+ align="center"
+ prop="userName"
+ />
<el-table-column label="鏍囬" width="120" align="center" prop="title" />
<el-table-column label="寤鸿鍐呭" align="left" prop="advice" />
<!-- <el-table-column
@@ -127,6 +133,7 @@
name: "Packagese",
props: {
cusobj: Object,
+ mrjy: String,
},
data() {
return {
@@ -168,12 +175,26 @@
this.fList = val;
this.queryParams.sex = val.sex;
this.queryParams.isZj = val.isZj;
- this.tjproposal = "0";
+ // this.tjproposal = "0";
this.getList();
+ },
+ mrjy(val) {
+ /* if (val === "Y") {
+ this.tjproposal = "1"; // 榛樿閫変腑鈥滃父鐢ㄥ缓璁��
+ this.radiotjproposalChange("1"); // 鎵嬪姩瑙﹀彂鐩稿叧閫昏緫
+ } */
+ const mode = val === "Y" ? "1" : "0";
+ this.setTjProposal(mode);
},
},
methods: {
+ setTjProposal(mode) {
+ if (this.tjproposal !== mode) {
+ this.tjproposal = mode;
+ this.radiotjproposalChange(mode); // 鎵ц鍒囨崲閫昏緫
+ }
+ },
getAllList() {
this.loading = true;
this.openone = true;
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 1964efc..e5abf96 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -575,16 +575,17 @@
<el-table-column align="center" prop="proName" label="椤圭洰" width="260"></el-table-column>
<el-table-column label="鐘舵��" align="center" prop="type" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
- <span v-if="scope.row.type == '0'">鏈鏍�</span>
- <span v-if="scope.row.type == '1'">宸插鏍�</span>
+ <span v-if="scope.row.type == '0'">鏈</span>
+ <span v-if="scope.row.type == '1'">宸叉</span>
<span v-if="scope.row.type == '2'">寮冩</span>
<span v-if="scope.row.type == '3'">寤舵湡</span>
</template>
</el-table-column>
- <el-table-column label="妫�鏌ユ椂闂�" align="center" prop="bcupdateTime" width="160" />
- <el-table-column label="鎿嶄綔" align="center" width="130px">
+ <el-table-column label="妫�鏌ユ椂闂�" align="center" prop="bcupdateTime" :formatter="formatDate" width="160" />
+ <el-table-column label="鎿嶄綔" align="center" width="80px">
<template slot-scope="scope">
- <el-button type="primary" size="mini" @click="huifu" v-if="scope.row.type == '2'">鎭㈠</el-button>
+ <el-button type="primary" size="mini" @click="huifu(scope.row)" v-if="scope.row.type == '2'">鎭㈠</el-button>
+ <el-button type="primary" size="mini" @click="chexiao(scope.row)" v-if="scope.row.type == '1'">鎾ら攢</el-button>
</template>
</el-table-column>
</el-table>
@@ -962,13 +963,14 @@
</el-dialog>
<Packages ref="bbb" :baogao="baogao" />
<Prescription ref="Pre" :preObj="preObj" />
- <proposal ref="proposal" :cusobj="cusobj" @event1="eventchange($event)" />
+ <proposal ref="proposal" :cusobj="cusobj" :mrjy="mrjy" @event1="eventchange($event)" />
<createproposal ref="createproposal" :creatobj="creatobj" />
<el-dialog title="甯哥敤寤鸿缁存姢" :visible.sync="propdialog" width="500px" append-to-body></el-dialog>
</div>
</template>
<script>
import _ from "lodash";
+import { getConfigKey } from "@/api/system/config";
import jianqianwenzhen from "@/components/jianqianwenzhen";
import Packages from "@/components/Packages";
import Prescription from "@/components/Prescription";
@@ -992,6 +994,7 @@
UpdFcPro,
huiFuyichangxiangmu,
hfbt,
+ chexiao
} from "@/api/doctor/checkAll";
import { getInfoById } from "@/api/hosp/history";
import { getInfo } from "@/api/login";
@@ -1189,6 +1192,7 @@
yichangList: [],
fcList: [],
statusList: [],
+ mrjy:"",
queryParam: {
pageNum: 1,
pageSize: 10,
@@ -1348,6 +1352,12 @@
this.cancelAdviceDialog();
done();
}
+ },
+
+ formatDate(row) {
+ if (!row.qdcreateTime) return "";
+ const date = moment(row.qdcreateTime, "YYYY-MM-DD");
+ return date.isValid() ? date.format("YYYY-MM-DD") : "鏃犳晥鏃ユ湡";
},
handleAdviceBlur(row, index) {
@@ -1625,6 +1635,7 @@
this.loading = false;
});
},
+
guanbi() {
this.drawer = false;
@@ -1987,9 +1998,19 @@
propoChange() {
this.cusobj = { sex: this.tableAll.cusSex, isZj: 0 };
- this.$refs.proposal.open = true;
- this.$refs.proposal.title = "寤鸿鏂规";
+ getConfigKey("mrzscyjy").then((res) => {
+ this.mrjy = res.msg; // 浼氳Е鍙� watch 鈫� 璁剧疆 tjproposal = "1"
+ console.log(res,4444);
+
+ // 绛夋暟鎹姸鎬佸噯澶囧ソ鍚庡啀鎵撳紑寮圭獥
+ this.$refs.proposal.title = "寤鸿鏂规";
+ this.$refs.proposal.open = true;
+ });
+
},
+
+
+
eventchange(data) {
this.dataText = data;
@@ -2121,6 +2142,17 @@
const proId = row.proId;
huifu(tjNUm, proId).then((res) => {
if (res.code == 200) {
+ this.$message.success("鎭㈠鎴愬姛");
+ this.xiangmuqingkuang();
+ }
+ });
+ },
+ chexiao(row) {
+ const tjNUm = this.tjNumber;
+ const proId = row.proId;
+ chexiao(tjNUm, proId).then((res) => {
+ if (res.code == 200) {
+ this.$message.success("鎾ら攢鎴愬姛");
this.xiangmuqingkuang();
}
});
diff --git a/src/views/system/keyword/index.vue b/src/views/system/keyword/index.vue
index 5ba2d1b..309fb1d 100644
--- a/src/views/system/keyword/index.vue
+++ b/src/views/system/keyword/index.vue
@@ -90,7 +90,13 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="id" width="80" />
+ <el-table-column
+ label="搴忓彿"
+ align="center"
+ type="index"
+ :index="indexMethod"
+ width="80"
+ />
<el-table-column label="鍏抽敭瀛�" align="center" prop="gjz" />
<el-table-column
label="鎿嶄綔"
@@ -198,6 +204,11 @@
this.loading = false;
});
},
+
+ indexMethod(index) {
+ return index + 1; // 浠�100寮�濮嬬紪鍙�
+ },
+
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
--
Gitblit v1.8.0