qinxianzhangyao
2024-06-19 a192b392d861dc2b2db0d2200da3dc51c3865a4b
qxtj
3个文件已修改
381 ■■■■■ 已修改文件
src/views/hosp/order/index.vue 331 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/package/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/tijian/index.vue 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/order/index.vue
@@ -96,7 +96,7 @@
          >导出</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
@@ -116,7 +116,7 @@
          >补录项目</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
@@ -437,21 +437,19 @@
          <el-input placeholder="输入关键字进行过滤" v-model="filterText">
          </el-input>
          <div class="tab3">
              <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>
            <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-col>
        <el-col :span="5">
@@ -461,69 +459,71 @@
            明细项目列表
          </div>
          <div class="tab3">
              <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>
            <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-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"
              >
              <el-table-column prop="propinName" label="检查项目" >
                </el-table-column>
                <el-table-column prop="proName" label="明细项目" width="260px">
                </el-table-column>
                <el-table-column prop="proPrice" label="原价" width="56px">
                </el-table-column>
            <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="proName" label="明细项目" width="260px">
              </el-table-column>
              <el-table-column prop="proPrice" label="原价" width="56px">
              </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%">
                      <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>
              <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">
@@ -608,28 +608,26 @@
          <el-input placeholder="输入关键字进行过滤" v-model="filterText">
          </el-input>
          <div class="tab3">
              <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>
            <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-col>
        <el-col :span="5">
          <div
            style="text-align: center; margin-bottom: 10px; margin-top: 10px"
          >
          明细项目列表
            明细项目列表
          </div>
          <div class="tab3">
            <div class="outside1">
@@ -650,54 +648,63 @@
        </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"
              >
              <el-table-column prop="propinName" label="检查项目" >
                </el-table-column>
                <el-table-column prop="proName" label="明细项目" width="260px">
                </el-table-column>
                <el-table-column prop="proPrice" label="原价" width="56px">
                </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>
            <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="proName" label="明细项目" width="260px">
              </el-table-column>
              <el-table-column prop="proPrice" label="原价" width="56px">
              </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">
@@ -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";
@@ -874,7 +882,7 @@
      loading: true,
      // 选中数组
      ids: [],
      dataObj:{},
      dataObj: {},
      // 非单个禁用
      single: true,
      // 非多个禁用
@@ -1071,11 +1079,31 @@
      });
    },
    handleRevoke(){
      revokeTjOrderByTjNum(this.tjnumbers).then(res => {
        this.$modal.msgSuccess("撤销成功")
        this.getList();
      })
    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) {
@@ -1294,10 +1322,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;
@@ -1327,7 +1355,6 @@
          this.TreedataList = res.data.list;
          this.checkedListkey = [];
        });
      }
    },
@@ -1359,11 +1386,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;
@@ -1384,9 +1411,9 @@
      });
    },
     //  // 默认接受四个值 { 当前行的值, 当前列的值, 行的下标, 列的下标 }
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      console.log(row, column, rowIndex, columnIndex)
    //  // 默认接受四个值 { 当前行的值, 当前列的值, 行的下标, 列的下标 }
    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)) {
src/views/system/package/index.vue
@@ -873,6 +873,8 @@
      this.open = true;
      this.title = "体检套餐信息维护";
      this.DataList = [];
      this.checkedkey=[];
      this.checkedListkey=[];
      this.getDataList();
      // getAllList().then((response) => {
      //   this.allList = response.data;
@@ -1077,8 +1079,10 @@
            });
          });
        } else {
          console.log(this.checkedkey)
          this.checkedkey.push(this.Treedata[0].proId);
          let proId = this.Treedata[0].proId;
          console.log(proId)
          getProSonDxList(proId).then((res) => {
            this.TreedataList = res.data.list;
            this.TreedataList.forEach((item) => {
@@ -1096,6 +1100,7 @@
      });
    },
    handleCurrentChecked(data, checked, checkedNodes) {
      console.log(data, checked)
      this.dataObj = data;
      this.checkedObj = checked;
      if (checked == true) {
src/views/system/tijian/index.vue
@@ -804,13 +804,20 @@
                <!-- <el-input v-model="form.category" placeholder="请输入体检类别" /> -->
              </el-form-item>
              <el-form-item style="margin-left: 269px">
              <el-form-item style="margin-left: 149px">
                <el-button
                  type="primary"
                  @click="Package"
                  size="mini"
                  style="margin-right: 20px"
                  >选择套餐</el-button
                >
                <el-button
                  type="primary"
                  @click="resetpackage"
                  size="mini"
                  style="margin-right: 20px"
                  >重置套餐</el-button
                >
                <el-button
                  type="primary"
@@ -2267,6 +2274,42 @@
    //   }
    // },
    resetpackage(){
      if (this.form.cusIdcard) {
        var cusId = this.form.cusIdcard;
      } else {
        this.$message.warning("请先填写信息,再选体检内容");
      }
      let _this = this;
        _this.pacId = "";
      this.proIds = [];
      let data = {
        cusId,
        pacId: _this.pacId,
        proIds: this.proIds,
      };
      getaddtTransition(data).then((response) => {
        if (response.code === 200) {
          let cusId = this.form.cusIdcard;
          this.proIds = [];
          getTransitionList(cusId).then((response) => {
            this.tableData1 = response.data;
            this.TotalPrice1 = 0;
            if (this.tableData1.length>=1) {
              this.list1 = false;
              this.list3 = true;
            } else {
              this.list1 = true;
              this.TotalPrice = "0.00";
            }
          });
        }
      });
      this.taocan = false;
      this.defaultKeys = [];
    },
    Package() {
      this.taocan = true;
      let cusSex = this.form.cusSex;