更改公共样式，左面侧边栏，更改医疗外诊管理APl,修改医疗模块

src/api/medicalhealth/diagnose.js

@@ -66,4 +66,13 @@ export function getZhuChiRen(data) {
     method: 'get',
     params: { deptId: data }
   })
+}
+
+// 外诊管理归队
+export function weiZhengGuiDui(data) {
+  return request({
+    url: '/medicalhealth/diagnose/update',
+    method: 'put',
+    data: data
+  })
 }

src/assets/styles/global.css

@@ -908,7 +908,11 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 
 /* 主页左侧导航栏 */
 .nest-menu li {
-  padding-left: 25px !important;
+  padding-left: -2px !important;
+}
+
+.el-submenu__title {
+  padding-left: 0px !important;
 }
 
 /* input下拉背景、字体颜色------input加类名 */

src/views/medicalhealth/announcement/index.vue

@@ -148,7 +148,13 @@
     />
 
     <!-- 添加或修改疫情通知公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="文件">
           <fileUpload v-model="form.file" />
@@ -372,7 +378,7 @@ export default {
 ::v-deep .el-upload__tip {
   color: #bcc5cc !important;
 }
-::v-deep .el-input__inner{
+::v-deep .el-input__inner {
   height: 36px !important;
 }
 </style>

src/views/medicalhealth/antiepidemicamount/index.vue

@@ -207,7 +207,13 @@
     />
 
     <!-- 添加或修改防疫用品库存数据对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="防疫品ID" prop="durgArchivesId">
           <el-input

src/views/medicalhealth/antiepidemicguoqi/index.vue

@@ -136,7 +136,13 @@
     />
 
     <!-- 添加或修改药品入库登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"

src/views/medicalhealth/antiepidemiclingyong/index.vue

@@ -328,7 +328,13 @@
     />
 
     <!-- 添加或修改防疫用品发放登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"

src/views/medicalhealth/antiepidemicputout/index.vue

@@ -366,7 +366,7 @@
             v-model="form.putTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择领用时间"
+            placeholder="选择使用时间"
           >
           </el-date-picker>
         </el-form-item>
@@ -377,7 +377,7 @@
           <treeselect
             v-model="form.unitId"
             :options="deptOptions"
-            placeholder="选择单位"
+            placeholder="选择领用单位"
             @select="selectPeo"
           />
         </el-form-item>

src/views/medicalhealth/antiepidemicruin/index.vue

@@ -218,7 +218,13 @@
     />
 
     <!-- 添加或修改防疫用品销毁记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="销毁时间" prop="durgArchivesId">
           <el-input

src/views/medicalhealth/bdgldurgguoqi/index.vue

@@ -151,7 +151,13 @@
     />
 
     <!-- 添加或修改药品入库登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"
@@ -175,10 +181,10 @@
           <el-input v-model="form.source" placeholder="请输入药品来源" />
         </el-form-item>
         <el-form-item label="过期数量" prop="putIn">
-          <el-input v-model="form.putIn" placeholder="请输入入库数量" />
+          <el-input v-model="form.putIn" placeholder="请输入过期数量" />
         </el-form-item>
         <el-form-item label="存放位置" prop="place">
-          <el-input v-model="form.place" placeholder="请输入入库位置" />
+          <el-input v-model="form.place" placeholder="请输入存放位置" />
         </el-form-item>
         <el-form-item label="入库时间" prop="putTime">
           <el-date-picker

src/views/medicalhealth/bdgldurgputin/index.vue

@@ -118,8 +118,8 @@
         </template>
       </el-table-column>
       <el-table-column label="编号" align="center" prop="number" />
-      <el-table-column label="剩余库存" align="center" prop="surplus" />
-      <el-table-column label="是否销毁" align="center" prop="status" />
+      <!-- <el-table-column label="剩余库存" align="center" prop="surplus" /> -->
+      <!-- <el-table-column label="是否销毁" align="center" prop="status" /> -->
       <el-table-column label="品牌" align="center" prop="durgBrand" />
       <el-table-column label="生产厂商" align="center" prop="manufacturer" />
       <el-table-column label="规格" align="center" prop="specifications" />

src/views/medicalhealth/bdgldurgruin/index.vue

@@ -202,7 +202,13 @@
     />
 
     <!-- 添加或修改药品销毁记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="700px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"

src/views/medicalhealth/consumeguoqi/index.vue

@@ -157,7 +157,13 @@
     />
 
     <!-- 添加或修改药品入库登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="700px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"

src/views/medicalhealth/consumelingyong/index.vue

@@ -365,7 +365,13 @@
     />
 
     <!-- 添加或修改耗材出库登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="800px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"

src/views/medicalhealth/consumeputin/index.vue

@@ -333,7 +333,13 @@
     />
 
     <!-- 添加或修改耗材入库登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="700px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"

src/views/medicalhealth/consumeputout/index.vue

@@ -360,7 +360,13 @@
     />
 
     <!-- 添加或修改耗材出库登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="800px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"
@@ -783,11 +789,12 @@ export default {
 ::v-deep .el-dialog {
   background: #004d86 !important;
 }
-::v-deep .el-dialog .el-form--inline .el-form-item{
+::v-deep .el-dialog .el-form--inline .el-form-item {
   margin-right: 68px;
 }
 ::v-deep .el-dialog__body {
-    padding: 30px 0px 0px 64px !important;}
+  padding: 30px 0px 0px 64px !important;
+}
 
 ::v-deep .el-textarea__inner {
   width: 667px;
@@ -795,7 +802,8 @@ export default {
   margin: auto !important;
 }
 ::v-deep .el-dialog__footer {
-    margin-right: 50px;}
+  margin-right: 50px;
+}
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
 }

src/views/medicalhealth/consumeruin/index.vue

@@ -206,7 +206,13 @@
     />
 
     <!-- 添加或修改耗材销毁记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="700px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"

src/views/medicalhealth/diagnose/index.vue

@@ -192,7 +192,11 @@
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="陪护人" align="center" prop="userName" />
+      <el-table-column
+        label="陪护人"
+        align="center"
+        prop="accompanyingPerson"
+      />
       <el-table-column label="登记时间" align="center" prop="createtime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createtime, "{y}-{m}-{d}") }}</span>
@@ -213,10 +217,11 @@
       >
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.state == null"
             size="btu"
             type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['medicalhealth:diagnose:edit']"
+            @click="handleUpdateGuiDui(scope.row)"
+            v-hasPermi="['medicalhealth:diagnose:update']"
             >归队</el-button
           >
           <el-button
@@ -282,8 +287,11 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="陪护" prop="address">
-          <el-input v-model="form.address" placeholder="请输入陪护人" />
+        <el-form-item label="陪护" prop="accompanyingPerson">
+          <el-input
+            v-model="form.accompanyingPerson"
+            placeholder="请输入陪护人"
+          />
         </el-form-item>
         <el-form-item label="地点" prop="address">
           <el-input v-model="form.address" placeholder="请输入地点" />
@@ -365,6 +373,7 @@ import {
   exportDiagnose,
   getDept,
   getZhuChiRen,
+  weiZhengGuiDui,
 } from "@/api/medicalhealth/diagnose";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -425,6 +434,27 @@ export default {
     this.getList();
   },
   methods: {
+    // 归队按钮触发
+    handleUpdateGuiDui(row) {
+      this.reset();
+      this.$modal
+        .confirm("是否确认归队？", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+        })
+        .then(() => {
+          this.form = row;
+          if (this.form.id != null) {
+            this.form.state = "1";
+            weiZhengGuiDui(this.form).then((response) => {
+              this.$modal.msgSuccess("归队成功");
+              this.getList();
+            });
+          }
+        })
+        .catch(() => {});
+    },
+
     /** 查询部门下拉树结构 */
     getTreeselect() {
       getDept().then((response) => {

src/views/medicalhealth/examine/index.vue

@@ -230,8 +230,8 @@
             <el-input v-model="form.yeardate" />
           </el-form-item>
           <div class="xiangMu">
-            <el-form-item label="项目" prop="yeardate">
-              <el-select v-model="form.wuPinType" placeholder="请选择物品类型">
+            <el-form-item label="项目" prop="type">
+              <el-select v-model="form.type" placeholder="请选择类型">
                 <el-option
                   v-for="dict in dict.type.project"
                   :key="dict.value"
@@ -278,6 +278,18 @@
           <el-form-item label="年份" prop="yeardate">
             <el-input v-model="form.yeardate" />
           </el-form-item>
+          <div class="xiangMu">
+            <el-form-item label="项目" prop="type">
+              <el-select v-model="form.type" placeholder="请选择类型">
+                <el-option
+                  v-for="dict in dict.type.project"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
           <div class="jiben">体检信息</div>
           <el-form-item>
             <quill-editor
@@ -459,6 +471,7 @@ export default {
         this.form = response.data;
         this.form.yeardate = null;
         this.form.checkInformation = null;
+        this.form.type = null;
         // this.getRenYuan(this.form.unitId);
         this.opene = true;
         this.title = "新增人员体检信息";

src/views/medicalhealth/recuperate/index.vue

@@ -261,7 +261,13 @@
     />
 
     <!-- 添加或修改疗养管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"
@@ -414,6 +420,7 @@
       :visible.sync="opene"
       width="500px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="forme"