qx

qx

9 天以前 91ec24b5e11ee9294f4061853b93b97508804023

 src/views/system/comp/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-dialog title="选择套餐" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
     <el-dialog :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
      <!-- <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" label-width="auto">
        <el-form-item label="套餐名称" prop="pacName">
          <el-input v-model="queryParam.pacName" placeholder="请输入套餐名称" clearable @keyup.enter.native="handle"
@@ -10,13 +10,39 @@
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">搜索</el-button>
        </el-form-item>
      </el-form> -->
      <el-table v-loading="loading" element-loading-text="正在加载中..." element-loading-spinner="el-icon-loading" border
        :data="newpacName1" @selection-change="handleSelectionChange1" height="450px" ref="tb">
        <el-table-column type="selection" width="40px" align="center" label="选择" />
        <el-table-column label="套餐名称" align="center" prop="pacName" width="120px" />
        <el-table-column label="套餐价格" align="center" prop="price" width="120px" />
        <el-table-column label="套餐明细" align="center" prop="allProName" :show-overflow-tooltip="true" />
      </el-table>

      <el-radio-group v-model="taocanStatus" @input="radioChangetaocan" style="margin-left: 10px;margin-bottom: 20px;">
        <el-radio-button label="0">基础套餐</el-radio-button>
        <el-radio-button label="1">单位套餐</el-radio-button>
      </el-radio-group>
      <div>
        <el-form :model="formdanwen" ref="queryForm" size="small" :inline="true" label-width="68px"
          @submit.native.prevent v-if="taocanStatus == 1">
          <el-form-item label="单位名称" prop="drugManufacturerId">
            <el-select v-model="formdanwen.drugManufacturerId" remote filterable style="width: 200px"
              placeholder="请选择单位名称" clearable>
              <el-option v-for="dict in compList" :key="dict.cnName" :label="dict.cnName"
                :value="dict.drugManufacturerId" />
            </el-select>
          </el-form-item>
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuerydanwen"
              style="margin: 0 15px">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-form>
        <el-table v-loading="loading" element-loading-text="正在加载中..." element-loading-spinner="el-icon-loading" border
          :data="newpacName1" @selection-change="handleSelectionChange1" height="450px" ref="tb">
          <el-table-column type="selection" width="40px" align="center" label="选择" />
          <el-table-column label="套餐名称" align="center" prop="pacName" width="120px" />
          <el-table-column label="套餐价格" align="center" prop="price" width="120px" />
          <el-table-column label="套餐明细" align="center" prop="allProName" :show-overflow-tooltip="true" />
        </el-table>
      </div>
      <!-- <div v-else>

      </div> -->

      <span slot="footer" class="dialog-footer">
        <el-button @click="cancel1">取 消</el-button>
        <el-button type="primary" @click="submit">确 定</el-button>
@@ -59,7 +85,7 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table border v-loading="loading" :data="compList" @selection-change="handleSelectionChange">
    <el-table border v-loading="loading" :data="compList"  ref="tab" @selection-change="handleSelectionChange">
      <el-table-column fixed="left" type="selection" width="40px" align="center" />
      <el-table-column label="序号" align="center" prop="newID" :show-overflow-tooltip="true" width="50px" fixed="left" />
      <el-table-column label="单位名称" align="center" prop="cnName" width="240px" />
@@ -139,7 +165,7 @@
    </div>

    <div>
      <el-dialog :title="title" :visible.sync="opens" width="1350px" append-to-body :close-on-click-modal="false">
      <el-dialog :title="title" :visible.sync="opens" width="1350px" append-to-body :close-on-click-modal="true">
        <el-row :gutter="20">
          <el-col :span="7" :xs="24">
            <div style="padding: 0 20px">
