From 76af820e2e11366b322705b51c351ace3d40608a Mon Sep 17 00:00:00 2001 From: qx <1084500556@qq.com> Date: 星期二, 01 七月 2025 16:46:04 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region --- src/components/proposal/index.vue | 78 ++++++++++++++++++++++++++++++-------- 1 files changed, 61 insertions(+), 17 deletions(-) diff --git a/src/components/proposal/index.vue b/src/components/proposal/index.vue index 0d8f006..58d3474 100644 --- a/src/components/proposal/index.vue +++ b/src/components/proposal/index.vue @@ -16,16 +16,16 @@ </el-form-item> </el-form> --> - <el-form inline> + <el-form inline @submit.native.prevent="search"> <el-form-item> <el-radio-group v-model="tjproposal" @input="radiotjproposalChange"> - <el-radio-button label="0">蹇嵎寤鸿</el-radio-button> - <el-radio-button label="1">甯哥敤寤鸿</el-radio-button> + <el-radio-button label="0">甯哥敤寤鸿</el-radio-button> + <el-radio-button label="1">蹇嵎寤鸿</el-radio-button> </el-radio-group> </el-form-item> <el-form-item v-show="tjproposal == 0"> <el-input - v-model="searchAdv" + v-model="queryParams1.zyzd" style="width: 180px" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" clearable @@ -39,6 +39,7 @@ <el-table :data="dataList" + v-if="tjproposal == 1" ref="elTable" v-loading="loading" @selection-change="handleSelectionChange" @@ -62,13 +63,50 @@ prop="createTime" /> --> </el-table> - <div class="pag"> + <el-table + :data="dataList" + v-else + ref="elTable" + v-loading="loading" + @selection-change="handleSelectionChange" + border + height="500px" + > + <el-table-column type="selection" width="40" align="center" /> + <el-table-column label="绉戝" prop="ks" width="100" align="center" /> + <el-table-column label="寤鸿鍚嶇О" prop="jymc" align="center" /> + <el-table-column label="寤鸿鍐呭" prop="jynr" align="center" /> + <!-- <el-table-column + label="鍒涘缓浜�" + align="center" + prop="createBy" + width="110px" + /> + <el-table-column + label="鍒涘缓鏃堕棿" + width="160px" + align="center" + prop="createTime" + /> --> + </el-table> + <div class="pag" v-if="tjproposal == 1"> <div class="pag1"> <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize" + @pagination="radiotjproposalChange" + /> + </div> + </div> + <div class="pag" v-else> + <div class="pag1"> + <pagination + v-show="total > 0" + :total="total" + :page.sync="queryParams1.pageNum" + :limit.sync="queryParams1.pageSize" @pagination="radiotjproposalChange" /> </div> @@ -86,6 +124,7 @@ getKjTjAdviceKjbqBySex, getCyTjAdviceKjbqBySex, } from "@/api/hosp/project"; +import { listAdvicerules } from "@/api/hosp/advicerules"; import { getInfo } from "@/api/login"; export default { name: "Packagese", @@ -105,6 +144,11 @@ // 閬僵灞� loading: false, searchAdv: "", + queryParams1: { + pageNum: 1, + pageSize: 10, + zyzd: "", + }, queryParams: { sex: "", isZj: "", @@ -112,7 +156,7 @@ page: 1, pageSize: 10, jynr: "", - jybt:"" + jybt: "", }, list: [], fList: {}, @@ -148,9 +192,9 @@ }, getList() { this.loading = true; - getKjTjAdviceKjbqBySex(this.queryParams).then((res) => { - this.dataList = res.data.records; - this.total = res.data.total; + listAdvicerules(this.queryParams1).then((res) => { + this.dataList = res.rows; + this.total = res.total; this.loading = false; }); }, @@ -166,20 +210,20 @@ console.log(this.list); }, search() { - this.queryParams.jybt = this.searchAdv; - this.queryParams.page = 1; + // this.queryParams.jybt = this.searchAdv; + // this.queryParams.page = 1; this.loading = true; - getKjTjAdviceKjbqBySex(this.queryParams).then((res) => { - this.dataList = res.data.records; - this.total = res.data.total; + listAdvicerules(this.queryParams1).then((res) => { + this.dataList = res.rows; + this.total = res.total; this.loading = false; }); }, radiotjproposalChange() { if (this.tjproposal == "0") { this.searchAdv = ""; - this.queryParams.isZj = this.fList.isZj; - this.queryParams.userId = null; + // this.queryParams.isZj = this.fList.isZj; + // this.queryParams.userId = null; this.getList(); } else { this.loading = true; @@ -220,7 +264,7 @@ .pag1 { width: 30%; } -::v-deep .el-dialog__body{ +::v-deep .el-dialog__body { padding: 7px 20px; } </style> -- Gitblit v1.8.0