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

lkk

2025-01-20 16ba2ae07d1790ff5f38deebdba7baa5537f1f3d

 src/views/hosp/order/index.vue

@@ -177,6 +177,7 @@
          type="primary"
          size="mini"
          @click="handleRevoke"
          :loading="isLoading"
          :disabled="single"
          >撤销签到</el-button
        >
@@ -658,7 +659,7 @@
                      width="260px"
                    >
                    </el-table-column>
                  

                    <el-table-column prop="proPrice" label="原价" width="56px">
                    </el-table-column>

@@ -763,6 +764,8 @@
                >
                  <el-table-column prop="propinName" label="检查项目">
                  </el-table-column>
                  <el-table-column prop="sl" label="数量" width="56px">
                  </el-table-column>
                  <el-table-column prop="proPrice" label="原价" width="56px">
                  </el-table-column>
                  <el-table-column
@@ -771,7 +774,6 @@
                    width="260px"
                  >
                  </el-table-column>
             

                  <el-table-column
                    label="操作"
@@ -863,6 +865,7 @@
                        type="primary"
                        @click="submitPrice"
                        :disabled="confirm"
                        :loading="isSubmit"
                        style="margin-top: 34px"
                        >提交</el-button
                      >
@@ -1219,7 +1222,12 @@

        <!-- 提交按钮 -->
        <el-form-item style="display: flex">
          <el-button type="primary" @click="submitPrice1" :disabled="confirm">
          <el-button
            type="primary"
            :loading="isSubmit1"
            @click="submitPrice1"
            :disabled="confirm"
          >
            提交
          </el-button>
        </el-form-item>
@@ -1657,6 +1665,9 @@
      DataList3: [],
      bldhid: "",
      budadaozhen: false,
      isLoading: false,
      isSubmit: false,
      isSubmit1: false,
      huizongList: [],
      DataLists: [],
      infoList: [],
@@ -1947,7 +1958,6 @@
      // 获取单位信息集合
      getCompany(this.queryParams).then((response) => {
        this.CompanyList = response.data;
        console.log(this.CompanyList, 555);

        this.loading = false;
      });
@@ -2084,6 +2094,7 @@
    },

    handleRevoke() {
      this.isLoading = true;
      this.$confirm("您确认要撤销？", "确认信息", {
        distinguishCancelAndClose: true,
        confirmButtonText: "确认",
@@ -2092,6 +2103,7 @@
        .then(() => {
          revokeTjOrderByTjNum(this.tjnumbers).then((res) => {
            this.$modal.msgSuccess("撤销成功");
            // this.isLoading = false;
            this.getList();
          });
        })
@@ -2102,6 +2114,10 @@
              message: "已取消",
            });
          }
        })
        .finally(() => {
          // 不论操作成功还是失败，都会执行
          this.isLoading = false;
        });
    },
    /** 点击显示体检报告报表*/
@@ -2465,8 +2481,10 @@
        let datas = {
          zhId: data.id,
        };

        getlistByZhId(datas).then((res) => {
          this.packagedataList = res.data.tjProjectList;

          for (var i = 0; i < this.packagedataList.length; i++) {
            let proId = this.packagedataList[i].proId;
            getProSonDxList(proId).then((res) => {
@@ -2628,7 +2646,7 @@
          this.TotalPrice1 = 0;
          if (this.DataList3.length != 0) {
            this.DataList3.forEach((item) => {
              this.TotalPrice1 += item.proPrice;
              this.TotalPrice1 += item.proPrice * item.sl;
            });
          }
          // this.TotalPrice1 = 0;
@@ -2681,7 +2699,6 @@
        });
      } else if (checked == true) {
        this.DataList.push(data);
        console.log(this.DataList, 6666);
        this.DataList.forEach((item1) => {
          if (item1.proParentId == this.dataObj.proId) {
            item1.propinName = this.dataObj.proName;
@@ -2690,6 +2707,9 @@
        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) {
@@ -2816,6 +2836,7 @@
    // 收费按钮
    submitPrice() {
      this.proIds = [];
      this.isSubmit = true;
      if (this.DataList.length != 0) {
        this.DataList.forEach((item) => {
          this.proIds.push(item.proId);
@@ -2851,6 +2872,7 @@
            payType: this.payType,
          };
          getwater(data).then((res) => {
            this.isSubmit = false;
            this.$modal.msgSuccess("提交成功");
            this.mobanId = res.data.mobanId;
            this.waterId = res.data.waterId;
@@ -2866,6 +2888,7 @@
    // 收费按钮
    submitPrice1() {
      this.proIds = [];
      this.isSubmit1 = true;
      if (this.DataList.length != 0) {
        this.DataList.forEach((item) => {
          this.proIds.push(item.proId);
@@ -2895,11 +2918,12 @@
            discount,
            copeWith,
            tjType,
            payStasus:this.jsType,
            payStasus: this.jsType,
            orderId: this.orderIds,
            tjProIds: this.proIds,
            payType: this.payType,
          };

          getwater(data).then((res) => {
            this.$modal.msgSuccess("提交成功");
            this.mobanId = res.data.mobanId;
@@ -2909,6 +2933,7 @@
            const params = { viewNum, tjnumber };
            this.$tab.openPage("收款小票", "/report/charge", params);
            this.Projectopen1 = false;
            this.isSubmit1 = false;
          });
        }
      });