From 42e7bee237fc87c2f8f4e20116cdc47da4842b44 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 17 七月 2025 18:32:49 +0800
Subject: [PATCH] 1
---
src/views/doctor/checkAll/index.vue | 1
dist.zip | 0
src/components/proposal/index.vue | 76 +++++++++++++++++++++++++++++++++----
src/views/hosp/commonAdvice/index.vue | 5 +-
src/api/doctor/checkAll.js | 6 ++-
5 files changed, 75 insertions(+), 13 deletions(-)
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..4f3e271
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/doctor/checkAll.js b/src/api/doctor/checkAll.js
index f40602c..e011382 100644
--- a/src/api/doctor/checkAll.js
+++ b/src/api/doctor/checkAll.js
@@ -55,8 +55,8 @@
export function getTjdetailList(data) {
return request({
url: '/check/getTjdetailList',
- method: 'put',
- params: data
+ method: 'post',
+ data: data
})
}
@@ -196,3 +196,5 @@
}
+
+
diff --git a/src/components/proposal/index.vue b/src/components/proposal/index.vue
index 5a9e021..c84e61e 100644
--- a/src/components/proposal/index.vue
+++ b/src/components/proposal/index.vue
@@ -37,6 +37,18 @@
<el-button type="primary" @click="search" v-show="tjproposal == 0"
>鎼滅储</el-button
>
+ <el-form-item v-show="tjproposal == 1">
+ <el-input
+ v-model="searchCyjy"
+ style="width: 180px"
+ placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"
+ clearable
+ @clear="search1"
+ ></el-input>
+ </el-form-item>
+ <el-button type="primary" @click="search1" v-show="tjproposal == 1"
+ >鎼滅储</el-button
+ >
</el-form>
<el-table
@@ -80,13 +92,13 @@
height="500px"
>
<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="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
@@ -109,7 +121,7 @@
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
- @pagination="radiotjproposalChange"
+ @pagination="radiotjproposalChange1"
/>
</div>
</div>
@@ -150,12 +162,15 @@
// 閬僵灞�
loading: false,
searchAdv: "",
+ searchCyjy: "",
queryParams: {
- sex: "",
- isZj: "",
- userId: "",
page: 1,
pageSize: 10,
+ jymc: "",
+ // sex: "",
+ isZj: "",
+ userId: "",
+ nr: "",
},
queryParams1: {
pageNum: 1,
@@ -173,7 +188,7 @@
cusobj(val, newVla) {
console.log(val, newVla, 1111);
this.fList = val;
- this.queryParams.sex = val.sex;
+ // this.queryParams.sex = val.sex;
this.queryParams.isZj = val.isZj;
// this.tjproposal = "0";
this.getList();
@@ -183,8 +198,8 @@
this.tjproposal = "1"; // 榛樿閫変腑鈥滃父鐢ㄥ缓璁��
this.radiotjproposalChange("1"); // 鎵嬪姩瑙﹀彂鐩稿叧閫昏緫
} */
- const mode = val === "Y" ? "1" : "0";
- this.setTjProposal(mode);
+ const mode = val === "Y" ? "1" : "0";
+ this.setTjProposal(mode);
},
},
@@ -244,9 +259,25 @@
this.loading = false;
});
},
+ search1() {
+ this.queryParams.nr = this.searchCyjy;
+ this.queryParams.page = 1;
+ this.loading = true;
+ getInfo().then((res) => {
+ this.queryParams.userId = res.user.userId;
+ this.queryParams.isZj = null;
+ getCyTjAdviceKjbqBySex(this.queryParams).then((res) => {
+ this.dataList = res.data.records;
+ this.total = res.data.total;
+
+ this.loading = false;
+ });
+ });
+ },
radiotjproposalChange() {
if (this.tjproposal == "0") {
this.searchAdv = "";
+ this.searchCyjy = "";
this.queryParams1.isZj = this.fList.isZj;
this.queryParams1.userId = null;
this.getList();
@@ -273,6 +304,33 @@
});
}
},
+ radiotjproposalChange1() {
+ if (this.tjproposal == "0") {
+ this.searchCyjy = "";
+ this.queryParams.isZj = this.fList.isZj;
+ this.queryParams.userId = null;
+ this.getList();
+ } else {
+ this.loading = true;
+ getInfo().then((res) => {
+ this.queryParams.userId = res.user.userId;
+ this.queryParams.isZj = null;
+ console.log(this.queryParams, 22222);
+ getCyTjAdviceKjbqBySex(this.queryParams).then((res) => {
+ if (res.data) {
+ this.dataList = res.data.records;
+ this.total = res.data.total;
+ } else {
+ this.dataList = [];
+ this.total = 0;
+ this.$modal.msgError(res.msg);
+ }
+ this.loading = false;
+ });
+ });
+ }
+ },
+
handleOk() {
this.open = false;
if (this.list.length != 0) {
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 327ec5e..916839f 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -733,6 +733,7 @@
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="textarea1"
:autosize="{ minRows: minRows, maxRows: maxRows }"
+ style="font-size: 16px;"
></el-input>
</el-form-item>
</el-form>
diff --git a/src/views/hosp/commonAdvice/index.vue b/src/views/hosp/commonAdvice/index.vue
index e5769c8..14c85d8 100644
--- a/src/views/hosp/commonAdvice/index.vue
+++ b/src/views/hosp/commonAdvice/index.vue
@@ -28,6 +28,7 @@
height="580px">
<el-table-column type="selection" width="40" align="center" />
<el-table-column label="搴忓彿" width="70" align="center" prop="newID" />
+ <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 label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="100px">
@@ -46,10 +47,10 @@
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" label-width="80px" :inline="true">
<el-form-item label="鏍囬" prop="title">
- <el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" style="width: 200px" />
+ <el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" style="width: 780px" />
</el-form-item>
<el-form-item label="鍐呭" prop="advice">
- <el-input v-model="form.advice" type="textarea" placeholder="璇疯緭鍏ヤ富瑕佸唴瀹�" style="width: 780px" />
+ <el-input v-model="form.advice" type="textarea" :rows="20" placeholder="璇疯緭鍏ヤ富瑕佸唴瀹�" style="width: 780px" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
--
Gitblit v1.8.0