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

lkk

2025-05-14 af094a9de73e456b33a4f058b2d9bf981852558a

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

 src/api/doctor/checkAll.js

@@ -147,3 +147,12 @@
    params: data
  })
}


export function UpdFcPro(data) {
  return request({
    url: '/check/UpdFcPro',
    method: 'post',
    data: data
  })
}

 src/api/hosp/customer.js

@@ -153,3 +153,14 @@
    }
  })
}



// 体检点击收费按钮接口
export function getUserinfo(data) {
  return request({
    url: '/hosp/customer/zhuceTjCustomer',
    method: 'post',
    data: data
  })
}

 src/views/doctor/check/index.vue

@@ -1061,7 +1061,7 @@
            const bmi = this.calculateBMI(heightRow.proResult, weightRow.proResult);
            bmiRow.proResult = bmi || '';
          } else {
            this.$message.error('缺少身高、体重或 BMI 项目');
            // this.$message.error('缺少身高、体重或 BMI 项目');
          }
          this.proParentList.xiaoJie.forEach((item) => {
            this.titles += item.title + ",";

 src/views/doctor/checkAll/index.vue

@@ -184,9 +184,9 @@
        <div class="btn1">
          <el-button @click="yichangjieguo()" type="primary"><span class="vertical-text">异常结果</span></el-button>
        </div>
        <!-- <div class="btn1">
        <div class="btn1">
          <el-button @click="fuchaxiangmu()" type="primary"><span class="vertical-text">复查项目</span></el-button>
        </div> -->
        </div>
      </div>
      <div class="box">
        <div class="left-container">
@@ -824,7 +824,7 @@
  gettoPdf,
  getModified,
  isPdfOrJimu,
  addOrder,
  addOrder,UpdFcPro,
  getFcList
} from "@/api/doctor/checkAll";
import { getInfoById } from "@/api/hosp/history";
@@ -876,7 +876,7 @@
      preObj: {},
      baogao: [],
      flags: false,

      fcList: [],
      xmopen: false,
      datasList: [],
      jianqianwenzhendata: [],

 src/views/hosp/customer/index.vue

@@ -270,6 +270,16 @@
          >导出</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
          size="mini"
          @click="handleReInfor"
          :disabled="single"
          :loading="blackloading"
          >注册his信息</el-button
        >
      </el-col>
      <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
@@ -1006,7 +1016,7 @@
  delCustomer,
  addCustomer,
  updateCustomer,
  getHistryTjOrderByCusIdCard,
  getHistryTjOrderByCusIdCard,getUserinfo
} from "@/api/hosp/customer";
import { getPdf, addCustomerBlack } from "@/api/hosp/order";
import {
@@ -1360,6 +1370,16 @@
      });
    },

    handleReInfor() {
      let data = {
        cusId: this.ids[0],
      };
      getUserinfo(data).then((res) => {
        this.$modal.msgSuccess("注册成功");
        this.getList();
      });
    },

    inputChange() {
      const reg =
        /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;

 src/views/system/comp/index.vue

@@ -98,6 +98,7 @@
      v-loading="loading"
      :data="compList"
      @selection-change="handleSelectionChange"
      ref="tab"
    >
      <el-table-column
        fixed="left"
@@ -743,7 +744,7 @@
            <el-col :span="8">
              <span
                >性别：{{
                  forms.sex === "1" ? "男" : forms.sex === "0" ? "女" : "未知"
                  forms.sex === "1" ? "女" : forms.sex === "0" ? "男" : "未知"
                }}</span
              >
            </el-col>
@@ -1761,6 +1762,11 @@
      this.ids = selection.map((item) => item.drugManufacturerId);
      this.single = selection.length !== 1;
      this.multiple = !selection.length;
        if (selection.length > 1) {
        // 如果选择了多行，保留最后一行
        this.$refs.tab.clearSelection();  // 清空所有选择
        this.$refs.tab.toggleRowSelection(selection[selection.length - 1]);  // 重新选择最后一项
      }
    },
    // 部门表格单行获取
    handleSelection(selection) {
@@ -2001,6 +2007,8 @@
        this.dataList = selection;
        this.resetright();
      }

      
    },
    resetright() {
      if (this.dataList.length == 0) {