qxtj

qinxianzhangyao

2024-05-24 94c40e717c313d91bde25bff7c6938dfc21d9aaf

 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,7 @@
          >补录项目</el-button
        >
      </el-col>
      
      <el-col :span="1.5">
        <el-button
          type="primary"
@@ -466,14 +477,14 @@
        </el-col>
        <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>
              <el-table
                :data="DataList"
                border
                style="width: 100%"
                height="250"
                height="400"  :span-method="objectSpanMethod"
              >
              <el-table-column prop="propinName" label="检查项目" >
                </el-table-column>
@@ -639,7 +650,7 @@
        </el-col>
        <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>
            
@@ -647,7 +658,7 @@
                :data="DataList"
                border
                style="width: 100%"
                height="250"
                height="400"  :span-method="objectSpanMethod"
              >
              <el-table-column prop="propinName" label="检查项目" >
                </el-table-column>
@@ -677,7 +688,7 @@
              <el-collapse v-model="activeName" accordion v-if="list1">
                <div>
                  <el-collapse-item title="请选择项目">
                    <el-table :data="DataList" border style="width: 100%">
                    <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="原价">
@@ -801,7 +812,7 @@
  hasReport,
  getPdf,
  getOrderList,
  getNewDateList,
  getNewDateList,revokeTjOrderByTjNum,
} from "@/api/hosp/order";
import moment from "moment";
import { getwater } from "@/api/hosp/customer";
@@ -1059,6 +1070,13 @@
        }
      });
    },

    handleRevoke(){
      revokeTjOrderByTjNum(this.tjnumbers).then(res => {
        this.$modal.msgSuccess("撤销成功")
        this.getList();
      })
    },
    /** 点击显示体检报告报表*/
    // viewReport(row) {
    //   const tjNumber = row.tjNumber;
@@ -1276,6 +1294,7 @@
      this.Projectopen1 = true;
      this.title = "补录项目";
    },
   
    // 点击获取每个树节点
    handleCurrentChecked(data, checked, checkedNodes) {
      this.dataObj = data
@@ -1365,6 +1384,28 @@
      });
    },

     //  // 默认接受四个值 { 当前行的值, 当前列的值, 行的下标, 列的下标 }
     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 };
          }
        }
      }
    },

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