科室 科室病种 标准科室对照

src/api/system/compare.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询标准科室对照信息列表
+export function listCompare(query) {
+    return request({
+        url: '/system/compare/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询标准科室对照信息详细
+export function getCompare(id) {
+    return request({
+        url: '/system/compare/' + id,
+        method: 'get'
+    })
+}
+
+// 新增标准科室对照信息
+export function addCompare(data) {
+    return request({
+        url: '/system/compare',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改标准科室对照信息
+export function updateCompare(data) {
+    return request({
+        url: '/system/compare',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除标准科室对照信息
+export function delCompare(id) {
+    return request({
+        url: '/system/compare/' + id,
+        method: 'delete'
+    })
+}

src/api/system/departmentDisease.js

@@ -37,7 +37,7 @@ export function addDepartmentDisease(data) {
 export function updateDepartmentDisease(data) {
     return request({
         url: '/system/departmentDisease',
-        method: 'put',
+        method: 'post',
         data: data
     })
 }

src/views/system/agency/index.vue

@@ -57,7 +57,6 @@
           >导出</el-button
         >
       </el-col> -->
-      <!-- 这个？ -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -77,8 +76,6 @@
           />
         </div> -->
         <div class="head-container">
-          <!-- <el-button icon="el-icon-delete"></el-button> -->
-
           <el-tree
             :data="deptOptions"
             :props="defaultProps"
@@ -227,7 +224,7 @@
             ></el-option>
           </el-select>
           <el-select
-            v-model="form.regionName"
+            v-model="form.areaName"
             clearable
             placeholder="请选择区"
             style="width: 129px; margin-left: 10px"
@@ -241,7 +238,7 @@
             ></el-option>
           </el-select>
           <el-select
-            v-model="form.regionName"
+            v-model="form.streetName"
             clearable
             placeholder="请选择街道"
             style="width: 129px; margin-left: 10px"
@@ -255,7 +252,7 @@
             ></el-option>
           </el-select>
           <el-select
-            v-model="form.streetName"
+            v-model="form.communityName"
             clearable
             placeholder="请选择社区"
             style="width: 129px; margin-left: 10px"
@@ -324,7 +321,7 @@
             :props="{ checkStrictly: true }"
             :options="treeOptions"
             @change="change($event)"
-            style="width: 205px; color: black"
+            style="width: 205px;"
             v-model="form.parentId"
             :show-all-levels="false"
             :placeholder="
@@ -772,6 +769,12 @@ export default {
     //点击省
     province(item) {
       this.form.cityName = "";
+      this.form.streeName = "";
+
+      this.form.areaName = "";
+      this.form.communityName = "";
+
+
       this.form.regionName = "";
       this.form.areaCode = "";
       this.form.streetCode = "";
@@ -820,6 +823,7 @@ export default {
       // console.log(this.$refs.cascader)
       // this.form.parentId = e;
       this.form.parentId = e[e.length - 1];
+
     },
     changeagencyCategoryId(e) {
       this.form.agencyCategoryId = e[e.length - 1];
@@ -1048,7 +1052,7 @@ export default {
   color: #686a6d;
 }
 
-::v-deep .el-cascader .el-input input::-webkit-input-placeholder {
+.el-cascader .el-input input::-webkit-input-placeholder {
   color: black;
 }
 </style>

src/views/system/compare/index.vue

@@ -0,0 +1,473 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <!-- <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="normCompareName">
+        <el-input
+          v-model="queryParams.normCompareName"
+          placeholder="请输入标准对照名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="标准对照编码" prop="normCompareCode">
+        <el-input
+          v-model="queryParams.normCompareCode"
+          placeholder="请输入标准对照编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="标准对照排序" prop="normCompareSort">
+        <el-input
+          v-model="queryParams.normCompareSort"
+          placeholder="请输入标准对照排序"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="标准对照概述" prop="normCompareRemark">
+        <el-input
+          v-model="queryParams.normCompareRemark"
+          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-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:compare:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:compare:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:compare:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:compare:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="compareList" @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="所属科室id" align="center" prop="departmentId" /> -->
+      <!-- <el-table-column label="所属科室名称" align="center" prop="departmentName" /> -->
+      <el-table-column label="标准对照名称" align="center" prop="normCompareName" />
+      <el-table-column label="标准对照编码" align="center" prop="normCompareCode" />
+      <el-table-column label="标准对照排序" align="center" prop="normCompareSort" />
+      <el-table-column label="标准对照概述" align="center" prop="normCompareRemark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:compare:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:compare:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改标准科室对照信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+        <!-- <el-form-item label="所属科室id" prop="departmentId">
+          <el-input v-model="form.departmentId" placeholder="请输入所属科室id" />
+        </el-form-item> -->
+        <el-form-item label="所属科室" prop="departmentId">
+          <el-button
+            type=""
+            v-if="form.departmentName == '请选择科室'"
+            @click="clickinnerVisible()"
+            style="
+              width: 208px;
+              text-align: left;
+              height: 36px;
+              color: #c0c4cc;
+              overflow: hidden;
+            "
+            >{{ form.departmentName }}</el-button
+          >
+          <el-button
+            @click="clickinnerVisible()"
+            type=""
+            v-else
+            style="
+              width: 208px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+              overflow: hidden;
+            "
+            >{{ form.departmentName }}</el-button
+          >
+        </el-form-item>
+        <!-- <el-form-item label="所属科室名称" prop="departmentName">
+          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" />
+        </el-form-item> -->
+        <el-form-item label="标准对照名称" prop="normCompareName">
+          <el-input v-model="form.normCompareName" placeholder="请输入标准对照名称" />
+        </el-form-item>
+        <el-form-item label="标准对照编码" prop="normCompareCode">
+          <el-input v-model="form.normCompareCode" placeholder="请输入标准对照编码" />
+        </el-form-item>
+        <el-form-item label="标准对照排序" prop="normCompareSort">
+          <el-input v-model="form.normCompareSort" placeholder="请输入标准对照排序" />
+        </el-form-item>
+        <el-form-item label="标准对照概述" prop="normCompareRemark">
+          <el-input v-model="form.normCompareRemark" placeholder="请输入标准对照概述" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+       <!-- 科室弹框 -->
+       <el-dialog
+      title=""
+      :visible.sync="innerVisibleshow"
+      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
+            v-model="informationqueryParams.departmentName"
+            placeholder="请输入科室名称"
+            clearable
+          />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            type="primary"
+            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-column label="请选择" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              v-if="form.departmentId == scope.row.departmentCode"
+              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
+          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"
+      />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCompare, getCompare, delCompare, addCompare, updateCompare } from "@/api/system/compare";
+import {  department } from "@/api/manage/script";
+
+export default {
+  name: "Compare",
+  data() {
+    return {
+      totaldepartment:0,
+      infolist:[],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 标准科室对照信息表格数据
+      compareList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        departmentId: null,
+        departmentName: null,
+        normCompareName: null,
+        normCompareCode: null,
+        normCompareSort: null,
+        normCompareRemark: null,
+      },
+      // 表单参数
+      form: {},
+       // 科室
+       informationqueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        departmentName: null,
+      },
+      innerVisibleshow:false,
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+      // 科室名称重置
+      addresetQuerylist() {
+      this.informationqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.informationInfoinfo();
+    },
+    innerVisiblecancel() {
+      this.innerVisibleshow = false;
+    },
+    // 科室名称圆点按钮
+    nurseclick(row) {
+      this.form.departmentId = row.departmentCode;
+      this.form.departmentName = row.departmentName;
+      // console.log(this.departmentName, "0000");
+      this.innerVisibleshow = false;
+    },
+    // 科室列表
+    informationInfoinfo() {
+      department(this.informationqueryParams).then((response) => {
+        this.infolist = response.rows;
+        this.totaldepartment = response.total;
+        this.loading = false;
+      });
+      // this.informationqueryParams.page = 1;
+    },
+    // 点击科室
+    clickinnerVisible() {
+      this.innerVisibleshow = true;
+      // if (this.itemname) {
+        this.informationqueryParams.departmentId = this.itemname;
+      // } else {
+        this.informationqueryParams.departmentId = null;
+      // }
+      this.informationInfoinfo();
+    },
+    /** 查询标准科室对照信息列表 */
+    getList() {
+      this.loading = true;
+      listCompare(this.queryParams).then(response => {
+        this.compareList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        departmentId: null,
+        departmentName: null,
+        normCompareName: null,
+        normCompareCode: null,
+        normCompareSort: null,
+        normCompareRemark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+        this.form.departmentName = "请选择科室"
+      this.title = "添加标准科室对照信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getCompare(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改标准科室对照信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCompare(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCompare(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除标准科室对照信息编号为"' + ids + '"的数据项？').then(function() {
+        return delCompare(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/compare/export', {
+        ...this.queryParams
+      }, `compare_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/system/department/index.vue

@@ -154,12 +154,28 @@
             align="center"
             prop="departmentType"
           >
-          <template slot-scope="scope">
+            <template slot-scope="scope">
-          {{ scope.row.departmentType == "ADMINISTRATION_LOGISTICS" ? "行政后勤类" : "" }}
+              {{
-          {{ scope.row.departmentType == "MEDICAL_ASSISTANCE" ? "医疗辅助类" : "" }}
+                scope.row.departmentType == "ADMINISTRATION_LOGISTICS"
-          {{ scope.row.departmentType == "MEDICAL_TECHNOLOGY" ? "医疗技术类" : "" }}
+                  ? "行政后勤类"
-          {{ scope.row.departmentType == "CLINICAL_SERVICES" ? "临床服务类" : "" }}
+                  : ""
-        </template>
+              }}
+              {{
+                scope.row.departmentType == "MEDICAL_ASSISTANCE"
+                  ? "医疗辅助类"
+                  : ""
+              }}
+              {{
+                scope.row.departmentType == "MEDICAL_TECHNOLOGY"
+                  ? "医疗技术类"
+                  : ""
+              }}
+              {{
+                scope.row.departmentType == "CLINICAL_SERVICES"
+                  ? "临床服务类"
+                  : ""
+              }}
+            </template>
           </el-table-column>
           <el-table-column
             label="提供服务类别"
@@ -322,96 +338,100 @@
             placeholder="请输入所属机构名称"
           />
         </el-form-item> -->
-        <el-form-item label="科室名称" prop="departmentName">
+        <div class="nameinformation">基本信息</div>
-          <el-input
+        <div class="content">
-            v-model="form.departmentName"
+          <el-form-item label="科室名称" prop="departmentName">
-            placeholder="请输入科室名称"
+            <el-input
-          />
+              v-model="form.departmentName"
-        </el-form-item>
+              placeholder="请输入科室名称"
-        <el-form-item label="科室代码" prop="departmentCode">
+            />
-          <el-input
+          </el-form-item>
-            v-model="form.departmentCode"
+          <el-form-item label="科室代码" prop="departmentCode">
-            placeholder="请输入科室代码"
+            <el-input
-          />
+              v-model="form.departmentCode"
-        </el-form-item>
+              placeholder="请输入科室代码"
-        <el-form-item label="科室简称" prop="departmentAbbreviation">
+            />
-          <el-input
+          </el-form-item>
-            v-model="form.departmentAbbreviation"
+          <el-form-item label="科室简称" prop="departmentAbbreviation">
-            placeholder="请输入科室简称"
+            <el-input
-          />
+              v-model="form.departmentAbbreviation"
-        </el-form-item>
+              placeholder="请输入科室简称"
-        <el-form-item label="科室类型" prop="departmentType">
+            />
-          <el-select
+          </el-form-item>
-            v-model="form.departmentType"
+          <el-form-item label="科室类型" prop="departmentType">
-            placeholder="请选择"
+            <el-select
-            style="width: 205px"
+              v-model="form.departmentType"
-          >
+              placeholder="请选择"
-            <el-option
+              style="width: 205px"
-              v-for="item in departmentoptions"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in departmentoptions"
-        </el-form-item>
+                :key="item.dictValue"
-        <!-- <el-form-item label="科室负责人id" prop="departmentPersonId">
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="科室负责人id" prop="departmentPersonId">
           <el-input
             v-model="form.departmentPersonId"
             placeholder="请输入科室负责人id"
           />
         </el-form-item> -->
-        <el-form-item label="科室负责人姓名" prop="departmentPersonName">
+          <el-form-item label="科室负责人姓名" prop="departmentPersonName">
-          <el-input
+            <el-input
-            v-model="form.departmentPersonName"
+              v-model="form.departmentPersonName"
-            placeholder="请输入科室负责人姓名"
+              placeholder="请输入科室负责人姓名"
-          />
+            />
-        </el-form-item>
+          </el-form-item>
-        <el-form-item label="节点类型" prop="nodeType">
+          <el-form-item label="节点类型" prop="nodeType">
-          <el-select
+            <el-select
-            v-model="form.nodeType"
+              v-model="form.nodeType"
-            placeholder="请选择"
+              placeholder="请选择"
-            style="width: 205px"
+              style="width: 205px"
-          >
-            <el-option
-              v-for="item in nodeTypeoptions"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in nodeTypeoptions"
-        </el-form-item>
+                :key="item.dictValue"
-        <el-form-item label="所属机构" prop="agencyName">
+                :label="item.dictLabel"
-          <el-cascader
+                :value="item.dictValue"
-            :props="{ checkStrictly: true }"
+              >
-            :options="treeOptions"
+              </el-option>
-            @change="change($event)"
+            </el-select>
-            style="width: 205px; color: black"
+          </el-form-item>
-            v-model="form.agencyId"
+          <el-form-item label="所属机构" prop="agencyName">
-            :show-all-levels="false"
+            <el-cascader
-            :placeholder="
+              :props="{ checkStrictly: true }"
-              form.agencyName ? form.agencyName : '请选择上级机构'
+              :options="treeOptions"
-            "
+              @change="change($event)"
-            ref="cascader"
+              style="width: 205px; color: black"
-            :key="isResouceShow"
+              v-model="form.agencyId"
-          ></el-cascader>
+              :show-all-levels="false"
-        </el-form-item>
+              :placeholder="
-        <el-form-item label="上级科室" prop="parentDepartmentId">
+                form.agencyName ? form.agencyName : '请选择上级机构'
-          <el-select
+              "
-            v-model="form.parentDepartmentId"
+              ref="cascader"
-            placeholder="请选择"
+              :key="isResouceShow"
-            style="width: 205px"
+            ></el-cascader>
-          >
+          </el-form-item>
-            <el-option
+          <el-form-item label="上级科室" prop="parentDepartmentId">
-              v-for="item in optionsparentDepartment"
+            <el-select
-              :key="item.id"
+              v-model="form.parentDepartmentName"
-              :label="item.departmentName"
+              placeholder="请选择"
-              :value="item.departmentCode"
+              style="width: 205px"
+              @change="changeparentDepartment"
+
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in optionsparentDepartment"
-          <!-- <el-cascader
+                :key="item.id"
+                :label="item.departmentName"
+                :value="item.departmentCode"
+              >
+              </el-option>
+            </el-select>
+            <!-- <el-cascader
             :props="{ checkStrictly: true }"
             :options="treeOptionsagencyCategoryId"
             @change="changeagencyCategoryId($event)"
@@ -426,113 +446,112 @@
             ref="cascader"
             :key="isResouceShows"
           ></el-cascader> -->
-        </el-form-item>
+          </el-form-item>
-        <el-form-item label="提供服务类别" prop="provideServiceCategory">
+        </div>
-          <el-select
+        <div class="nameinformation">扩展信息</div>
-            v-model="form.provideServiceCategory"
+        <div class="content">
-            placeholder="请选择"
+          <el-form-item label="提供服务类别" prop="provideServiceCategory">
-            style="width: 205px"
+            <el-select
-          >
+              v-model="form.provideServiceCategory"
-            <el-option
+              placeholder="请选择"
-              v-for="item in options"
+              style="width: 205px"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in options"
-          <!-- <el-input
+                :key="item.dictValue"
-            v-model="form.provideServiceCategory"
+                :label="item.dictLabel"
-            placeholder="请输入提供服务类别，门诊：OUTPATIENT_SERVICE，急诊：EMERGENCY_TREATMENT，住院：BE_HOSPITALIZED，病区：WARD，医技：MEDICAL_TECHNOLOGY，
+                :value="item.dictValue"
-药剂：DRUG，财务：FINANCE，行政：ADMINISTRATION，药房：PHARMACY，药库：DRUG_STORAGE，公卫：PUBLIC_HEALTH"
+              >
-          /> -->
+              </el-option>
-        </el-form-item>
+            </el-select>
-        <el-form-item label="细分类别" prop="subdivisionCategoryId">
+          </el-form-item>
-          <el-select
+          <el-form-item label="细分类别" prop="subdivisionCategoryId">
-            v-model="form.subdivisionCategoryId"
+            <el-select
-            placeholder="请选择"
+              v-model="form.subdivisionCategoryId"
-            style="width: 205px"
+              placeholder="请选择"
-          >
+              style="width: 205px"
-            <el-option
-              v-for="item in optionsubdivisionCategory"
-              :key="item.subdivisionCategoryCode"
-              :label="item.subdivisionCategoryName"
-              :value="item.subdivisionCategoryCode"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in optionsubdivisionCategory"
-        </el-form-item>
+                :key="item.subdivisionCategoryCode"
-        <!-- <el-form-item label="细分类别名称" prop="subdivisionCategoryName">
+                :label="item.subdivisionCategoryName"
+                :value="item.subdivisionCategoryCode"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="细分类别名称" prop="subdivisionCategoryName">
           <el-input
             v-model="form.subdivisionCategoryName"
             placeholder="请输入细分类别名称"
           />
         </el-form-item> -->
-        <el-form-item label="标准科室对照" prop="normDepartmentCompareId">
+          <el-form-item label="标准科室对照" prop="normDepartmentCompareId">
-          <el-select
+            <el-select
-            v-model="form.normDepartmentCompareId"
+              v-model="form.normDepartmentCompareId"
-            placeholder="请选择"
+              placeholder="请选择"
-            style="width: 205px"
+              style="width: 205px"
-          >
-            <el-option
-              v-for="item in optionnormDepartmentCompare"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
             >
-            </el-option>
+              <el-option
-          </el-select>
+                v-for="item in compareList"
-          <!-- <el-input
+                :key="item.departmentId"
+                :label="item.departmentName"
+                :value="item.departmentId"
+              >
+              </el-option>
+            </el-select>
+            <!-- <el-input
             v-model="form.normDepartmentCompareId"
             placeholder="请输入标准科室对照id"
           /> -->
-        </el-form-item>
+          </el-form-item>
-        <!-- <el-form-item label="标准科室对照名称" prop="normDepartmentCompareName">
+          <!-- <el-form-item label="标准科室对照名称" prop="normDepartmentCompareName">
           <el-input
             v-model="form.normDepartmentCompareName"
             placeholder="请输入标准科室对照名称"
           />
         </el-form-item> -->
-        <el-form-item label="编制床位数" prop="prepareBedsCount">
+          <el-form-item label="编制床位数" prop="prepareBedsCount">
-          <el-input
+            <el-input
-            v-model="form.prepareBedsCount"
+              v-model="form.prepareBedsCount"
-            placeholder="请输入编制床位数"
+              placeholder="请输入编制床位数"
-          />
+            />
-        </el-form-item>
+          </el-form-item>
-        <el-form-item label="科室电话" prop="departmentPhone">
+          <el-form-item label="科室电话" prop="departmentPhone">
-          <el-input
+            <el-input
-            v-model="form.departmentPhone"
+              v-model="form.departmentPhone"
-            placeholder="请输入科室电话"
+              placeholder="请输入科室电话"
-          />
+            />
-        </el-form-item>
+          </el-form-item>
-        <el-form-item label="科室邮箱" prop="departmentMail">
+          <el-form-item label="科室邮箱" prop="departmentMail">
-          <el-input
+            <el-input
-            v-model="form.departmentMail"
+              v-model="form.departmentMail"
-            placeholder="请输入科室邮箱"
+              placeholder="请输入科室邮箱"
-          />
+            />
-        </el-form-item>
+          </el-form-item>
-        <el-form-item label="成立日期" prop="establishDate">
+          <el-form-item label="成立日期" prop="establishDate">
-          <el-date-picker
+            <el-date-picker
-            clearable
+              clearable
-            v-model="form.establishDate"
+              v-model="form.establishDate"
-            type="date"
+              type="date"
-            style="width: 205px"
+              style="width: 205px"
-            value-format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
-            placeholder="请选择成立日期"
+              placeholder="请选择成立日期"
-          >
+            >
-          </el-date-picker>
+            </el-date-picker>
-        </el-form-item>
+          </el-form-item>
-        <el-form-item label="撤销日期" prop="revokeDate">
+          <el-form-item label="撤销日期" prop="revokeDate">
-          <el-date-picker
+            <el-date-picker
-            clearable
+              clearable
-            v-model="form.revokeDate"
+              v-model="form.revokeDate"
-            type="date"
+              type="date"
-            style="width: 205px"
+              style="width: 205px"
-            value-format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
-            placeholder="请选择撤销日期"
+              placeholder="请选择撤销日期"
-          >
+            >
-          </el-date-picker>
+            </el-date-picker>
-        </el-form-item>
+          </el-form-item>
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -549,26 +568,38 @@ import {
   delDepartment,
   addDepartment,
   updateDepartment,
-  getDepartmentList
+  getDepartmentList,
 } from "@/api/system/department";
 import { agencyList, getAgencytype } from "@/api/system/agency";
 import { getToken } from "@/utils/auth";
-import { listSubdivision, } from "@/api/system/subdivision";
+import { listSubdivision } from "@/api/system/subdivision";
-
+import {
+  listCompare,
+} from "@/api/system/compare";
 export default {
   name: "Department",
   data() {
     return {
-      optionsparentDepartment:[],
+      optionsparentDepartment: [],
+      queryParamscompare: {
+        pageNum: 1,
+        pageSize: 10,
+        departmentId: null,
+        departmentName: null,
+        normCompareName: null,
+        normCompareCode: null,
+        normCompareSort: null,
+        normCompareRemark: null,
+      },
       // 细分
-      optionsubdivisionCategory:[],
+      optionsubdivisionCategory: [],
       // 标准科室对照4
-      optionnormDepartmentCompare:[],
+      compareList: [],
       option: [],
       nodeTypeoptions: [],
       treeOptions: [],
       treeOptionsagencyCategoryId: [],
-      departmentoptions:[],
+      departmentoptions: [],
       options: [
         // {
         //     value: "PUBLIC_HEALTH",
@@ -670,11 +701,11 @@ export default {
         // 上传的地址
         url:
           process.env.VUE_APP_BASE_API +
-          "/system/agency/insertAgencyImportList",
+          "/system/department/insertDepartmentList",
       },
       isResouceShow: 1,
       isResouceShows: 1,
-      id:'',
+      id: "",
       // 表单校验
       rules: {
         // parentDepartmentId: [
@@ -686,27 +717,40 @@ export default {
   created() {
     this.getList();
     this.gettreelist();
-    // this.gettreelistitem();
     this.info();
     this.infolist();
     this.getinfo();
     this.getinfolist();
-    this.infodepartment()
+    this.infodepartment();
+    this.infocompare();
   },
   methods: {
-    getinfolist(){
+    changeparentDepartment(e){
-      listSubdivision().then(res=>{
+      this.form.parentDepartmentId=e
-        this.optionsubdivisionCategory=res.rows
+console.log(e)
-      })
     },
-    getinfo(){
+    /** 查询标准科室对照信息列表 */
-      getDepartmentList().then(res=>{
+    infocompare() {
-        console.log(res,'666')
+      this.loading = true;
-        this.optionsparentDepartment=res.data
+      listCompare(this.queryParamscompare).then((response) => {
-      })
+        this.compareList = response.rows;
+        // this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getinfolist() {
+      listSubdivision().then((res) => {
+        this.optionsubdivisionCategory = res.rows;
+      });
+    },
+    getinfo() {
+      getDepartmentList().then((res) => {
+        console.log(res, "666");
+        this.optionsparentDepartment = res.data;
+      });
     },
     info() {
-      var dictType = "node_type";
+      var dictType = "department_node_type";
       getAgencytype(dictType).then((res) => {
         this.nodeTypeoptions = res.data;
       });
@@ -725,11 +769,15 @@ export default {
     },
     change(e) {
       console.log(e, "78");
-      // console.log(this.$refs.cascader)
-      // this.form.parentId = e;
       this.form.agencyId = e[e.length - 1];
+      const arr = this.$refs["cascader"].getCheckedNodes()[0].pathLabels;
+      this.form.agencyName=arr.slice(-1).join(',')
+     
+      console.log(this.form.agencyName);
+
     },
 
+
     changeagencyCategoryId(e) {
       this.form.parentDepartmentId = e[e.length - 1];
     },
@@ -745,16 +793,9 @@ export default {
       agencyList().then((res) => {
         // 接口请求
         this.deptOptions = res.data;
-
         this.treeOptions = res.data.map((item) => {
           return { value: item.id, ...item };
         });
-        // this.treeOption = {
-        //   lazy: true,
-        //   checkStrictly: true,
-        //   lazyLoad: this.lazyLoad,
-        // };
-        console.log(res.data, "58", this.treeOptions);
       });
     },
     /** 导入按钮操作 */
@@ -765,9 +806,9 @@ export default {
     /** 下载模板操作 */
     importTemplate() {
       this.download(
-        "/system/importDownload/downloadTemplate?fileType=agency",
+        "/system/importDownload/downloadTemplate?fileType=department",
         {},
-        `科室导入模板.xlsx`
+        `科室下载模板.xlsx`
       );
     },
 
@@ -884,6 +925,7 @@ export default {
       const id = row.id || this.ids;
       getDepartment(id).then((response) => {
         this.form = response.data;
+        this.form.parentDepartmentName=response.data.parentDepartmentName
         this.open = true;
         this.title = "修改科室信息";
       });
@@ -935,3 +977,20 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+.el-cascader .el-input input::-webkit-input-placeholder {
+  color: black;
+}
+.nameinformation {
+  border-left: 3px solid #4d9de7;
+  width: 200px;
+  height: 20px;
+  padding-left: 10px;
+  font-size: 18px;
+  // margin-top: 8px;
+  color: black;
+}
+.content {
+  margin: 22px;
+}
+</style>

src/views/system/departmentDisease/index.vue

@@ -241,7 +241,7 @@
         <el-form-item label="所属科室" prop="departmentId">
           <el-button
             type=""
-            v-if="departmentName == '请选择所属科室'"
+            v-if="form.departmentName == '请选择科室'"
             @click="clickinnerVisible()"
             style="
               width: 250px;
@@ -250,7 +250,7 @@
               color: #c0c4cc;
               overflow: hidden;
             "
-            >{{ departmentName }}</el-button
+            >{{ form.departmentName }}</el-button
           >
           <el-button
             @click="clickinnerVisible()"
@@ -263,7 +263,7 @@
               padding-left: -10px;
               overflow: hidden;
             "
-            >{{ departmentName }}</el-button
+            >{{ form.departmentName }}</el-button
           >
         </el-form-item>
         <!-- <el-form-item label="所属科室" prop="departmentId">
@@ -507,8 +507,6 @@ export default {
       },
       querydepartmen: {
         departmentName: "",
-        // pageNum: 1,
-        // pageSize: 10,
 
       },
       // 表单参数
@@ -516,7 +514,7 @@ export default {
       // 表单校验
       rules: {
         departmentId: [
-          { required: true, message: "所属科室id不能为空", trigger: "blur" },
+          { required: true, message: "所属科室不能为空", trigger: "blur" },
         ],
       },
     };
@@ -549,8 +547,8 @@ export default {
     // 科室名称圆点按钮
     nurseclick(row) {
       this.form.departmentId = row.departmentCode;
-      this.departmentName = row.departmentName;
+      this.form.departmentName = row.departmentName;
-      console.log(this.departmentName, "0000");
+      // console.log(this.departmentName, "0000");
       this.innerVisibleshow = false;
     },
     // 科室列表
@@ -686,6 +684,10 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      if(this.itemname == null){
+        this.form.departmentName = "请选择科室"
+
+      }
       this.title = "添加科室病种信息";
     },
     /** 修改按钮操作 */