Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region

qx

2025-03-26 155a30a172e4cf04838dcf7c8bb73ce6b200e574

 src/views/hosp/order/index.vue

@@ -804,13 +804,20 @@
          <el-table
            :data="DataList3"
            border
            style="width: 100%"
            style="width: 100%; table-layout: fixed"
            height="560"
            :span-method="objectspanmethod"
          >
            <el-table-column prop="propinName" label="检查项目">
            :span-method="objectspanmethod">
            <el-table-column 
              prop="propinName" 
              label="检查项目"
              width="200px"
              :show-overflow-tooltip="true">
            </el-table-column>
            <el-table-column prop="proName" label="明细项目" width="200px">
            <el-table-column 
              prop="proName" 
              label="明细项目"
              width="200px"
              :show-overflow-tooltip="true">
            </el-table-column>
            <el-table-column prop="sl" label="数量" width="56px">
            </el-table-column>
@@ -953,15 +960,7 @@
              <div class="tab8">
                <el-row :gutter="20" style="width: 100%">
                  <el-col :span="22">
                    <!-- <div
                    style="
                      text-align: center;
                      margin-bottom: 10px;
                      margin-top: 10px;
                    "
                  >
                    项目列表
                  </div> -->
         
                    <el-input
                      placeholder="输入关键字进行过滤"
                      v-model="filterage"
@@ -984,29 +983,6 @@
                      </el-tree>
                    </div>
                  </el-col>
                  <!-- <el-col :span="11">
                  <div
                    style="
                      text-align: center;
                      margin-bottom: 10px;
                      margin-top: 10px;
                    "
                  >
                    明细项目列表
                  </div>
                  <div class="tab3">
                    <el-tree
                      class="filter-tree"
                      v-loading="loading"
                      :data="packagedataList"
                      node-key="proId"
                      :props="defaultpackProps"
                      :render-content="renderContent"
                    >
                    </el-tree>
                  </div>
                </el-col> -->
                  <!-- <el-col :span="11"> </el-col> -->
                </el-row>
              </div>
            </el-tab-pane>
@@ -1014,15 +990,6 @@
              <div class="tab8">
                <el-row type="flex" class="row-bg" justify="space-around">
                  <el-col :span="22">
                    <!-- <div
                  style="
                    text-align: center;
                    margin-bottom: 10px;
                    margin-top: 10px;
                  "
                >
                  项目列表
                </div> -->
                    <el-input
                      placeholder="输入关键字进行过滤"
                      v-model="filterText"
@@ -1045,106 +1012,6 @@
                      </el-tree>
                    </div>
                  </el-col>
                  <!-- <el-col :span="11">
                <div
                  style="
                    text-align: center;
                    margin-bottom: 10px;
                    margin-top: 10px;
                  "
                >
                  明细项目列表
                </div>
                <div class="tab3">
                  <div class="outside1">
                    <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"
                      :render-content="renderContent"
                    >
                    </el-tree>
                  </div>
                </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>

                <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="proPrice" label="原价" width="56px">
                  </el-table-column>
                  <el-table-column
                    prop="proName"
                    label="明细项目"
                    width="260px"
                  >
                  </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> -->
                  <!-- </div>
            </el-col> -->
                </el-row>
              </div>
            </el-tab-pane>
@@ -1158,13 +1025,20 @@
          <el-table
            :data="DataList3"
            border
            style="width: 100%"
            style="width: 100%; table-layout: fixed"
            height="560"
            :span-method="objectspanmethod"
          >
            <el-table-column prop="propinName" label="检查项目">
            :span-method="objectspanmethod">
            <el-table-column 
              prop="propinName" 
              label="检查项目"
              width="200px"
              :show-overflow-tooltip="true">
            </el-table-column>
            <el-table-column prop="proName" label="明细项目" width="200px">
            <el-table-column 
              prop="proName" 
              label="明细项目"
              width="200px"
              :show-overflow-tooltip="true">
            </el-table-column>
            <el-table-column prop="sl" label="数量" width="56px">
            </el-table-column>
@@ -1682,6 +1556,7 @@
import { getwater } from "@/api/hosp/customer";
import { getInfo } from "@/api/login";
import ViewPdf from "@/components/ViewPdf";
import { getDicts } from "@/api/system/dict/data";
import {
  shijianzhou,
  getaddtTransition,
@@ -1743,8 +1618,8 @@
      createTimeList: "",
      packagedataList: [],
      cusId: "",
      payType: "0",
      jsType: "0",
      payType: "",
      jsType: "",
      packageList: [],
      checkedkeys: [],
      dialogVisible: false,
@@ -2686,7 +2561,7 @@
    renderContent(h, { node, data, store }) {
      return (
        <span class="custom-tree-node">
            <span>{node.label}</span>
           <span>{node.label}</span>
          <span>({data.proPrice}元)</span>
        </span>
      );
@@ -2694,7 +2569,19 @@

    // 补录项目
    handleProject(row) {
      this.payType = "0";
      let dictType = "reservation_pay_type";
      getDicts(dictType).then((res) => {
        if (res.code == 200) {
          this.jsType = res.data[0].dictValue;
        }
      })
      let dictTypes = "dict_pay_type";
      getDicts(dictTypes).then((res) => {
        if (res.code == 200) {
          this.payType = res.data[0].dictValue;
        }
      })
      
      this.loading = true;
      this.DataList = [];
      this.DataList3 = [];
@@ -2703,8 +2590,6 @@
      this.orderId = row.orderId;
      this.cusId = row.tjCusIdCard;
      this.userId = row.userId;
      console.log(row, 666);

      this.customer = {
        cusIdcard: row.tjCusIdCard,
        cusName: row.tjCustomerName,
@@ -2766,7 +2651,18 @@
    },
    // 补录项目
    handleProject1() {
      this.payType = "0";
      let dictType = "reservation_pay_type";
      getDicts(dictType).then((res) => {
        if (res.code == 200) {
          this.jsType = res.data[0].dictValue;
        }
      })
      let dictTypes = "dict_pay_type";
      getDicts(dictTypes).then((res) => {
        if (res.code == 200) {
          this.payType = res.data[0].dictValue;
        }
      })
      this.loading = true;
      this.DataList = [];
      this.DataList3 = [];