qx
qx
6 天以前 a4d79237c73a1db49649a8d3108eec95a8e67c37
qx
3个文件已修改
289 ■■■■ 已修改文件
src/views/advice/advice/index.vue 252 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doctor/check/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/user/index.vue 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/advice/advice/index.vue
@@ -1,187 +1,74 @@
<template>
  <div class="app-container">
    <el-form
      :model="queryParams"
      ref="queryForm"
      size="small"
      :inline="true"
      v-show="showSearch"
      label-width="68px"
      @submit.native.prevent
    >
    <el-row :gutter="20">
      <el-col :span="4" :xs="24"> </el-col>
      <el-col :span="20" :xs="24">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
          @submit.native.prevent>
    <el-form-item label="标题" prop="bt">
        <el-input
          v-model="queryParams.bt"
          placeholder="请输入标题"
          clearable
          @keyup.enter.native="handleQuery"
        />
            <el-input v-model="queryParams.bt" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="项目名称" prop="proName">
        <el-input
          v-model="queryParams.proName"
          placeholder="请输入项目名称"
          clearable
          @keyup.enter.native="handleQuery"
        />
            <el-input v-model="queryParams.proName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item>
        <el-button
          type="primary"
          icon="el-icon-search"
          size="mini"
          @click="handleQuery"
          >搜索</el-button
        >
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
          >重置</el-button
        >
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
      </el-col>
    </el-row>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['advice:advice:add']"
          >新增</el-button
        >
        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
          v-hasPermi="['advice:advice:add']">新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['advice:advice:edit']"
          >修改</el-button
        >
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
          v-hasPermi="['advice:advice:edit']">修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['advice:advice:remove']"
          >删除</el-button
        >
        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
          v-hasPermi="['advice:advice:remove']">删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['advice:advice:export']"
          >导出</el-button
        >
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
          v-hasPermi="['advice:advice:export']">导出</el-button>
      </el-col>
    </el-row>
    <el-row :gutter="20">
      <el-col :span="4" :xs="24">
        <div class="head-container">
          <div class="content">
            <el-tree
              :data="deptOptions"
              :props="defaultProps"
              :expand-on-click-node="false"
              :filter-node-method="filterNode"
              ref="tree"
              node-key="id"
              default-expand-all
              :default-expanded-keys="treeId"
              highlight-current
              @node-click="handleNodeClick"
            />
            <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
              :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all
              :default-expanded-keys="treeId" highlight-current @node-click="handleNodeClick" />
          </div>
        </div>
       
      </el-col>
      <el-col :span="20" :xs="24">
        <el-table
          v-loading="loading"
          :data="adviceList"
          @selection-change="handleSelectionChange"
          border
        >
        <el-table v-loading="loading" :data="adviceList" @selection-change="handleSelectionChange" border>
          <el-table-column type="selection" width="55" align="center" fixed />
          <el-table-column
            label="序号"
            align="center"
            prop="newID"
            width="55px"
          />
          <el-table-column
            label="所属科室"
            align="center"
            prop="deptName"
            width="120px"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="体检项目"
            align="center"
            prop="proName"
            width="120px"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="标题"
            align="center"
            prop="title"
            width="120px"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="建议"
            align="center"
            prop="advice"
            width="1249px"
            :show-overflow-tooltip="true"
          />
          <el-table-column
            label="操作"
            align="center"
            fixed="right"
            class-name="small-padding fixed-width"
            width="80px"
          >
          <el-table-column label="序号" align="center" prop="newID" width="55px" />
          <el-table-column label="所属科室" align="center" prop="deptName" width="120px" :show-overflow-tooltip="true" />
          <el-table-column label="体检项目" align="center" prop="proName" width="120px" :show-overflow-tooltip="true" />
          <el-table-column label="标题" align="center" prop="title" width="120px" :show-overflow-tooltip="true" />
          <el-table-column label="建议" align="center" prop="advice" width="1249px" :show-overflow-tooltip="true" />
          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="80px">
            <template slot-scope="scope">
              <el-button
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['advice:advice:edit']"
                title="修改"
              ></el-button>
              <el-button
                size="mini"
                type="text"
                icon="el-icon-delete"
                @click="handleDelete(scope.row)"
                v-hasPermi="['advice:advice:remove']"
                title="删除"
              ></el-button>
              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                v-hasPermi="['advice:advice:edit']" title="修改"></el-button>
              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                v-hasPermi="['advice:advice:remove']" title="删除"></el-button>
            </template>
          </el-table-column>
        </el-table>
        <div class="pag">
      <div class="pag1">
        <pagination
          v-show="total > 0"
          :total="total"
          :page.sync="queryParams.page"
          :limit.sync="queryParams.pageSize"
          @pagination="getList"
        />
            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page"
              :limit.sync="queryParams.pageSize" @pagination="getList" />
      </div>
    </div>
      </el-col>
