lkk
2024-12-12 0fdc7a65f8dab433cbc65baa956031f25e5d4583
初审
3个文件已修改
166 ■■■■ 已修改文件
src/views/doctor/examination/index.vue 157 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/rules/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sampling/sampling/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doctor/examination/index.vue
@@ -149,23 +149,32 @@
            </template>
          </el-table-column>
          <!--   v-hasPermi="['reservation:reservation:edit']" -->
          <el-table-column label="操作" align="center" width="120px">
          <!-- <el-table-column label="操作" align="center" width="120px">
            <template slot-scope="scope">
              <el-button size="mini" type="text" @click="tongbu(scope.row)"
              <el-button
                size="mini"
                type="text"
                @click="tongbu(scope.row)"
                v-show="
                  (xianshi == 'Y' || xianshi == 'y') &&
                  (scope.row.confirmStatus == '299' ||
                    scope.row.confirmStatus == 288)
                "
                >同步</el-button
              >
              <el-button
                :disabled="dis"
                size="mini"
                type="text"
                @click="tongguo(scope.row)"
                v-show="
                  (xianshi == 'Y' || xianshi == 'y') &&
                  (scope.row.confirmStatus == '299' ||
                    scope.row.confirmStatus == 288)
                "
                @click="tongguo(scope.row)"
                >通过</el-button
              >
              <el-button
                size="mini"
                type="text"
@@ -178,29 +187,33 @@
                >驳回</el-button
              >
            </template>
          </el-table-column>
          </el-table-column> -->
        </el-table>
      </div>
      <div style="width: 50%">
        <el-table
          v-loading="loading"
          border
          :row-class-name="tableRowClassName"
          height="520"
          ref="tab1"
          :data="xiangmuList"
          highlight-current-row
          @row-click="handleRowClick"
        >
          <!-- <el-table-column type="selection" width="40" align="center" /> -->
          <el-table-column
            label="部门"
            align="center"
            prop="deptName"
            width="100"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="项目"
            align="center"
            prop="proName"
            width="115"
            width="150"
            :show-overflow-tooltip="true"
          />
          <el-table-column
@@ -208,29 +221,31 @@
            align="center"
            prop="type"
            :show-overflow-tooltip="true"
            width="60"
            width="100"
          >
            <template slot-scope="scope">
              <span v-if="scope.row.type == '0'">未检</span>
              <span v-if="scope.row.type == '1'">已检</span>
              <span v-if="scope.row.type == '0'" style="color: red"
                >未完成</span
              >
              <span v-if="scope.row.type == '1'">已完成</span>
              <span v-if="scope.row.type == '2'">弃检</span>
              <span v-if="scope.row.type == '3'">延期</span>
            </template>
          </el-table-column>
          <el-table-column
          <!-- <el-table-column
            label="收费方式"
            align="center"
            prop="sffs"
            :show-overflow-tooltip="true"
            width="80"
          />
          <el-table-column
          /> -->
          <!-- <el-table-column
            label="是否收费"
            align="center"
            prop="isPay"
            :show-overflow-tooltip="true"
          />
          /> -->
          <!-- <el-table-column
            label="签到时间"
            align="center"
