6eb098b9ea2673240e802e4aa460ddc67ec7d869..e6fc429bc28eea2ff4d5f79942159e71bb352192
2 天以前 qx
Merge branch 'master' of http://101.42.27.146:5001/r/ltkj...
e6fc42 对比 | 目录
2 天以前 qx
qx
a95990 对比 | 目录
2 天以前 lkk
1
bf1b5e 对比 | 目录
5 天以前 lkk
1
158c1b 对比 | 目录
4个文件已修改
119 ■■■■■ 已修改文件
src/api/system/sfxm.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doctor/check/index.vue 105 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/project/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/biol/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/system/sfxm.js
@@ -4,8 +4,8 @@
export function listSfxm(query) {
    return request({
        url: '/system/sfxm/list',
        method: 'post',
        data: query
        method: 'get',
        params: query
    })
}
src/views/doctor/check/index.vue
@@ -976,6 +976,18 @@
            });
          }
        });
      }else {
        if (this.focusrow.proResult != this.focusrow.project.proDefault) {
          const substrings = ["正常", "未见异常", "阴性", "未见明显异常", "无"];
          let containsAllSubstrings = substrings.some(sub => this.focusrow.proResult.includes(sub));
          if (containsAllSubstrings) {
            this.focusrow.exceptionDesc = false;
          } else {
            this.focusrow.exceptionDesc = true;
          }
        } else {
          this.focusrow.exceptionDesc = false;
        }
      }
    },
@@ -1081,6 +1093,18 @@
            });
          }
        });
      }else {
        if (this.focusrow.proResult != this.focusrow.project.proDefault) {
          const substrings = ["正常", "未见异常", "阴性", "未见明显异常", "无"];
          let containsAllSubstrings = substrings.some(sub => this.focusrow.proResult.includes(sub));
          if (containsAllSubstrings) {
            this.focusrow.exceptionDesc = false;
          } else {
            this.focusrow.exceptionDesc = true;
          }
        } else {
          this.focusrow.exceptionDesc = false;
        }
      }
      this.rows.push(row);
    },
@@ -1333,46 +1357,46 @@
      var deptAdviceList1 = []
      // let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
      // getAdviceByTjNumAndPro(data).then((res) => {
        // if (res.data) {
        //   this.deptAdviceList3 = res.data;
          if (this.proParentList.xiaoJieIds.length != 0) {
            if (this.vaids.length != 0) {
              const result = this.vaids.reduce((acc, item) => {
                const matches = this.deptAdviceList.filter(items => {
                  return item == items.id;  // 或 === 根据需求
                });
                return acc.concat(matches);
              }, []);
              deptAdviceList1 = result;
      // if (res.data) {
      //   this.deptAdviceList3 = res.data;
      if (this.proParentList.xiaoJieIds.length != 0) {
        if (this.vaids.length != 0) {
          const result = this.vaids.reduce((acc, item) => {
            const matches = this.deptAdviceList.filter(items => {
              return item == items.id;  // 或 === 根据需求
            });
            return acc.concat(matches);
          }, []);
          deptAdviceList1 = result;
              return this.deptAdviceList1 = [
                ...new Set(deptAdviceList1),
              ];
            } else {
              this.proParentList.xiaoJieIds.forEach(item => {
                this.deptAdviceList.forEach((items) => {
                  if (item == items.id) {
                    deptAdviceList1.push(items)
                  }
                });
              })
              return this.deptAdviceList1 = [
                ...new Set(deptAdviceList1),
              ];
            }
          return this.deptAdviceList1 = [
            ...new Set(deptAdviceList1),
          ];
        } else {
          this.proParentList.xiaoJieIds.forEach(item => {
            this.deptAdviceList.forEach((items) => {
              if (item == items.id) {
                deptAdviceList1.push(items)
              }
            });
          })
          return this.deptAdviceList1 = [
            ...new Set(deptAdviceList1),
          ];
        }
          } else if (this.proParentList.xiaoJieIds == null) {
            this.deptAdviceList1 = []
          }
      } else if (this.proParentList.xiaoJieIds == null) {
        this.deptAdviceList1 = []
      }
          // this.deptAdviceList1 = [
          //   ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
          // ];
          // this.deptAdviceList3.forEach((items) => {
          //   this.idss.push(items.id);
          //   this.remakes += items.advice + ",";
          // });
      // this.deptAdviceList1 = [
      //   ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
      // ];
      // this.deptAdviceList3.forEach((items) => {
      //   this.idss.push(items.id);
      //   this.remakes += items.advice + ",";
      // });
      //   }
      // });
    },
@@ -1625,7 +1649,14 @@
    eventchange(data) {
      this.dataText = data;
      data.forEach((item) => (this.proParentList.remark += item.advice));
      //data.forEach((item) => (this.proParentList.remark += item.advice));
      data.forEach((item) => {
        if (item.advice) {
          this.proParentList.remark += item.advice
        } else if (item.jynr) {
          this.proParentList.remark += item.jynr
        }
      })
    },
    proposalChange() {
src/views/hosp/project/index.vue
@@ -921,7 +921,6 @@
                prop="tdzgxj"
              />
            </el-table>
            <div class="pag" v-if="List == true">
              <div class="pag1">
                <pagination
@@ -1484,7 +1483,6 @@
      }
    },
    getlistSfxm() {
      console.log(2222);
      this.loading = true;
      this.List = true;
      listSfxm(this.querycharge).then((response) => {
@@ -1522,6 +1520,8 @@
      this.loading = true;
      getListByXmId(this.queryParam).then((response) => {
        console.log(response,123456);
        this.sfxmList = response.data.date || [];
        if (response.data.date == null) {
          return;
src/views/system/biol/index.vue
@@ -294,9 +294,9 @@
    </el-dialog>
    <!--:before-close="handleClose"  -->
    <el-dialog title="提示" :visible.sync="dialogVisiblese" width="30%">
      <el-form :model="forms" ref="form" :inline="true" label-width="76px" style="margin-top: 10px">
        <el-form-item label="" prop="radios">
          <el-select  filterable v-model="forms.radios" placeholder="请选择打印健康检查表类型" clearable
      <el-form :model="forms" ref="form" style="width: 100%">
        <el-form-item label="" prop="radios" style="width: 100%">
          <el-select  filterable v-model="forms.radios" placeholder="请选择打印健康检查表类型" clearable style="width: 100%"
            >
            <el-option v-for="dict in radiosList" :key="dict.dictValue" :label="dict.dictLabel"
              :value="dict.dictValue" />