qxtj

qinxianzhangyao

2024-07-08 53b7cfd8589201ec728c68a08b4ea07d94e66258

 src/views/hosp/order/index.vue

@@ -96,6 +96,16 @@
          >导出</el-button
        >
      </el-col>

      <el-col :span="1.5">
        <el-button
          type="primary"
          size="mini"
          @click="handleRevoke"
          :disabled="single"
          >撤销签到</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
@@ -106,6 +116,17 @@
          >补录项目</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
          size="mini"
          @click="revokeProject"
          :disabled="single"
          v-hasPermi="['hosp:order:export']"
          >撤销补录</el-button
        >
      </el-col>

      <el-col :span="1.5">
        <el-button
          type="primary"
@@ -159,7 +180,15 @@
          align="center"
          prop="tjCustomerName"
          fixed="left"
          width="100px"
          width="90px"
          :show-overflow-tooltip="true"
        />
        <el-table-column
          label="身份证号"
          align="center"
          prop="tjCusIdCard"
          fixed="left"
          width="180px"
          :show-overflow-tooltip="true"
        />
        <el-table-column
@@ -208,11 +237,19 @@
          :show-overflow-tooltip="true"
          width="160px"
        />
        <el-table-column
          label="门诊号"
          align="center"
          prop="cardId"
          :show-overflow-tooltip="true"
          width="160px"
        />
        <!-- <el-table-column label="流水号" align="center" prop="tjSerialNumber" /> -->
        <el-table-column
          label="所选套餐"
          align="center"
          prop="pacName"
          :formatter="driver"
          :show-overflow-tooltip="true"
        />
        <el-table-column
@@ -412,7 +449,7 @@
    <el-dialog
      :title="title"
      :visible.sync="Projectopen"
      width="1500px"
      width="1100px"
      style="height: 860px"
      append-to-body
    >
@@ -426,103 +463,95 @@
          <el-input placeholder="输入关键字进行过滤" v-model="filterText">
          </el-input>
          <div class="tab3">
            <div class="outside1">
              <el-tree
                class="filter-tree"
                v-loading="loading"
                :data="Treedata"
                :props="defaultProps"
                show-checkbox
                node-key="proId"
                @check-change="handleCurrentChecked"
                :default-checked-keys="checkedkey"
                :filter-node-method="filterNode"
                ref="tree"
              >
              </el-tree>
            </div>
            <el-tree
              class="filter-tree"
              v-loading="loading"
              :data="Treedata"
              :props="defaultProps"
              show-checkbox
              node-key="proId"
              @check="handleCurrentChecked"
              :default-checked-keys="checkedkey"
              :filter-node-method="filterNode"
              ref="tree"
              :render-content="renderContent"
            >
            </el-tree>
          </div>
        </el-col>
        <el-col :span="4">
        <el-col :span="5">
          <div
            style="text-align: center; margin-bottom: 10px; margin-top: 10px"
          >
            项目列表
            明细项目列表
          </div>
          <div class="tab3">
            <div class="outside1">
              <el-tree
                class="filter-tree"
                v-loading="loading"
                :data="TreedataList"
                node-key="proId"
                :props="defaultProps"
                :filter-node-method="filterNode"
                show-checkbox
                @check-change="handleCurrentChecked1"
                :default-checked-keys="checkedListkey"
              >
              </el-tree>
            </div>
            <el-tree
              class="filter-tree"
              v-loading="loading"
              :data="TreedataList"
              node-key="proId"
              :props="defaultProps"
              :filter-node-method="filterNode"
              show-checkbox
              @check-change="handleCurrentChecked1"
              :default-checked-keys="checkedListkey"
              :render-content="renderContent"
            >
            </el-tree>
          </div>
        </el-col>
        <el-col :span="12">
        <el-col :span="11">
          <div class="grid-content bg-purple">
            <div style="text-align: center; margin-bottom: 10px">
            <div
              style="text-align: center; margin-bottom: 10px; margin-top: 10px"
            >
              已选项目列表
            </div>
            <div
              style="
                padding: 0px 6px;
                border: 1px solid #e6ebf5;
                max-height: 420px;
                overflow: auto;
              "
            <el-table
              :data="DataList"
              border
              style="width: 100%"
              height="400"
              :span-method="objectSpanMethod"
            >
              <el-table
                :data="DataList"
                border
                style="width: 100%"
                height="250"
              >
                <el-table-column prop="propinName" label="父项">
                </el-table-column>
                <el-table-column prop="proName" label="项目" width="180">
                </el-table-column>
                <el-table-column prop="proPrice" label="原价">
                </el-table-column>
              <el-table-column prop="propinName" label="检查项目">
              </el-table-column>
              <el-table-column prop="proPrice" label="原价" width="56px">
              </el-table-column>
              <el-table-column prop="proName" label="明细项目" width="260px">
              </el-table-column>

                <el-table-column
                  label="操作"
                  align="center"
                  fixed="right"
                  class-name="small-padding fixed-width"
                  width="80px"
                >
                  <template slot-scope="scope">
                    <el-button
                      size="mini"
                      type="text"
                      icon="el-icon-delete"
                      @click="handleDelete(scope.row)"
                      >删除</el-button
                    >
                  </template>
                </el-table-column>
              </el-table>
              <el-collapse v-model="activeName" accordion v-if="list1">
                <div>
                  <el-collapse-item title="请选择项目">
                    <el-table :data="DataList" border style="width: 100%">
                      <el-table-column prop="proName" label="项目" width="180">
                      </el-table-column>
                      <el-table-column prop="ordPrice" label="原价">
                      </el-table-column>
                    </el-table>
                  </el-collapse-item>
                </div>
              </el-collapse>
            </div>
              <el-table-column
                label="操作"
                align="center"
                fixed="right"
                class-name="small-padding fixed-width"
                width="50px"
              >
                <template slot-scope="scope">
                  <el-button
                    size="mini"
                    type="text"
                    icon="el-icon-delete"
                    @click="handleDelete(scope.row)"
                    title="删除"
                  ></el-button>
                </template>
              </el-table-column>
            </el-table>
            <el-collapse v-model="activeName" accordion v-if="list1">
              <div>
                <el-collapse-item title="请选择项目">
                  <el-table :data="DataList" border style="width: 100%">
                    <el-table-column prop="proName" label="项目" width="180">
                    </el-table-column>
                    <el-table-column prop="ordPrice" label="原价">
                    </el-table-column>
                  </el-table>
                </el-collapse-item>
              </div>
            </el-collapse>
            <template>
              <el-form :model="form">
                <el-form-item label="体检类型" prop="tjType">
