qinxianzhangyao
2024-06-19 a192b392d861dc2b2db0d2200da3dc51c3865a4b
src/views/hosp/order/index.vue
@@ -437,7 +437,6 @@
          <el-input placeholder="输入关键字进行过滤" v-model="filterText">
          </el-input>
          <div class="tab3">
              <el-tree
                class="filter-tree"
                v-loading="loading"
@@ -451,7 +450,6 @@
                ref="tree"
              >
              </el-tree>
          </div>
        </el-col>
        <el-col :span="5">
@@ -477,14 +475,17 @@
        </el-col>
        <el-col :span="11">
          <div class="grid-content bg-purple">
            <div style="text-align: center; margin-bottom: 10px;margin-top: 10px">
            <div
              style="text-align: center; margin-bottom: 10px; margin-top: 10px"
            >
              已选项目列表
            </div>
              <el-table
                :data="DataList"
                border
                style="width: 100%"
                height="400"  :span-method="objectSpanMethod"
              height="400"
              :span-method="objectSpanMethod"
              >
              <el-table-column prop="propinName" label="检查项目" >
                </el-table-column>
@@ -507,8 +508,7 @@
                      icon="el-icon-delete"
                      @click="handleDelete(scope.row)"
                      title="删除"
                      ></el-button
                    >
                  ></el-button>
                  </template>
                </el-table-column>
              </el-table>
@@ -608,7 +608,6 @@
          <el-input placeholder="输入关键字进行过滤" v-model="filterText">
          </el-input>
          <div class="tab3">
              <el-tree
                class="filter-tree"
                v-loading="loading"
@@ -622,7 +621,6 @@
                ref="tree"
              >
              </el-tree>
          </div>
        </el-col>
        <el-col :span="5">
@@ -650,7 +648,9 @@
        </el-col>
        <el-col :span="11">
          <div class="grid-content bg-purple">
            <div style="text-align: center; margin-bottom: 10px;margin-top: 10px">
            <div
              style="text-align: center; margin-bottom: 10px; margin-top: 10px"
            >
              已选项目列表
            </div>
            
@@ -658,7 +658,8 @@
                :data="DataList"
                border
                style="width: 100%"
                height="400"  :span-method="objectSpanMethod"
              height="400"
              :span-method="objectSpanMethod"
              >
              <el-table-column prop="propinName" label="检查项目" >
                </el-table-column>
@@ -688,7 +689,13 @@
              <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
                    :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="原价">
@@ -812,7 +819,8 @@
  hasReport,
  getPdf,
  getOrderList,
  getNewDateList,revokeTjOrderByTjNum,
  getNewDateList,
  revokeTjOrderByTjNum,
} from "@/api/hosp/order";
import moment from "moment";
import { getwater } from "@/api/hosp/customer";
@@ -1072,10 +1080,30 @@
    },
    handleRevoke(){
      revokeTjOrderByTjNum(this.tjnumbers).then(res => {
        this.$modal.msgSuccess("撤销成功")
      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) {
@@ -1297,7 +1325,7 @@
   
    // 点击获取每个树节点
    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;
@@ -1327,7 +1355,6 @@
          this.TreedataList = res.data.list;
          this.checkedListkey = [];
        });
      }
    },
@@ -1363,7 +1390,7 @@
                item1.propinName = this.dataObj.proName;
              }
            });
        this.spliceData()
        this.spliceData();
        this.TotalPrice1 = 0;
        this.DataList.forEach((item1) => {
          this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
@@ -1386,7 +1413,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)) {