@@ -150,6 +176,13 @@
                <el-form-item label="签约金额" prop="signingPrice">
                  <el-input v-model="form.signingPrice" placeholder="请输入签约金额" />
                </el-form-item>
                 <el-form-item label="病种" prop="bz" v-if="dwlxs == 1">
                   <el-input v-model="form.bz" placeholder="请输入病种" />
                <!-- <el-select v-model="form.bz" placeholder="请选择病种" style="width: 180px" clearable>
                  <el-option v-for="dict in dict.type.reservation_pay_type" :key="dict.value" :label="dict.label"
                    :value="dict.value" />
                </el-select> -->
              </el-form-item>
              </el-form>
              <el-row :gutter="10" class="mb8">
                <el-col :span="1.5">
@@ -162,7 +195,7 @@
                </el-col>
              </el-row>
              <el-table ref="tb" v-loading="loading" :data="deptList" @selection-change="handleSelection" border
                style="width: 320px" height="350">
                style="width: 320px" height="300">
                <el-table-column type="selection" width="40px" align="center" />
                <el-table-column label="套餐名称" align="center" prop="dwDeptName" />
              </el-table>
@@ -201,6 +234,7 @@
                    :value="dict.value" />
                </el-select>
              </el-form-item>
              
              <el-form-item label="年龄段">
                <el-col :span="7">
                  <el-input v-model="forms.ltAge" style="width: 53px" />
@@ -210,10 +244,6 @@
                  <el-input v-model="forms.gtAge" style="width: 54px" />
                </el-col>
              </el-form-item>




            </el-form>

            <el-row :gutter="10" class="mb8">
@@ -292,6 +322,9 @@
              <el-form-item>
                <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">重置</el-button>
              </el-form-item>
              <el-form-item>
                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">选择套餐</el-button>
              </el-form-item>
            </el-form>
            <!-- <div style="color: red; font-size: 8px">
              注释：鼠标左键双击选中行可删除
@@ -322,13 +355,11 @@
            </div>
          </el-col>
          <el-col :span="8" :xs="24">
            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
            <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
              label-width="68px" @submit.native.prevent>
              <el-form-item>
                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">选择套餐</el-button>
              </el-form-item>
              
              <el-form-item label="项目名称" prop="proName">
                <el-input ref="inputName" v-model="queryParams.proName" placeholder="请输入项目名称" clearable
                <el-input ref="inputName" v-model="queryParams1.proName" placeholder="请输入项目名称" clearable
                  @keyup.enter.native="handleSearchFor" style="width: 140px" />
              </el-form-item>
              <el-form-item>
@@ -338,8 +369,8 @@
            <el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
              height="478">
              <el-table-column type="selection" width="40px" align="center" />
              <el-table-column label="项目名称" align="center" prop="proName" />
              <el-table-column label="项目价格/元" align="center" prop="proPrice" />
              <el-table-column label="项目名称" align="center" prop="proName" width="230px"/>
              <el-table-column label="项目价格/元" align="center" prop="proPrice" width="100px"/>
            </el-table>
          </el-col>
        </el-row>
@@ -370,6 +401,9 @@
              </el-form-item>
              <el-form-item>
                <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">重置</el-button>
              </el-form-item>
              <el-form-item>
                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">选择套餐</el-button>
              </el-form-item>
            </el-form>
            <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
@@ -402,7 +436,7 @@
                }}</span>条</div>

          </el-col>
          <el-col :span="2" :xs="24">
          <!-- <el-col :span="2" :xs="24">
            <div style="margin: 240% 16%" class="btntoleft">
              <el-button type="primary" size="medium"
                style="writing-mode: vertical-rl; text-align: center; letter-spacing: 5px;" @click="resetright">
@@ -411,16 +445,14 @@
                <i class="el-icon-back"></i>
              </el-button>
            </div>
          </el-col>
          </el-col> -->
          <el-col :span="7" :xs="24">
            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
            <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
              label-width="68px" @submit.native.prevent>
              <el-form-item>
                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">选择套餐</el-button>
              </el-form-item>
              

              <el-form-item label="项目名称" prop="proName">
                <el-input ref="inputName" v-model="queryParams.proName" placeholder="请输入项目名称" clearable
                <el-input ref="inputName" v-model="queryParams1.proName" placeholder="请输入项目名称" clearable
                  @keyup.enter.native="handleSearchFor" style="width: 140px" />
              </el-form-item>
              <el-form-item>
