public/yuanqu.ini

@@ -1,11 +1,7 @@
[development]
8094=pbkwyy
81=jdczgzyy
<<<<<<< HEAD
82=bjxjyy
=======
82=jdczgzyy
>>>>>>> ce00a82248ed72b6b23d1ceddcf332779317cdbb
82=ssyjyy
8095=jdczgzyy
8096=sqyy
8097=wbzxyy

 src/views/doctor/checkAll/index.vue

@@ -808,7 +808,6 @@
                      style="width: 100%"
                      :header-cell-style="{ background: '#67C23A' }"
                      :row-key="getRowKeys"
                      v-loading="loading"
                    >
                      <!-- :expand-row-keys="expends" -->
                      <el-table-column type="expand">
@@ -2581,7 +2580,7 @@
    },

    yichangjieguo() {
      this.isLoading = true;
      this.loading = true;
      this.status1 = 0;
      this.yichangList = [];
      yichang({
@@ -3339,6 +3338,7 @@
      let tjNumber = this.tableAll.tjNumber;
      let tjh = this.tableAll.tjNumber;
      let advice = this.textarea1;
      this.isLoading = true;
      let data = {
        tjNumber,
        advice,
@@ -3365,7 +3365,8 @@
      getTjdetailList(data)
        .then((response) => {
          if (response.code === 200) {
            this.$modal.msgSuccess("提交成功");
            this.isLoading = false;
           this.$modal.msgSuccess(response.msg);
            // 清空字段
            this.zhiyeJl = "";
            this.zhiyeJg = "";
@@ -3376,7 +3377,7 @@
              state: 1,
              id: this.MsgId,
            };
            gettoPdf(tjNumber)
            /* gettoPdf(tjNumber)
              .then((res) => {
                this.$modal.msgSuccess("已生成报告！请前往报告核收页面确认！");
              })
@@ -3384,7 +3385,7 @@
                this.$modal.msgError(
                  "打印报告失败，请前往报告打印页面补打报告！"
                );
              });
              }); */
            const statePromise = getfiedState(reportData).then(() => {
              this.drawer = false;
            });

 src/views/hosp/order/index.vue

@@ -596,7 +596,7 @@
              </el-table-column>
              <el-table-column prop="proPrice" label="原价" width="56px">
              </el-table-column>
              <el-table-column label="折扣">
              <el-table-column label="折扣" width="150px">
                <template slot-scope="scope">
                  <!-- @input="validateDiscount(scope.row)" -->
                  <el-input-number v-model.number="scope.row.discount" @change="handleManualChange(scope.row)"
@@ -1058,7 +1058,7 @@
      },
      TreedataList: [],
      discount: 10,
      lastXianPrice:0,
      lastXianPrice: 0,
      DataList: [],
      shijianlist: [],
      // 套餐提交按钮
@@ -1483,21 +1483,6 @@
    },


    updateProPrice(row) {
      console.log(row)
      const ordPrice = new Big(row.ordPrice);
      const discount = new Big(row.discount);
      const result = ordPrice.times(discount.div(10)); // ordPrice * (discount / 10)
      row.nowPrice = result.toNumber();
      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;
    },


    debounceNumberChange(currentValue, oldValue) {
      clearTimeout(this.debounceTimer);
      this.debounceTimer = setTimeout(() => {
@@ -1523,7 +1508,7 @@
            // this.TotalPrice = this.DataList3.reduce((sum, item) => {
            //   return sum.plus(new Big(item.nowPrice || "0"));
            // }, new Big(0));
            this.TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10))
            this.TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10)).toFixed(2)
          });
        })
        .catch(() => {
@@ -1541,6 +1526,7 @@
    numberChangeXianPrice(currentValue, oldValue) {
      // 如果现价没有变化，直接返回
      if (this.TotalPrice === this.lastXianPrice || !this.TotalPrice) {
        console.log(2222333)
        return;
      }
      this.$confirm("确定修改所有子项的折扣吗？", "提示", {
@@ -1554,8 +1540,8 @@
          //   this.discount = this.getInfodis;
          // }
          let totalYsprice = new Big(0);
          console.log(this.tableData3, 11111)
          this.tableData3.forEach((item) => {
          console.log(this.DataList3, 11111)
          this.DataList3.forEach((item) => {
            item.discount = this.discount;
            const ordPrice = new Big(item.proPrice);
            const discount = new Big(item.discount);
@@ -1636,16 +1622,20 @@
    // },

    updateProPrice(row) {
      console.log(row, 55555)
      const ordPrice = new Big(row.proPrice);
      const discount = new Big(row.discount);
      const result = ordPrice.times(discount.div(10)); // ordPrice * (discount / 10)
      row.nowPrice = result.toNumber();
      this.TotalPrice = this.DataList3.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;
      if (row.proPrice == 0) {
        row.discount = 10
        return
      } else {
        const ordPrice = new Big(row.proPrice);
        const discount = new Big(row.discount);
        const result = ordPrice.times(discount.div(10)); // ordPrice * (discount / 10)
        row.nowPrice = result.toNumber();
        this.TotalPrice = this.DataList3.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;
      }
    },

    handleRevoke() {
@@ -2289,9 +2279,11 @@
      this.DataList = [];
      this.DataList3 = [];
      this.Datalists = [];
      this.filterText = "",
        this.filterage = "",
        this.TotalPrice1 = 0;
      this.TotalPrice = 0;
      this.discount = 10;
      this.filterText = "";
      this.filterage = "";
      this.TotalPrice1 = 0;
      this.orderId = this.ids;
      this.cusId = this.cusIds;
      this.userId = this.userIds;
@@ -2402,8 +2394,8 @@
          this.TotalPrice1 = 0;
          this.DataList3.forEach((item) => {
            this.TotalPrice1 += item.proPrice * item.sl;
             this.TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10))
          this.lastXianPrice = this.TotalPrice;
            this.TotalPrice = this.TotalPrice1 * (this.discount / 10)
            this.lastXianPrice = this.TotalPrice;
          });
        });
      } else if (checked === false) {
@@ -2432,8 +2424,8 @@
          this.TotalPrice1 = 0;
          this.DataList3.forEach((item) => {
            this.TotalPrice1 += item.proPrice * item.sl;
             this.TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10))
          this.lastXianPrice = this.TotalPrice;
            this.TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10))
            this.lastXianPrice = this.TotalPrice;
          });
        });
      }
