group

src/components/common/LocalConfig.vue

@@ -1,37 +1,72 @@
 <template>
   <div>
-    <el-tabs tab-position="left" style="height: 100px;">
+    <div class="contenttitle">
+      浏览器 /<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-input type="number" v-model="LocalConfig.lisLabel.MarginTop" 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>
+            <el-col :span="24">
+              <el-form-item label="是否显示图片">
+                <el-checkbox v-model="LocalConfig.doctorCheck.isCheckPicture" size="small" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>        
       </el-tab-pane>
     </el-tabs>
 
-    <div style="margin-left: 150px;margin-top: 5px;">
+    <div style="margin: 10px; display: flex;justify-content: space-between;">
+      <div></div>
       <el-button type="primary" @click="btnOk" class="commonbutton" size="small">确定</el-button>
-      <el-button type="primary" @click="btnCancel" class="commonbutton" size="small">取消</el-button>
     </div>
   </div>
 </template>
 <script>
 
+import { deepCopy } from "@/utlis/proFunc";
 import { mapState } from "vuex";
 
 export default {
   data() {
     return {
-      LocalConfig: {}
+      LocalConfig: {
+        lisLabel: { // 检验条码打印
+          MarginTop: 56, //
+        },
+        doctorCheck: { // 医生诊台
+          isCheckPicture: false, // 是否显示检查图片
+        }
+      },
+      LocalConfigInit: {},
     };
   },
 
+
   computed: {
-    ...mapState(["dict", "dialogWin"]),
+    ...mapState(["window", "dict", "dialogWin"]),
   },
   //创建组件后
   created() {
-
+    this.LocalConfigInit = deepCopy(this.LocalConfig)
+    let LocalConfig = window.localStorage.getItem("LocalConfig") || null
+    try {
+      this.LocalConfig = JSON.parse(LocalConfig) || this.LocalConfig
+    } catch (error) {
+      console.log('window.localStorage.getItem("LocalConfig")', error)
+    }
   },
 
   //挂载组件完成
@@ -41,12 +76,9 @@ export default {
 
   methods: {
     btnOk() {
-      this.dialogWin.LocalConfig = false
-    },
-
-    btnCancel() {
-      this.dialogWin.LocalConfig = false
+      window.localStorage.setItem("LocalConfig",JSON.stringify(this.LocalConfig))
     },
+    
   },
   watch: {
 

src/components/patientRegister/PatientLis.vue

@@ -109,8 +109,8 @@
         <el-tabs v-model="tabChoosed" style="margin-top: -22px;">
           <!-- 给合项目 -->
           <el-tab-pane label="预览" name="1">
-            <embed :src="lisLabel" type="application/pdf" width="100%" style="margin-top: -56px;"
-              :height="(window.pageHeight < 600 ? 119 : Math.floor((window.pageHeight - 243) / 3)) + 56" />
+            <embed :src="lisLabel" type="application/pdf" width="100%" :style="`margin-top: ${-LocalConfig.lisLabel.MarginTop}px;`"
+              :height="(window.pageHeight < 600 ? 119 : Math.floor((window.pageHeight - 243) / 3)) + LocalConfig.lisLabel.MarginTop" />
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -257,6 +257,11 @@ export default {
 
       printPre: 0,
       lisLabel: '',  // data:application/pdf;base64,
+      LocalConfig: {
+        lisLabel: {
+          MarginTop: 56, // 预览上移像素 px 
+        }
+      }
     };
   },
 
@@ -266,6 +271,12 @@ export default {
     if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
 
     this.loadOptsInit = Object.assign({}, this.loadOpts)
+    let LocalConfig = window.localStorage.getItem("LocalConfig") || null
+    try {
+      this.LocalConfig = JSON.parse(LocalConfig) || this.LocalConfig
+    } catch (error) {
+      console.log('window.localStorage.getItem("LocalConfig")', error)
+    }    
   },
 
   //挂载完成
@@ -450,7 +461,7 @@ export default {
         this.dataTransOpts.tableS.patient_register.id = this.tableData[lfind].id
         this.tableDataCurrentRow = deepCopy(this.tableData[lfind])
         //触发条码预览  
-        if (this.$peisAPI) this.lisPrint(this.dataTransOpts.tableS.patient_register.id, "0002", "Y", "Y")  
+        if (this.$peisAPI) this.lisPrint(this.dataTransOpts.tableS.patient_register.id, "0002", "Y", "Y")
       }
     },
 
@@ -687,13 +698,13 @@ export default {
         BusinessCode: prId
       };
 
-      if (isPreview) {        
+      if (isPreview) {
         this.$peisAPI.printPre(JSON.stringify(toOutShell))
           .then(res => {
             let lres = JSON.parse(res)
             if (lres.code < 0) {
               this.$message.warning({ showClose: true, message: JSON.parse(res).message });
-            }else if(IsUploadPdf == 'Y'){
+            } else if (IsUploadPdf == 'Y') {
               this.lisLabel = 'data:application/pdf;base64,' + lres.data
             }
           })
@@ -703,7 +714,7 @@ export default {
           });
 
       } else {
-        
+
         this.$peisAPI.print(JSON.stringify(toOutShell))
           .then(res => {
             if (JSON.parse(res).code < 0) {
@@ -748,7 +759,7 @@ export default {
         BusinessCode: prId
       };
 
-      if (isPreview) {        
+      if (isPreview) {
         this.$peisAPI.printPre(JSON.stringify(toOutShell))
           .then(res => {
             if (JSON.parse(res).code < 0) {
@@ -759,7 +770,7 @@ export default {
             console.log('打印pacs条码错误', err)
             this.$message.warning({ showClose: true, message: `${err}` });
           });
-      } else {        
+      } else {
         this.$peisAPI.print(JSON.stringify(toOutShell))
           .then(res => {
             if (JSON.parse(res).code < 0) {

src/components/patientRegister/patientRegisterQuery.vue

@@ -6,10 +6,10 @@
       <div class="query">
         <span class="spanClass">登记日期：</span>
         <el-date-picker v-model="patientRegister.query.startDate" type="date" placeholder="起始日期" size="small"
-          style="width:90px;" value-format="yyyy-MM-dd"/>
+          style="width:90px;" value-format="yyyy-MM-dd" />
         <span class="spanClass">至</span>
         <el-date-picker v-model="patientRegister.query.endDate" type="date" placeholder="截止日期" size="small"
-          style="width:90px;" value-format="yyyy-MM-dd"/>
+          style="width:90px;" value-format="yyyy-MM-dd" />
       </div>
       <div class="query">
         <span class="spanClass">条码号：</span>
@@ -114,7 +114,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["window", "dict","dataTransOpts", "patientRegister", "customerOrg"]),
+    ...mapState(["window", "dict", "dataTransOpts", "patientRegister", "customerOrg"]),
   },
   methods: {
     checkPagePriv,
@@ -123,7 +123,7 @@ export default {
       if (!customerOrgId || customerOrgId == this.dict.personOrgId) {
         this.patientRegister.query.customerOrgRegister = null
         this.customerOrgRegisterList = []
-        if(customerOrgId == this.dict.personOrgId){
+        if (customerOrgId == this.dict.personOrgId) {
           let today = new Date()
           this.patientRegister.query.startDate = today
           this.patientRegister.query.endDate = today
@@ -167,13 +167,13 @@ export default {
     //读身份证
     readIdCard() {
       if (!this.$peisAPI) {
-        this.$message.info("此功能，需要在壳客户端才可运行！")
+        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
         return
       }
       this.$peisAPI.peopleIcCard().then(res => {
         console.log('peopleIcCard', res)
         let lres = JSON.parse(res)
-        if (lres.code >= 0) {
+        if (lres.code > -1) {
           let idNos = parsIcCardtoLocal(lres.data, this.dict.sex, this.dict.nation)
           // this.form.patientName = idNos.Name
           // this.form.birthDate = idNos.birthDate
@@ -186,8 +186,13 @@ export default {
           this.patientRegister.query.patientName = idNos.Name
           this.patientRegister.query.sex = idNos.sexId
           this.patientRegister.query.idCardNo = idNos.IDCode
+        } else {
+          this.$message.error({ showClose: true, message: lres.message })
         }
       })
+      .catch(err => {
+        this.$message.error({ showClose: true, message: `读取身份证失败，原因：${err}` })
+      })
     },
 
   },
@@ -197,9 +202,9 @@ export default {
       // immediate: true,
       handler(newVal, oldVal) {
         console.log(`watch 体检单位切换 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.patientRegister.query.customerOrgId}`);
-        if(newVal != oldVal) this.init(this.patientRegister.query.customerOrgId)
+        if (newVal != oldVal) this.init(this.patientRegister.query.customerOrgId)
       }
-    }, 
+    },
   },
 
 }

src/views/Home.vue

@@ -74,8 +74,10 @@
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
                   <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 @click.native="clientConfigShow">客户端参数</el-dropdown-item>                  
                   <el-dropdown-item @click.native="windowMin">最小化</el-dropdown-item>
                   <el-dropdown-item @click.native="windowMax">最大化</el-dropdown-item>
                   <el-dropdown-item @click.native="windowClose">关闭</el-dropdown-item>
@@ -293,6 +295,15 @@ export default {
       }
       this.$peisAPI.toggleDevTools();
     },
+
+    // 打开客户端设置
+    clientConfigShow(){
+      if (!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return
+      }
+      this.$peisAPI.clientConfigShow();
+    },
     // 最小化
     windowMin() {
       if (!this.$peisAPI) {

src/views/customerOrg/patientRegisterRecover.vue

@@ -155,9 +155,9 @@ export default {
       });
 
       //分组，所有分组，不限单位，不限次数
-      getapi("/api/app/customer-org-group").then((res) => {
-        if (res.code == 1) {
-          this.dict.customerOrgGroupAll = res.data.items;
+      getapi("/api/app/customerorggroup/getlistinfilter").then((res) => {
+        if (res.code > -1) {
+          this.dict.customerOrgGroupAll = res.data;
         }
       });
 

src/views/customerOrg/patientRegisterRefuse.vue

@@ -140,9 +140,9 @@ export default {
       });
 
       //分组，所有分组，不限单位，不限次数
-      getapi("/api/app/customer-org-group").then((res) => {
-        if (res.code == 1) {
-          this.dict.customerOrgGroupAll = res.data.items;
+      getapi("/api/app/customerorggroup/getlistinfilter").then((res) => {
+        if (res.code > -1) {
+          this.dict.customerOrgGroupAll = res.data;
         }
       });
 

src/views/customerOrg/patientRegisterSign.vue

@@ -149,9 +149,9 @@ export default {
       });
 
       //分组，所有分组，不限单位，不限次数
-      getapi("/api/app/customer-org-group").then((res) => {
-        if (res.code == 1) {
-          this.dict.customerOrgGroupAll = res.data.items;
+      getapi("/api/app/customerorggroup/getlistinfilter").then((res) => {
+        if (res.code > -1) {
+          this.dict.customerOrgGroupAll = res.data;
         }
       });
 

src/views/doctorCheck/doctorCheck.vue

@@ -88,24 +88,40 @@ export default {
       peoplePhoto: '', //人员照片
       activeName: 'asbitem',
       isCheckPicture: true,  //是否显示结果图片
+
+      LocalConfig: {
+        doctorCheck: { // 医生诊台
+          isCheckPicture: false, // 是否显示检查图片
+        }
+      },
     };
   },
 
   created() {
     // console.log("this.$route.query", this.$route.query)
-    if(this.$route.query.patient_register){
+    if (this.$route.query.patient_register) {
       this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register
-    }else{
-      this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: ''}
+    } else {
+      this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' }
     }
-        
+
     if (this.$peisAPI) {
       // this.$message.info("此功能，需要在壳客户端才可运行！");
       // console.log('this.$peisAPI',this.$peisAPI)
       this.$peisAPI.getIsCheckPicture().then(res => {
-        console.log("this.$peisAPI.getIsCheckPicture()",res)
-        if (res) this.isCheckPicture = res.toUpperCase() == 'Y' ? true:false
+        console.log("this.$peisAPI.getIsCheckPicture()", res)
+        if (res) this.isCheckPicture = res.toUpperCase() == 'Y' ? true : false
       })
+    } else {
+      let LocalConfig = window.localStorage.getItem("LocalConfig") || null
+      try {
+        this.LocalConfig = JSON.parse(LocalConfig) || this.LocalConfig
+      } catch (error) {
+        console.log('window.localStorage.getItem("LocalConfig")', error)
+      }
+      this.isCheckPicture = this.LocalConfig.doctorCheck.isCheckPicture
+
+      console.log('this.LocalConfig.doctorCheck.isCheckPicture', this.LocalConfig.doctorCheck.isCheckPicture)
     }
 
   },