26a983e0c22f1fe54c91c66c2b52888858e52cd1..50e2b67bcd84decac4c6be19271fcab2fd61c28c
2025-08-01 lkk
1
50e2b6 对比 | 目录
2025-08-01 qx
tj
d3ea99 对比 | 目录
2025-08-01 qx
qx
ebe4f1 对比 | 目录
2025-08-01 lkk
1
6a341a 对比 | 目录
4个文件已修改
109 ■■■■■ 已修改文件
src/components/public/index.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doctor/checkAll/index.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/comp/index.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/public/index.vue
@@ -60,11 +60,12 @@
            :data="dataList"
            ref="multipleTable"
            v-loading="loading"
            row-key="aid"
            @selection-change="handleSelectionChange"
            border
            height="480px"
          >
            <el-table-column type="selection" width="40" align="center" />
            <el-table-column type="selection" width="40" align="center" :reserve-selection="true"/>
            <el-table-column
              label="序号"
              type="index"
@@ -180,7 +181,7 @@
      queryParams: {
        ruleStr: "",
        pageNum: 1,
        pageSize: 10,
        pageSize: 50,
      },
      list: [],
      fList: {},
@@ -190,7 +191,6 @@
  },
  watch: {
    checkStatus(newValue) {
      console.log(565658);
      if (newValue === "1") {
        this.updateData(this.proResult, this.conclusion);
      }
@@ -263,10 +263,7 @@
      if (this.checkStatus == 1) {
        this.form.jcsj = proResult; // 更新检查所见
        this.form.desc = conclusion; // 更新检查结论
      } else {
        this.form.desc = "";
        this.form.jcsj = "";
      }
      }
      if (this.list.length != 0) {
        let desc = "";
@@ -279,8 +276,11 @@
          .map((item) => item.yxbx)
          .filter(Boolean)
          .join(",");
        this.form.jcsj = this.form.jcsj + jcsj; // 更新检查所见
        this.form.desc = this.form.desc + desc;
        this.form.jcsj = jcsj; // 更新检查所见
        this.form.desc =  desc;
      }else {
        this.form.desc = "";
        this.form.jcsj = "";
      }
    },
@@ -339,6 +339,7 @@
        this.$emit("add", this.form.desc, this.form.jcsj);
        this.resetForm();
        this.open = false;
         this.$refs.multipleTable.clearSelection();
      } catch (error) {
        console.error("处理数据失败:", error);
        this.$message.error("操作失败");
@@ -355,6 +356,7 @@
    },
    callcolos() {
      this.open = false;
       this.$refs.multipleTable.clearSelection();
    },
  },
  computed: {
src/views/doctor/checkAll/index.vue
@@ -744,13 +744,14 @@
                  type="primary"
                  @click.stop="rowClick"
                  icon="el-icon-edit-outline"
                  :disabled="isdisabled || isLoading"
                  >开处方</el-button
                >
                <div v-if="tjproject == '0'">
                  <el-button
                    type="primary"
                    @click="determine"
                    :disabled="isdisabled"
                    :disabled="isdisabled || isLoading"
                    >提交并生成报告</el-button
                  >
                </div>
@@ -2593,8 +2594,9 @@
    },
    yichangjieguo() {
      this.loading = true;
      this.isLoading = true;
      // 移除表格loading状态,避免在点击详情时显示表格loading框
      // this.loading = true;
      // 不要在这里设置 isLoading = true,因为它在 handleClick 中已经被设置了
      this.status1 = 0;
      getConfigKey("kzycxmsfzk").then((res) => {
        this.shouldExpand = res.msg;
@@ -2612,9 +2614,11 @@
          const data = res.data;
          if (!data || data.length === 0) {
            this.$message.warning("暂无异常报告");
            this.loading = false;
            this.isLoading = false; // 关闭整体加载框
            // 移除警告消息,用户不希望看到"暂无异常报告"的弹框
            // this.$message.warning("暂无异常报告");
            // 移除表格loading状态设置
            // this.loading = false;
            // 不在这里关闭 isLoading,因为它由 handleClick 管理
            resolve(); // 返回 Promise,但不继续后续逻辑
            return;
          }
@@ -2629,9 +2633,9 @@
              }
            });
          });
          if (!this.yichangList) {
          /* if (!this.yichangList) {
            this.$message.warning("暂无异常报告");
          }
          } */
          resolve(); // 成功完成
          // 这里也可以根据shouldExpand再调用一次getExpends,确保数据已加载
          if (this.shouldExpand === "Y" || this.shouldExpand === "y") {
@@ -2642,20 +2646,18 @@
        });
      })
        .catch((error) => {
          this.isLoading = false;
          this.loading = false;
          // 不在这里关闭 isLoading,因为它由 handleClick 管理
          // 移除表格loading状态设置
          // this.loading = false;
          console.error("获取异常结果失败:", error);
          this.$message.error("获取异常结果失败");
          reject(error); // 返回错误
        })
        .finally(() => {
          // 只在没有提前返回的情况下关闭加载框
          if (this.isLoading) {
            this.isLoading = false;
          }
          if (this.loading) {
            this.loading = false;
          }
          // 移除表格loading状态设置,因为 isLoading 由 handleClick 管理
          // if (this.loading) {
          //   this.loading = false;
          // }
        });
    },
