12.04

lkk

2024-12-04 d747406e0eb22d47726916be55e85376c4aa2729

12.04

 src/api/team/tuanti.js

@@ -38,7 +38,12 @@
  })
}


export function getconfigKey(configKey) {
  return request({
    url: "/system/config/configKey/" + configKey,
    method: "get",
  });
}
// 
export function getTeamTjPeopleList(teamNo) {
  return request({

 src/views/doctor/check/index.vue

@@ -1789,6 +1789,8 @@
      this.loading = true;
      this.queryParams.type = this.tjStatus;
      getProList(this.queryParams).then((response) => {
        console.log(response,1212);
        
        if (response.code == 200) {
          this.loading = false;
          if (response.data) {

 src/views/hosp/customer/index.vue

@@ -541,6 +541,13 @@
            style="width: 200px"
          />
        </el-form-item>
        <!-- <el-form-item label="工作单位" prop="">
          <el-input
            v-model="form."
            placeholder="请输入工作单位"
            style="width: 820px"
          />
        </el-form-item> -->
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -947,9 +954,9 @@
        cusBrithday: [
          { required: true, validator: checkPhoneNum, trigger: "blur" },
        ],
        cusAddr: [
          { required: true, validator: checkPhoneNum, trigger: "blur" },
        ],
        // cusAddr: [
        //   { required: true, validator: checkPhoneNum, trigger: "blur" },
        // ],
        cusPhone: [
          { required: true, validator: checkPhoneNum, trigger: "blur" },
        ],

 src/views/reservation/resercopy/index.vue

@@ -67,7 +67,7 @@
      </el-form-item>
      <el-form-item label="有效天数" prop="yxts">
        <el-input
          style="width:100px"
          style="width: 100px"
          v-model="objs.yxts"
          placeholder="有效天数"
        />天(可自定义)
@@ -90,7 +90,6 @@
          icon="el-icon-upload2"
          size="mini"
          @click="handleImport"
          
          >导入</el-button
        >
      </el-col>
@@ -100,7 +99,6 @@
          icon="el-icon-upload2"
          size="mini"
          @click="importTemplate"
         
          >下载模板</el-button
        >
      </el-col>
@@ -231,7 +229,7 @@
        </div>
      </el-upload>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitFileForm">确 定</el-button>
        <el-button type="primary" @click="submitFileForm">保存信息</el-button>
        <el-button @click="upload.open = false">取 消</el-button>
      </div>
    </el-dialog>
@@ -399,9 +397,13 @@
  getDwAndDwDept,
  newExcelImport,
} from "@/api/system/comp";
import { newConfirm, getCompany, queryCompany } from "@/api/team/tuanti";
import {
  newConfirm,
  getCompany,
  queryCompany,
  getconfigKey,
} from "@/api/team/tuanti";
import { getToken } from "@/utils/auth";
import { read, utils } from "xlsx";

export default {
  dicts: [
@@ -475,7 +477,7 @@
      objs: {
        drugManufacturerId: "",
        reservationTime: "",
        yxts: "30",
        yxts: "",
      },
      DataList: [],
      tjOrderList: [], //单个项目集合
@@ -769,6 +771,7 @@
    },
    // 搜索
    getRemoteData(query) {
      
      if (query) {
        let compName = query;
        queryCompany(compName).then((response) => {
@@ -783,6 +786,10 @@
    // 获取单位信息集合
    getCompanyList() {
      this.loading = true;
      getconfigKey('team_reservation_default_day').then((res) => {
        console.log(res, 1111);
        this.objs.yxts = res.msg;
      });
      getCompany(this.queryParam).then((response) => {
        this.CompanyList = response.data;
        this.total = response.total;
@@ -844,6 +851,7 @@
      this.TotalPrice = "";
      this.tableData[0] = [];
      this.TotalPrice1 = "";
      this.userList = []
      // this.resetForm("form");
      this.form = {};
    },
@@ -852,7 +860,6 @@
    selectTime(val) {
      this.objs.reservationTime = val;
    },

    /** 导入按钮操作 */
    handleImport() {
      if (this.objs.drugManufacturerId && this.objs.reservationTime) {
@@ -876,14 +883,24 @@
    },
    // 文件上传成功处理
    handleFileSuccess(response, file, fileList) {
      console.log(response,666666);
       if (response.code == 500) {
      console.log(response, 666666);
      if (response.code == 500) {
        console.log(22222222222);
        // Message.warning(response.msg);
        this.$modal.msgError(response.msg);
        // this.$modal.msgError(response.msg);
        // this.$modal.msgError("人员"+ response.data.list + "信息错误");
        const errorList = response.data.list.join(", ");
        this.$confirm(`${errorList}`, "以下人员信息有误，请核对后导入：", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "error",
          center: true,
          dangerouslyUseHTMLString: true,
        });
      }
      this.ListObj = response.data;
      this.userList = response.data.list;

      this.userList.forEach((item) => {
        this.CompanyList.forEach((item1) => {
          if (item1.drugManufacturerId == this.objs.drugManufacturerId) {
@@ -896,7 +913,7 @@
      this.$refs.upload.clearFiles();
      this.leftList = response.msg;
      console.log(response.code);
     

      if (this.leftList == "操作失败") {
        this.isdisabled = true;
        this.$alert(

 src/views/sampling/sampling/index.vue

@@ -96,23 +96,18 @@
        v-if="samplingList.length > 0 && tjStatus == 1"
      >
        <el-button type="primary" @click="Merging">合并项目</el-button>
        <el-button
        <!-- <el-button
          type="primary"
          icon="el-icon-thumb"
          style="margin: 0 15px"
          v-hasPermi="['hosp:detail:add']"
          @click="Confirmreceipt"
          >确认采样</el-button
        >
        > -->
        <el-button type="primary" :disabled="!disabled" @click="Cancellation"
          >撤销合并</el-button
        >
        <el-button
          type="primary"
          :disabled="!selectList.length"
          @click="Collection"
          >采样打码</el-button
        >
        <el-button type="primary" @click="Confirmreceipt">采样打码</el-button>
      </el-col>
      <el-col
        :span="12"
@@ -190,15 +185,21 @@
        </el-table>
      </div>
      <div style="width: 50%">
        <!-- :default-sort="{ prop: 'specimenType', order: 'ascending' }"  :default-sort="{ prop: 'specimenType', order: 'ascending' }"
          @sort-change="handleSortChange"
          :span-method="objectSpanMethod"
          @selection-change="handleChange" ref="tab1"
          :row-class-name="tableRowClassName"-->
        <el-table
          v-loading="loading"
          :data="tableList"
          :span-method="objectSpanMethod"
          @sort-change="handleSortChange"
          @selection-change="handleChange"
          border
          height="520px"
          :span-method="objectSpanMethod"
          ref="tab1"
          :row-class-name="tableRowClassName"
          border
          height="520px"
        >
          <el-table-column type="selection" width="40" align="center" />
          <!--  :selectable="selectEnable" -->
@@ -291,8 +292,9 @@
          </div>
          <div class="tj">
            <span>体检中心</span>
            <span>{{ item.cardId.substring(0, 14) }}</span>
            <!-- <span>{{ item.cardId ? item.cardId.substring(0, 14) : '' }}</span> -->
            <!-- <span>{{ item.cardId.slice(0, 14) }}</span> -->
            <!-- <span>{{ item.cardId }}</span> -->
            <span>{{ item.cardId ? item.cardId.substring(0, 14) : "" }}</span>
          </div>
          <div class="tj">
            <span>{{ item.jyxh }}</span>
@@ -477,17 +479,34 @@
  },

  methods: {
    handleSortChange({ prop, order }) {
      if (order === null) return; // 无排序时不处理

      this.tableList.sort((a, b) => {
        // 如果标本类型相同，继续按照采样编号排序
        if (a.jyxh !== b.jyxh) {
          return order === "ascending" ? a.jyxh - b.jyxh : b.jyxh - a.jyxh;
        }

        return 0;
      });
    },
    getTruncatedName(proName) {
      // 去掉所有空格
      const trimmedProName = proName.replace(/\s+/g, "");

      const number = this.msg;

      const truncated =
        trimmedProName.length > number
          ? trimmedProName.slice(0, number)
          : trimmedProName;
      const remaining =
      let remaining =
        trimmedProName.length > number ? trimmedProName.slice(number) : "";

      if (remaining.length > number) {
        remaining = remaining.slice(0, number) + "...";
      }
      return { truncated, remaining }; // 返回结果
    },

@@ -717,8 +736,9 @@
      getCusCyList(cusId, this.tjStatus) // 调用API获取数据
        .then((response) => {
          if (response.data) {
            console.log(response, 2525);

            this.tableList = response.data; // 确认 list 存在后再进行赋值
            // console.log(this.tableList, 123);
          } else {
            // 如果没有数据或 list 为空，清空表格并提示
            this.tableList = [];
@@ -963,24 +983,26 @@
    // 确认采样
    Confirmreceipt() {
      let data = this.ids;
      if (data.length === 0) {
        // 如果没有已合并的项目，给出提示信息
        this.$message.error("没有已合并的项目可以撤销！");
        return;
      }
      console.log(this.ids, 999);

      const loadingInstance = this.$loading({
        lock: true, // 锁定屏幕
        text: "加载中...", // 加载文本
        spinner: "el-icon-loading", // 自定义加载图标
        background: "rgba(255, 255, 255, 0.7)", // 背景颜色
      });
      confirmSampling(data)
      confirmSampling(this.ids)
        .then((res) => {
          this.$modal.msgSuccess("采样成功");
          this.getList();
          if (res.code === 200) {
            this.$modal.msgSuccess("采样成功");
            this.Collection();
          }else{
            this.$message.error(res.msg)
          }
          // this.getList();
        })
        .catch((error) => {
          this.$message.error("采样失败");
          this.$message.error(res.msg);
        })
        .finally(() => {
          loadingInstance.close();

 src/views/system/register/index.vue

@@ -125,7 +125,7 @@
            <span>{{ parseTime(scope.row.reservationTime) }}</span>
          </template> -->
        </el-table-column>
        <el-table-column label="撤销人员" align="center" prop="name" width="100px" height="10px" :show-overflow-tooltip="true">
        <el-table-column label="撤销人员" align="center" prop="updateBy" width="100px" height="10px" :show-overflow-tooltip="true">
          <!-- <template slot-scope="scope">
            <span>{{ parseTime(scope.row.reservationTime) }}</span>
          </template> -->
@@ -497,6 +497,8 @@
      this.loading = true;
      let token = user.state.token;
      getselectTj(token).then((response) => {
        console.log(response,9999);
        
        this.orderList = response.rows;
        response.rows.forEach((item, index) => {
          item.newID =

 src/views/system/tijian/index.vue

@@ -1653,12 +1653,13 @@

      // 表单参数
      // 表单参数
      obj: {},
      form: {
        cusIdcard: "",
        tjType: "3",
        cusSex: 1,
        cusNational: "1",
        cusMarryStatus: "1",
        cusMarryStatus: "5",
        idType: "1",
        ageUnit: "0",
      },
@@ -2278,7 +2279,6 @@
        //   this.$message.error("此用户不存在");
        // });
      } else {

        let configKey = "getInfoFromSqlData";
        getconfigKey(configKey).then((res) => {
          console.log(res);
@@ -2326,7 +2326,7 @@
              websocket.onmessage = function (event) {
                var resultObj = eval("(" + event.data + ")");
                //resultFlag为0代表读卡成功
                

                if (
                  resultObj.name == "readCard" ||
                  resultObj.name == "readCert" ||
@@ -2972,10 +2972,10 @@
            let proId = this.packagedataList[i].proId;
            this.checkedListkey1.push(proId);
            // this.DataLists.push(this.packagedataList[i]);
              getProSonDxList(proId).then((res) => {
            getProSonDxList(proId).then((res) => {
              this.TreedataList = res.data.list;
              console.log(this.TreedataList,888);
              
              console.log(this.TreedataList, 888);

              this.TreedataList.forEach((item) => {
                // this.checkedListkey1.push(item.proId);

@@ -2985,7 +2985,7 @@
                  this.marryalls = 0;
                  this.DataLists.forEach((item1) => {
                    this.marryalls += item1.proPrice;
                    

                    this.packagedataList.forEach((item3) => {
                      if (item1.proParentId == item3.proId) {
                        item1.propinName = item3.proName;

 vue.config.js

@@ -53,9 +53,9 @@
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        // target: `https://ltpeis.xaltjdkj.cn:5801/`,
        target: `http://localhost:5011`,
        target: `http://192.168.1.3:5011`,
        // target: `http://192.168.1.113:5011`,
        // target: `http://localhost:5011`,
        // target: `http://192.168.1.3:5011`,
        target: `http://192.168.1.113:5011`,
        // // target: `http://192.168.0.99:8080/ltkj-admin`,
        // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
        // target: `http://10.168.0.9:5011`,