11
lkk
2025-04-15 c70ffa07e49c0711b79156f00f80b1883d07450f
11
3个文件已修改
103 ■■■■ 已修改文件
src/views/hosp/ruleAdvice/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/rules/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reservation/reservations/index.vue 93 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/ruleAdvice/index.vue
@@ -440,7 +440,7 @@
      this.open = true;
      this.title = "添加病种+意见";
      listRules(this.queryParams).then((response) => {
        this.rulesList = response.rows;
        this.rulesList = response.data.rows;
      });
    },
    /** 修改按钮操作 */
@@ -460,7 +460,7 @@
          bingzhong: query,
        };
        listRules(data).then((response) => {
          this.rulesList = response.rows;
          this.rulesList = response.data.rows;
        });
      }
    },
src/views/hosp/rules/index.vue
@@ -1123,16 +1123,16 @@
    getListByXmId() {
      this.loading = true;
      listRules(this.queryParams).then((response) => {
        response.rows.forEach((item, index) => {
        response.data.rows.forEach((item, index) => {
          item.newID =
            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
            index +
            1;
        });
        this.rulesList = response.rows;
        this.rulesList = response.data.rows;
        console.log(this.rulesList, 999);
        this.total = response.total;
        this.total = response.data.total;
        this.loading = false;
      });
    },
src/views/reservation/reservations/index.vue
@@ -857,9 +857,19 @@
                  "
                >
                  <el-table :data="tableData1" border style="width: 100%">
                    <el-table-column prop="proName" label="项目" width="180" align="center">
                    <el-table-column
                      prop="proName"
                      label="项目"
                      width="180"
                      align="center"
                    >
                    </el-table-column>
                    <el-table-column prop="proType" label="性别" width="50" align="center">
                    <el-table-column
                      prop="proType"
                      label="性别"
                      width="50"
                      align="center"
                    >
                      <template slot-scope="scope">
                        <template v-if="isAll(scope.row.proType)">
                          全部
@@ -873,7 +883,11 @@
                      </template>
                    </el-table-column>
                    <el-table-column prop="ordPrice" label="应收金额" align="center">
                    <el-table-column
                      prop="ordPrice"
                      label="应收金额"
                      align="center"
                    >
                    </el-table-column>
                    <el-table-column label="折扣" width="160px" align="center">
                      <template slot-scope="scope">
@@ -892,9 +906,17 @@
                        </el-input-number>
                      </template>
                    </el-table-column>
                    <el-table-column prop="nowPrice" label="实收金额" align="center">
                    <el-table-column
                      prop="nowPrice"
                      label="实收金额"
                      align="center"
                    >
                    </el-table-column>
                    <el-table-column prop="proCheckMethod" label="是否空腹" align="center">
                    <el-table-column
                      prop="proCheckMethod"
                      label="是否空腹"
                      align="center"
                    >
                      <template slot-scope="scope">
                        <dict-tag
                          :options="dict.type.sys_yes_no"
@@ -1097,7 +1119,6 @@
        </div>
      </template>
    </el-drawer>
    <el-dialog
      title="PDF 预览"
@@ -1611,9 +1632,19 @@
                  "
                >
                  <el-table :data="tableData1" border style="width: 100%">
                    <el-table-column prop="proName" label="项目" width="180" align="center">
                    <el-table-column
                      prop="proName"
                      label="项目"
                      width="180"
                      align="center"
                    >
                    </el-table-column>
                    <el-table-column prop="proType" label="性别" width="50" align="center">
                    <el-table-column
                      prop="proType"
                      label="性别"
                      width="50"
                      align="center"
                    >
                      <template slot-scope="scope">
                        <template v-if="isAll(scope.row.proType)">
                          全部
@@ -1627,7 +1658,11 @@
                      </template>
                    </el-table-column>
                    <el-table-column prop="ordPrice" label="应收金额" align="center">
                    <el-table-column
                      prop="ordPrice"
                      label="应收金额"
                      align="center"
                    >
                    </el-table-column>
                    <el-table-column label="折扣" width="160px" align="center">
                      <template slot-scope="scope">
@@ -1646,9 +1681,17 @@
                        </el-input-number>
                      </template>
                    </el-table-column>
                    <el-table-column prop="nowPrice" label="实收金额" align="center">
                    <el-table-column
                      prop="nowPrice"
                      label="实收金额"
                      align="center"
                    >
                    </el-table-column>
                    <el-table-column prop="proCheckMethod" label="是否空腹" align="center">
                    <el-table-column
                      prop="proCheckMethod"
                      label="是否空腹"
                      align="center"
                    >
                      <template slot-scope="scope">
                        <dict-tag
                          :options="dict.type.sys_yes_no"
@@ -1853,10 +1896,9 @@
</template>
<script>
import { addComp,
  addPlOrderAndDetail } from "@/api/system/comp";
import { addComp, addPlOrderAndDetail } from "@/api/system/comp";
import Big from "big.js";
import { Loading } from 'element-ui';
import { Loading } from "element-ui";
import {
  listReservation,
  gettjCancel,
@@ -1934,7 +1976,7 @@
      url: "",
      open2: false,
      forms: {
        tjCategory:"12"
        tjCategory: "12",
      },
      dialogVisible: false,
      /** 照相机弹窗模块-start */
@@ -2682,13 +2724,15 @@
      this.open2 = true;
    },
    submitType() {
      // let cusIds = [];
      // this.selectList.forEach((item) => {
      //   cusIds.push(item.idCard);
      // });
      let loadingInstance1 = Loading.service({ fullscreen: true,text:"签到中" });
      let loadingInstance1 = Loading.service({
        fullscreen: true,
        text: "签到中",
      });
      let data = {
        cusIds: this.cusIds,
        tjCategory: this.forms.tjCategory,
@@ -2714,7 +2758,8 @@
          });
        }else{
          let _this = this;
          this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
            this.$nextTick(() => {
              // 以服务的方式调用的 Loading 需要异步关闭
            loadingInstance1.close();
});
        var websocket = null;
@@ -2729,6 +2774,8 @@
          alert("11111");
        }
        websocket.onopen = function () {
              console.log('res',res);
          try {
            // 连接设备
            var jsonObjs = {
@@ -2768,18 +2815,16 @@
          alert("请检查连接是否正常");
        };
     
          this.getList()
            this.getList();
        }
        }else{
          this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
          this.$nextTick(() => {
            // 以服务的方式调用的 Loading 需要异步关闭
            loadingInstance1.close();
});
        }
      });
    },
    base64ToBlob({ b64data = "", contentType = "", sliceSize = 512 } = {}) {
      return new Promise((resolve, reject) => {
@@ -3206,8 +3251,6 @@
  height: 700px;
  overflow: hidden;
}
#printIframe::-webkit-scrollbar {
  width: 6px;