Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb

qx

2025-06-05 53606eac81e6d3a76937c4cb6f45ad61581cb4da

 src/components/public/index.vue

@@ -10,14 +10,19 @@
      <h3 v-if="fList.proResult">
        检测结果 :{{ fList.proResult }}{{ fList.project.proMetering }}
      </h3>
      <!-- <el-form
        :model="queryParams"
        ref="queryForm"
        size="small"
        :inline="true"
        label-width="68px"
      > -->
        <!-- <el-form-item label="病种名称" prop="bingzhong">

      <h2 style="text-align: center">{{ proName || "暂无项目名称" }}</h2>
      <div style="display: flex; width: 100%">
        <div style="width: 50%; margin-right: 40px">
          <el-form
            :model="queryParams"
            ref="queryForm"
            size="small"
            :inline="true"
            label-width="68px"
            @submit.native.prevent
          >
            <!-- <el-form-item label="病种名称" prop="bingzhong">
          <el-input
            v-model="queryParams.bingzhong"
            placeholder="请输入简称"
@@ -25,42 +30,39 @@
            @keyup.enter.native="handleQuery"
            style="width: 120px"
          />
        </el-form-item>
        <el-form-item label="拼音码" prop="bzPinyin">
          <el-input
            v-model="queryParams.bzPinyin"
            placeholder="请输入拼音码"
            clearable
            @keyup.enter.native="handleQuery"
            style="width: 130px"
          />
        </el-form-item>
        <el-form-item>
          <el-button
            type="primary"
            icon="el-icon-search"
            size="mini"
            @click="handleQuery"
            >搜索</el-button
          >
        </el-form-item> -->
        <!-- <el-form-item>
        </el-form-item>-->
            <el-form-item label="检查结论" prop="ruleStr">
              <el-input
                v-model="queryParams.ruleStr"
                placeholder="请输入检查结论"
                clearable
                @keyup.enter.native="getList"
                style="width: 130px"
              />
            </el-form-item>
            <el-form-item>
              <el-button
                type="primary"
                icon="el-icon-search"
                size="mini"
                @click="getList"
                >搜索</el-button
              >
            </el-form-item>
            <!-- <el-form-item>
          <h3 >{{ queryParams.proName  || '暂无项目名称'  }}</h3>
        </el-form-item> -->
        <!-- <el-form-item>
            <!-- <el-form-item>
          <h3 style="margin-left: 160px">已选项目</h3>
        </el-form-item> -->
      <!-- </el-form> -->
      <h2 style="text-align: center;margin-top: -30px;">{{ queryParams.proName  || '暂无项目名称'  }}</h2>
      <div style="display: flex; width: 100%">
        <div style="width: 50%; margin-right: 40px">
          </el-form>
          <el-table
            :data="dataList"
            ref="multipleTable"
            v-loading="loading"
            @selection-change="handleSelectionChange"
            border
            height="420px"
            height="480px"
          >
            <el-table-column type="selection" width="40" align="center" />
            <el-table-column
@@ -87,14 +89,14 @@
          </div>
        </div>

        <div style="width: 100%; height: 600px">
        <div class="jianc">
          <!-- <h3 style="margin-top: -30px;">已选项目</h3> -->
          <el-form
            :model="form"
            ref="queryForm"
            size="small"
            label-width="68px"
            :inline="true"
            :label-position="labelPosition"
          >
            <!--  :inline="true" -->
            <!-- <el-form-item>
@@ -109,16 +111,16 @@
                v-model="form.jcsj"
                clearable
                type="textarea"
                :autosize="{ minRows: 8 }"
                :autosize="{ minRows: 7 }"
                style="width: 380px"
              />
            </el-form-item>
            <el-form-item label="检查结论" prop="conclusion">
            <el-form-item label="检查结论" prop="desc">
              <el-input
                v-model="form.desc"
                clearable
                type="textarea"
                :autosize="{ minRows: 8 }"
                :autosize="{ minRows: 7 }"
                style="width: 380px"
              />
            </el-form-item>
@@ -126,14 +128,14 @@
        </div>
      </div>

      <span slot="footer" class="dialog-footer" style="margin-top: -120px">
        <el-button @click="open = false">取 消</el-button>
      <span slot="footer" class="dialog-footer" style="margin-top: -20px">
        <el-button @click="callcolos">取 消</el-button>
        <el-button type="primary" @click="handleOk">确 定</el-button>
      </span>
    </el-dialog>
  </div>
</template>
  

