ssssss

src/components/common/LocalConfig.vue

@@ -4,6 +4,17 @@
       浏览器 /<span class="contenttitleBold">本地设置</span>
     </div>
     <el-tabs tab-position="left" :style="`margin-top: 5px;height: ${window.pageHeight - 150}px;`">
+      <el-tab-pane label="常规设置">
+        <el-form label-width="100px" size="medium">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="显示调试工具">
+                <el-checkbox v-model="LocalConfig.normal.isDevTool" size="small" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-tab-pane>
       <el-tab-pane label="检验条码">
         <el-form label-width="100px" size="medium">
           <el-row>
@@ -43,6 +54,9 @@ export default {
   data() {
     return {
       LocalConfig: {
+        normal: {
+          isDevTool: false, // 壳端是否显示打开调试工具按钮
+        },
         lisLabel: { // 检验条码打印
           MarginTop: 56, //
         },
@@ -63,7 +77,7 @@ export default {
     this.LocalConfigInit = deepCopy(this.LocalConfig)
     let LocalConfig = window.localStorage.getItem("LocalConfig") || null
     try {
-      this.LocalConfig = JSON.parse(LocalConfig) || this.LocalConfig
+      this.LocalConfig = Object.assign({}, this.LocalConfig, JSON.parse(LocalConfig) || {})
     } catch (error) {
       console.log('window.localStorage.getItem("LocalConfig")', error)
     }
@@ -76,7 +90,7 @@ export default {
 
   methods: {
     btnOk() {
-      window.localStorage.setItem("LocalConfig",JSON.stringify(this.LocalConfig))
+      window.localStorage.setItem("LocalConfig", JSON.stringify(this.LocalConfig))
     },
 
   },

src/components/customerOrg/customerOrgTree.vue

@@ -11,10 +11,6 @@
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <div>
             <span class="treeicons">              
-              <!-- <i
-                class="el-icon-document-remove"
-                v-if="data.parentId == null"
-              ></i> -->
               <img style="width:20px;height:20px;vertical-align: sub;" src="@/assets/images/order.png" v-if="data.parentId == null"/>
             </span>
             <span

src/components/patientRegister/PatientRegisterEdit.vue

@@ -1491,6 +1491,7 @@ export default {
         isBuildImage: 'N',
         IsUploadPdf: 'N',
         preViewCanPrint: 'N',
+        BusinessCode:this.form.id,
         Parameters: [
           { Name: 'printer', Value: user },
           { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
@@ -1499,8 +1500,7 @@ export default {
 
 
       if (isPreview) {
-        //
-        //this.multipleSelection.forEach((item,index) =>{
+        /*
         postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.form.id}`)
           .then((res) => {
             if (res.code != -1) {
@@ -1512,26 +1512,39 @@ export default {
           .catch(err => {
             this.$message.warning({ showClose: true, message: err});
           });
-        // });
-      } else {
-
-        postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.form.id}`)
-          .then((res) => {
-            if (res.code != -1) {
-              toOutShell.ReportTable = res.data;
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
-              return this.$peisAPI.print(JSON.stringify(toOutShell));
+        */
+        this.$peisAPI.printPre(JSON.stringify(toOutShell))          
+          .then(res => {
+            console.log('this.$peisAPI.printPre',res)
+            if (JSON.parse(res).code < 0) {
+              this.$message.warning({ showClose: true, message: JSON.parse(res).message });
             }
           })
+          .catch((err) => {
+            console.log('打印指引单错误', err)
+            this.$message.warning({ showClose: true, message: `${err}` });
+          });
+      } else {
+
+        // postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.form.id}`)
+        //   .then((res) => {
+        //     if (res.code != -1) {
+        //       toOutShell.ReportTable = res.data;
+        //       console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+        //       return this.$peisAPI.print(JSON.stringify(toOutShell));
+        //     }
+        //   })
+        this.$peisAPI.print(JSON.stringify(toOutShell))
           .then(res => {
-            //console.log('this.$peisAPI.print',res)
-            if (JSON.parse(res).code >= 0) {
+            if (JSON.parse(res).code < 0) {
+              this.$message.warning({ showClose: true, message: JSON.parse(res).message });
+            }else{
               //更新打印次数
               return postapi('/api/app/patientregister/updatepatientregisterguideprinttimesmany', [this.form.id])
             }
           })
           .then(res => {
-            if (res.code != -1) {
+            if (res && res.code > -1) {
               let lfind = arrayExistObj(this.patientRegister.prList, 'id', this.form.id)
               if (lfind > -1) {
                 if (this.patientRegister.prList[lfind].guidePrintTimes) {
@@ -1540,6 +1553,8 @@ export default {
                   this.patientRegister.prList[lfind].guidePrintTimes = 1;
                 }
               }
+            }else{
+              this.$message.warning({ showClose: true, message: res.message});
             }
           })
           .catch(err => {
@@ -1551,6 +1566,8 @@ export default {
 
     //检验申请
     async lisRequest() {
+      this.$message.warning({ showClose: true, message: '开发中……'});
+      /*
       let isPrintLisRequest = false
       let res = null
       if (this.form.id.length < 1) {
@@ -1590,6 +1607,7 @@ export default {
       }
       //打印检验申请单
       this.lisPrint('0003', false);
+      */
     },
 
     //条码打印
@@ -1609,6 +1627,7 @@ export default {
         ReportCode, token,
         isBuildImage: 'N',
         IsUploadPdf: 'N',
+        BusinessCode:this.form.id,
         Parameters: [
           { Name: 'printer', Value: user },
           { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
@@ -1617,45 +1636,38 @@ export default {
 
 
       if (isPreview) {
-        //http://140.143.162.39:9529/api/app/printreport/getlisrequestreport?PatientRegisterId=3a0d2e90-da68-3746-6775-bf17e5f9b295
-        //this.multipleSelection.forEach((item,index) =>{
-        postapi(`/api/app/printreport/getlisrequestreport?PatientRegisterId=${this.form.id}`)
-          .then((res) => {
-            if (res.code != -1) {
-              toOutShell.ReportTable = { lisRequest: res.data };
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
-              return this.$peisAPI.printPre(JSON.stringify(toOutShell));
+        this.$peisAPI.printPre(JSON.stringify(toOutShell))          
+          .then(res => {
+            let lres = JSON.parse(res)
+            console.log('this.$peisAPI.printPre',lres)
+            if (lres.code < 0) {
+              console.log('打印检验条码错误',lres.message)
+              this.$message.warning({ showClose: true, message: lres.message });
             }
           })
-          .catch(err => {
-            this.$message.warning({ showClose: true, message: err});
+          .catch((err) => {
+            console.log('打印检验条码错误', err)
+            this.$message.warning({ showClose: true, message: `${err}` });
           });
-        // });
       } else {
 
-        postapi(`/api/app/printreport/getlisrequestreport?PatientRegisterId=${this.form.id}`)
-          .then((res) => {
-            if (res.code != -1) {
-              toOutShell.ReportTable = { lisRequest: res.data };
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
-              return this.$peisAPI.print(JSON.stringify(toOutShell));
+        this.$peisAPI.print(JSON.stringify(toOutShell))
+          .then(res => {
+            let lres = JSON.parse(res)
+            if (res && lres.code > -1) {
+              return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: this.form.id })
+            }else{
+              this.$message.warning({ showClose: true, message: lres.message });
             }
           })
           .then(res => {
-            if (res.code != -1) {
-              //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
-              // {
-              //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
-              //   "patientRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-              //   "lisRequestId": "3fa85f64-5717-4562-b3fc-2c963f66afa6"
-              // }
-              return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: this.form.id })
+            if(res && res.code < 0){
+              this.$message.error({ showClose: true, message: `更新条码打印状态失败，原因：${res.message}` });
             }
           })
           .catch(err => {
-            this.$message.warning({ showClose: true, message: err});
+            this.$message.warning({ showClose: true, message: `${err}`});
           });
-
       }
     },
 

src/router/index.js

@@ -570,10 +570,11 @@ const router = new VueRouter({
     routes,
 });
 
-router.beforeEach((to, form, next) => {
+router.beforeEach((to, from, next) => {
+    console.log('to,form',to, from)
     let token = window.sessionStorage.getItem("token");
     let tokentype = window.sessionStorage.getItem("tokentype");
-    if (to.path === "/login") {
+    if (to.path == "/login") {
         if (token != null) {
             next({
                 path: "/",

src/views/Home.vue

@@ -79,7 +79,7 @@
                   <el-dropdown-item @click.native="editpassword">修改密码</el-dropdown-item>
 
                   <el-dropdown-item @click.native="localSet">本地设置</el-dropdown-item>                  
-                  <el-dropdown-item @click.native="toggleDevTools">调试工具</el-dropdown-item>
+                  <el-dropdown-item v-if="LocalConfig.normal.isDevTool" @click.native="toggleDevTools">调试工具</el-dropdown-item>
                   <el-dropdown-item @click.native="clientConfigShow">客户端参数</el-dropdown-item>
                   <el-dropdown-item @click.native="windowMin">最小化</el-dropdown-item>
                   <!--
@@ -132,6 +132,7 @@ import router from "@/router";
 import { getapi, postapi } from "@/api/api";
 import { mapState } from "vuex";
 import { getTreeNode, madeTree } from "../utlis/tree";
+import { deepCopy } from "@/utlis/proFunc";
 import LocalConfig from "../components/common/LocalConfig.vue";
 
 export default {
@@ -161,6 +162,12 @@ export default {
           { required: true, message: "请输入新密码", trigger: "blur" },
         ],
       },
+      LocalConfig: {
+        normal: { // 常规参数
+          isDevTool: false, // 壳端是否显示打开调试工具的按钮
+        }
+      },
+      LocalConfigInit:{},
     };
   },
   computed: {
@@ -182,6 +189,14 @@ export default {
     //获取当前用户的菜单权限
     this.getUserAllPriv()
     // this.getUserMenuPriv()
+
+    this.LocalConfigInit = deepCopy(this.LocalConfig)
+    let LocalConfig = window.localStorage.getItem("LocalConfig") || null
+    try {
+      this.LocalConfig = Object.assign({}, this.LocalConfig, JSON.parse(LocalConfig) || {})
+    } catch (error) {
+      console.log('window.localStorage.getItem("LocalConfig")', error)
+    }
   },
   methods: {
     // 菜单操作

src/views/doctorCheck/doctorCheck.vue

@@ -115,7 +115,7 @@ export default {
     } else {
       let LocalConfig = window.localStorage.getItem("LocalConfig") || null
       try {
-        this.LocalConfig = JSON.parse(LocalConfig) || this.LocalConfig
+        this.LocalConfig = Object.assign({}, this.LocalConfig, JSON.parse(LocalConfig) || {})
       } catch (error) {
         console.log('window.localStorage.getItem("LocalConfig")', error)
       }

src/views/login/Login.vue

@@ -3,7 +3,7 @@
     <div style="display: flex;justify-content: space-between;padding-top: 5px;">
       <div></div>
       <div style="display: flex;">
-        <i class="el-icon-setting" @click="toggleDevTools" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
+        <i class="el-icon-setting" v-if="LocalConfig.normal.isDevTool" @click="toggleDevTools" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
         <i class="el-icon-minus" @click="btnMin" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
         <i class="el-icon-copy-document" @click="btnMax" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
         <i class="el-icon-close" @click="btnClose" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
@@ -60,6 +60,7 @@
 <script>
 
 import { writetoken } from "@/utlis/istoken";
+import { deepCopy } from "@/utlis/proFunc";
 import axios from "axios";
 
 export default {
@@ -80,11 +81,25 @@ export default {
           //{ min: 3, max: 8, message: "长度在 3 到 8 个字符", trigger: "blur" },
         ],
       },
+      LocalConfig: {
+        normal: { // 常规参数
+          isDevTool: false, // 壳端是否显示打开调试工具的按钮
+        }
+      },
+      LocalConfigInit:{}
     };
   },
+  created() {
+    this.LocalConfigInit = deepCopy(this.LocalConfig)
+    let LocalConfig = window.localStorage.getItem("LocalConfig") || null
+    try {
+      this.LocalConfig = Object.assign({}, this.LocalConfig, JSON.parse(LocalConfig) || {})      
+    } catch (error) {
+      console.log('window.localStorage.getItem("LocalConfig")', error)
+    }
+  },
   async mounted() {    
     await this.getSysConfig()    
-    
   },
   methods: {
 

src/views/report/chargeAsbitem.vue

@@ -361,5 +361,7 @@ export default {
     font-weight: 400;
     font-family: "NotoSansSC-Regular";
 }
-
+::v-deep .el-icon-search:before {
+  color: #00F;
+}
 </style>

src/views/report/checkStatus.vue

@@ -363,5 +363,8 @@ export default {
     font-weight: 400;
     font-family: "NotoSansSC-Regular";
 }
+::v-deep .el-icon-search:before {
+  color: #00F;
+}
 
 </style>

src/views/report/unCheckAsbitem.vue

@@ -333,5 +333,7 @@ export default {
     font-family: "NotoSansSC-Regular";
 }
 
-
+::v-deep .el-icon-search:before {
+  color: #00F;
+}
 </style>