@@ -190,46 +77,20 @@
    <!-- 添加或修改advice对话框 -->
    <el-dialog
      :title="title"
      :visible.sync="open"
      width="1000px"
      append-to-body
    >
    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="归属科室" prop="deptId">
            <!-- <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属科室"
              style="width: 200px" /> -->
            <el-select
            v-if="DepartmentList.length > 0"
              v-model="form.deptId"
              placeholder="请选择归属科室"
              clearable
              style="width: 200px"
              filterable
            >
              <el-option
                v-for="dict in DepartmentList"
                :key="dict.deptId"
                :label="dict.deptName || ''"
                :value="dict.deptId"
              />
          <el-select v-if="DepartmentList.length > 0" v-model="form.deptId" placeholder="请选择归属科室" clearable
            style="width: 200px" filterable>
            <el-option v-for="dict in DepartmentList" :key="dict.deptId" :label="dict.deptName || ''"
              :value="dict.deptId" />
            </el-select>
          </el-form-item>
        <el-form-item label="检查项目" prop="proName">
          <el-select
            v-model="form.proId"
            placeholder="请输入项目名称"
            filterable
            style="width: 240px"
            clearable
          >
            <el-option
              v-for="(dict, index) in projectList"
              :key="index"
              :label="dict.proName"
              :value="dict.proId"
            />
          <el-select v-model="form.proId" placeholder="请输入项目名称" filterable style="width: 240px" clearable>
            <el-option v-for="(dict, index) in projectList" :key="index" :label="dict.proName" :value="dict.proId" />
          </el-select>
        </el-form-item>
        
@@ -237,29 +98,15 @@
          <el-input v-model="form.title" placeholder="请输入名称标题" />
        </el-form-item>
        <el-form-item label="快捷标签" prop="kjbq">
          <span
            slot="label"
            style="display: inline-block; border-bottom: 2px solid blue"
            @click="handlekjbq"
          >
          <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handlekjbq">
            快捷标签
          </span>
          <el-checkbox-group v-model="kjbq" @change="handleCheckedCitiesChange">
            <el-checkbox
              v-for="(item, index) in dataList"
              :key="index"
              :label="item.id"
              >{{ item.kjbq }}</el-checkbox
            >
            <el-checkbox v-for="(item, index) in dataList" :key="index" :label="item.id">{{ item.kjbq }}</el-checkbox>
          </el-checkbox-group>
        </el-form-item>
        <el-form-item label="建议内容" prop="advice">
          <el-input
            type="textarea"
            v-model="form.advice"
            :autosize="{ minRows: 9, maxRows: 10 }"
            placeholder="请输入建议"
          />
          <el-input type="textarea" v-model="form.advice" :autosize="{ minRows: 9, maxRows: 10 }" placeholder="请输入建议" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -267,12 +114,7 @@
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
    <el-dialog
      title="添加快捷标签"
      :visible.sync="kjbqopen"
      width="500px"
      append-to-body
    >
    <el-dialog title="添加快捷标签" :visible.sync="kjbqopen" width="500px" append-to-body>
      <el-form ref="form" :model="form" label-width="80px">
        <el-form-item label="名称" prop="kjbq">
          <el-input v-model="formss.kjbq" placeholder="请输入名称" />
