qx
qx
2025-04-11 514146014586aa8b98d667edbaf0d6897186173d
qx
6个文件已修改
533 ■■■■■ 已修改文件
src/components/public/index.vue 124 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/advice/advice/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/project/index.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/picture/picture/index.vue 330 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sampling/sampling/index.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/tijian/index.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/public/index.vue
@@ -1,11 +1,6 @@
<template>
  <div>
    <el-dialog
      :title="title"
      :visible.sync="open"
      width="1080px"
      append-to-body
    >
    <el-dialog :title="title" :visible.sync="open" width="1080px" append-to-body>
      <h3 v-if="fList.proResult">检测项目 :{{ fList.project.proName }}</h3>
      <h3 v-if="fList.proResult">
        检测结果 :{{ fList.proResult }}{{ fList.project.proMetering }}
@@ -54,48 +49,25 @@
      <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-table
            :data="dataList"
            ref="multipleTable"
            v-loading="loading"
            @selection-change="handleSelectionChange"
            border
            height="420px"
          >
          <el-table :data="dataList" ref="multipleTable" v-loading="loading" @selection-change="handleSelectionChange"
            border height="420px">
            <el-table-column type="selection" width="40" align="center" />
            <el-table-column
              label="序号"
              type="index"
              align="center"
              width="50px"
            />
            <el-table-column label="序号" type="index" align="center" width="50px" />
            <!-- <el-table-column label="规则" align="center" prop="ruleStr" /> -->
            <el-table-column label="检查所见" align="center" prop="yxbx" />
            <el-table-column label="检查结论" align="center" prop="ruleStr" />
          </el-table>
          <div class="pag">
            <div class="pag1" style="margin-left: 630px">
              <pagination
                small
                v-show="total > 0"
                :total="total"
                :page.sync="queryParams.pageNum"
                :limit.sync="queryParams.pageSize"
                @pagination="getList"
              />
              <pagination small v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                :limit.sync="queryParams.pageSize" @pagination="getList" />
            </div>
          </div>
        </div>
        <div style="width: 100%; height: 600px">
          <!-- <h3 style="margin-top: -30px;">已选项目</h3> -->
          <el-form
            :model="form"
            ref="queryForm"
            size="small"
            label-width="68px"
            :inline="true"
          >
          <el-form :model="form" ref="queryForm" size="small" label-width="68px" :inline="true">
            <!--  :inline="true" -->
            <!-- <el-form-item>
              <el-input
@@ -105,29 +77,17 @@
              ></el-input>
            </el-form-item> -->
            <el-form-item label="检查所见" prop="jcsj">
              <el-input
                v-model="form.jcsj"
                clearable
                type="textarea"
                :autosize="{ minRows: 8 }"
                style="width: 380px"
              />
              <el-input v-model="form.jcsj" clearable type="textarea" :autosize="{ minRows: 8 }" style="width: 380px" />
            </el-form-item>
            <el-form-item label="检查结论" prop="conclusion">
              <el-input
                v-model="form.desc"
                clearable
                type="textarea"
                :autosize="{ minRows: 8 }"
                style="width: 380px"
              />
              <el-input v-model="form.desc" clearable type="textarea" :autosize="{ minRows: 8 }" style="width: 380px" />
            </el-form-item>
          </el-form>
        </div>
      </div>
      <span slot="footer" class="dialog-footer" style="margin-top: -120px">
        <el-button @click="open = false">取 消</el-button>
        <el-button @click="callcolos">取 消</el-button>
        <el-button type="primary" @click="handleOk">确 定</el-button>
      </span>
    </el-dialog>