@@ -579,7 +608,7 @@
                    @click="submitPrice"
                    :disabled="confirm"
                    style="margin-top: 34px"
                    >收费</el-button
                    >提交</el-button
                  >
                </el-form-item>
              </el-form>
@@ -593,7 +622,7 @@
    <el-dialog
      :title="title"
      :visible.sync="Projectopen1"
      width="1500px"
      width="1100px"
      style="height: 860px"
      append-to-body
    >
@@ -607,28 +636,27 @@
          <el-input placeholder="输入关键字进行过滤" v-model="filterText">
          </el-input>
          <div class="tab3">
            <div class="outside1">
              <el-tree
                class="filter-tree"
                v-loading="loading"
                :data="Treedata"
                :props="defaultProps"
                show-checkbox
                node-key="proId"
                @check="handleCurrentChecked"
                :default-checked-keys="checkedkey"
                :filter-node-method="filterNode"
                ref="tree"
              >
              </el-tree>
            </div>
            <el-tree
              class="filter-tree"
              v-loading="loading"
              :data="Treedata"
              :props="defaultProps"
              show-checkbox
              node-key="proId"
              @check="handleCurrentChecked"
              :default-checked-keys="checkedkey"
              :filter-node-method="filterNode"
              ref="tree"
              :render-content="renderContent"
            >
            </el-tree>
          </div>
        </el-col>
        <el-col :span="4">
        <el-col :span="5">
          <div
            style="text-align: center; margin-bottom: 10px; margin-top: 10px"
          >
            项目列表
            明细项目列表
          </div>
          <div class="tab3">
            <div class="outside1">