@@ -584,6 +426,7 @@
  display: flex;
  justify-content: center;
}
.pag1 {
  width: 30%;
}
@@ -593,6 +436,7 @@
  width: 1000px;
  height: 1000px;
}
.head-container {
  width: 200px;
  height: 629px;
src/views/doctor/check/index.vue
@@ -1863,11 +1863,11 @@
            //判断新数组是否有这个元素值,没有的话,就把arr[i]给push到新数组newArr中
            if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) {
                this.radio =  this.lastClickedTab.name               
              this.$modal.msgError("请填写资料");
              this.$modal.msgError("请检查项目是否填写完成");
              this.minedis = true
              return
            } else if (this.proParentList.sons[i].proResult.includes(" ")) {
              this.$modal.msgError("请查看是否有空格");
              this.$modal.msgError("请检查项目是否有空格");
               this.radio =  this.lastClickedTab.name
              this.minedis = true
              return
@@ -1936,11 +1936,11 @@
      for (var i = 0; i < this.proParentList.sons.length; i++) {
        //判断新数组是否有这个元素值,没有的话,就把arr[i]给push到新数组newArr中
        if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) {
          this.$modal.msgError("请填写资料");
          this.$modal.msgError("请检查项目是否填写完成");
          this.minedis = true
          return
        } else if (this.proParentList.sons[i].proResult.includes(" ")) {
          this.$modal.msgError("请查看是否有空格");
          this.$modal.msgError("请检查填写项目中是否有空格");
          this.minedis = true
          return
        } else {
src/views/system/user/index.vue
@@ -1321,7 +1321,7 @@
          </el-collapse>
        </el-form>
        <div slot="footer" class="dialog-footer1">
          <el-button type="primary" @click="submitForm">确 定</el-button>
          <el-button :disabled="submit" type="primary" @click="submitForm">确 定</el-button>
          <el-button @click="cancel">取 消</el-button>
        </div>
      </el-dialog>
@@ -1465,6 +1465,7 @@
      single: true,
      // 非多个禁用
      multiple: true,
      submit: false,
      // 显示搜索条件
      showSearch: true,
      // 总条数
@@ -1798,6 +1799,9 @@
      this.ids = selection.map((item) => item.userId);
      this.single = selection.length != 1;
      this.multiple = !selection.length;
        if (selection.length >= 1) {
        this.queryParams.userName = selection[0].userName
      }
    },
    // 更多操作触发
@@ -1852,16 +1856,18 @@
    handleUp(row) {
      this.title = "用户信息维护";
      // this.form = row;
      this.open = true;
      this.form = row;
      this.form.hospId = Number(row.hospId);
      // listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
      //   (response) => {
      //     response.rows.forEach((item, index) => {
      //       this.form = item;
      //     });
      //   }
      // );
      this.submit = false
      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
        (response) => {
          response.rows.forEach((item, index) => {
            this.form = item;
          });
        }
      );
    },
    select(val) {
      this.postList.forEach((item) => {
@@ -1889,6 +1895,7 @@
      //   this.forms = this.form.userInfo;
      // }
      this.open = true;
            this.submit = false
      this.title = "用户信息维护";
    },
@@ -1898,9 +1905,11 @@
      this.$refs["form"].validate((valid) => {
        if (valid) {
          if (_this.form.userId !== undefined) {
           _this.submit = true
            updateUser(_this.form).then((response) => {
              _this.$modal.msgSuccess("修改成功");
              _this.open = false;
               _this.submit = false
              _this.getList();
            });
          } else {