@@ -255,15 +270,106 @@
            prop="bcdoctorName"
            width="120"
          /> -->
          <el-table-column
          <!-- <el-table-column
            label="最后修改时间"
            align="center"
            prop="zhupdateTime"
            width="160"
          />
          /> -->
          <el-table-column label="操作" align="center" width="120px">
            <template slot-scope="scope">
              <el-button
                size="mini"
                type="text"
                :disabled="scope.row.type === 1"
                @click="qijian(scope.row)"
                >弃检</el-button
              >
              <el-button size="mini" type="text"  @click="queryResult(scope.row)"
                >结果查询</el-button
              >
              <!--  @click="chaxun(scope.row) " -->
            </template>
          </el-table-column>
        </el-table>
      </div>
    </div>
    <!-- <el-drawer title="我是标题" :visible.sync="drawer" :with-header="false">
      <div class="rightbox">
          <div class="right">
            <template>
              <div v-for="(item, index) in xiangmuList" :key="index">
                <div
                  style="
                    text-align: center;
                    background-color: #FDE2E2;
                    margin-top: 10px;
                  "
                >
                  {{ item.proName || "" }}
                </div>
                <el-table
                  :stripe="true"
                  :row-style="red"
                  :data="item.sone"
                  border
                  style="width: 100%"
                  :header-cell-style="{ background: 'Transparent' }"
                >
                  <el-table-column type="expand">
                    <template slot-scope="props">
                      <div
                        v-if="props.row.advices && props.row.advices.length > 0"
                      >
                        <div
                          v-for="(jianyi, index1) in props.row.advices"
                          :key="index1"
                          style="padding: 0 10px; margin-bottom: 10px"
                        >
                          <div>标题:{{ jianyi.bt || "" }}</div>
                          <div>内容:{{ jianyi.nr || "" }}</div>
                        </div>
                      </div>
                    </template>
                  </el-table-column>
                  <el-table-column align="center" label="检测项目" width="335">
                    <template slot-scope="scope">
                      <div>{{ scope.row.proName }}</div>
                    </template>
                  </el-table-column>
                  <el-table-column
                    align="center"
                    prop="proResult"
                    label="检测结果"
                    width="85"
                  >
                  </el-table-column>
                  <el-table-column
                    align="center"
                    prop="stanId"
                    label=" 参考范围"
                    width="117"
                  >
                  </el-table-column>
                  <el-table-column
                    align="center"
                    prop="proAdvice"
                    label="单位"
                    width="78"
                  >
                  </el-table-column>
                </el-table>
              </div>
            </template>
          </div>
        </div>
    </el-drawer> -->
    <div class="pag">
      <div class="pag1">
        <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :pager-count="5" :current-page.sync="currentPage1" :current-page="page"
@@ -301,6 +407,7 @@
      createTimeList: "",
      total: 0,
      loading: true,
      drawer: false,
      // 查询参数
      queryParams: {
        page: 1,
@@ -316,7 +423,7 @@
      checkStatus: "0",
      exaList: [],
      // 表单参数
      xianshi: '',
      xianshi: "",
      form: {},
      clearTimeSet: null,
      tjNumbers: "",
@@ -364,15 +471,22 @@
    // this.getNowTime();
  },
  mounted() {
    this.$nextTick(() => {
      this.$refs.inputName.focus();
    });
  },
  methods: {
    red() {
      return {
        color: "red",
      };
    },
    getdate() {
      getConfigKey("tj_confirm").then((res) => {
        this.xianshi = res.msg;
        console.log(this.xianshi, 999);
      });
      getNewDateList().then((res) => {
        this.createTimeList = [
@@ -559,6 +673,19 @@
        });
      });
    },
    qijian(row) {},
    chaxun() {},
    handleRowClick(row, column, event) {
      console.log(row); //
    },
    queryResult(row) {
      // 将当前行的数据存储到 currentRow
      this.currentRow = row;
      console.log(this.currentRow,999555);
      // 打开抽屉
      this.drawer = true;
    },
    setTime() {
      //设置定时器
      this.clearTimeSet = setInterval(() => {
src/views/hosp/rules/index.vue
@@ -255,6 +255,7 @@
              label="规则范围+"
              align="center"
              prop="ruleGt"
              width="90"
              :show-overflow-tooltip="true"
            />
            <el-table-column
src/views/sampling/sampling/index.vue
@@ -991,7 +991,6 @@
      };
      websocket.onopen = () => {
        this.websocket = websocket;
        // var list = this.selectList;
         this.dayinData = this.selectList.map((item) => ({
          jyxh: item.jyxh ,
          proName: item.proName,
@@ -1003,7 +1002,6 @@
        }));
        console.log(this.dayinData,2222);
        
        // 连接设备
        this.jsonObj = {
          type: "3",
@@ -1014,7 +1012,7 @@
        var jStr = JSON.stringify(this.jsonObj);
        this.websocket.send(jStr);
        this.jsonObj = {};
        this.dialogVisible = false;
        // this.dialogVisible = false;
      };
      // this.getList();
    },
@@ -1079,8 +1077,8 @@
            websocket.onmessage = (event) => {
              var resultObj = eval("(" + event.data + ")");
              console.log(resultObj, 9988);
            };
 */
            }; */
            // this.Collection();
            this.getList();
          } else {