From 6b25fcbe824a87a1ab57bf6a6d816ffd6d70cefb Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 03 四月 2025 10:47:29 +0800
Subject: [PATCH] qx

---
 src/views/doctor/checkAll/index.vue |    8 +++
 src/views/system/comp/index.vue     |    4 +-
 src/components/proposal/index.vue   |   70 +++++++++++++++++++++++++++++------
 src/views/system/package/index.vue  |    6 +++
 4 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/src/components/proposal/index.vue b/src/components/proposal/index.vue
index bce9ba1..472fd2a 100644
--- a/src/components/proposal/index.vue
+++ b/src/components/proposal/index.vue
@@ -25,7 +25,7 @@
         </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,9 @@
   getKjTjAdviceKjbqBySex,
   getCyTjAdviceKjbqBySex,
 } from "@/api/hosp/project";
+import {
+  listAdvicerules,
+} from "@/api/hosp/advicerules";
 import { getInfo } from "@/api/login";
 export default {
   name: "Packagese",
@@ -105,6 +146,11 @@
       // 閬僵灞�
       loading: false,
       searchAdv: "",
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+        zyzd: ''
+      },
       queryParams: {
         sex: "",
         isZj: "",
@@ -148,9 +194,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 +212,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;
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 33c4f63..8f3aaef 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -1612,8 +1612,14 @@
       if (this.textarea1 == null) {
         this.textarea1 = "";
       }
+      console.log(data)
       data.forEach((item) => {
-        this.textarea1 += item.advice;
+        if(item.advice){
+          this.textarea1 += item.advice;
+        }else{
+          this.textarea1 += item.jynr;
+        }
+        
       });
     },
     proposalChange() {
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index cf73da0..2e7d7b9 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
-  <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" label-width="auto">
+  <!-- <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" label-width="auto">
     <el-form-item label="濂楅鍚嶇О" prop="pacName">
       <el-input 
         v-model="queryParam.pacName" 
@@ -19,7 +19,7 @@
         @click="handle"
       >鎼滅储</el-button>
     </el-form-item>
-  </el-form>
+  </el-form> -->
   <el-table 
     v-loading="loading" 
     element-loading-text="姝e湪鍔犺浇涓�..." 
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index ed18da5..de2fd1b 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -488,6 +488,7 @@
       youhui: 10,
       debounceTimer: null,
       rules: {},
+      initializing: true, // 鍒濆鍖栨爣蹇�
     };
   },
   created() {
@@ -606,6 +607,7 @@
         counterPrice: null,
         limits: 10,
       };
+      this.initializing = true; 
       this.resetForm("form");
     },
     handleQuery() {
@@ -824,6 +826,7 @@
         this.pics = this.DataList.reduce((total, item) => total + item.priceOrd, 0);
         this.$nextTick(() => {
           this.$refs.tree.setCheckedKeys(this.checkedNodes);
+          this.initializing = false;
         });
       });
       this.loading = false;
@@ -836,6 +839,9 @@
       });
     },
     handleCurrentChecked(data, checked, indeterminate) {
+      if (this.initializing) {
+        return; // 鍒濆鍖栨椂涓嶅鐞�
+      }
       if (checked) {
         if (!this.DataList.some((item) => item.proId === data.proId)) {
           this.DataList.push({

--
Gitblit v1.8.0