@@ -642,68 +670,71 @@
                show-checkbox
                @check-change="handleCurrentChecked1"
                :default-checked-keys="checkedListkey"
                :render-content="renderContent"
              >
              </el-tree>
            </div>
          </div>
        </el-col>
        <el-col :span="12">
        <el-col :span="11">
          <div class="grid-content bg-purple">
            <div style="text-align: center; margin-bottom: 10px">
            <div
              style="text-align: center; margin-bottom: 10px; margin-top: 10px"
            >
              已选项目列表
            </div>
            <div
              style="
                padding: 0px 6px;
                border: 1px solid #e6ebf5;
                max-height: 420px;
                overflow: auto;
              "
            >
              <el-table
                :data="DataList"
                border
                style="width: 100%"
                height="250"
              >
                <el-table-column prop="propinName" label="检查项目">
                </el-table-column>
                <el-table-column prop="proName" label="明细项目" width="180">
                </el-table-column>
                <el-table-column prop="proPrice" label="原价">
                </el-table-column>

                <el-table-column
                  label="操作"
                  align="center"
                  fixed="right"
                  class-name="small-padding fixed-width"
                  width="80px"
                >
                  <template slot-scope="scope">
                    <el-button
                      size="mini"
                      type="text"
                      icon="el-icon-delete"
                      @click="handleDelete(scope.row)"
                      title="删除"
                    ></el-button>
                  </template>
                </el-table-column>
              </el-table>
              <el-collapse v-model="activeName" accordion v-if="list1">
                <div>
                  <el-collapse-item title="请选择项目">
                    <el-table :data="DataList" border style="width: 100%">
                      <el-table-column prop="proName" label="项目" width="180">
                      </el-table-column>
                      <el-table-column prop="ordPrice" label="原价">
                      </el-table-column>
                    </el-table>
                  </el-collapse-item>
                </div>
              </el-collapse>
            </div>
            <el-table
              :data="DataList"
              border
              style="width: 100%"
              height="400"
              :span-method="objectSpanMethod"
            >
              <el-table-column prop="propinName" label="检查项目">
              </el-table-column>
              <el-table-column prop="proPrice" label="原价" width="56px">
              </el-table-column>
              <el-table-column prop="proName" label="明细项目" width="260px">
              </el-table-column>

              <el-table-column
                label="操作"
                align="center"
                fixed="right"
                class-name="small-padding fixed-width"
                width="50px"
              >
                <template slot-scope="scope">
                  <el-button
                    size="mini"
                    type="text"
                    icon="el-icon-delete"
                    @click="handleDelete(scope.row)"
                    title="删除"
                  ></el-button>
                </template>
              </el-table-column>
            </el-table>
            <el-collapse v-model="activeName" accordion v-if="list1">
              <div>
                <el-collapse-item title="请选择项目">
                  <el-table
                    :data="DataList"
                    border
                    style="width: 100%"
                    height="400"
                    :span-method="objectSpanMethod"
                  >
                    <el-table-column prop="proName" label="项目" width="180">
                    </el-table-column>
                    <el-table-column prop="ordPrice" label="原价">
                    </el-table-column>
                  </el-table>
                </el-collapse-item>
              </div>
            </el-collapse>

            <template>
              <el-form :model="form">
                <el-form-item label="体检类型" prop="tjType">
@@ -760,7 +791,7 @@
                    @click="submitPrice1"
                    :disabled="confirm"
                    style="margin-top: 34px"
                    >收费</el-button
                    >提交</el-button
                  >
                </el-form-item>
              </el-form>
