修改

src/api/system/departmentDisease.js

@@ -15,11 +15,11 @@ export function getDepartmentList(query) {
         params: query
     })
 }
-export function selectDiseaseCount(departmentName) {
+export function selectDiseaseCounts(query) {
     return request({
-        url: `/system/departmentDisease/selectDiseaseCount?departmentName=${departmentName}`,
+        url: `/system/departmentDisease/selectDiseaseCount`,
         method: 'get',
-      
+        params: query
     })
 }
 //  get 搜索条件传departmentName

src/views/components/DepartmentList.vue

@@ -68,6 +68,9 @@ import { listServicePackageNum } from "@/api/manage/servicepackage";
 import {
     selectDiseaseCount
 } from "@/api/system/specialDiseaseRoute";
+import {
+    selectDiseaseCounts,
+} from "@/api/system/departmentDisease";
 export default {
     props: ['methods', 'modal', 'servicePackageId'],
     name: "DepartmentList",
@@ -225,6 +228,8 @@ export default {
                 this.querydepartmen.releaseStatus = 'PUBLISHED'
                 this.querydepartmen.servicePackageId = this.servicePackageId
                 method = selectDiseaseCount(this.querydepartmen)
+            } else if (this.methods == 'selectDiseaseCounts') {
+                method = selectDiseaseCounts(this.querydepartmen)
             }
             this.DepartmentoList = []
             method.then(response => {

src/views/system/departmentDisease/index.vue

@@ -3,294 +3,96 @@
     <el-row :gutter="20">
       <el-col :span="5" :xs="24" style="height: calc(100vh - 124px)">
         <div class="left" ref="box">
-          <div class="name">科室名称</div>
+          <DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'selectDiseaseCounts'">
-          <div>
+          </DepartmentList>
-            <el-input
-              v-model="name"
-              placeholder="请输入科室名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </div>
-          <div
-            class="listitem"
-            v-for="(item, index) in DepartmentoList"
-            :key="index"
-            @click="itemdata(item)"
-          >
-            <div :class="itemname == item.id ? 'allactive' : 'all'">
-              {{ item.departmentName }}
-            </div>
-            <span class="count">{{ item.countNum }}</span>
-          </div>
         </div>
       </el-col>
       <el-col :span="19" :xs="24">
         <div ref="topform" class="form">
-          <el-form
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-            :model="queryParams"
+            label-width="68px">
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="68px"
-          >
-            <!-- <el-form-item label="所属科室id" prop="departmentId">
-        <el-input
-          v-model="queryParams.departmentId"
-          placeholder="请输入所属科室id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属科室名称" prop="departmentName">
-        <el-input
-          v-model="queryParams.departmentName"
-          placeholder="请输入所属科室名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
             <el-form-item label="病种名称" prop="diseaseTypeName">
-              <el-input
+              <el-input maxlength="50" v-model="queryParams.diseaseTypeName" placeholder="请输入病种名称" clearable
-                maxlength="50"
+                @keyup.enter.native="handleQuery" />
-                v-model="queryParams.diseaseTypeName"
-                placeholder="请输入病种名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
-            <!-- <el-form-item label="病种代码" prop="diseaseTypeCode">
-        <el-input
-          v-model="queryParams.diseaseTypeCode"
-          placeholder="请输入病种代码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="对应诊断信息" prop="diagnosisInfo">
-        <el-input
-          v-model="queryParams.diagnosisInfo"
-          placeholder="请输入对应诊断信息"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="病种概述" prop="diseaseTypeRemark">
-        <el-input
-          v-model="queryParams.diseaseTypeRemark"
-          placeholder="请输入病种概述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
             <el-form-item>
-              <el-button
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                type="primary"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                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>
         </div>
         <div ref="mb8" class="mb8">
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
-              <el-button
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                type="primary"
+                v-hasPermi="['system:departmentDisease:add']">新增</el-button>
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['system:departmentDisease:add']"
-                >新增</el-button
-              >
             </el-col>
             <el-col :span="1.5">
-              <el-button
+              <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-                type="success"
+                v-hasPermi="['system:departmentDisease:edit']">修改</el-button>
-                plain
-                icon="el-icon-edit"
-                size="mini"
-                :disabled="single"
-                @click="handleUpdate"
-                v-hasPermi="['system:departmentDisease:edit']"
-                >修改</el-button
-              >
             </el-col>
             <el-col :span="1.5">
-              <el-button
+              <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-                type="danger"
+                @click="handleDelete" v-hasPermi="['system:departmentDisease:remove']">删除</el-button>
-                plain
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="['system:departmentDisease:remove']"
-                >删除</el-button
-              >
             </el-col>
             <el-col :span="1.5">
-              <el-button
+              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                type="warning"
+                v-hasPermi="['system:departmentDisease:export']">导出</el-button>
-                plain
-                icon="el-icon-download"
-                size="mini"
-                @click="handleExport"
-                v-hasPermi="['system:departmentDisease:export']"
-                >导出</el-button
-              >
             </el-col>
-            <right-toolbar
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
-            ></right-toolbar>
           </el-row>
         </div>
         <div ref="table">
-          <el-table
+          <el-table :max-height="maxTableHeight" v-loading="loading" :data="departmentDiseaseList"
-            :max-height="maxTableHeight"
+            @selection-change="handleSelectionChange">
-            v-loading="loading"
-            :data="departmentDiseaseList"
-            @selection-change="handleSelectionChange"
-          >
             <el-table-column type="selection" width="55" align="center" />
-            <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
-            <!-- <el-table-column
+            <el-table-column label="所属科室名称" align="center" prop="departmentName" />
-            label="所属科室id"
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            align="center"
-            prop="departmentId"
-          /> -->
-            <el-table-column
-              label="病种名称"
-              align="center"
-              prop="diseaseTypeName"
-            />
-
-            <el-table-column
-              label="所属科室名称"
-              align="center"
-              prop="departmentName"
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-            >
               <template slot-scope="scope">
-                <el-button
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                  size="mini"
+                  v-hasPermi="['system:departmentDisease:edit']">修改</el-button>
-                  type="text"
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                  icon="el-icon-edit"
+                  v-hasPermi="['system:departmentDisease:remove']">删除</el-button>
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:departmentDisease:edit']"
-                  >修改</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:departmentDisease:remove']"
-                  >删除</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" /> -->
-        <myPagination
+        <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-          v-show="total > 0"
+          :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-          :total="total"
-          :pageSize="queryParams.pageSize"
-          :indexFromWrap="queryParams.pageNum"
-          @updateCPage="updateCPage"
-        ></myPagination>
       </el-col>
     </el-row>
     <!-- 添加或修改科室病种信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
-        :inline="true"
-      >
         <el-form-item label="所属科室" prop="departmentId">
-          <el-button
+          <el-button type="" @click="clickinnerVisible()"
-            type=""
+            :style="form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''" style="
-            v-if="form.departmentName == '请选择科室'"
+              width: 206px;
-            @click="clickinnerVisible()"
-            style="
-              width: 250px;
               text-align: left;
               height: 36px;
-              color: #c0c4cc;
               overflow: hidden;
-            "
+            ">{{ form.departmentName }}</el-button>
-            >{{ form.departmentName }}</el-button
-          >
-          <el-button
-            @click="clickinnerVisible()"
-            type=""
-            v-else
-            style="
-              width: 250px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-              overflow: hidden;
-            "
-            >{{ form.departmentName }}</el-button
-          >
         </el-form-item>
-        <!-- <el-form-item label="所属科室" prop="departmentId">
-
-          <el-input v-model="form.departmentId" placeholder="请输入所属科室" />
-        </el-form-item> -->
-        <!-- <el-form-item label="所属科室名称" prop="departmentName">
-          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" />
-        </el-form-item> -->
         <el-form-item label="病种名称" prop="diseaseTypeName">
-          <el-input
+          <el-input style="width: 250px" v-model="form.diseaseTypeName" placeholder="请输入病种名称" />
-            style="width: 250px"
-            v-model="form.diseaseTypeName"
-            placeholder="请输入病种名称"
-          />
         </el-form-item>
         <!-- <el-form-item label="病种代码" prop="diseaseTypeCode">
           <el-input v-model="form.diseaseTypeCode" placeholder="请输入病种代码" />
         </el-form-item> -->
         <el-form-item label="对应诊断信息" prop="diagnosisInfo">
-          <el-input
+          <el-input type="textarea" maxlength="300" style="width: 610px" v-model="form.diagnosisInfo"
-            type="textarea"
+            placeholder="请输入对应诊断信息" />
-            maxlength="300"
-            style="width: 610px"
-            v-model="form.diagnosisInfo"
-            placeholder="请输入对应诊断信息"
-          />
         </el-form-item>
         <el-form-item label="病种概述" prop="diseaseTypeRemark ">
-          <el-input
+          <el-input type="textarea" maxlength="200" style="width: 610px" v-model="form.diseaseTypeRemark"
-            type="textarea"
+            placeholder="请输入病种概述" />
-            maxlength="200"
-            style="width: 610px"
-            v-model="form.diseaseTypeRemark"
-            placeholder="请输入病种概述"
-          />
         </el-form-item>
-
         <!-- <el-button
           type="primary"
           plain
-
           @click="handleImport"
           v-hasPermi="['system:person:importStationPerson']"
           >导入</el-button
@@ -305,24 +107,10 @@
       </div>
     </el-dialog>
     <!-- 导入 -->
-    <el-dialog
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      :title="upload.title"
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
-      :visible.sync="upload.open"
+        :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
-      width="400px"
+        :auto-upload="false" drag>
-      append-to-body
-    >
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">
           将文件拖到此处，或
@@ -330,13 +118,8 @@
         </div>
         <div class="el-upload__tip text-center" slot="tip">
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
-            type="primary"
+            @click="importTemplate">下载模板</el-link>
-            :underline="false"
-            style="font-size: 12px; vertical-align: baseline"
-            @click="importTemplate"
-            >下载模板</el-link
-          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -345,84 +128,32 @@
       </div>
     </el-dialog>
     <!-- 科室弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="innerVisibleshow" width="1000px" append-to-body
-      title=""
+      :before-close="innerVisiblecancel">
-      :visible.sync="innerVisibleshow"
+      <el-form ref="queryForm" :model="informationqueryParams" :rules="rules" label-width="80px" :inline="true">
-      width="1000px"
-      append-to-body
-      :before-close="innerVisiblecancel"
-    >
-      <el-form
-        ref="queryForm"
-        :model="informationqueryParams"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
         <el-form-item label="科室名称" prop="departmentName" label-width="120">
-          <el-input
+          <el-input v-model="informationqueryParams.departmentName" placeholder="请输入科室名称" clearable />
-            v-model="informationqueryParams.departmentName"
-            placeholder="请输入科室名称"
-            clearable
-          />
         </el-form-item>
-
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="informationInfoinfo">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="informationInfoinfo"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="addresetQuerylist"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-
+      <el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
-      <el-table
-        :data="infolist"
-        @cell-dblclick="nurseclick"
-        v-loading="loading"
-      >
         <el-table-column label="请选择" width="150" align="center">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="primary" style="width: 15px; height: 15px" v-if="form.departmentId == scope.row.id" circle
-              type="primary"
+              @click="nurseclick(scope.row)"></el-button>
-              style="width: 15px; height: 15px"
+            <el-button v-else style="width: 15px; height: 15px" circle @click="nurseclick(scope.row)"></el-button>
-              v-if="form.departmentId == scope.row.id"
-              circle
-              @click="nurseclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="nurseclick(scope.row)"
-            ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
-          property="departmentName"
-          label="科室名称"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
         </el-table-column>
       </el-table>
       <!-- <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
         :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" /> -->
-      <myPagination
+      <myPagination v-show="totaldepartment > 0" :total="totaldepartment" :pageSize="informationqueryParams.pageSize"
-        v-show="totaldepartment > 0"
+        :indexFromWrap="informationqueryParams.pageNum" @updateCPage="updateCPagetwo"></myPagination>
-        :total="totaldepartment"
-        :pageSize="informationqueryParams.pageSize"
-        :indexFromWrap="informationqueryParams.pageNum"
-        @updateCPage="updateCPagetwo"
-      ></myPagination>
     </el-dialog>
   </div>
 </template>
@@ -435,16 +166,15 @@ import {
   addDepartmentDisease,
   updateDepartmentDisease,
   getDepartmentList,
-  selectDiseaseCount,
 } from "@/api/system/departmentDisease";
 import { listScript, department } from "@/api/manage/script";
-// import { getDepartmentLis } from "@/api/operationInfo/operationInfo";
+import DepartmentList from '../../components/DepartmentList.vue'
 import { getToken } from "@/utils/auth";
 export default {
+  components: { DepartmentList },
   name: "DepartmentDisease",
   data() {
     return {
-      departmentName: null,
       innerVisibleshow: false, //科室弹框
       maxTableHeight: undefined,
       infolist: [],
@@ -469,10 +199,6 @@ export default {
           process.env.VUE_APP_BASE_API +
           "/system/agency/insertAgencyImportList",
       },
-      itemname: null,
-      name: "",
-      DepartmentoList: [],
-      count: "", //全部
       // 遮罩层
       loading: true,
       // 选中数组
@@ -502,13 +228,9 @@ export default {
         diagnosisInfo: null,
         diseaseTypeRemark: null,
       },
-      querydepartmen: {
+      departmentName: '',
-        departmentName: "",
-      },
-      departmentName: "",
       // 表单参数
       form: {},
-      // querydepartment:{}
       // 表单校验
       rules: {
         departmentId: [
@@ -521,36 +243,26 @@ export default {
     };
   },
   created() {
-    this.getList();
+    // this.getList();
-    // this.Departmentlist();
-    // listScript(this.queryParams).then((response) => {
-    //   this.count = response.total;
-    // });
-    this.infolists();
   },
   mounted() {
     this.getMaxTableHeight();
     this.screenChange();
   },
   watch: {
-    name(val) {
-      // this.querydepartmen.departmentName = val;
-      this.departmentName = val;
-
-      this.infolists();
-    },
   },
   methods: {
-    infolists() {
+    //接收科室列表传值
-      selectDiseaseCount(this.departmentName).then((res) => {
+    clickdepartment(item) {
-        this.DepartmentoList = res.data;
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
-
+      this.informationqueryParams.hospitalAgencyId = item.hospitalAgencyId
-        console.log(res, "8888");
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
-        // res.data.forEach((e) => {
+      this.queryParams.departmentId = item.itemid
-        //   this.count = e.countNum;
+      this.departmentName = item.itemName
-
+      if (item.hospitalAgencyId) {
-        // });
+        this.handleQuery();
-      });
+      }
+      this.$forceUpdate()
     },
     // 科室名称重置
     addresetQuerylist() {
@@ -576,7 +288,6 @@ export default {
         this.totaldepartment = response.total;
         this.loading = false;
       });
-      // this.informationqueryParams.page = 1;
     },
     // 点击科室
     clickinnerVisible() {
@@ -601,7 +312,6 @@ export default {
         `诊断模板.xlsx`
       );
     },
-
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
@@ -613,8 +323,8 @@ export default {
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-          response.msg +
+        response.msg +
-          "</div>",
+        "</div>",
         "导入结果",
         { dangerouslyUseHTMLString: true }
       );
@@ -624,33 +334,6 @@ export default {
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
     },
-    // 左侧科室
-    // Departmentlist() {
-    //   this.loading = true;
-    //   getDepartmentList(this.querydepartmen).then((response) => {
-    //     this.DepartmentoList = response.data;
-    //     // this.total = response.total;
-
-    //     this.loading = false;
-    //   });
-    // },
-    // 左侧科室
-    itemdata(item) {
-      if (item) {
-        console.log(item, "9999");
-        this.itemname = item.id;
-        // this.form.departmentId = item.id
-        this.departmentName = item.departmentName;
-        // this.queryDisease.departmentId = this.itemname
-        this.loading = true;
-        this.queryParams.departmentId = item.id;
-        this.getList();
-      } else {
-        this.queryParams.departmentId = "";
-        this.itemname = null;
-        this.getList();
-      }
-    },
     /** 查询科室病种信息列表 */
     getList() {
       this.loading = true;
@@ -691,7 +374,8 @@ export default {
     resetQuery() {
       this.queryParams.diseaseTypeName = "";
       this.resetForm("queryForm");
-      this.handleQuery();
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -702,11 +386,14 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.open = true;
+      if (this.queryParams.departmentId) {
-      // if (this.itemname == null) {
+        this.form.departmentId = this.queryParams.departmentId;
-      this.form.departmentName = "请选择科室";
+        this.form.departmentName = this.departmentName;
-      // }
+      } else {
+        this.form.departmentName = "请选择科室";
+      }
       this.title = "添加科室病种信息";
+      this.open = true;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -727,16 +414,14 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
-              this.departmentName = "";
+              this.$refs.DepartmentList.Departmentlist()
-              this.infolists();
             });
           } else {
             addDepartmentDisease(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
-              this.departmentName = "";
+              this.$refs.DepartmentList.Departmentlist()
-              this.infolists();
             });
           }
         }
@@ -752,12 +437,9 @@ export default {
         })
         .then(() => {
           this.getList();
-          this.departmentName = "";
+          this.$refs.DepartmentList.Departmentlist()
-          this.infolists();
-
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {