Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/components/doctorCheck/ButtonList.vue

@@ -107,7 +107,7 @@
 
 
         <div v-show="doctorCheck.doctorCheckDialogVisible"
-            :style="`z-index:2;border-radius: 10px;border: 1px solid #ddd;background-color:#FFF; position: absolute;top:50px;right:0px;width:300px;height: ${window.pageHeight - 42 - 10}px;opacity:1;`">
+            :style="`z-index:2;border-radius: 10px;border: 1px solid #ddd;background-color:#FFF; position: absolute;top:50px;right:120px;width:300px;height: ${window.pageHeight - 42 - 10}px;opacity:1;`">
 
             <PatientRegisterList win="doctorCheck" :winAbsolute="true" />
 

src/components/doctorCheck/CheckItemList.vue

@@ -120,7 +120,7 @@
     <div>
       <!-- 结果录入模版 -->
       <el-dialog title="结果录入模版" :visible.sync="dialogWinMoreResult" width="800px" :close-on-click-modal="false">
-        <div style="margin-top: -10px">
+        <div style="margin-top: -10px" @contextmenu.prevent="onContextmenuTemplate">
           <el-checkbox v-model="LocalConfig.doctorCheck.isSplitChooseResult" size="small" true-label="Y"
             false-label="N">选结果模板时自动添加分隔符；</el-checkbox>
           <div style="
@@ -1226,6 +1226,34 @@ export default {
 
     },
 
+    // 模板右击
+    onContextmenuTemplate(event) {
+      if (!this.$peisAPI) return
+      let menus = [
+        { type: 'separator' },
+        { label: '显示明细历次结果', itemId: '显示明细历次结果', enabled: true },
+        { label: '预览影像报告', itemId: '预览影像报告', enabled: true }
+        // { label: '测试菜单', itemId: '测试菜单', enabled: true },
+        // {
+        //   label: '更多操作',
+        //   submenu: [
+        //     { label: '子菜单', itemId: '子菜单', enabled: true }
+        //   ]
+        // }
+      ]
+
+      this.$peisAPI.showContextMenu(menus)
+        .then(res => {
+          console.log('res', res)
+        })
+        .catch(err => {
+          console.log('err', err)
+        })
+        .finally(() => {
+          console.log('finally')
+        })
+    },
+
     // 自定义右击事件
     onContextMenuDIY(data) {
       //this.$message({showClose:true,message:data})

src/components/patientRegister/PatientRegisterEdit.vue

@@ -1665,7 +1665,7 @@ export default {
           this.peoplePhoto = 'data:image/bmp;base64,' + idNos.Photo
           // this.patientRegister.photo = 'data:image/bmp;base64,' + idNos.Photo
           // isNameContinue 身份证号查重后是否姓名查重
-          this.changeIdNo('Y') //  触发身份证查询档案号
+          this.changeIdNo('N') //  触发身份证查询档案号（Y:身份证没查到，再按名字查，N：仅按身份证号查）
         } else {
           this.$message.error({ showClose: true, message: `${lres.message}` })
         }

src/components/sumDoctorCheck/ButtonList.vue

@@ -100,7 +100,7 @@
         </div>
 
         <div v-show="sumDoctorCheck.sumDoctorCheckDialogVisible"
-            :style="`z-index:3;border-radius: 10px;border: 1px solid #ddd;background-color:#FFF; position: absolute;top:50px;right:0px;width:300px;height: ${window.pageHeight - 42 - 10}px;opacity:1;`">
+            :style="`z-index:3;border-radius: 10px;border: 1px solid #ddd;background-color:#FFF; position: absolute;top:50px;right:120px;width:300px;height: ${window.pageHeight - 42 - 10}px;opacity:1;`">
 
             <PatientRegisterList win="sumDoctorCheck" :winAbsolute="true" />