@@ -771,42 +802,193 @@
    </el-dialog>

    <!-- 添加或修改体检记录对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body>
      <el-table :data="numberList" style="width: 100%">
        <el-table-column prop="proName" label="项目/耗材" width="300">
        </el-table-column>
        <el-table-column prop="price" label="单价" width="300">
        </el-table-column>
        <el-table-column prop="count" label="数量" width="300">
        </el-table-column>
      </el-table>
      <el-table :data="bill" style="width: 100%">
        <el-table-column prop="copeWith" label="应付" width="180">
        </el-table-column>
        <el-table-column prop="discount" label="折扣" width="180">
        </el-table-column>
        <el-table-column prop="paidIn" label="实付" width="180">
        </el-table-column>
        <el-table-column prop="payType" label="付款方式" width="180">
          <template slot-scope="scope">
            <span v-if="scope.row.payType == '0'">现金支付</span>
            <span v-if="scope.row.payType == '1'">刷卡支付</span>
            <span v-if="scope.row.payType == '2'">支付宝支付</span>
            <span v-if="scope.row.payType == '3'">微信支付</span>
            <span v-if="scope.row.payType == '4'">云闪付支付</span>
          </template>
        </el-table-column>
        <el-table-column prop="payStasus" label="付款状态" width="180">
          <template slot-scope="scope">
            <span v-if="scope.row.payStasus == '0'">未付款</span>
            <span v-if="scope.row.payStasus == '1'">已付款</span>
            <span v-if="scope.row.payStasus == '2'">退费</span>
            <span v-if="scope.row.payStasus == '3'">预付款</span>
          </template>
        </el-table-column>
      </el-table>
    <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body >
      <el-tabs v-model="activeName1" type="card">
        <!-- <el-tab-pane label="订单流水" name="first">
          <el-table :data="numberList" style="width: 100%">
            <el-table-column prop="proName" label="项目/耗材" width="300">
            </el-table-column>
            <el-table-column prop="price" label="单价" width="300">
            </el-table-column>
            <el-table-column prop="count" label="数量" width="300">
            </el-table-column>
          </el-table>
          <el-table :data="bill" style="width: 100%">
            <el-table-column prop="copeWith" label="应付" width="180">
            </el-table-column>
            <el-table-column prop="discount" label="折扣" width="180">
            </el-table-column>
            <el-table-column prop="paidIn" label="实付" width="180">
            </el-table-column>
            <el-table-column prop="payType" label="付款方式" width="180">
              <template slot-scope="scope">
                <span v-if="scope.row.payType == '0'">现金支付</span>
                <span v-if="scope.row.payType == '1'">刷卡支付</span>
                <span v-if="scope.row.payType == '2'">支付宝支付</span>
                <span v-if="scope.row.payType == '3'">微信支付</span>
                <span v-if="scope.row.payType == '4'">云闪付支付</span>
              </template>
            </el-table-column>
            <el-table-column prop="payStasus" label="付款状态" width="180">
              <template slot-scope="scope">
                <span v-if="scope.row.payStasus == '0'">未付款</span>
                <span v-if="scope.row.payStasus == '1'">已付款</span>
                <span v-if="scope.row.payStasus == '2'">退费</span>
                <span v-if="scope.row.payStasus == '3'">预付款</span>
              </template>
            </el-table-column>
          </el-table>
        </el-tab-pane> -->
        <el-tab-pane label="项目汇总" name="second" style="height: 400px;">
          <el-table :data="huizongList" style="width: 100%" max-height="200">
            <el-table-column
              align="center"
              prop="newID"
              label="序号"
              width="50"
            >
            </el-table-column>
            <el-table-column align="center" prop="parent_pro_name" label="项目">
            </el-table-column>
            <el-table-column align="center" prop="ks" label="科室">
            </el-table-column>
            <el-table-column align="center" prop="price" label="费用合计">
            </el-table-column>
          </el-table>
          <h3>付款详情</h3>
          <el-table :data="bill" style="width: 100%; margin-top: 10px">
            <el-table-column align="center" prop="copeWith" label="应付">
            </el-table-column>
            <el-table-column align="center" prop="discount" label="折扣">
            </el-table-column>
            <el-table-column align="center" prop="paidIn" label="实付">
            </el-table-column>
          </el-table>
        </el-tab-pane>
        <el-tab-pane label="明细项目" name="third" style="height: 350px;">
          <el-table
            :data="infoList"
            style="width: 100%"
            max-height="330"
            :span-method="objectSpanMethod1"
          >
            <el-table-column
              align="center"
              prop="newID"
              label="序号"
              width="50"
            >
            </el-table-column>
            <el-table-column align="center" prop="parent_pro_name" label="父项">
            </el-table-column>
            <el-table-column align="center" prop="pro_name" label="子项">
            </el-table-column>
            <el-table-column align="center" prop="danjia" label="单价">
            </el-table-column>
            <el-table-column align="center" prop="num" label="数量">
            </el-table-column>
            <el-table-column align="center" prop="zongjia" label="总价">
            </el-table-column>
            <el-table-column
              align="center"
              prop="time"
              label="开单时间"
              width="180"
            >
            </el-table-column>
          </el-table>
        </el-tab-pane>
      </el-tabs>
      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>

    <el-dialog
      :title="title1"
      :visible.sync="Projectssopen"
      width="1100px"
      style="height: 860px"
      append-to-body
    >
      <el-row type="flex" class="row-bg" justify="space-around">
        <el-col :span="13">
          <div
            style="text-align: center; margin-bottom: 10px; margin-top: 10px"
          >
            补录列表
          </div>

          <div class="tab3">
            <el-table :data="DataLists" border style="width: 100%" height="400"  @selection-change="handleProjectssChange" >
              <el-table-column type="selection" width="40" align="center" />
              <el-table-column
                type="index"
                label="序号"
                align="center"
                width="49px"
              >
              </el-table-column>
              <el-table-column
                prop="blje"
                label="补录金额"
                align="center"
                width="74px"
              >
              </el-table-column>
              <el-table-column
                prop="bldh"
                label="补录单号"
                align="center"
                width="155px"
              >
              </el-table-column>
              <el-table-column
                prop="blsj"
                label="补录时间"
                align="center"
                width="156px"
              >
              </el-table-column>
              <el-table-column
                prop="blrmc"
                label="补录人"
                align="center"
                width="96px"
              >
              </el-table-column>
             
            </el-table>
          </div>
        </el-col>

        <el-col :span="10">
          <div class="grid-content bg-purple">
            <div
              style="text-align: center; margin-bottom: 10px; margin-top: 10px"
            >
              补录项目
            </div>
            <el-table
              :data="DataListss"
              border
              style="width: 100%"
              height="400"
              :span-method="objectSpanMethod2"
            >
              <el-table-column prop="propinName" label="检查项目">
              </el-table-column>
              <el-table-column prop="proPrice" label="原价" width="56px">
              </el-table-column>
              <el-table-column prop="proName" label="明细项目" width="260px">
              </el-table-column>
            </el-table>
          </div>
        </el-col>
      </el-row>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">撤 销</el-button>
        <!-- <el-button @click="cancel">取 消</el-button> -->
      </div>
    </el-dialog>
  </div>
