1
wwl
2025-01-04 492a91ada4f0f98d9d800b55f9dddda7b53f7dd8
1
3个文件已修改
274 ■■■■ 已修改文件
src/components/jianceResult/index.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/comp/index.vue 109 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/tijian/index.vue 138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/jianceResult/index.vue
@@ -1,6 +1,16 @@
<template>
  <div>
    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body @close="quxiao">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
        <el-form-item label="内容" prop="xmg">
          <el-input v-model="queryParams.xmgz" 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>
      <el-table :data="dataList" ref="elTable" v-loading="loading" border @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="40" align="center" />
        <el-table-column label="标号" prop="aid" align="center" />
@@ -9,7 +19,7 @@
        <el-table-column label="简码" prop="jm" align="center" />
      </el-table>
      <span slot="footer" class="dialog-footer">
        <el-button @click="open = false">取 消</el-button>
        <el-button @click="quxiao">取 消</el-button>
        <el-button type="primary" @click="handleOk">确 定</el-button>
      </span>
    </el-dialog>
@@ -39,11 +49,18 @@
      },
      list: [],
      fList: {},
      queryParams: { xmgz: '' }
    };
  },
  mounted() {
  },
  methods: {
    quxiao(){
      this.open = false
      this.queryParams = {
        xmgz: ''
      }
    },
    handleOk() {
      if(this.list.length == 0) {
        this.$modal.msgError("请选择至少一项!");
@@ -63,14 +80,16 @@
    getList() {
      this.loading = true;
      selectZT({
        proId: this.proId
        proId: this.proId,
        xmgz: this.queryParams.xmgz
      }).then((res) => {
        if (res.data.length>0) {
          this.open = true
          this.dataList = res.data;
          this.loading = false;
        } else {
          this.open = false
          this.dataList = res.data;
          this.loading = false;
        }
      });
    },
src/views/system/comp/index.vue
@@ -31,7 +31,7 @@
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="mainDepartment"
          v-hasPermi="['system:comp:edit']">维护部门</el-button>
          v-hasPermi="['system:comp:edit']">维护套餐</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
@@ -333,8 +333,8 @@
                <el-input ref="inputName" v-model="queryParams.price" placeholder="合计" clearable style="width: 140px" />
              </el-form-item>
              <el-form-item label="优惠">
                <el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="2"
                  :step="0.1" :max="10" :min="1"></el-input-number>
                <el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="2" :step="0.1"
                  :max="10" :min="1" @change="numberChange"></el-input-number>
              </el-form-item>
              <el-form-item label="现价">
                <el-input ref="inputName" v-model="queryParams.xianprice" placeholder="合计" clearable
@@ -372,8 +372,8 @@
          <el-col :span="2" :xs="24">
            <div style="margin: 240% 16%">
              <el-button type="primary" size="medium " icon="el-icon-back"
                style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;"
                @click="resetright">确认</el-button>
                style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;" @click="resetright">确
                认</el-button>
            </div>
          </el-col>
          <el-col :span="11" :xs="24">
@@ -971,16 +971,34 @@
        }
      });
    },
    // 折扣
    numberChange(currentValue) {
      this.forms.limits = currentValue;
      /* if (this.forms.limits > this.getInfodis) {
        this.forms.limits = this.getInfodis;
        this.forms.ysPrice = (
          this.forms.price *
          (this.forms.limits / 10)
        ).toFixed(2);
      } */
    numberChange(currentValue, oldValue) {
      this.$confirm("确定修改所有子项的折扣吗?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          this.youhui = currentValue;
          if (this.youhui < this.getInfodis) {
            this.youhui = this.getInfodis;
            // this.$modal.msgError(`该人员最高优惠权限为${this.getInfodis}折`);
          }
          this.OnenewpacName.forEach((item) => {
            item.limits = this.youhui
            const proPrice = new Big(item.proPrice);
            const limits = new Big(item.limits);
            const result = proPrice.times(limits.div(10));  // ordPrice * (discount / 10)
            item.ysPrice = result.toNumber();
            this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
              return sum.plus(new Big(item.ysPrice || '0'));
            }, new Big(0));
          })
          // ----------------------------------------------------------
        })
        .catch(() => {
          this.youhui = oldValue;
        });
    },
