1

lkk

7 小时以前 18f35fe78de41a1b240758c91e05380decb48978

 src/views/hosp/project/index.vue

@@ -1,5 +1,5 @@
<template>
  <div class="app-container">
  <div class="app-container" v-loading="pageLoading">
    <el-row :gutter="20">
      <el-col :span="4" :xs="24">
        <div class="head-container">
@@ -12,7 +12,7 @@
            style="margin-bottom: 15px"
          />
        </div>
        <div class="scrollable-container">
        <div class="scrollable-container" v-loading="loadings">
          <div class="content">
            <el-tree
              :data="deptOptions"
@@ -25,7 +25,6 @@
              highlight-current
              @node-click="handleNodeClick"
              :render-content="renderContent"
              v-loading="loadings"
            />
          </div>
        </div>
@@ -87,6 +86,7 @@
              icon="el-icon-plus"
              size="mini"
              @click="handleUpdate1"
              :loading="updateLoading"
              v-hasPermi="['hosp:project:add']"
              >修改</el-button
            >
@@ -128,6 +128,7 @@
        <el-table
          v-if="refreshTable"
          v-loading="loading"
          style="width: 100%"
          :data="projectList"
          ref="tableRef"
          height="580"
@@ -308,6 +309,7 @@
      width="1200px"
      append-to-body
      :before-close="handleClose"
      v-loading="loading"
      :close-on-click-modal="false"
    >
      <el-form
@@ -636,10 +638,18 @@
            ></el-option>
          </el-select>
        </el-form-item>
         <el-form-item label="是否外送" prop="proDelivery">
          <el-select v-model="form.proDelivery" placeholder="请选择是否外送" style="width: 200px">
            <el-option v-for="dict in wsTypesy" :key="dict.value" :label="dict.label"
              :value="dict.value"></el-option>
        <el-form-item label="是否外送" prop="proDelivery">
          <el-select
            v-model="form.proDelivery"
            placeholder="请选择是否外送"
            style="width: 200px"
          >
            <el-option
              v-for="dict in wsTypesy"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
      </el-form>
@@ -1012,6 +1022,7 @@
      deptOptions: [],
      dialogTableVisible: false,
      isPriceDisabled: false,
      pageLoading: true,
      sfxmList: [],
      deptOptionstree: [],
      defaultPropstree: {
@@ -1028,15 +1039,15 @@
          label: "否",
        },
      ],
         wsTypesy: [
      wsTypesy: [
        {
          value:"1",
          label:"是"
          value: "1",
          label: "是",
        },
        {
          value:"0",
          label:"否"
        }
          value: "0",
          label: "否",
        },
      ],
      xmmc: "",
      chargeId: [],
@@ -1046,6 +1057,8 @@
      ChangeList: [],
      loading: true,
      loadings: false,
      addLoading: false,
      updateLoading: false,
      key: "",
      ids: [],
      single: true,