@@ -819,6 +1001,9 @@
  getPdf,
  getOrderList,
  getNewDateList,
  revokeTjOrderByTjNum,
  getTransitionInfo,
  getBlproByTjh,revokeBlProByBldhAndTjh
} from "@/api/hosp/order";
import moment from "moment";
import { getwater } from "@/api/hosp/customer";
@@ -837,9 +1022,16 @@
  name: "Order",
  data() {
    return {
      huizongList: [],
      DataLists:[],
      infoList: [],
      bldhs:[],
      activeName1: "second",
      filterText: "",
      orderIds: "",
      tjnumbers: "",
      Projectssopen: false,
      title1: "",
      cusIds: "",
      userIds: "",
      cusIdcard: "",
@@ -857,8 +1049,9 @@
      src: "",
      url: "",
      flag: true,
      bill: null,
      bill: [],
      Treedata: [],
      DataListss:[],
      checkedkey: [],
      checkedListkey: [],
      defaultProps: {
@@ -880,7 +1073,7 @@
      loading: true,
      // 选中数组
      ids: [],
      dataObj:{},
      dataObj: {},
      // 非单个禁用
      single: true,
      // 非多个禁用
@@ -979,7 +1172,12 @@
    },
    filterNode(value, data) {
      if (!value) return true;
      return data.proName.indexOf(value) !== -1;
      // return data.proName.indexOf(value) !== -1;
      if (data.proName.indexOf(value) !== -1) {
        return data.proName.indexOf(value) !== -1;
      } else {
        return data.proEngName.indexOf(value) !== -1;
      }
    },
    // / 处理默认选中当前日期
    // getNowTime() {
@@ -1050,6 +1248,9 @@
        this.loading = false;
      });
    },
    driver(row) {
      return row.pacName == null ? "普通体检" : row.pacName;
    },
    /** 点击显示导检单报表*/ //lige    开始
    handleReport(row) {
      const tjNumber = row.tjNumber;
@@ -1075,6 +1276,28 @@
          this.$message.error("该用户暂无项目！");
        }
      });
    },

    handleRevoke() {
      this.$confirm("您确认要撤销？", "确认信息", {
        distinguishCancelAndClose: true,
        confirmButtonText: "确认",
        cancelButtonText: "取消",
      })
        .then(() => {
          revokeTjOrderByTjNum(this.tjnumbers).then((res) => {
            this.$modal.msgSuccess(res.msg);
            this.getList();
          });
        })
        .catch((action) => {
          if (action === "cancel") {
            this.$message({
              type: "warning",
              message: "已取消",
            });
          }
        });
    },
    /** 点击显示体检报告报表*/
    // viewReport(row) {
