Merge remote-tracking branch 'origin/master'

.husky/pre-commit

 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npm run lint
+

src/router/index.js

@@ -171,6 +171,16 @@ export const constantRoutes = [
         meta: {
           title: '病历详情', icon: 'component'
         }
+      },
+      // 病历编辑
+      {
+        path: 'medical-edit/:id',
+        component: () => import('@/views/medical-record-management/medical-edit'),
+        name: 'MedicalEdit',
+        props: true,
+        meta: {
+          title: '病历编辑', icon: 'component'
+        }
       }
     ]
   },
@@ -423,6 +433,7 @@ export const dynamicRoutes = [
       }
     ]
   },
+  // 数据字典
   {
     path: '/system/dict-data',
     component: Layout,

src/views/article-management/article-detail.vue

@@ -47,17 +47,16 @@ color: #333333;"
               <el-form-item label="状态" prop="articleStatus">
                 <div style="display: flex; ">
                   <div style="padding-right: 15px;">
-                    <el-switch
-                      v-model="form.articleStatus"
-                      active-color="#13ce66"
-                      active-value="0"
-                      disabled
-                      inactive-color="#ff4949"
-                      inactive-value="1"
+                    <el-select v-model="form.articleStatus" disabled>
+                      <el-option
+                        v-for="({value, label}) in statusList"
+                        :label="label"
+                        :value="value"
                       />
+                    </el-select>
                   </div>
-                  <div v-if="form.articleStatus==='0'" style="padding-top: 1px;">已上架</div>
-                  <div v-else-if="form.articleStatus==='1'" style="padding-top: 1px;">已下架</div>
+                  <!--                  <div v-if="form.articleStatus==='0'" style="padding-top: 1px;">已上架</div>-->
+                  <!--                  <div v-else-if="form.articleStatus==='1'" style="padding-top: 1px;">已下架</div>-->
                 </div>
               </el-form-item>
               <!--   2-- 文章信息--文章内容 -->
@@ -109,13 +108,18 @@ export default {
     return {
       // 图片访问
       baseURL: process.env.VUE_APP_TEST_API,
-
+      // 状态下拉框
+      statusList: [{
+        label: '已上架',
+        value: '0'
+      }, {
+        label: '已下架',
+        value: '1'
+      }],
       // 弹出层标题
       title: '',
       // 是否显示弹出层
       open: false,
-      // 状态位
-      value: true,
       // 表单参数
       form: {},
       // 表单校验

src/views/article-management/article-edit.vue

@@ -39,16 +39,14 @@ color: #333333;"
               <el-form-item label="状态" prop="articleStatus">
                 <div style="display: flex;">
                   <div style="padding-right: 15px;">
-                    <el-switch
-                      v-model="form.articleStatus"
-                      active-color="#13ce66"
-                      active-value="0"
-                      inactive-color="#ff4949"
-                      inactive-value="1"
+                    <el-select v-model="form.articleStatus">
+                      <el-option
+                        v-for="({value, label}) in statusList"
+                        :label="label"
+                        :value="value"
                       />
+                    </el-select>
                   </div>
-                  <div v-if="form.articleStatus==='0'" style="padding-top: 1px;">已上架</div>
-                  <div v-else-if="form.articleStatus==='1'" style="padding-top: 1px;">已下架</div>
                 </div>
               </el-form-item>
               <el-form-item label="文章内容" prop="articleContent">
@@ -89,6 +87,14 @@ export default {
   },
   data() {
     return {
+      // 状态下拉框
+      statusList: [{
+        label: '已上架',
+        value: '0'
+      }, {
+        label: '已下架',
+        value: '1'
+      }],
       user: {},
       isShow: true,
 
@@ -96,8 +102,6 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
-      // 状态位
-      value: true,
       // 表单参数
       form: {},
       // 表单校验

src/views/article-management/article-insert.vue

@@ -34,16 +34,16 @@ color: #333333;"
               <el-form-item label="状态" prop="articleStatus">
                 <div style="display: flex;">
                   <div style="padding-right: 15px;">
-                    <el-switch
-                      v-model="form.articleStatus"
-                      active-color="#13ce66"
-                      active-value="0"
-                      inactive-color="#ff4949"
-                      inactive-value="1"
+                    <el-select v-model="form.articleStatus">
+                      <el-option
+                        v-for="({value, label}) in statusList"
+                        :label="label"
+                        :value="value"
                       />
+                    </el-select>
                   </div>
-                  <div v-if="form.articleStatus==='0'" style="padding-top: 1px;">已上架</div>
-                  <div v-else-if="form.articleStatus==='1'" style="padding-top: 1px;">已下架</div>
+                  <!--                  <div v-if="form.articleStatus==='0'" style="padding-top: 1px;">已上架</div>-->
+                  <!--                  <div v-else-if="form.articleStatus==='1'" style="padding-top: 1px;">已下架</div>-->
                 </div>
               </el-form-item>
               <el-form-item label="文章内容" prop="articleContent">
@@ -84,6 +84,14 @@ export default {
   },
   data() {
     return {
+      // 状态下拉框
+      statusList: [{
+        label: '已上架',
+        value: '0'
+      }, {
+        label: '已下架',
+        value: '1'
+      }],
       // 弹出层标题
       title: '',
       // 是否显示弹出层

src/views/article-management/article-management.vue

@@ -111,7 +111,6 @@
             border
             row-key="id"
             @selection-change="handleSelectionChange"
-            @select-all="selectAll($event, false)"
           >
             <el-table-column align="center" reserve-selection type="selection" width="55" />
             <el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" />

src/views/medical-record-management/medical-record-management.vue

@@ -438,7 +438,7 @@ export default {
       this.reset()
       console.log('start to edit...')
       this.$router.push({
-        name: 'medical-edit', params: { id: row.id }
+        name: 'MedicalEdit', params: { id: row.id }
       })
     }
   }

src/views/service-management/medical-record-management/medical-record-management.vue

@@ -151,7 +151,6 @@
 
 <script>
 import { listManage, getManage, delManage, addManage, updateManage } from '@/api/business/manage'
-
 export default {
   name: 'MedicalRecordManagement',
   dicts: ['exam_type'],

src/views/service-management/registration-queue/components/schedule-info.vue

@@ -114,7 +114,6 @@
             </div>
           </div>
         </div>
-
       </div>
     </div>
   </div>