From e50cb06a1b64e08954eda176d463856f68ae47e5 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Mon, 14 Aug 2023 15:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                      |   4 +
 src/store/index.js                       |   3 +
 src/views/Home.vue                       | 213 +++++++++--------------
 src/views/doctorCheck/personnelBatch.vue |   6 +-
 4 files changed, 94 insertions(+), 132 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index a2349f6..478eb04 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,6 +4,10 @@ import VueRouter from "vue-router";
 
 import login from "@/views/login/Login.vue";
 Vue.use(VueRouter);
+// const originalpush = VueRouter.prototype.push
+// VueRouter.prototype.push = function (location) {
+//   return originalpush.call(this, location).catch(err => err)
+// }
 const routes = [
   {
     path: "/",
diff --git a/src/store/index.js b/src/store/index.js
index 3b82a41..6a4fbca 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -9,6 +9,9 @@ export default new Vuex.Store({
   state: {
     changepassword:'',//用户密码
     set: "qqqq",
+    router:{
+      path:'',
+    },
     window:{
       pageHeight:960, //页面高度
       pageWidth:1920, //页面宽度
diff --git a/src/views/Home.vue b/src/views/Home.vue
index f800c7f..a3faf15 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -5,22 +5,17 @@
         <div class="navs">
           <!-- <div class="maintitle">神豚医疗信息系统</div> -->
           <div style="">
-            <el-dropdown>
+            <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link"> 用户权限管理 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/organization-units' })"
+                <el-dropdown-item command="organization-units"
                   >组织架构</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/role' })"
-                  >角色管理</el-dropdown-item
-                >                <el-dropdown-item
-                  @click.native="$router.push({ path: '/user-list' })"
+                <el-dropdown-item command="role">角色管理</el-dropdown-item>
+                <el-dropdown-item command="user-list"
                   >用户管理</el-dropdown-item
-                >             
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/audit-log' })"
+                >
+                <el-dropdown-item command="audit-log"
                   >安全日志</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -28,92 +23,62 @@
           </div>
           <!-- 基础字典 -->
           <div style="margin-left: 15px" class="basicdictionany">
-            <el-dropdown>
+            <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link"> 基础字典 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/guide-type' })"
+                <el-dropdown-item command="guide-type"
                   >导引类别</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/medical-report-type' })"
+                <el-dropdown-item command="medical-report-type"
                   >体检报告类别</el-dropdown-item
                 >
-                <el-dropdown-item @click.native="$router.push({ path: '/sex' })"
-                  >性别</el-dropdown-item
-                >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/marital-status' })"
+                <el-dropdown-item command="sex">性别</el-dropdown-item>
+                <el-dropdown-item command="marital-status"
                   >婚姻状况</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/nation' })"
-                  >民族</el-dropdown-item
-                >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/birth-place' })"
-                  >籍贯</el-dropdown-item
-                >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/result-status' })"
+                <el-dropdown-item command="nation">民族</el-dropdown-item>
+                <el-dropdown-item command="birth-place">籍贯</el-dropdown-item>
+                <el-dropdown-item command="result-status"
                   >结果状态</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/medical-type' })"
+                <el-dropdown-item command="medical-type"
                   >体检类别</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/personnel-type' })"
+                <el-dropdown-item command="personnel-type"
                   >人员类别</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/device-type' })"
+                <el-dropdown-item command="device-type"
                   >仪器类别</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/sample-type' })"
+                <el-dropdown-item command="sample-type"
                   >标本类型</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/unit' })"
-                  >计量单位</el-dropdown-item
-                >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/diagnosis-postfix' })"
+                <el-dropdown-item command="unit">计量单位</el-dropdown-item>
+                <el-dropdown-item command="diagnosis-postfix"
                   >诊断后缀</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="
-                    $router.push({ path: '/medical-conclusion-type' })
-                  "
+                <el-dropdown-item command="medical-conclusion-type"
                   >体检结论类别</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/medical-conclusion' })"
+                <el-dropdown-item command="medical-conclusion"
                   >体检结论</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/sample-container' })"
+                <el-dropdown-item command="sample-container"
                   >标本容器</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/common-char-type' })"
+                <el-dropdown-item command="common-char-type"
                   >常用字符类别</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/common-char' })"
+                <el-dropdown-item command="common-char"
                   >常用字符</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/customer-org-type' })"
+                <el-dropdown-item command="customer-org-type"
                   >客户单位类别</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/item-default-result' })"
+                <el-dropdown-item command="item-default-result"
                   >项目默认结果</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/diagnosis-level' })"
+                <el-dropdown-item command="diagnosis-level"
                   >诊断级别</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -121,39 +86,27 @@
           </div>
           <!-- 收费设置 -->
           <div class="feesettings" style="margin-left: 20px">
-            <el-dropdown>
+            <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link"> 收费设置 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/invoice-item-type' })"
+                <el-dropdown-item command="invoice-item-type"
                   >发票项目类别</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/pay-mode' })"
-                  >支付方式</el-dropdown-item
-                >
+                <el-dropdown-item command="pay-mode">支付方式</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
           <!--常用设置  -->
           <div class="commonsettings" style="margin-left: 20px">
-            <el-dropdown>
+            <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link"> 常用设置 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/item-type' })"
+                <el-dropdown-item command="item-type"
                   >项目类别</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/item' })"
-                  >项目设置</el-dropdown-item
-                >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/asbitem' })"
-                  >组合项目</el-dropdown-item
-                >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/sample-group' })"
+                <el-dropdown-item command="item">项目设置</el-dropdown-item>
+                <el-dropdown-item command="asbitem">组合项目</el-dropdown-item>
+                <el-dropdown-item command="sample-group"
                   >条码分组</el-dropdown-item
                 >
                 <!-- <el-dropdown-item
@@ -166,34 +119,23 @@
                   "
                   >性激素参考范围</el-dropdown-item
                 > -->
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/diagnosis' })"
-                  >诊断</el-dropdown-item
-                >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/diagnosis-template' })"
+                <el-dropdown-item command="diagnosis">诊断</el-dropdown-item>
+                <el-dropdown-item command="diagnosis-template"
                   >诊断模板</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="
-                    $router.push({ path: '/item-result-template' })
-                  "
+                <el-dropdown-item command="item-result-template"
                   >项目结果模板</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/item-result-match' })"
+                <el-dropdown-item command="item-result-match"
                   >项目结果匹配</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/item-template' })"
+                <el-dropdown-item command="item-template"
                   >项目模板</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/medical-package' })"
+                <el-dropdown-item command="medical-package"
                   >套餐</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/sys-parm-type' })"
+                <el-dropdown-item command="sys-parm-type"
                   >系统参数</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -201,35 +143,25 @@
           </div>
           <!-- 体检登记 -->
           <div class="examinationregistration" style="margin-left: 15px">
-            <el-dropdown>
+            <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link"> 体检登记 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/customerOrg' })"
+                <el-dropdown-item command="customerOrg"
                   >体检单位设置</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/customerOrgGroup' })"
+                <el-dropdown-item command="customerOrgGroup"
                   >单位分组设置</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/patientRegister' })"
+                <el-dropdown-item command="patientRegister"
                   >体检人员登记</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/patientRegisterSign' })"
+                <el-dropdown-item command="patientRegisterSign"
                   >体检人员签到</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="
-                    $router.push({ path: '/patientRegisterRecover' })
-                  "
+                <el-dropdown-item command="patientRegisterRecover"
                   >体检表回收</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="
-                    $router.push({ path: '/patientRegisterRefuse' })
-                  "
+                <el-dropdown-item command="patientRegisterRefuse"
                   >弃检登记</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -237,19 +169,16 @@
           </div>
           <!-- 体检 -->
           <div class="physicalexamination" style="margin-left: 15px">
-            <el-dropdown>
+            <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link"> 体检 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/doctorCheck' })"
+                <el-dropdown-item command="doctorCheck"
                   >体检医生诊台</el-dropdown-item
                 >
-                <el-dropdown-item
-                  @click.native="$router.push({ path: '/sumDoctorCheck' })"
+                <el-dropdown-item command="sumDoctorCheck"
                   >总检医生诊台</el-dropdown-item
                 >
-                   <el-dropdown-item
-                  @click.native="$router.push({ name: '/personnelBatch' }.catch(()=>{}))"
+                <el-dropdown-item command="personnelBatch"
                   >人员预约登记</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -275,7 +204,12 @@
         </div>
       </el-header>
       <!-- 修改密码弹框 -->
-      <el-dialog title="修改密码" :visible.sync="dialogVisible" width="30%"   :close-on-click-modal="false">
+      <el-dialog
+        title="修改密码"
+        :visible.sync="dialogVisible"
+        width="30%"
+        :close-on-click-modal="false"
+      >
         <el-form
           :model="form"
           :rules="rules"
@@ -283,13 +217,26 @@
           label-width="100px"
         >
           <el-form-item label="旧密码" prop="oldPassWord">
-            <el-input v-model="form.oldPassWord" autocomplete='new-password'  show-password></el-input>
+            <el-input
+              v-model="form.oldPassWord"
+              autocomplete="new-password"
+              show-password
+            ></el-input>
           </el-form-item>
           <el-form-item label="新密码" prop="newPassWord">
-            <el-input v-model="form.newPassWord" autocomplete='new-password'  show-password></el-input>
+            <el-input
+              v-model="form.newPassWord"
+              autocomplete="new-password"
+              show-password
+            ></el-input>
           </el-form-item>
           <el-form-item label="确认密码" prop="newPassWord">
-            <el-input v-model="confirmpassword" type="password" autocomplete='new-password'  show-password></el-input>
+            <el-input
+              v-model="confirmpassword"
+              type="password"
+              autocomplete="new-password"
+              show-password
+            ></el-input>
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
@@ -540,7 +487,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["changepassword"]),
+    ...mapState(["changepassword", "router"]),
   },
   created() {
     this.password = this.changepassword;
@@ -549,6 +496,12 @@ export default {
     this.user = localStorage.getItem("user");
   },
   methods: {
+    handleCommand(command) {
+      if (this.router.path != command) {
+        this.router.path = command;
+        this.$router.push({ path: command });
+      }
+    },
     //确定修改密码按钮
     determine() {
       this.$refs.ruleForm.validate((valid) => {
diff --git a/src/views/doctorCheck/personnelBatch.vue b/src/views/doctorCheck/personnelBatch.vue
index 979ea78..115dcb0 100644
--- a/src/views/doctorCheck/personnelBatch.vue
+++ b/src/views/doctorCheck/personnelBatch.vue
@@ -61,6 +61,7 @@
 </template>
 <script>
 import ExcelJS from "exceljs";
+
 export default {
   data() {
     return {
@@ -74,7 +75,6 @@ export default {
     onFileChange(event) {
       // 获取上传的文件
       const file = event.target.files[0];
-
       // 调用导入Excel文件的方法
       this.importExcelFile(file);
     },
@@ -100,8 +100,9 @@ export default {
           const worksheet = workbook.getWorksheet(1);
           // 处理Excel文件内容
           worksheet.eachRow((row, rowNumber) => {
+            console.log(row.values);
             // this.importData.push(row.values);
-            // console.log(`第${rowNumber}行的数据：${rowData}`);
+            // console.log(`第${row.rowNumber}行的数据：${row.rowData}`);
           });
         });
       };
@@ -126,6 +127,7 @@ export default {
     //下一步
     nextstep() {
       this.dialogVisible3 = true;
+      this.dialogVisible2 = false;
     },
     loading() {},
   },