@@ -2477,9 +2469,6 @@
        this.spliceData();
        this.TotalPrice1 = 0;
        this.DataList.forEach((item1) => {
          console.log(item1.proPrice, 3322);
          console.log(this.TotalPrice1, 1122);

          this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
        });
        if (this.marryalls != 0) {
@@ -2497,8 +2486,18 @@
          });
        }
      });

      this.DataList3.forEach((item, index) => {
        if (item.proId == row.proId) {
          let proParentId = item.proParentId
          // 获取当前选中的节点key
          const currentCheckedKeys = this.$refs.tree.getCheckedKeys();

          // 创建一个新数组，移除想要取消选中的节点key（这里假设是1）
          const newCheckedKeys = currentCheckedKeys.filter(key => key !== proParentId);

          // 使用setCheckedKeys方法更新选中状态
          this.$refs.tree.setCheckedKeys(newCheckedKeys);
          this.DataList3.splice(index, 1);
          this.marryalls = 0;
          this.DataList3.forEach((item1) => {
@@ -2506,21 +2505,36 @@
          });
        }
      });
      if (this.DataList3.length == 0) {
        this.discount = 10
        this.checkedkey = []
        this.$refs.tree.setCheckedKeys([])
        this.TotalPrice1 = this.marryalls;
        this.TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10))
      } else if (this.DataList3.length == 1) {
        this.discount = this.DataList3[0].discount
        this.TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10)).toFixed(2)
      }
      this.DataList.forEach((item, index) => {
        if (item.proId == row.proId) {
          this.DataList.splice(index, 1);
          this.TotalPrice1 = 0;
          this.TotalPrice = 0;
          this.DataList.forEach((item1) => {
            this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
            this.TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10))
          });
          if (this.marryalls != 0) {
            this.TotalPrice1 += this.marryalls;
            this.TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10))
          }
        }
      });
      this.TotalPrice1 = 0;
      this.TotalPrice = 0;
      this.DataList3.forEach((item) => {
        this.TotalPrice1 += item.proPrice;
        this.TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10))
      });
    },
    /** 删除按钮操作 */
@@ -2877,7 +2891,7 @@
}

.box1 {
  width: 50%;
  width: 35%;
  display: flex;
  flex-direction: column;
}

 src/views/sampling/sampling/index.vue

@@ -347,7 +347,6 @@
    // this.getNowTime();
    getTxmmccd().then((res) => {
      this.msg = Number(res.msg);
      console.log(res, 444);
    });
    getCompany(this.queryParams).then((response) => {
      this.CompanyList = response.data;
@@ -384,7 +383,6 @@
    searchSelect(val) {
      this.CheckBox = val;
      this.queryParams.dw = this.CheckBox.drugManufacturerId;
      console.log(this.CheckBox, 9999);
    },
    getRemoteData(query) {
      if (query) {

 src/views/system/user/index.vue

@@ -1877,6 +1877,10 @@
      this.getlistHosp();
      this.reset();
      this.form = row;
      this.form = {
        ...row,
        deptId: row.deptId != null ? String(row.deptId) : null, // 👈 确保为字符串
      };
      if (this.form.hospId) {
        this.sendhospName();
      }