@@ -430,8 +462,8 @@
            <el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
              height="478" style="width: 100%">
              <el-table-column type="selection" width="40px" align="center" />
              <el-table-column label="项目名称" align="center" prop="proName" />
              <el-table-column label="项目价格/元" align="center" prop="proPrice" />
              <el-table-column label="项目名称" align="center" prop="proName" width="230px"/>
              <el-table-column label="项目价格/元" align="center" prop="proPrice" width="100px"/>
            </el-table>
          </el-col>
        </el-row>
@@ -476,6 +508,9 @@
              <el-form-item>
                <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">重置</el-button>
              </el-form-item>
              <el-form-item>
                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">选择套餐</el-button>
              </el-form-item>
            </el-form>
            <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
              <el-table-column label="项目名称" align="center" prop="proName" width="170">
@@ -505,13 +540,11 @@
            </div>
          </el-col>
          <el-col :span="8" :xs="24">
            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
            <el-form :model="queryParams" ref="queryForm1" size="small" :inline="true" v-show="showSearch"
              label-width="68px" @submit.native.prevent>
              <el-form-item>
                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">选择套餐</el-button>
              </el-form-item>
             
              <el-form-item label="项目名称" prop="proName">
                <el-input ref="inputName" v-model="queryParams.proName" placeholder="请输入项目名称" clearable
                <el-input ref="inputName" v-model="queryParams1.proName" placeholder="请输入项目名称" clearable
                  @keyup.enter.native="handleSearchFor" style="width: 140px" />
              </el-form-item>
              <el-form-item>
@@ -521,7 +554,7 @@
            <el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
              height="478">
              <el-table-column type="selection" width="40px" align="center" />
              <el-table-column label="项目名称" align="center" prop="proName" width="288" />
              <el-table-column label="项目名称" align="center" prop="proName" width="230" />
              <el-table-column label="项目价格/元" align="center" prop="proPrice" width="100" />
            </el-table>
          </el-col>
@@ -533,15 +566,46 @@
      </el-dialog>
    </div>

    <!-- 添加或修改体检单位信息维护对话框 -->
       <!-- 添加或修改体检单位信息维护对话框 -->
    <div class="dia">
      <el-dialog :title="title" :visible.sync="open" width="1340px" append-to-body>
        <el-form ref="form" :model="form" :rules="rules" label-width="106px" :inline="true" @submit.native.prevent>
          <el-form-item label="单位名称" prop="cnName">
            <el-input v-model="form.cnName" placeholder="请输入中文名称" style="width: 520px" />
      <el-dialog
        :title="title"
        :visible.sync="open"
        width="1330px"
        append-to-body
      >
        <el-form
          ref="form"
          :model="form"
          :rules="rules"
          label-width="98px"
          :inline="true"
          @submit.native.prevent
        >
          <el-form-item label="单位类型" prop="dwlx">
            <el-radio-group v-model="form.dwlx" @input="radioChange" >
              <el-radio :label="0">普通单位</el-radio>
              <el-radio :label="1">职业病单位</el-radio>
            </el-radio-group>
          </el-form-item>
          <br/>
          <el-form-item
            label="单位名称"
            prop="cnName"
           
          >
            <el-input
              v-model="form.cnName"
              placeholder="请输入中文名称"
              style="width:510px"
            />
          </el-form-item>
          <el-form-item label="统一信用代码" prop="taxNumber">
            <el-input v-model="form.taxNumber" placeholder="请输入统一信用代码" style="width: 520px" />
            <el-input
              v-model="form.taxNumber"
              placeholder="请输入统一信用代码"
              style="width: 510px"
            />
          </el-form-item>
          <el-form-item label="法人代表" prop="legalPerson">
            <el-input v-model="form.legalPerson" placeholder="请输入法人" />
@@ -550,7 +614,10 @@
            <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
          </el-form-item>
          <el-form-item label="联系电话" prop="contactPhone">
            <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
            <el-input
              v-model="form.contactPhone"
              placeholder="请输入联系电话"
            />
          </el-form-item>
          <el-form-item label="传真" prop="faxNumber">
            <el-input v-model="form.faxNumber" placeholder="请输入传真" />