@@ -1209,8 +1432,34 @@
      getNumber(tjNumber).then((response) => {
        // this.form = response.data;
        this.numberList = response.data.charging;
        this.bill = response.data.water;
        this.bill =[]
        var copeWith = 0;
        var paidIn = 0;
        var discount = ""
        response.data.water.forEach(item => {
          copeWith += item.copeWith;
          paidIn+= item.copeWith;
          discount= item.discount
        })
        this.bill.push({copeWith:copeWith,paidIn:paidIn,discount:discount});

        this.title = "订单流水";
      });
      getTransitionInfo(tjNumber).then((res) => {
        this.huizongList = res.data.huizong;
        this.infoList = res.data.info;
        this.huizongList.forEach((item, index) => {
          item.newID =
            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
            index +
            1;
        });
        this.infoList.forEach((item, index) => {
          item.newID =
            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
            index +
            1;
        });
      });
    },
    /** 订单明细按钮 */
@@ -1220,9 +1469,45 @@
      getNumber(tjNumber).then((response) => {
        // this.form = response.data;
        this.numberList = response.data.charging;
        this.bill = response.data.water;
        this.bill =[]
        var copeWith = 0;
        var paidIn = 0;
        var discount = ""
        response.data.water.forEach(item => {
          copeWith += item.copeWith;
          paidIn+= item.copeWith;
          discount= item.discount
        })
        this.bill.push({copeWith:copeWith,paidIn:paidIn,discount:discount});

        console.log(this.bill)
        this.title = "订单流水";
      });
      getTransitionInfo(tjNumber).then((res) => {
        this.huizongList = res.data.huizong;
        this.infoList = res.data.info;
        this.huizongList.forEach((item, index) => {
          item.newID =
            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
            index +
            1;
        });
        this.infoList.forEach((item, index) => {
          item.newID =
            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
            index +
            1;
        });
      });
    },

    renderContent(h, { node, data, store }) {
      return (
        <span class="custom-tree-node">
            <span>{node.label}</span>
          <span>({data.proPrice}元)</span>
        </span>
      );
    },

    // 补录项目
@@ -1275,6 +1560,20 @@
        this.loading = false;
      });
    },
    revokeProject() {
      getBlproByTjh(this.tjnumbers).then((res) => {
        if (res.data) {
          this.DataLists = res.data
          this.Projectssopen = true;
          this.title1 = "撤销补录";
        } else {
          this.$message({
            type: "warning ",
            message: "该客户没有补录项目",
          });
        }
      });
    },
    // 补录项目
    handleProject1() {
      this.loading = true;
@@ -1293,9 +1592,10 @@
      this.Projectopen1 = true;
      this.title = "补录项目";
    },

    // 点击获取每个树节点
    handleCurrentChecked(data, checked, checkedNodes) {
      this.dataObj = data
      this.dataObj = data;
      if (checked.checkedNodes.length != 0) {
        this.$refs.tree.setCheckedKeys([data.proId]);
        let proId = data.proId;
@@ -1325,7 +1625,6 @@
          this.TreedataList = res.data.list;
          this.checkedListkey = [];
        });
        
      }
    },

