qinxianzhangyao
2024-04-01 bb9312f2f7b09b6a7b70798ffd48cdcce74079fb
src/views/hosp/order/index.vue
@@ -466,14 +466,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 +639,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 +647,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 +677,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="原价">
@@ -1365,6 +1365,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 = [];