diff --git a/src/components/customerOrg/customerOrgGroupAsbitem.vue b/src/components/customerOrg/customerOrgGroupAsbitem.vue index e51a8ab..0859759 100644 --- a/src/components/customerOrg/customerOrgGroupAsbitem.vue +++ b/src/components/customerOrg/customerOrgGroupAsbitem.vue @@ -296,8 +296,7 @@ export default { selecteddata: [], //已选数据 - unselecteddata: [], //未选数据 - unselecteddata: [], //右边勾选中 + unselecteddata: [], //未选数据 rightselctedata: [], //右侧已选 options: [], value: "", diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index fbf3b39..237c1c4 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -44,7 +44,7 @@ - + @@ -54,9 +54,13 @@ - + --> + + prefix-icon="" size="small"/> @@ -325,7 +329,7 @@ -
+
拍照
@@ -351,7 +355,7 @@ 指引单打印
- 指引单预览 + 指引单预览
手动合并项目 @@ -765,7 +769,7 @@ export default { methods: { ...mapActions(['getPatientRegisterAbs']), dddw,moment, - + //初始form表单数据 initFormData(){ objCopy(this.formInitData, this.form); diff --git a/src/main.js b/src/main.js index 97964df..0faf757 100644 --- a/src/main.js +++ b/src/main.js @@ -115,6 +115,7 @@ window.addEventListener('keydown', code => { if (code.key == "Control" && code.ctrlKey) { store.commit('setData', { key: 'window.ctrl', value: true });// 标记按住了ctrl键 } + }); // 监听keyup：获取键盘松开事件,code返回按住的键信息 diff --git a/src/utlis/getKeyDown.js b/src/utlis/getKeyDown.js index a936ad0..7fdcf7f 100644 --- a/src/utlis/getKeyDown.js +++ b/src/utlis/getKeyDown.js @@ -8,6 +8,24 @@ } */ + +const enterToTab = new KeyboardEvent('keydown', { + keyCode: 9, // A键的键码 + code: 'Tab', // A键的标准编码 + key: 'Tab', // A键的字符 + which: 13, + bubbles: true, + location: 0, // 键盘位置，0为主键盘 + repeat: false, // 是否重复按下 + ctrlKey: false, // 是否按下Ctrl键 + altKey: false, // 是否按下Alt键 + shiftKey: false, // 是否按下Shift键 + metaKey: false // 是否按下Meta键 + }); + + //document.dispatchEvent(enterToTab); + + export function getKeyDown(className) { //当前页面监视键盘输入 onkeyup /onkeydown document.onkeydown = function (e) { @@ -19,12 +37,19 @@ export function getKeyDown(className) { // }else{ // e.preventDefault(); // 阻止默认行为 // } - + console.log('document.onkeydown',e) // 标记当前组件为true if(e.target.tagName === 'INPUT'){ e.target.autofocus = true; - - e.preventDefault(); // 阻止默认行为 + + e.preventDefault(); // 阻止默认行为 + + //document.dispatchEvent(enterToTab); + + + + + //$.event.trigger({ type: 'keydown', which: 13 }); } // else if(e.target.tagName === 'TEXTAREA'){ // e.target.autofocus = true; diff --git a/src/utlis/istoken.js b/src/utlis/istoken.js index 8ec42dd..1c13cee 100644 --- a/src/utlis/istoken.js +++ b/src/utlis/istoken.js @@ -12,7 +12,7 @@ export const yztoken = async () => { console.log("dqtime / expires_in",dqtime,expires_in) if(!expires_in){ - router.push({ path: "/Login" }); + router.push({ path: "/login" }); return; } diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue index 354c8b4..f272094 100644 --- a/src/views/charge/charge.vue +++ b/src/views/charge/charge.vue @@ -417,10 +417,14 @@ export default { // this.query.patientRegisterNo = this.patientList[0].patientRegisterNo; // this.query.patientName = this.patientList[0].patientName; // this.query.patientNo = this.patientList[0].patientNo; - this.rowClick(this.patientList[0]) - setTimeout(() => { + this.$nextTick(() =>{ this.$refs['patientList'].setCurrentRow(this.patientList[0]) - }, 200) + this.rowClick(this.patientList[0]) + }) + // this.rowClick(this.patientList[0]) + // setTimeout(() => { + // this.$refs['patientList'].setCurrentRow(this.patientList[0]) + // }, 200) } } loading.close(); diff --git a/src/views/common-settings/SampleGroup.vue b/src/views/common-settings/SampleGroup.vue index c6c4885..ffc6e51 100644 --- a/src/views/common-settings/SampleGroup.vue +++ b/src/views/common-settings/SampleGroup.vue @@ -1,276 +1,236 @@ diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index 91d01b4..4cfb2d2 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -40,8 +40,10 @@