@@ -216,10 +176,12 @@
    async getList() {
      try {
        this.loading = true; // 添加加载状态
        const res = await getlist(this.queryParams);
        this.dataList = res.rows;
        this.total = res.total;
          this.updateData(this.proResult, this.conclusion);
        // 如果需要选中操作,将其封装为独立方法
        await this.handleAutoSelection();
@@ -256,11 +218,26 @@
    },
    updateData(proResult, conclusion) {
      if (this.checkStatus === "1") {
      console.log(proResult, conclusion, 5658)
        this.form.jcsj = proResult; // 更新检查所见
        this.form.desc = conclusion; // 更新检查结论
        // console.log(proResult, conclusion);
        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;
      }
    },
    handleSelectionChange(selection) {
@@ -269,28 +246,28 @@
    },
    updateFormContent(selection) {
      if (!selection.length) return;
      // 如果处于检查状态,使用传入的值
      if (this.checkStatus === "1") {
      // if (!selection.length) return;
        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() {
@@ -317,6 +294,9 @@
        this.$refs.multipleTable.clearSelection();
      }
    },
    callcolos() {
      this.open = false;
    }
  },
  computed: {
    isCheckMode() {
@@ -334,9 +314,9 @@
.el-dialog__body {
  padding: 10px 20px;
}
::v-deep .el-dialog__footer {
  padding: 0 !important;
  padding-bottom: 40px !important;
}
</style>
src/views/advice/advice/index.vue
@@ -76,7 +76,7 @@
      </el-col>
    </el-row>
    <el-row :gutter="20">
      <el-col :span="3" :xs="24">
      <el-col :span="4" :xs="24">
        <div class="head-container">
          <div class="content">
            <el-tree
src/views/hosp/project/index.vue
@@ -1,7 +1,7 @@
<template>
  <div class="app-container">
    <el-row :gutter="20">
      <el-col :span="3" :xs="24">
      <el-col :span="4" :xs="24">
        <div class="head-container">
          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
            style="margin-bottom: 15px" />
@@ -9,7 +9,7 @@
        <div class="scrollable-container">
          <div class="content">
            <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
              :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="treeId"
              :filter-node-method="filterNode" ref="tree1" node-key="id" :default-expanded-keys="treeId"
              highlight-current @node-click="handleNodeClick" :render-content="renderContent" v-loading="loadings"/>
          </div>
        </div>
@@ -542,6 +542,7 @@
  watch: {
    deptName(val) {
      this.debounceFilter(val);
    },
    treeId(newVal) {
      if (newVal && newVal.length > 0) {
@@ -549,7 +550,7 @@
          const lastId = newVal[newVal.length - 1] || "532";
          const node = this.findNodeById(this.deptOptions, lastId);
          if (node) {
            this.$refs.tree.setCurrentKey(lastId);
            this.$refs.tree1.setCurrentKey(lastId);
            const nodeElement = document.querySelector(`.el-tree-node[data-key="${lastId}"] .el-tree-node__content`);
            if (nodeElement) {
              nodeElement.click();
@@ -587,7 +588,7 @@
  },
  methods: {
    debounceFilter: debounce(function(val) {
      this.$refs.tree.filter(val);
      this.$refs.tree1.filter(val);
    }, 300),
    precomputePinyin() {
      const traverse = (nodes) => {
@@ -603,6 +604,7 @@
      traverse(this.deptOptions);
    },
    filterNode(value, data) {
      console.log(value, data,2233)
      if (!value) return true;
      const cached = this.pinyinCache.get(data.id);
      if (!cached) return false;
@@ -729,9 +731,12 @@
      } else if (this.form.proParentId) {
        if (this.form.proParentId != 0) {
          this.dialogTableVisible = true;
          if (this.deptOptionstree.length != 0) {
          this.$nextTick(() => {
            this.chargeId.push(this.deptOptionstree[0].id);
          });
          }
          this.getlistSfxm();
        } else {
          this.dialogTableVisible = false;
@@ -862,6 +867,11 @@
      getAllChildListById(data).then(() => {
        this.loading = false;
      });
      this.deptName = "";
      // 手动调用过滤方法(需等待 DOM 更新)
      this.$nextTick(() => {
        this.$refs.tree1.filter(this.deptName);
      });
    },
    handleClose() {
      this.cancel();
@@ -900,7 +910,7 @@
    resetQuery() {
      this.resetForm("queryForm");
      this.queryParams.proId = undefined;
      this.$refs.tree.setCurrentKey(null);
      this.$refs.tree1.setCurrentKey(null);
      this.handleQuery();
    },
    flexColumnWidth(column) {
@@ -1057,6 +1067,11 @@
          }
        }
      });
      this.deptName = "";
      // 手动调用过滤方法(需等待 DOM 更新)
      this.$nextTick(() => {
        this.$refs.tree1.filter(this.deptName);
      });
    },
    processSubmission(isUpdate, isY) {
      if (isUpdate) {
@@ -1099,6 +1114,10 @@
        this.sfxmId = parseInt(item.id);
      });
      this.dialogTableVisible = false;
       this.getDeptList();
    this.getDeptTree().then(() => {
      this.precomputePinyin();
    });
    },
    handleDelete(row) {
      const proIds = row.proId || this.ids;
src/views/picture/picture/index.vue
@@ -1,138 +1,50 @@
<template>
  <div class="app-container">
    <el-form
      :model="queryParams"
      ref="queryForm"
      size="small"
      :inline="true"
      v-show="showSearch"
      label-width="68px"
    >
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="体检号" prop="tjNumber">
        <el-input
          ref="inputName"
          v-model="queryParams.tjNumber"
          placeholder="请输入体检号"
          clearable
          @keyup.enter.native="handleQuery"
          @blur="hb"
          style="width: 170px"
        />
        <el-input ref="inputName" v-model="queryParams.tjNumber" placeholder="请输入体检号" clearable
          @keyup.enter.native="handleQuery" @blur="hb" style="width: 170px" />
      </el-form-item>
      <el-form-item label="姓名" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入姓名"
          clearable
          @keyup.enter.native="handleQuery"
          style="width: 110px"
        />
        <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery"
          style="width: 110px" />
      </el-form-item>
      <el-form-item
        label="单位名称"
        prop="tjCompName"
        style="margin-left: 20px"
      >
        <el-select
          :remote-method="getRemoteData"
          v-model="queryParams.tjCompName"
          value-key="drugManufacturerId"
          style="width: 180px"
          remote
          filterable
          placeholder="请选择单位名称"
          clearable
          @change="searchSelect"
        >
          <el-option
            v-for="dict in CompanyList"
            :key="dict.drugManufacturerId"
            :label="dict.cnName"
            :value="dict"
          />
      <el-form-item label="单位名称" prop="tjCompName" style="margin-left: 20px">
        <el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
          style="width: 180px" remote filterable placeholder="请选择单位名称" clearable @change="searchSelect">
          <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
        </el-select>
      </el-form-item>
      <el-form-item label="项目" prop="tcm">
        <el-input
          v-model="queryParams.tcm"
          placeholder="请输入体检号"
          clearable
          @keyup.enter.native="handleQuery"
          style="width: 170px"
        />
        <el-input v-model="queryParams.tcm" placeholder="请输入项目" clearable @keyup.enter.native="handleQuery"
          style="width: 170px" />
      </el-form-item>
      <el-form-item label="登记时间" prop="createTimeList">
        <el-date-picker
          v-model="createTimeList"
          type="datetimerange"
          align="right"
          :picker-options="pickerOptions"
          style="width: 310px"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          :default-time="['00:00:00', '23:00:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm"
          @change="dateChangebirthday1"
        >
        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
          style="width: 310px" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:00:00']"
          format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
        </el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button
          type="primary"
          icon="el-icon-search"
          size="mini"
          @click="handleQuery"
          style="margin-right: 15px"
          >搜索</el-button
        >
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
          >重置</el-button
        >
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
          style="margin-right: 15px">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
    <el-radio-group
      v-model="checkStatus"
      @input="radioChange"
      style="margin: 10px 15px"
    >
    <el-radio-group v-model="checkStatus" @input="radioChange" style="margin: 10px 15px">
      <el-radio-button label="0">未检</el-radio-button>
      <el-radio-button label="1">已检</el-radio-button>
    </el-radio-group>
    <div style="width: 100%; margin-left: 10px; display: flex">
      <div style="width: 36%; margin-right: 30px">
        <el-table
          id="table"
          v-loading="loading"
          ref="tb"
          :data="pictureList"
          highlight-current-row
          :row-class-name="tableRowClassName"
          @current-change="handleCurrentChange"
          border
          height="520px"
        >
        <el-table  v-loading="loading" ref="tb" :data="pictureList" highlight-current-row
          :row-class-name="tableRowClassName" @current-change="handleCurrentChange" border height="520px">
          <!--  @selection-change="handleSelectionChange" -->
          <el-table-column
            label="体检号"
            align="center"
            prop="tjNumber"
            min-width="160"
          />
          <el-table-column
            label="姓名"
            align="center"
            prop="cusName"
            min-width="80"
          />
          <el-table-column
            label="性别"
            align="center"
            prop="cusSex"
            min-width="50"
          >
          <el-table-column label="体检号" align="center" prop="tjNumber" min-width="160" />
          <el-table-column label="姓名" align="center" prop="cusName" min-width="80" />
          <el-table-column label="性别" align="center" prop="cusSex" min-width="50">
            <template slot-scope="scope">
              <span v-if="scope.row.cusSex == '0'">男</span>
              <span v-if="scope.row.cusSex == '1'">女</span>
@@ -145,90 +57,35 @@
            <!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> -->
            <!-- </template> -->
          </el-table-column>
          <el-table-column
            label="手机号"
            align="center"
            prop="cusPhone"
            min-width="100"
          />
          <el-table-column
            label="套餐名"
            align="center"
            prop="tcm"
            min-width="100"
          />
          <el-table-column
            label="登记时间"
            align="center"
            prop="tjTime"
            min-width="120"
          />
          <el-table-column
            label="审核状态"
            align="center"
            prop="confirmStatus"
            min-width="80"
          >
          <el-table-column label="手机号" align="center" prop="cusPhone" min-width="100" />
          <el-table-column label="套餐名" align="center" prop="tcm" min-width="100" />
          <el-table-column label="登记时间" align="center" prop="tjTime" min-width="120" />
          <el-table-column label="审核状态" align="center" prop="confirmStatus" min-width="80">
            <template slot-scope="scope">
              <span
                :style="{
              <span :style="{
                  color:
                    scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
                }"
                v-if="scope.row.confirmStatus == '301'"
                >已通过</span
              >
              <span
                :style="{
              }" v-if="scope.row.confirmStatus == '301'">已通过</span>
              <span :style="{
                  color:
                    scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
                }"
                v-if="scope.row.confirmStatus == '299'"
                >已驳回</span
              >
              }" v-if="scope.row.confirmStatus == '299'">已驳回</span>
            </template>
          </el-table-column>
        </el-table>
      </div>
      <div style="width: 44%; height: 610px">
        <el-table
          v-loading="loading"
          ref="mu"
          :data="tableList"
          :row-class-name="tableRowClassName"
          highlight-current-row
          @selection-change="handleChange"
          border
          style="height: 400px"
        >
          <el-table-column type="selection" width="50" align="center" />
          <el-table-column
            label="科室"
            align="center"
            prop="deptName"
            min-width="100"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="项目"
            align="center"
            prop="proName"
            min-width="150"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="状态"
            align="center"
            prop="type"
            :show-overflow-tooltip="true"
            min-width="100"
          >
      <div id="table"  style="width: 44%; height: 610px">
        <el-table v-loading="loading" ref="mu" :data="tableList"   :row-class-name="tableRowClassName"   @header-click="handleHeaderClick"
          highlight-current-row @selection-change="handleChange" border style="height: 400px">
          <el-table-column type="selection" width="50" align="center">
          </el-table-column>
          <el-table-column label="科室" align="center" prop="deptName" min-width="100" :show-overflow-tooltip="true" />
          <el-table-column label="项目" align="center" prop="proName" min-width="150" :show-overflow-tooltip="true" />
          <el-table-column label="状态" align="center" prop="type" :show-overflow-tooltip="true" min-width="100">
            <template slot-scope="scope">
              <span
                v-if="scope.row.type == '0'"
                :style="type == 0 ? { color: 'red' } : { color: '#409EFF' }"
              >
              <span v-if="scope.row.type == '0'" :style="type == 0 ? { color: 'red' } : { color: '#409EFF' }">
                {{ type == 0 ? "未  检" : "在  检" }}
              </span>
              <span v-if="scope.row.type == '1'">已完成</span>
@@ -236,12 +93,7 @@
              <span v-if="scope.row.type == '3'">延期</span>
            </template>
          </el-table-column>
          <el-table-column
            label="检查时间"
            align="center"
            prop="bcupdateTime"
            min-width="160"
          />
          <el-table-column label="检查时间" align="center" prop="bcupdateTime" min-width="160" />
          <!-- <el-table-column label="操作" align="center" min-width="120px">
            <template slot-scope="scope">
              <el-button
@@ -271,44 +123,16 @@
          <el-table-column label="项目结果" align="center" prop="proResult" /> -->
        </el-table>
        <div style="margin-top: 10px">
          <el-form
            :model="form"
            ref="queryForm"
            size="small"
            :inline="false"
            label-width="68px"
          >
          <el-form :model="form" ref="queryForm" size="small" :inline="false" label-width="68px">
            <el-form-item label="检查所见" prop="proResult">
              <el-input
                v-model="form.proResult"
                clearable
                type="textarea"
                @focus="submiepilog"
              />
              <el-input v-model="form.proResult" clearable type="textarea" @focus="submiepilog" />
            </el-form-item>
            <el-form-item label="检查结论" prop="conclusion">
              <el-input
                v-model="form.conclusion"
                clearable
                type="textarea"
                @focus="submiepilog"
              />
              <el-input v-model="form.conclusion" clearable type="textarea" @focus="submiepilog" />
            </el-form-item>
            <el-form-item>
              <el-button
                type="primary"
                icon="el-icon-picture"
                size="mini"
                @click="tupian"
                >图片</el-button
              >
              <el-button
                type="primary"
                icon="el-icon-search"
                size="mini"
                @click="submito"
                >提交</el-button
              >
              <el-button type="primary" icon="el-icon-picture" size="mini" @click="tupian">图片</el-button>
              <el-button type="primary" icon="el-icon-search" size="mini" @click="submito">提交</el-button>
            </el-form-item>
          </el-form>
        </div>
@@ -330,23 +154,12 @@
    </el-dialog>
    <div style="margin-right: 58%">
      <pagination
        v-show="total > 0"
        :total="total"
        :page.sync="queryParams.page"
        :limit.sync="queryParams.pageSize"
        @pagination="submitForm"
      />
      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize"
        @pagination="submitForm" />
    </div>
    <Public
      ref="aaa"
      :check-status="checkStatus"
      :pro-result="form.proResult"
      :conclusion="form.conclusion"
      @add="handleChanges"
      :project-list="projectList"
    />
    <Public ref="aaa" :check-status="checkStatus" :pro-result="form.proResult" :conclusion="form.conclusion"
      @add="handleChanges" :project-list="projectList" />
    <!--  :last-desc="form.conclusion" -->
  </div>
</template>
@@ -713,16 +526,24 @@
      this.CheckBox = val;
      // console.log(this.CheckBox, 9999);
    },
    handleHeaderClick(column, event) {
      if (column.type === 'selection') {
        // 查找全选框并隐藏
        const checkbox = event.target.closest('.el-checkbox');
        if (checkbox) checkbox.style.display = 'none';
      }
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.queryParams.page = 1;
      this.submitForm();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.createTimeList = [];
      (this.queryParams = {
        pageNum: 1,
        page: 1,
        pageSize: 10,
        tjNumber: null,
        compId: null,
@@ -761,10 +582,12 @@
      this.loading = true;
      getYxJcXx(tjNumber).then((res) => {
        console.log(res, 222);
        this.tableList = res.data;
        this.loading = false;
        this.$nextTick(() => {
          const headerCheckbox = this.$refs.mu.$el.querySelector('.el-table__header .el-checkbox');
        if (headerCheckbox) headerCheckbox.style.display = 'none';
          if (this.tableList.length > 0) {
            const firstRow = this.tableList[0];
            this.$refs.mu.toggleRowSelection(firstRow, true);
@@ -888,6 +711,10 @@
      });
    },
    handleChange(selection) {
      if (selection.length > 1) {
        let del_row = selection.shift();
        this.$refs.mu.toggleRowSelection(del_row, false); //设置这一行取消选中
      }
      this.projectList = selection.map((item) => ({
        proId: item.proId,
        proName: item.proName,
@@ -940,8 +767,11 @@
    tupian() {
      this.dialogVisible = true;
    },
    // 确定按钮
    submito() {
      console.log(111112225)
      /* if (this.dataobj) {
        if (this.form.proResult) {
          this.dataobj.proResult = this.form.proResult;
@@ -962,16 +792,15 @@
        console.error("未选中行或缺少 proId");
        return;
      }
      console.log(this.selectedRow.proId, 96);
      const proId = this.selectedRow.proId;
      const jcsj = this.form.proResult; // 获取检查所见
      const jcjl = this.form.conclusion; // 获取检查结论
      const jcsj = this.form.proResult || " "; // 获取检查所见
      const jcjl = this.form.conclusion || " "; // 获取检查结论
      // 确保 jcsj 和 jcjl 存在
      if (!jcsj || !jcjl) {
        console.error("检查所见或检查结论不能为空");
        return;
      }
      // if (!jcsj || !jcjl) {
      //   console.error("检查所见或检查结论不能为空");
      //   return;
      // }
      addYxJcXx({
        proId: proId,
@@ -980,7 +809,6 @@
        jcjl: jcjl, // 传递检查结论
      })
        .then((response) => {
          console.log("提交成功", response);
          this.submitForm();
          this.form.proResult = "";
@@ -1002,10 +830,6 @@
<style>
#table .el-table__header-wrapper .el-checkbox {
  display: none;
}
.default-button-style :hover {
  width: 80px;
  border-bottom: none;
src/views/sampling/sampling/index.vue
@@ -105,8 +105,9 @@
      </div>
      <div style="width: 50%">
        <!-- v-if="this.rightTabShow" -->
        <el-table :key="tableKey" :row-key="getRowKey" v-if="tableList.length > 0" v-loading="loading" :data="tableList" @selection-change="handleChange"
          :span-method="objectSpanMethod" ref="tab1" :row-class-name="tableRowClassName" border height="520px">
        <el-table :key="tableKey" :row-key="getRowKey" v-if="tableList.length > 0" v-loading="loading" :data="tableList"
          @selection-change="handleChange" :span-method="objectSpanMethod" ref="tab1"
          :row-class-name="tableRowClassName" border height="520px">
          <el-table-column type="selection" width="40" align="center" />
          <!--  :selectable="selectEnable" -->
          <!-- <el-table-column label="是否签收" align="center" prop="isSignFor" /> -->
@@ -552,6 +553,14 @@
    if (response.data && response.data.list && response.data.list.length > 0) {
      this.samplingList = response.data.list;
      this.total = response.data.total;
          this.$nextTick(() => {
            if (this.$refs.tb) {
              const headerCheckbox = this.$refs.tb.$el.querySelector('.el-table__header .el-checkbox');
              if (headerCheckbox) headerCheckbox.style.display = 'none';
            }
          });
      // 移除默认选中第一行的逻辑
      // this.$nextTick(() => {
      //   this.$refs.tb.toggleRowSelection(this.samplingList[0], true); // 默认选中第一行
@@ -679,6 +688,8 @@
                if (this.$refs.tab1) {
                  this.$refs.tab1.doLayout(); // 修改为正确的 ref 名称
                  this.$refs.tab1.clearSelection(); // 清空选中状态
                  const headerCheckbox = this.$refs.tab1.$el.querySelector('.el-table__header .el-checkbox');
                  if (headerCheckbox) headerCheckbox.style.display = 'inline';
                }
              });
              resolve(this.tableList);
@@ -1016,6 +1027,14 @@
        this.loading = false;
      } else {
        this.samplingList = response.data.list;
            this.$nextTick(() => {
            if (this.$refs.tb) {
              const headerCheckbox = this.$refs.tb.$el.querySelector('.el-table__header .el-checkbox');
              if (headerCheckbox) headerCheckbox.style.display = 'none';
            }
          });
        this.loading = false;
        // 移除默认选中第一行的逻辑
        // if (this.samplingList.length != 0) {
src/views/system/tijian/index.vue
@@ -292,7 +292,7 @@
      <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%" v-model="activeNames"
        @tab-click="handleClick">
        <el-tab-pane label="套餐" name="first">
          <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto">
          <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto" @submit.native.prevent="handle">
            <el-form-item label="套餐名称" prop="pacName">
              <el-input v-model="queryParam.pacName" placeholder="请输入套餐名称" clearable @keyup.enter.native="handle" />
            </el-form-item>
@@ -1323,7 +1323,9 @@
      // }
      if (!value) return true;
      if (data.proName.indexOf(value) !== -1) return true;
      if (data.proEngName.indexOf(value) !== -1) return true;
      let values = value.toLowerCase();
      if (data.proEngName.indexOf(values) !== -1) return true;
      // 匹配小写
      let arr = data.proName.spell("low", "array");
      let spell = arr.join("");
@@ -1347,20 +1349,8 @@
      if (data.zhmc.indexOf(value) !== -1) {
        return data.zhmc.indexOf(value) !== -1;
      } else {
        console.log(55555)
        if (/[A-Z]/.test(data.pym)) { // 检查是否包含大写字母
          let pym = data.pym.toLowerCase()
          console.log(pym,11111)
          return pym.indexOf(value) !== -1;
        } else if (/[a-z]/.test(data.pym)) { // 检查是否包含小写字母
          console.log(pym,22222)
          let pym = data.pym.toLowerCase()
          return pym.indexOf(value) !== -1;
        } else {
          console.log(66666)
          return data.pym.indexOf(value) !== -1;
        }
        let values = value.toLowerCase();
        return data.pym.indexOf(values) !== -1;
      }
    },
    beforeDestroy() {
@@ -2323,7 +2313,8 @@
        dwId: this.form.firmId,
      };
      if (this.name) {
        getPackageListName(this.name).then((response) => {
      let name= this.name.toLowerCase()
        getPackageListName(name).then((response) => {
          this.newpacName = response.data;
          this.loading = false;
        });