qxtj

qinxianzhangyao

2024-06-25 b54b3c4662338ca0897b8dbc9172f7f00306a09d

 src/views/hosp/order/index.vue

@@ -787,7 +787,7 @@
    <!-- 添加或修改体检记录对话框 -->
    <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-tab-pane label="订单流水" name="first">
          <el-table :data="numberList" style="width: 100%">
            <el-table-column prop="proName" label="项目/耗材" width="300">
            </el-table-column>
@@ -821,26 +821,34 @@
              </template>
            </el-table-column>
          </el-table>
        </el-tab-pane>
        </el-tab-pane> -->
        <el-tab-pane label="项目汇总" name="second">
          <el-table :data="huizongList" style="width: 100%">
            <el-table-column prop="newID" label="序号"> </el-table-column>
            <el-table-column prop="parent_pro_name" label="项目">
          <el-table :data="huizongList" style="width: 100%" max-height="280">
            <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 prop="ks" label="科室"> </el-table-column>
            <el-table-column prop="price" 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>
          <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">
          <el-table :data="infoList" style="width: 100%">
            <el-table-column prop="newID" label="序号"> </el-table-column>
            <el-table-column prop="parent_pro_name" label="父项">
          <el-table :data="infoList" style="width: 100%" max-height   ="300" :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 prop="proName" label="子项"> </el-table-column>
            <el-table-column prop="danjia" label="单价"> </el-table-column>
            <el-table-column prop="num" label="数量"> </el-table-column>
            <el-table-column prop="zongjia" label="总价"> </el-table-column>
            <el-table-column prop="time" 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>
@@ -880,7 +888,7 @@
    return {
      huizongList: [],
      infoList: [],
      activeName1: "first",
      activeName1: "second",
      filterText: "",
      orderIds: "",
      tjnumbers: "",
@@ -1023,12 +1031,12 @@
    },
    filterNode(value, data) {
      if (!value) return true;
      return data.proName.indexOf(value) !== -1;
      // if (value == data.proName) {
      //   return data.proName.indexOf(value) !== -1;
      // } else {
      //   return data.proEngName.indexOf(value) !== -1;
      // }
       if(data.proName.indexOf(value) !== -1){
        return data.proName.indexOf(value) !== -1;
      }else{
        return data.proEngName.indexOf(value) !== -1;
      }
    },
    // / 处理默认选中当前日期
    // getNowTime() {
@@ -1287,8 +1295,6 @@
        this.title = "订单流水";
      });
      getTransitionInfo(tjNumber).then((res) => {
        console.log(111);
        console.log(res);
        this.huizongList = res.data.huizong;
        this.infoList = res.data.info;
        this.huizongList.forEach((item, index) => {
@@ -1314,6 +1320,22 @@
        this.numberList = response.data.charging;
        this.bill = response.data.water;
        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;
        });
      });
    },

@@ -1485,7 +1507,7 @@

    //  // 默认接受四个值 { 当前行的值, 当前列的值, 行的下标, 列的下标 }
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      console.log(row, column, rowIndex, columnIndex);
      // console.log(row, column, rowIndex, columnIndex);
      let fields = ["propinName"];
      let cellValue = row[column.property];
      if (cellValue && fields.includes(column.property)) {
@@ -1505,6 +1527,27 @@
      }
    },

    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 };
          }
        }
      }
    },

    // 收费按钮
    submitPrice() {
      this.proIds = [];