@@ -3215,7 +3217,7 @@
                  this.isLoading = true;
                  this.drawer = true;
                  getupdateCheckType(this.tjNumber).then((response) => {
                    // this.isLoading = false;
                    this.isLoading = false;
                    this.changedate = response.data;
                    if (this.changedate) {
                      this.changedate.forEach((item) => {
@@ -3241,6 +3243,10 @@
                      this.zhiyeJl = "";
                      this.zhiyeJg = "未发现目标性疾病";
                    }
                  }).catch((error) => {
                    this.isLoading = false;
                    console.error("获取检查类型失败:", error);
                    this.$message.error("获取检查类型失败");
                  });
                });
              }
@@ -3270,7 +3276,7 @@
                      this.isLoading = true;
                      this.drawer = true;
                      getupdateCheckType(this.tjNumber).then((response) => {
                        // this.isLoading = false;
                        this.isLoading = false;
                        this.changedate = response.data;
                        if (this.changedate) {
                          for (let i = 0; i < this.changedate.length; i++) {
@@ -3295,6 +3301,10 @@
                          this.zhiyeJl = "";
                          this.zhiyeJg = "未发现目标性疾病";
                        }
                      }).catch((error) => {
                        this.isLoading = false;
                        console.error("获取检查类型失败:", error);
                        this.$message.error("获取检查类型失败");
                      });
                    });
                  }
src/views/system/comp/index.vue
@@ -252,7 +252,7 @@
              @submit.native.prevent>
              <el-form-item label="套餐名称" prop="pacName">
                <el-input ref="inputName" v-model="queryParams.pacName" placeholder="请输入套餐名称" clearable
                  @keyup.enter.native="handleSearch" style="width: 140px" />
                  @keyup.enter.native="handleSearch" @clear="handleClearSearch" style="width: 140px" />
              </el-form-item>
              <el-form-item>
                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">搜索</el-button>
@@ -423,7 +423,7 @@
              label-width="68px" @submit.native.prevent>
              <el-form-item label="项目名称" prop="proName">
                <el-input ref="inputName" v-model="queryParams1.proName" placeholder="请输入项目名称" clearable
                  @keyup.enter.native="handleSearchFor" style="width: 140px" />
                  @keyup.enter.native="handleSearchFor" @clear="handleClearSearch" style="width: 140px" />
              </el-form-item>
              <el-form-item>
                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">搜索</el-button>
@@ -517,7 +517,7 @@
              label-width="68px" @submit.native.prevent>
              <el-form-item label="项目名称" prop="proName">
                <el-input ref="inputName" v-model="queryParams1.proName" placeholder="请输入项目名称" clearable
                  @keyup.enter.native="handleSearchFor" style="width: 140px" />
                  @keyup.enter.native="handleSearchFor"  @clear="handleClearSearch" style="width: 140px" />
              </el-form-item>
              <el-form-item>
                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">搜索</el-button>
@@ -1305,7 +1305,7 @@
        });
      }
    },
    handleSearchFor() {
    /* handleSearchFor() {
      // 判断是否为汉字
      const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char);
      if (isChineseChar(this.queryParams1.proName)) {
@@ -1320,6 +1320,27 @@
          this.Treedata = response.data;
        });
      }
    }, */
     handleSearchFor() {
      // 判断是否为汉字
      const keyword = this.queryParams1.proName?.trim() || '';
      const isChineseChar = /[\u4E00-\u9FA5]/.test(keyword);
      const query = {
      ...this.queryParams1,
      proName: isChineseChar ? keyword : null,
      pym: isChineseChar ? null : keyword
     };
      getProjectList(query).then((response) => {
          this.Treedata = response.data;
      });
    },
    handleClearSearch() {
      this.queryParams1.proName = '';
      this.queryParams1.pym = null;
      // 重新加载表格数据
      getProjectList({}).then((response) => {
          this.Treedata = response.data;
        });
    },
    // 单项数据获取
    handleChangesingle(selection) {
@@ -1557,7 +1578,9 @@
        });
    },
    xiangmuWh() {
      if (!this.forms.groupingName || !this.forms.sex || !this.forms.payType) {
      if (!this.forms.groupingName ||
        !this.forms.sex ||
        !this.forms.payType) {
        this.$modal.msgError("请先填写所有必填项!");
        return; // Stop execution if any required field is empty
      }
@@ -1565,6 +1588,9 @@
      this.title = "分组项目维护";
      this.OnenewpacName = [];
      this.queryParams.price = 0;
      // 清空项目名称搜索框
      this.queryParams1.proName = '';
      this.queryParams1.pym = null;
      this.loading = true;
      if (this.groupList[0]) {
        let id = this.groupList[0].id || "";
vue.config.js
@@ -53,11 +53,6 @@
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        // target: `https://ltpeis.xaltjdkj.cn:5801/`,
        // target: `http://192.168.1.99:5012`,
<<<<<<< HEAD
=======
        target: `http://192.168.1.113:5011`,
>>>>>>> c12ce4c405d92c0bf11e876468108d1edb134ff2
        // target: `http://192.168.1.244:5011`,
        target: `http://192.168.1.113:5011`,
        // // target: `http://192.168.0.99:8080/ltkj-admin`,