su
su1124
2024-06-24 79a9d8883cb6272bf04674fe2c5db2dcb29f2d0f
su
3个文件已修改
65 ■■■■ 已修改文件
src/views/hosp/order/index.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/tijianall/index.vue 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/order/index.vue
@@ -232,6 +232,7 @@
          label="所选套餐"
          align="center"
          prop="pacName"
          :formatter="driver"
          :show-overflow-tooltip="true"
        />
        <el-table-column
@@ -456,7 +457,7 @@
              :default-checked-keys="checkedkey"
              :filter-node-method="filterNode"
              ref="tree"
                :render-content="renderContent"
              :render-content="renderContent"
            >
            </el-tree>
          </div>
@@ -478,7 +479,7 @@
              show-checkbox
              @check-change="handleCurrentChecked1"
              :default-checked-keys="checkedListkey"
                :render-content="renderContent"
              :render-content="renderContent"
            >
            </el-tree>
          </div>
@@ -503,7 +504,6 @@
              </el-table-column>
              <el-table-column prop="proName" label="明细项目" width="260px">
              </el-table-column>
              <el-table-column
                label="操作"
@@ -630,7 +630,7 @@
              :default-checked-keys="checkedkey"
              :filter-node-method="filterNode"
              ref="tree"
               :render-content="renderContent"
              :render-content="renderContent"
            >
            </el-tree>
          </div>
@@ -653,7 +653,7 @@
                show-checkbox
                @check-change="handleCurrentChecked1"
                :default-checked-keys="checkedListkey"
                 :render-content="renderContent"
                :render-content="renderContent"
              >
              </el-tree>
            </div>
@@ -680,7 +680,6 @@
              </el-table-column>
              <el-table-column prop="proName" label="明细项目" width="260px">
              </el-table-column>
              <el-table-column
                label="操作"
@@ -879,8 +878,8 @@
  name: "Order",
  data() {
    return {
      huizongList:[],
      infoList:[],
      huizongList: [],
      infoList: [],
      activeName1: "first",
      filterText: "",
      orderIds: "",
@@ -1024,9 +1023,9 @@
    },
    filterNode(value, data) {
      if (!value) return true;
      if(value == data.proName){
      if (value == data.proName) {
        return data.proName.indexOf(value) !== -1;
      }else{
      } else {
        return data.proEngName.indexOf(value) !== -1;
      }
    },
@@ -1099,6 +1098,9 @@
        this.loading = false;
      });
    },
    driver(row) {
      return row.pacName == null ? "普通体检" : row.pacName;
    },
    /** 点击显示导检单报表*/ //lige    开始
    handleReport(row) {
      const tjNumber = row.tjNumber;
src/views/system/tijianall/index.vue
@@ -297,7 +297,7 @@
    <el-dialog
      title="选择套餐"
      :visible.sync="taocan"
      width="59%"
      width="80%"
      height="700px"
    >
      <el-tabs
@@ -392,8 +392,8 @@
                  class="el-icon-d-arrow-right"></i></el-button> -->
          </div>
        </el-tab-pane>
        <el-tab-pane label="单项" name="second">
          <div class="tab8">
        <el-tab-pane label="单项" name="second" >
          <div class="tab8" >
            <!-- <div class="tab7">
              <v-tree-transfer
                :treeData="treedataList"
@@ -406,8 +406,8 @@
                @check-change="handleCurrentChecked">
              </el-tree> -->
            <!-- </div> -->
            <el-row :gutter="20">
              <el-col :span="6">
            <el-row :gutter="20" style="width:100%">
              <el-col :span="8">
                <div
                  style="
                    text-align: center;
@@ -431,6 +431,7 @@
                    :default-checked-keys="checkedkey"
                    :filter-node-method="filterNode"
                    ref="tree"
                    :render-content="renderContent"
                  >
                  </el-tree>
                </div>
@@ -456,6 +457,7 @@
                    show-checkbox
                    @check-change="handleCurrentChecked1"
                    :default-checked-keys="checkedListkey"
                    :render-content="renderContent"
                  >
                  </el-tree>
                </div>
@@ -507,6 +509,7 @@
                      </template>
                    </el-table-column>
                  </el-table>
                  <el-collapse v-model="activeName" accordion v-if="list1">
                    <div>
                      <el-collapse-item title="请选择项目">
@@ -529,6 +532,7 @@
                      </el-collapse-item>
                    </div>
                  </el-collapse>
                  <h3 v-else style="font-weight: 600;">合计:{{ marryall }}元</h3>
                </div>
              </el-col>
            </el-row>
@@ -897,6 +901,7 @@
    //   }
    // };
    return {
      marryall: 0,
      filterText: "",
      proIdList: [],
      tableDatas: [],
@@ -1154,7 +1159,12 @@
    filterNode(value, data) {
      if (!value) return true;
      return data.proName.indexOf(value) !== -1;
      // return data.proName.indexOf(value) !== -1;
      if(value == data.proName){
        return data.proName.indexOf(value) !== -1;
      }else{
        return data.proEngName.indexOf(value) !== -1;
      }
    },
    cope() {
      let cusIdCard = this.form.cusIdcard;
@@ -1598,6 +1608,14 @@
        this.getDataList();
      }
    },
    renderContent(h, { node, data, store }) {
      return (
        <span class="custom-tree-node">
          <span>{node.label}</span>
          <span>({data.proPrice}元)</span>
        </span>
      );
    },
    getDataList() {
      this.loading = true;
      getProParentIdDxList().then((response) => {
@@ -1623,11 +1641,12 @@
            });
          });
          this.TotalPrice1 = 0;
           this.marryall = 0;
          if (this.DataList.length != 0) {
            this.list1 = false;
            this.DataList.forEach((item) => {
              this.TotalPrice1 = item.proPrice + this.TotalPrice1;
              this.marryall += item.proPrice;
            });
          }
        });
@@ -1654,10 +1673,12 @@
            });
          });
          this.TotalPrice1 = 0;
          this.marryall = 0;
          if (this.DataList.length != 0) {
            this.list1 = false;
            this.DataList.forEach((item) => {
              this.TotalPrice1 = item.proPrice + this.TotalPrice1;
               this.marryall += item.proPrice;
            });
          }
        });
@@ -1690,8 +1711,10 @@
          if (item.proId == data.proId) {
            this.DataList.splice(index, 1);
            this.TotalPrice1 = 0;
            this.marryall = 0;
            this.DataList.forEach((item1) => {
              this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
              this.marryall += item1.proPrice;
            });
          }
        });
@@ -1704,8 +1727,10 @@
        });
        this.spliceData();
        this.TotalPrice1 = 0;
        this.marryall = 0;
        this.DataList.forEach((item1) => {
          this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
          this.marryall += item1.proPrice;
        });
      }
    },
@@ -1715,9 +1740,11 @@
      this.DataList.forEach((item, index) => {
        if (item.proId == row.proId) {
          this.DataList.splice(index, 1);
          this.marryall = 0;
          this.TotalPrice1 = 0;
          this.DataList.forEach((item1) => {
            this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
            this.marryall += item1.proPrice;
          });
        }
      });
vue.config.js
@@ -53,7 +53,7 @@
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        // target: `https://ltpeis.xaltjdkj.cn:5801/`,
        target: `http://192.168.1.113:5011`,
        target: `http://192.168.1.3:5011`,
        // // target: `http://192.168.0.99:8080/ltkj-admin`,
        // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
        // target: `http://10.168.0.9:5011`,