From a6d61cacba774058635113be2ceefe3d7443375f Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 14 七月 2025 14:09:18 +0800
Subject: [PATCH] 1

---
 src/views/doctor/checkAll/index.vue |   18 +++++++++++++++---
 src/components/proposal/index.vue   |   23 ++++++++++++++++++++++-
 src/views/system/keyword/index.vue  |   13 ++++++++++++-
 3 files changed, 49 insertions(+), 5 deletions(-)

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..8cbd8d5 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -962,13 +962,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";
@@ -1189,6 +1190,7 @@
       yichangList: [],
       fcList: [],
       statusList: [],
+      mrjy:"",
       queryParam: {
         pageNum: 1,
         pageSize: 10,
@@ -1987,10 +1989,20 @@
 
     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;
       if (this.textarea1 == null) {
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