@@ -1074,36 +1092,73 @@
        this.dataList = selection;
      }
    },
    // 单项选定按钮
    resetright() {
      this.queryParams.price = 0;
  this.queryParams.xianprice = 0; // 初始化现价
  this.youhui = 0; // 初始化优惠
  const newItemsToAdd = [];
      this.dataList.forEach((item) => {
        this.$refs.tre.toggleRowSelection(item, false);
        this.OnenewpacName.push(item);
    // 使用 $set 确保响应性
    this.$set(item, 'limits', 10);
    this.$set(item, 'ysPrice', item.proPrice);
    // 检查是否已经存在相同的项目
    const existingItem = this.OnenewpacName.find(existing => existing.proId === item.proId);
    if (!existingItem) {
      newItemsToAdd.push(item);
      this.updateProPrice(item); // 更新单个项目的价格
    }
      });
      for (var i = 0; i < this.OnenewpacName.length - 1; i++) {
        for (var j = i + 1; j < this.OnenewpacName.length; j++) {
          if (this.OnenewpacName[i].proId == this.OnenewpacName[j].proId) {
  // 添加新项目到 OnenewpacName
  this.OnenewpacName.push(...newItemsToAdd);
  // 删除重复项目,这里我们只需处理新添加的项目和原有项目之间的重复
  for (let i = this.OnenewpacName.length - newItemsToAdd.length; i < this.OnenewpacName.length - 1; i++) {
    for (let j = i + 1; j < this.OnenewpacName.length; j++) {
      if (this.OnenewpacName[i].proId === this.OnenewpacName[j].proId) {
            this.OnenewpacName.splice(j, 1);
            j--;
          }
        }
      }
      return this.OnenewpacName.forEach((item) => {
  // 计算总价和现价
  this.OnenewpacName.forEach((item) => {
        this.queryParams.price += item.proPrice;
    this.queryParams.xianprice += item.ysPrice || 0; // 确保ysPrice存在
      });
  // 计算优惠
  if (this.queryParams.price > 0) {
    this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
  } else {
    this.youhui = 0;
  }
    },
    handledbelete(row) {
      this.queryParams.price = 0;
      this.OnenewpacName.forEach((item, index) => {
        if (item.proId == row.proId) {
          this.OnenewpacName.splice(index, 1);
        }
      });
      return this.OnenewpacName.forEach((item) => {
  this.queryParams.xianprice = 0; // 初始化现价
  this.youhui = 0; // 初始化优惠
  // 先找到并删除项目
  this.OnenewpacName = this.OnenewpacName.filter(item => item.proId !== row.proId);
  // 然后更新总价和现价
  this.OnenewpacName.forEach((item) => {
        this.queryParams.price += item.proPrice;
    this.queryParams.xianprice += item.ysPrice || 0; // 确保ysPrice存在
      });
  // 计算优惠
  if (this.queryParams.price > 0) {
    this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
  } else {
    this.youhui = 0;
  }
    },
    submitrighr() {
src/views/system/tijian/index.vue
@@ -218,13 +218,7 @@
              <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="请输入介绍人" />
            </el-form-item>
            <el-form-item label="单位名称" prop="compName">
              <el-select :disabled="isDisabled" v-model="form.compName" remote default-first-option allow-create
                filterable style="width: 200px" placeholder="请选择单位名称" clearable @change="idFn1">
                <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.cnName" />
              </el-select>
              <!-- <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i> -->
            </el-form-item>
            <el-form-item label="文化程度" prop="wenHua" label-width="93px">
              <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="请输入文化程度" />
@@ -482,15 +476,47 @@
      <el-col :span="15">
        <div class="grid-content bg-purple">
          <template>
            <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px">
            <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px;width: 900px;">
              <el-form-item label="姓名" prop="cusName">
                <span slot="label">
                  姓名
                </span>
                <el-input v-model="form.cusName" placeholder="请输入姓名" :disabled="isDisabled" />
              </el-form-item>
              <el-form-item label="性别" prop="cusSex">
                <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="性别" style="width: 150px">
                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
                    :value="parseInt(dict.value)"></el-option>
                </el-select>
              </el-form-item>
              <el-form-item label="证件号码" prop="cusIdcard">
                <span slot="label">
                  证件号码
                </span>
                <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="请输入身份证号" @input="inputChange" />
              </el-form-item>
              <el-form-item label="单位名称" prop="firmName">
                <el-select v-model="form.firmName" remote default-first-option allow-create filterable
                  style="width: 200px" placeholder="请选择单位名称" clearable @change="idFn1" @clear="clear">
                  <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.cnName" />
                </el-select>
              </el-form-item>
              <el-form-item label="体检类型">
                <el-select style="width: 150px" v-model="form.tjType" placeholder="请选择体检类型">
                  <el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
                    :value="dict.value"></el-option>
                    :value="dict.value" :disabled="!form.firmId && dict.value === '1'"></el-option>
                </el-select>
              </el-form-item>
              <el-form-item label="体检类别">
                <el-select style="width: 200px" v-model="tjCategory" placeholder="请选择体检类别">
                  <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
                    :value="dict.value"></el-option>
                </el-select>
                <!-- <el-input v-model="form.category" placeholder="请输入体检类别" /> -->
              </el-form-item>
              <el-form-item label="应收金额">
                <el-input placeholder="应收金额" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
                <el-input placeholder="应收金额" v-model="TotalPrice1" disabled style="width: 200px"></el-input>
              </el-form-item>
              <el-form-item label="优惠">
                <!-- {{ discount }} -->
@@ -498,24 +524,11 @@
                  :max="10" :min="0" @change="numberChange" :disabled="isfalse"></el-input-number>
              </el-form-item>
              <el-form-item label="实收金额">
                <el-input placeholder="实收金额" v-model="TotalPrice" style="width: 150px"></el-input>
                <el-input placeholder="实收金额" v-model="TotalPrice" style="width: 206px"></el-input>
              </el-form-item>
              <br />
              <el-form-item label="领取方式">
                <el-select v-model="getType" style="width: 150px" @change="getmailType">
                  <el-option v-for="dict in dict.type.report_get_type" :key="dict.value" :label="dict.label"
                    :value="dict.value"></el-option>
                </el-select>
              </el-form-item>
              <el-form-item label="体检类别">
                <el-select style="width: 150px" v-model="tjCategory" placeholder="请选择体检类别">
                  <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
                    :value="dict.value"></el-option>
                </el-select>
                <!-- <el-input v-model="form.category" placeholder="请输入体检类别" /> -->
              </el-form-item>
              <el-form-item style="margin-left: 149px">
                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">选择套餐</el-button>
@@ -1026,6 +1039,8 @@
        cusMarryStatus: "5",
        idType: "1",
        ageUnit: "0",
        firmId: '',
      },
      form1: {},
      title: "",
@@ -1078,6 +1093,9 @@
  mounted() { },
  methods: {
    clear() {
      this.form.firmId = ""
    },
    /** 删除按钮操作 */
    handleDelete1(row) {
      console.log(row);
@@ -1177,16 +1195,20 @@
    },
    idFn1(value) {
      if (value) {
        const originalCompId = this.form.dictCompId;
        this.form.compName = value;
        console.log(value)
        const originalCompId = this.form.firmId;
        this.form.firmName = value;
        this.CompanyList.forEach((item) => {
          if (item.cnName == this.form.compName) {
            this.form.dictCompId = item.drugManufacturerId;
          if (item.cnName == this.form.firmName) {
            this.form.firmId = item.drugManufacturerId;
          }
        });
        if (this.form.dictCompId === originalCompId) {
          this.form.dictCompId = "";
        if (this.form.firmId === originalCompId) {
          this.form.firmId = "";
        }
        if (this.form.firmId) {
          this.form.tjType = "1"
        }
      }
    },
@@ -1551,6 +1573,7 @@
        updateBy: null,
        updateTime: null,
        deleted: null,
        firmid: ''
      };
      this.resetForm("form");
    },
@@ -1583,11 +1606,34 @@
    // 折扣
    numberChange(currentValue, oldValue) {
      this.$confirm("确定修改所有子项的折扣吗?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
      this.discount = currentValue;
      if (this.discount <= this.getInfodis) {
          if (this.discount < this.getInfodis) {
        this.discount = this.getInfodis;
            // this.$modal.msgError(`该人员最高优惠权限为${this.getInfodis}折`);
      }
      // this.TotalPrice = (this.TotalPrice1 * (this.discount / 10)).toFixed(2);
          this.tableData1.forEach((item) => {
            item.discount = this.discount
            const ordPrice = new Big(item.ordPrice);
            const discount = new Big(item.discount);
            const result = ordPrice.times(discount.div(10));  // ordPrice * (discount / 10)
            item.nowPrice = result.toNumber();
            this.TotalPrice = this.tableData1.reduce((sum, item) => {
              return sum.plus(new Big(item.nowPrice || '0'));
            }, new Big(0));
          })
          // ----------------------------------------------------------
        })
        .catch(() => {
          this.discount = oldValue;
        });
    },
    /** 登记提交按钮 */
@@ -2135,7 +2181,7 @@
      this.name = this.queryParam.pacName;
      let param = {
        sex: this.form.cusSex,
        dwId: this.form.dictCompId
        dwId: this.form.firmId
      }
      if (this.name) {
        getPackageListName(this.name).then((response) => {
@@ -2249,10 +2295,10 @@
      let param = {
        sex: cusSex,
        dwId: this.form.dictCompId || ''
        dwId: this.form.firmId || ''
      }
      if (this.form.tjType == 1) {
        if (!this.form.dictCompId) {
        if (!this.form.firmId) {
          this.$message({
            type: "warning",
            message: "请先维护单位!",
@@ -2712,8 +2758,6 @@
              this.TotalPrice1 = 0;
              if (this.tableData1) {
                this.tableData1.forEach((item) => {
                  this.TotalPrice1 += item.ordPrice;
                  this.TotalPrice += item.nowPrice;
                  if (item.tjCategory != null) {
                    this.tjCategory = item.tjCategory;
                  }
@@ -2722,10 +2766,16 @@
                      this.treeList.push(item9.proId);
                    });
                  }
                  this.TotalPrice1 += item.ordPrice;
                  this.TotalPrice += item.nowPrice;
                  this.pacName = item.pacName;
                });
                this.TotalPrice = this.tableData1.reduce((sum, item) => {
                  return sum.plus(new Big(item.nowPrice || '0'));
                }, new Big(0));
                this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10
                this.list1 = false;
                this.list3 = true;
                this.list2 = false;
@@ -2738,7 +2788,8 @@
          }
        });
      } else {
      }
       else {
        getaddtTransition(data).then((response) => {
          if (response.code == 200) {
            let cusId = this.form.cusIdcard;
@@ -2748,8 +2799,6 @@
              this.TotalPrice1 = 0;
              if (this.tableData1) {
                this.tableData1.forEach((item) => {
                  this.TotalPrice1 += item.ordPrice;
                  this.TotalPrice += item.nowPrice;
                  if (item.tjCategory != null) {
                    this.tjCategory = item.tjCategory;
                  }
@@ -2758,9 +2807,12 @@
                      this.treeList.push(item9.proId);
                    });
                  }
                  this.TotalPrice1 += item.ordPrice;
                  this.TotalPrice += item.nowPrice;
                  this.pacName = item.pacName;
                });
                this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10
                this.list1 = false;
@@ -2776,8 +2828,6 @@
          }
        });
      }
      this.taocan = false;
      this.defaultKeys = [];
      this.DataLists = [];