@@ -1149,6 +1162,8 @@
        this.$nextTick(() => {
          const lastId = newVal[newVal.length - 1] || "532";
          const node = this.findNodeById(this.deptOptions, lastId);
          this.queryParams.proId = lastId;
          this.getList();
          if (node) {
            this.$refs.tree1.setCurrentKey(lastId);
            const nodeElement = document.querySelector(
@@ -1177,16 +1192,18 @@
    },
  },
  created() {
    this.getConsumables();
    this.getDeptList();
    // this.getConsumables();
    // this.getDeptList();
    // this.getDeptTree().then(() => {
    //   this.precomputePinyin();
    // });
  },
  mounted() {
    this.getDeptTree().then(() => {
      this.precomputePinyin();
    });
    // this.getDeptTree().then(() => {
    //   this.precomputePinyin();
    // });
    // this.precomputePinyin();
    this.loadPage();
  },
  methods: {
    debounceFilter: debounce(function (val) {
@@ -1209,6 +1226,58 @@
      };
      traverse(this.deptOptions);
    },

    async loadPage() {
      this.pageLoading = true;
      try {
        await Promise.all([
          this.getDeptTree(), // 获取左侧树
          //this.getList(),  获取右侧表格
        ]);
      } catch (error) {
        console.error("加载页面出错", error);
      } finally {
        this.pageLoading = false; // 两个都加载完再关闭 loading
      }
    },

    async getDeptTree() {
      this.loadings = true;
      try {
        const response = await deptTree111();
        this.deptOptions = response.data;

        // 保证 treeId 是数组格式
        this.treeId = [];

        if (this.treeDate?.id) {
          this.treeId.push(this.treeDate.id);
        } else {
          this.treeId.push("532");
        }
      } catch (error) {
        console.error("加载部门树失败：", error);
      } finally {
        this.loadings = false; // loading 状态结束
      }
    },

    async getList() {
      this.loading = true;
      let data = {
        proName: this.queryParams.proName,
        checkType: this.queryParams.checkType,
        deptId: this.queryParams.deptId,
        proId: this.queryParams.proId,
      };
      try {
        const res = await getAllChildListById(data); // 替换成你实际的接口
        this.projectList = res.data.list;
      } finally {
        this.loading = false;
      }
    },

    filterNode(value, data) {
      if (!value) return true;
      const cached = this.pinyinCache.get(data.id);
@@ -1478,15 +1547,23 @@
      });
    },
    getDeptTree() {
      return deptTree111().then((response) => {
        this.deptOptions = response.data;
        this.treeId = [];
        if (this.treeDate.id) {
          this.treeId.push(this.treeDate.id);
        } else {
          this.treeId.push("532");
        }
      });
      this.loadings = true;
      return deptTree111()
        .then((response) => {
          this.deptOptions = response.data;
          this.treeId = [];
          if (this.treeDate.id) {
            this.treeId.push(this.treeDate.id);
          } else {
            this.treeId.push("532");
          }
        })
        .catch((err) => {
          console.error("加载部门树失败：", err);
        })
        .finally(() => {
          this.loadings = false; // 无论成功或失败，结束加载
        });
    },
    handleNodeClick(date) {
      this.treeDate = date;
@@ -1645,22 +1722,27 @@
      }
    },
    handleUpdate1() {
      this.updateLoading = true;
      this.form = {};
      this.form = this.xiugaiList;
      this.form.proStatus = this.form.proStatus.toString();
      this.form.sfcyyc = this.form.sfcyyc.toString();
      this.proParent = true;
      this.isPriceDisabled = true;
      getlist().then((response) => {
        if (response.code == 200) {
          this.loading = false;
          this.projectOptions = [];
          const project = { proId: 0, proName: "主类目", children: [] };
          project.children = this.handleTree(response.data.list, "proId");
          this.key = response.data.key;
          this.projectOptions.push(project);
        }
      });
      getlist()
        .then((response) => {
          if (response.code == 200) {
            this.loading = false;
            this.projectOptions = [];
            const project = { proId: 0, proName: "主类目", children: [] };
            project.children = this.handleTree(response.data.list, "proId");
            this.key = response.data.key;
            this.projectOptions.push(project);
          }
        })
        .finally(() => {
          this.updateLoading = false;
        });
      this.open = true;
    },
    handleUpdate(row) {
@@ -1699,7 +1781,7 @@
        }
        getlist().then((response) => {
          if (response.code == 200) {
            this.loading = false;
            // this.loading = false;
            this.projectOptions = [];
            const project = { proId: 0, proName: "主类目", children: [] };
            project.children = this.handleTree(response.data.list, "proId");
@@ -1707,6 +1789,7 @@
            this.projectOptions.push(project);
          }
        });
        // this.loadPage();
        this.open = true;
        this.title = "体检项目信息维护";
      });
@@ -1726,6 +1809,7 @@
    },
    submitForm() {
      this.noclick = true;
      this.pageLoading = true;
      this.$refs["form"].validate((valid) => {
        if (valid) {
          const isUpdate = this.form.proId != null;
@@ -1752,9 +1836,13 @@
          this.form.lisXmbm = this.form.lisXmbm;
          if (this.key === "N") {
            this.processSubmission(isUpdate, false);
            this.open = false;
            // this.pageLoading = false;
          } else if (this.key === "Y") {
            this.form.sfxmId = this.sfxmId;
            this.processSubmission(isUpdate, true);
            this.open = false;
            // this.pageLoading = false;
          }
        }
      });
@@ -1787,15 +1875,29 @@
        }
      }
    },
    handleSuccess(isY) {
    /* handleSuccess(isY) {
      this.cancel();
      this.getList();
      // this.getList();
      if (this.proParent || isY) {
        this.getDeptTree().then(() => {
          this.precomputePinyin();
        });
      }
      console.log(this.treeId);
    }, */
    async handleSuccess(isY) {
      this.cancel();

      if (this.proParent || isY) {
        // 等待左侧树加载和拼音处理
        await this.getDeptTree();
        this.precomputePinyin();
      }

      // 等待右侧表格刷新
      await this.getList();

      this.pageLoading = false; // ✅ 统一加载状态控制
    },
    submit() {
      this.ChangeList.forEach((item) => {