@@ -561,16 +628,111 @@
        </el-form-item> -->

          <el-form-item label="注册地址" prop="registerAddress">
            <el-input v-model="form.registerAddress" placeholder="请输入注册地址" style="width: 1157px" />
            <el-input
              v-model="form.registerAddress"
              placeholder="请输入注册地址"
              style="width: 1128px"
            />
          </el-form-item>
          <el-form-item label="通讯地址" prop="mailingAddress">
            <el-input v-model="form.mailingAddress" placeholder="请输入通讯地址" style="width: 1157px" />
            <el-input
              v-model="form.mailingAddress"
              placeholder="请输入通讯地址"
              style="width: 1128px"
            />
          </el-form-item>
          <el-form-item label="所属地区" prop="ssdq" v-if="form.dwlx == 1">
            <el-input v-model="form.ssdq" placeholder="请输入所属地区" />
          </el-form-item>
          <el-form-item
            label="隶属关系"
            prop="lsgx"
            v-if="form.dwlx == 1"
          >
            <!-- <el-input
              v-model="form.industryType"
              placeholder="请输入隶属关系"
            /> -->
            <el-select
              filterable
              v-model="form.lsgx"
              placeholder="请选择隶属关系"
              clearable
              style="width: 198px"
            >
              <el-option
                v-for="dict in dict.type.sys_yes_no"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item label="经济类型" prop="jjlx" v-if="form.dwlx == 1">
             <el-select
              filterable
              v-model="form.jjlx"
              placeholder="请选择经济类型"
              clearable
              style="width: 199px"
            >
              <el-option
                v-for="dict in dict.type.sys_yes_no"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item label="企业规模" prop="qygm" v-if="form.dwlx == 1">
            <el-input v-model="form.qygm" placeholder="请输入企业规模" />
          </el-form-item>
          <el-form-item label="行业分类" prop="hyfl" v-if="form.dwlx == 1">
            <el-select
              filterable
              v-model="form.hyfl"
              placeholder="请选择行业分类"
              clearable
              style="width: 199px"
            >
              <el-option
                v-for="dict in dict.type.sys_yes_no"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item label="风险评估" prop="fxpg" v-if="form.dwlx == 1">
             <el-select
              filterable
              v-model="form.fxpg"
              placeholder="请选择风险评估"
              clearable
              style="width: 198px"
            >
              <el-option
                v-for="dict in dict.type.sys_yes_no"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <br/>
          <el-form-item label="开户银行" prop="bankAccount">
            <el-input v-model="form.bankAccount" placeholder="请输入开户银行" style="width: 520px" />
            <el-input
              v-model="form.bankAccount"
              placeholder="请输入开户银行"
              style="width: 510px"
            />
          </el-form-item>
          <el-form-item label="银行账户" prop="countNum">
            <el-input v-model="form.countNum" placeholder="请输入银行账户" style="width: 520px" />
            <el-input
              v-model="form.countNum"
              placeholder="请输入银行账户"
              style="width: 510px"
            />
          </el-form-item>
          <el-form-item label="联系邮箱" prop="email">
            <el-input v-model="form.email" placeholder="请输入邮箱" />
@@ -583,12 +745,32 @@
          </el-form-item>

          <el-form-item label="行政区划名称" prop="areaName">
            <el-input v-model="form.areaName" placeholder="请输入行政区划名称" />
            <el-select
              filterable
              v-model="form.areaName"
              placeholder="请选择行政区划名称"
              clearable
              style="width: 198px"
            >
              <el-option
                v-for="dict in dict.type.sys_yes_no"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>

          <el-form-item label="备注" prop="remark">
            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :rows="2" label-width="400px"
              style="width: 830px" resize="none"></el-input>
            <el-input
              v-model="form.remark"
              type="textarea"
              placeholder="请输入内容"
              :rows="2"
              label-width="400px"
              style="width: 830px"
              resize="none"
            ></el-input>
          </el-form-item>
          <!-- <el-form-item label="五笔简码" prop="wbm">
          <el-input v-model="form.wbm" placeholder="请输入五笔简码" />