<script>
import { getlist, getlistByRuleStr } from "@/api/doctor/check";
import { getYxJcXxJg } from "@/api/picture/picture";
@@ -161,10 +163,11 @@
  data() {
    return {
      open: false,
      labelPosition: "top",
      // 弹出层标题
      title: "",
      yxbx: "",
      proName:'',
      proName: "",
      //   lastDesc: "",
      total: 0,
      dataList: [],
@@ -175,10 +178,7 @@
        jcsj: "",
      },
      queryParams: {
        bingzhong: "",
        bzPinyin: "",
        proId:"",
        proName:"",
        ruleStr: "",
        pageNum: 1,
        pageSize: 10,
      },
@@ -190,6 +190,7 @@
  },
  watch: {
    checkStatus(newValue) {
      console.log(565658);
      if (newValue === "1") {
        this.updateData(this.proResult, this.conclusion);
      }
@@ -203,8 +204,8 @@
        if (newVal && newVal.length > 0) {
          const firstProject = newVal[0]; // 你也可以遍历所有项目，看你业务需求
          this.queryParams.proId = firstProject.proId; // 假设项目中叫 id
          this.queryParams.proName = firstProject.proName; // 假设叫 proName
          this.proName = firstProject.proName
          // this.queryParams.proName = firstProject.proName;
          this.proName = firstProject.proName;
        }
      },
    },
@@ -216,10 +217,12 @@
    async getList() {
      try {
        this.loading = true; // 添加加载状态

        const res = await getlist(this.queryParams);
        this.dataList = res.rows;
        this.total = res.total;
        this.dataList = res.data.rows;
        if (res.data.total) {
          this.total = res.data.total;
        }
        this.updateData(this.proResult, this.conclusion);

        // 如果需要选中操作，将其封装为独立方法
        await this.handleAutoSelection();
@@ -256,10 +259,28 @@
    },

    updateData(proResult, conclusion) {
      if (this.checkStatus === "1") {
      console.log(proResult, conclusion, 5658);
      if (this.checkStatus == 1) {
        this.form.jcsj = proResult; // 更新检查所见
        this.form.desc = conclusion; // 更新检查结论
        // console.log(proResult, conclusion);
      } else {
        this.form.desc = "";
        this.form.jcsj = "";
      }

      if (this.list.length != 0) {
        let desc = "";
        desc += this.list
          .map((item) => item.bingzhong || item.ruleStr)
          .filter(Boolean)
          .join(",");
        let jcsj = "";
        jcsj += this.list
          .map((item) => item.yxbx)
          .filter(Boolean)
          .join(",");
        this.form.jcsj = this.form.jcsj + jcsj; // 更新检查所见
        this.form.desc = this.form.desc + desc;
      }
    },

@@ -269,34 +290,49 @@
    },

    updateFormContent(selection) {
      if (!selection.length) return;
      // if (!selection.length) return;
      console.log(selection, 123456);

      this.updateData(this.proResult, this.conclusion);
      // 如果处于检查状态，使用传入的值
      if (this.checkStatus === "1") {
        this.updateData(this.proResult, this.conclusion);
        return;
      }
      // if (this.checkStatus === "1") {
      //   this.updateData(this.proResult, this.conclusion);
      //   return;
      // }

      // 重置表单内容
      this.form.desc = "";
      this.form.jcsj = "";
      // this.form.desc = "";
      // this.form.jcsj = "";
      // console.log(22222);
      // // 使用map和join替代forEach和字符串拼接
      // this.form.desc = selection
      //   .map((item) => item.bingzhong || item.ruleStr)
      //   .filter(Boolean)
      //   .join(",");

      // 使用map和join替代forEach和字符串拼接
      this.form.desc = selection
        .map((item) => item.bingzhong || item.ruleStr)
        .filter(Boolean)
        .join(",");

      this.form.jcsj = selection
        .map((item) => item.yxbx)
        .filter(Boolean)
        .join(",");
      // this.form.jcsj = selection
      //   .map((item) => item.yxbx)
      //   .filter(Boolean)
      //   .join(",");
    },

    handleOk() {
      if (!this.form.desc && !this.form.jcsj) {
        this.$message.warning("请选择数据");
        return;
      } else {
        const desc = this.form.desc?.trim();
        const jcsj = this.form.jcsj?.trim();

        // 如果没有选中表格项
        if (!this.list || this.list.length === 0) {
          if (!desc && !jcsj) {
            this.$message.warning(
              "请填写有效的检查所见和检查结论，或选择表格数据"
            );
            return;
          }
        }
      }

      try {
@@ -317,6 +353,9 @@
        this.$refs.multipleTable.clearSelection();
      }
    },
    callcolos() {
      this.open = false;
    },
  },
  computed: {
    isCheckMode() {
@@ -329,14 +368,25 @@
  },
};
</script>
  

<style scoped>
.el-dialog__body {
  padding: 10px 20px;
  padding: 0px 20px;
}

::v-deep .el-dialog__header {
  padding: 0px !important;
  padding-bottom: 0px !important;
}

::v-deep .el-dialog__footer {
  padding: 0 !important;
  padding-bottom: 40px !important;
}
</style>
  

.jianc {
  width: 100%;
  height: 600px;
  padding-top: 40px;
}
</style>