DJ

src/components/doctorCheck/PatientRegisterList.vue

@@ -273,6 +273,14 @@ export default {
       }]
       this.patientRegister.query.cusOrgOCX = `(体检${today}~${today})`
 
+
+      //分组，所有分组，不限单位，不限次数
+      getapi("/api/app/customerorggroup/getlistinfilter").then((res) => {
+        if (res.code > -1) {
+          this.dict.customerOrgGroupAll = res.data;
+        }
+      });
+
       // 获取组合项目
       postapi('/api/app/asbitem/GetBasicList', { isFilterActive: 'Y' }).then(res => {
         if (res.code != -1) {

src/components/patientRegister/PatientLis.vue

@@ -105,12 +105,15 @@
             </div>
           </div>
         </div>
-        <!-- 给合项目  基本信息  -->
+        <!-- 组合项目  基本信息  -->
         <el-tabs v-model="tabChoosed" style="margin-top: -22px;">
-          <!-- 给合项目 -->
+          <!-- 组合项目 -->
           <el-tab-pane label="检验条码" name="1">
             <PatientLisRequest />
           </el-tab-pane>
+          <el-tab-pane label="登记组合项目" name="2">
+            <PatientRegisterAsbItem />
+          </el-tab-pane>
         </el-tabs>
       </div>
     </div>
@@ -132,10 +135,12 @@ import {
 
 
 import PatientLisRequest from "./PatientLisRequest.vue";
+import PatientRegisterAsbItem from "../../components/patientRegister/patientRegisterAsbItem.vue";
 
 export default {
   components: {
     PatientLisRequest,
+    PatientRegisterAsbItem,
   },
   data() {
     return {
@@ -281,6 +286,7 @@ export default {
     rowClick(row) {
       this.dataTransOpts.tableS.patient_register = deepCopy(row)
       this.dataTransOpts.refresh.lis_request.M++ //触发条码
+      this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新  
     },
 
     //查询
@@ -310,6 +316,7 @@ export default {
       console.log('getPrList', this.loadOpts)
 
       let body = {
+        isFilterPreRegistration:'Y',
         skipCount: this.loadOpts.skipCount,
         maxResultCount: this.loadOpts.maxResultCount
       };

src/components/patientRegister/PatientLisRequest.vue

@@ -144,7 +144,7 @@ export default {
       }
 
       if (isPreview) {
-        lisPrint(this.chooseRows[0].lisRequestId,"0003",isPreview)
+        this.lisPrint(this.chooseRows[0].lisRequestId,"0003",isPreview)
         return
       }
 
@@ -152,7 +152,7 @@ export default {
       for (let i = 0; i < this.chooseRows.length; i++) {
         let e = this.chooseRows[i];
         try {
-          let err = await lisPrint(e.lisRequestId,"0003",isPreview)
+          let err = await this.lisPrint(e.lisRequestId,"0003",isPreview)
           if(!err){
             let lfind = arrayExistObj(this.dataTransOpts.tableM.lis_request,"lisRequestId",e.lisRequestId)
           if(lfind > -1) this.dataTransOpts.tableM.lis_request[lfind].isPrint = "Y"

src/components/patientRegister/PatientRegisterList.vue

@@ -107,9 +107,9 @@
             </div>
           </div>
         </div>
-        <!-- 给合项目  基本信息  -->
+        <!-- 组合项目  基本信息  -->
         <el-tabs v-model="tabChoosed" style="margin-top: -22px;">
-          <!-- 给合项目 -->
+          <!-- 组合项目 -->
           <el-tab-pane label="已选组合项目" name="1">
             <PatientRegisterAsbItem />
           </el-tab-pane>

src/components/patientRegister/patientRegisterQuery.vue

@@ -111,6 +111,7 @@ export default {
   //挂载完成
   mounted() {
     this.init(this.patientRegister.query.customerOrgId)
+    this.enterToQuery()
   },
 
   computed: {
@@ -195,6 +196,36 @@ export default {
       })
     },
 
+    //回车替代查询
+    enterToQuery() {
+      // console.log('enterToTab');
+      this.$nextTick(() => {
+        let inputs = document.querySelectorAll(["input"]); //用数组可以读取多个标签的元素  //.inline-input
+        
+        // 为每个输入框添加键盘事件监听器
+        inputs.forEach((input,i) => {
+          // console.log('input',input);
+          input.addEventListener('keydown', (event) => {
+            if (event.keyCode === 13){
+              // 阻止回车键的默认行为（换行）            
+              event.preventDefault();
+
+              // 如果按下的是回车查询
+              console.log(input.getAttribute('placeholder'),input.value)
+              let placeholder = input.getAttribute('placeholder')
+              switch (placeholder) {
+                case '条码号':
+                case '档案号':
+                case '姓名':                  
+                case '预约手机号':
+                  if(input.value) this.patientRegister.query.times++;
+                  break;                 
+              }
+            }          
+          });
+        });
+      });
+    },
   },
 
   watch: {

src/components/report/PatientRegisterListNobtn.vue

@@ -172,14 +172,12 @@ export default {
       rClickRow: null,       //右击的行
       rClickColumn: null,    //右击的列（预留）
       
-
-
       dom: null,   //用于滚动加载数据
       lazyLoading: false,  //是否懒加载中
       loadOpts: {
         totalCount: 0,
         skipCount: 0,
-        maxResultCount: 1000,
+        maxResultCount: 100,
       },
       loadOptsInit: {},
     };

src/views/customerOrg/patientLis.vue

@@ -42,7 +42,14 @@ export default {
   },
 
   //组件创建完成，一般页面初始布局放在这里
-  created() { },
+  created() { 
+    // console.log("this.$route.query", this.$route.query)
+    if (this.$route.query.patient_register) {
+      this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register
+    } else {
+      this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' }
+    }
+  },
 
   //页面挂载完成，一般页面渲染数据放在这里
   mounted() {
@@ -50,7 +57,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["window", "dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window","dataTransOpts", "dict", "patientRegister", "customerOrg"]),
   },
 
   methods: {

src/views/customerOrg/patientRegister.vue

@@ -47,7 +47,14 @@ export default {
   },
 
   //组件创建完成，一般页面初始布局放在这里
-  created() {},
+  created() {
+    // console.log("this.$route.query", this.$route.query)
+    if (this.$route.query.patient_register) {
+      this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register
+    } else {
+      this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' }
+    }
+  },
 
   //页面挂载完成，一般页面渲染数据放在这里
   mounted() {
@@ -55,7 +62,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["window", "dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window","dataTransOpts", "dict", "patientRegister", "customerOrg"]),
   },
 
   methods: {

src/views/customerOrg/patientRegisterRecover.vue

@@ -56,7 +56,12 @@ export default {
   },
 
   created() {
-
+    // console.log("this.$route.query", this.$route.query)
+    if (this.$route.query.patient_register) {
+      this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register
+    } else {
+      this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' }
+    }
   },
 
   //挂载完成
@@ -65,7 +70,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["window", "dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window", "dataTransOpts","dict", "patientRegister", "customerOrg"]),
   },
 
   methods: {

src/views/customerOrg/patientRegisterRefuse.vue

@@ -39,7 +39,14 @@ export default {
     };
   },
 
-  created() {},
+  created() {
+    // console.log("this.$route.query", this.$route.query)
+    if (this.$route.query.patient_register) {
+      this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register
+    } else {
+      this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' }
+    }
+  },
 
   //挂载完成
   mounted() {
@@ -47,7 +54,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window","dataTransOpts","dict", "patientRegister", "customerOrg"]),
   },
 
   methods: {

src/views/customerOrg/patientRegisterSign.vue

@@ -53,7 +53,12 @@ export default {
   },
 
   created() {
-    this.resize();
+    // console.log("this.$route.query", this.$route.query)
+    if (this.$route.query.patient_register) {
+      this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register
+    } else {
+      this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' }
+    }    
   },
 
   //挂载完成
@@ -62,7 +67,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["window", "dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window","dataTransOpts", "dict", "patientRegister", "customerOrg"]),
   },
 
   methods: {