@@ -1357,11 +1656,11 @@
      } else if (checked == true) {
        this.DataList.push(data);
        this.DataList.forEach((item1) => {
              if (item1.proParentId == this.dataObj.proId) {
                item1.propinName = this.dataObj.proName;
              }
            });
        this.spliceData()
          if (item1.proParentId == this.dataObj.proId) {
            item1.propinName = this.dataObj.proName;
          }
        });
        this.spliceData();
        this.TotalPrice1 = 0;
        this.DataList.forEach((item1) => {
          this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
@@ -1380,6 +1679,70 @@
          });
        }
      });
    },

    //  // 默认接受四个值 { 当前行的值, 当前列的值, 行的下标, 列的下标 }
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      // console.log(row, column, rowIndex, columnIndex);
      let fields = ["propinName"];
      let cellValue = row[column.property];
      if (cellValue && fields.includes(column.property)) {
        let prevRow = this.DataList[rowIndex - 1];
        let nextRow = this.DataList[rowIndex + 1];
        if (prevRow && prevRow[column.property] === cellValue) {
          return { rowspan: 0, colspan: 0 };
        } else {
          let countRowspan = 1;
          while (nextRow && nextRow[column.property] === cellValue) {
            nextRow = this.DataList[++countRowspan + rowIndex];
          }
          if (countRowspan > 1) {
            return { rowspan: countRowspan, colspan: 1 };
          }
        }
      }
    },

    objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
      // console.log(row, column, rowIndex, columnIndex);
      let fields = ["parent_pro_name"];
      let cellValue = row[column.property];
      if (cellValue && fields.includes(column.property)) {
        let prevRow = this.infoList[rowIndex - 1];
        let nextRow = this.infoList[rowIndex + 1];
        if (prevRow && prevRow[column.property] === cellValue) {
          return { rowspan: 0, colspan: 0 };
        } else {
          let countRowspan = 1;
          while (nextRow && nextRow[column.property] === cellValue) {
            nextRow = this.infoList[++countRowspan + rowIndex];
          }
          if (countRowspan > 1) {
            return { rowspan: countRowspan, colspan: 1 };
          }
        }
      }
    },

    objectSpanMethod2({ row, column, rowIndex, columnIndex }) {
      // console.log(row, column, rowIndex, columnIndex);
      let fields = ["propinName"];
      let cellValue = row[column.property];
      if (cellValue && fields.includes(column.property)) {
        let prevRow = this.DataListss[rowIndex - 1];
        let nextRow = this.DataListss[rowIndex + 1];
        if (prevRow && prevRow[column.property] === cellValue) {
          return { rowspan: 0, colspan: 0 };
        } else {
          let countRowspan = 1;
          while (nextRow && nextRow[column.property] === cellValue) {
            nextRow = this.DataListss[++countRowspan + rowIndex];
          }
          if (countRowspan > 1) {
            return { rowspan: countRowspan, colspan: 1 };
          }
        }
      }
    },

    // 收费按钮
@@ -1465,26 +1828,49 @@
      });
    },

    handleProjectssChange(selection){
      this.DataListss =[]
      this.bldhs = selection.map((item) => item.bldh);
      selection.forEach(item => {
        item.projectList.forEach(item1 => {
          item1.children.forEach(item2 => {
            this.DataListss.push(item2)
            if(this.DataListss.length != 0){
              this.DataListss.forEach(item => {
                if(item.proParentId ==item1.proId )
                item.propinName= item1.proName
              })
            }
          })
        })
        
      })
    },

    /** 提交按钮 */
    // submitForm() {
    //   this.$refs["form"].validate(valid => {
    //     if (valid) {
    //       if (this.form.orderId != null) {
    //         updateOrder(this.form).then(response => {
    //           this.$modal.msgSuccess("修改成功");
    //           this.open = false;
    //           this.getList();
    //         });
    //       } else {
    //         addOrder(this.form).then(response => {
    //           this.$modal.msgSuccess("新增成功");
    //           this.open = false;
    //           this.getList();
    //         });
    //       }
    //     }
    //   });
    // },
    submitForm() {
      this.$confirm(" 是否撤销该补录项目?", "提示", {
        confirmButtonText: "是",
        cancelButtonText: "否",
        type: "warning",
      })
        .then(() => {
          let data = {
            tjh: this.tjnumbers,
            bldhs:this.bldhs
          }
          revokeBlProByBldhAndTjh(data).then(res => {
            this.Projectssopen =false
          })
        })
        .catch(() => {
          this.$message({
            type: "info",
            message: "已取消撤销",
          });
          this.Projectssopen =false
        });
    },

    /** 导出按钮操作 */
    handleExport() {
@@ -1552,7 +1938,7 @@
// }

.outside {
  width: 700px;
  width: 500px;
  display: flex;
  margin-top: 8px;
}
@@ -1560,6 +1946,7 @@
.tab3 {
  max-height: 500px;
  overflow-y: auto;
  border: 1px solid #d9d9d9;
}

.outside1 {