@@ -676,6 +858,7 @@
      singleg: true,
      singlegg: true,
      isfalse: false,
      dwlxs:null,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
@@ -703,9 +886,18 @@
        xianprice: null,
        limits: null
      },
      queryParams1: {
        proName: null,
        pym: null,
      },
      id: "",
      taocanStatus:0,
      formdanwen:{},
      // 表单参数
      form: {},
      form: {
       dwlx: 0,
       
      },
      lastXianPrice: 0,
      forms: {
        limits: 10,
@@ -882,8 +1074,8 @@
    updateProPrice(row) {
      const proPrice = new Big(row.proPrice);
      const limits = new Big(row.limits);
      const result = proPrice.times(limits.div(10));  // ordPrice * (discount / 10)
      row.ysPrice = result.toNumber();
      const result = proPrice.times(limits.div(10)).toNumber();  // ordPrice * (discount / 10)
      row.ysPrice = result.toFixed(2);
      this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
        return sum.plus(new Big(item.ysPrice || '0'));
      }, new Big(0)).toNumber();
@@ -892,8 +1084,8 @@
    updateProPrice1(row) {
      const proPrice = new Big(row.proPrice);
      const limits = new Big(row.limits);
      const result = proPrice.times(limits.div(10));
      row.ysPrice = result.toNumber();
      const result = proPrice.times(limits.div(10)).toNumber();  // ordPrice * (discount / 10)
      row.ysPrice = result.toFixed(2);
      const totalYsPrice = this.OnenewpacName.reduce((sum, item) => {
        return sum.plus(new Big(item.ysPrice || '0'));
      }, new Big(0));
@@ -923,12 +1115,9 @@
    },
    changeXianjia() {
      // 原始折扣率计算


      if (this.queryParams.price !== 0) {
        this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
      }

    },

    getList() {
@@ -938,7 +1127,6 @@
        (this.loading = true);
      listComp(this.queryParams).then((response) => {
        this.compList = response.rows;

        response.rows.forEach((item, index) => {
          item.newID =
            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
@@ -1029,6 +1217,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) {
@@ -1062,7 +1255,13 @@
    handleAdd() {
      this.reset();
      this.open = true;
      this.form.dwlx=0
      this.title = "添加体检单位信息维护";
    },

    radioChange(val){
      this.reset();
       this.form.dwlx=val
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
@@ -1070,6 +1269,7 @@
      const drugManufacturerId = row.drugManufacturerId || this.ids;
      getComp(drugManufacturerId).then((response) => {
        this.form = response.data;
         this.form.dwlx= Number(response.data.dwlx)
        this.open = true;
        this.title = "修改体检单位信息维护";
      });
@@ -1079,7 +1279,7 @@
      this.opens = true;

      this.groupingList = [];

      this.dwlxs = this.form.dwlx
      if (this.form.drugManufacturerId) {
        this.beCurrentDept();
      }
@@ -1103,7 +1303,7 @@
            item.ysPrice = result.toNumber();
            this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
              return sum.plus(new Big(item.ysPrice || '0'));
            }, new Big(0));
            }, new Big(0)).toNumber();
          })
          // ----------------------------------------------------------

@@ -1187,7 +1387,7 @@
        });
      } else {
        deptTreeSelect().then((response) => {
          console.log('222', response.rows);
        
          this.newpacName = response.rows;
          this.loading = false;
          response.rows.forEach((item, index) => {
@@ -1241,21 +1441,27 @@
      }
    },
    handleSearchFor() {
      getProjectList(this.queryParams.proName).then((response) => {

        response.data.forEach((item, index) => {
          item.newID =
            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
            index +
            1;
      // 判断是否为汉字
      const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char)
      if (isChineseChar(this.queryParams1.proName)) {
        this.queryParams1.pym = null
        getProjectList(this.queryParams1).then((response) => {
          this.Treedata = response.data;
        });
        this.Treedata = response.data;
      });
      } else {
        this.queryParams1.pym = this.queryParams1.proName
        this.queryParams1.proName = null
        getProjectList(this.queryParams1).then((response) => {
          this.Treedata = response.data;
        });
      }
    },
    // 单项数据获取
    handleChangesingle(selection) {
      console.log(selection,22222222)
      if (selection) {
        this.dataList = selection;
        this.resetright()
      }
    },
    resetright() {
@@ -1269,7 +1475,7 @@
        const newItemsToAdd = []; // 用于存储新需要添加的项目

        this.dataList.forEach((item) => {
          this.$refs.tre.toggleRowSelection(item, false); // 取消选中状态
         
          // 使用 $set 确保响应性
          this.$set(item, 'limits', 10); // 设置限制数量
          this.$set(item, 'ysPrice', item.proPrice); // 设置现价为原价
@@ -1280,11 +1486,12 @@
            newItemsToAdd.push(item); // 如果不存在相同项目，则添加到新数组
            this.updateProPrice(item);
          }
          this.$refs.tre.toggleRowSelection(item, false); // 取消选中状态
        });

        // 添加新项目到 OnenewpacName
        this.OnenewpacName.push(...newItemsToAdd);

        console.log(  this.OnenewpacName,2121)
        // 删除重复项目，这里我们只需处理新添加的项目和原有项目之间的重复
        for (let i = this.OnenewpacName.length - newItemsToAdd.length; i < this.OnenewpacName.length - 1; i++) {
          for (let j = i + 1; j < this.OnenewpacName.length; j++) {
@@ -1299,11 +1506,12 @@
        // 重新计算总价和现价
        this.OnenewpacName.forEach((item) => {
          this.queryParams.price += item.proPrice; // 累加原价
          this.queryParams.xianprice += item.ysPrice || 0; // 累加现价，如果ysPrice为undefined则累加0
          //this.queryParams.xianprice += item.ysPrice || 0;  累加现价，如果ysPrice为undefined则累加0
        });

        // 计算优惠，这里假设优惠是现价与原价的差额百分比
        this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
        this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
        return sum.plus(new Big(item.ysPrice || '0'));
      }, new Big(0)).toNumber();
      this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
      }
    },
    handledbelete(row) {
@@ -1418,6 +1626,7 @@
        dwId: this.form.drugManufacturerId,
        dwDeptName: this.form.dwDeptName,
        signingPrice: this.form.signingPrice,
        bz: this.form.bz,
      };
      addDept(data).then((response) => {
        if (response.code == 200) {
@@ -1474,13 +1683,16 @@
        let id = this.groupList[0].id || '';
        getDetails(id).then((res) => {
          this.OnenewpacName = res.data.groupingProList;
          this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
            return sum.plus(new Big(item.ysPrice || '0'));
          }, new Big(0));
          this.OnenewpacName.forEach((item, index) => {
            this.queryParams.price += item.proPrice;
          });
          this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
          // this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
          //   return sum.plus(new Big(item.ysPrice || '0'));
          // }, new Big(0)).toNumber();
          // this.OnenewpacName.forEach((item, index) => {
          //   this.queryParams.price += item.proPrice;
          // });
          // this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10      
          this.queryParams.xianprice = res.data.ysPrice
          this.queryParams.price= res.data.price
          this.youhui= res.data.limits
        });
      }
      // console.log(this.groupList[0].id, 9966);
@@ -1522,7 +1734,6 @@
      }
      getProjectList().then((response) => {
        this.Treedata = response.data;
        // console.log(this.Treedata,999888);
      });
    },

@@ -1602,6 +1813,20 @@
        });
      });
    },
   radioChangetaocan(val) {
      if (val == 0) {
        this.getList()
      } else {
       this.handleQuerydanwen() 
      }
    },

    handleQuerydanwen() {
      let dwId = this.formdanwen.drugManufacturerId
      huoqutuantitaocanxiangmuList(dwId).then(res => {
        this.newpacName1 = res.data
      })
    },
    // 删除分组
    deleteGroup() {
      delegrouping(this.groupIds).then((res) => {