SEO

src/components/doctorCheck/CheckPicture.vue

@@ -74,7 +74,8 @@
             </div>
           </div>
         </div>
-        <div v-show="getPicing" style="width: 300px;">
+        <div>
+          <table :width="`${getPicing ? 300:0}px;`"></table>
           <!--是否采图进行时，采图时自动滚到最右边-->
           <!--暴力滚动 element.scrollLeft = element.scrollWidth;-->
           <!--平滑滚动 element.scrollTo({ left: element.scrollWidth, behavior: 'smooth' });-->
@@ -267,7 +268,6 @@ export default {
       dialogWinCutPic: false,
       cutPicParam: {},
       pictureFileType: '1',
-
       getPicing:false,  //是否采图中
     };
   },
@@ -364,6 +364,9 @@ export default {
             this.checkPictures.forEach(e => {
               e.isPrintTrans = e.isPrint == "Y" ? true : false
             });
+
+            // 标记采图中，让滚动条滑到最右边……
+            if(this.getPicing) this.setGetPicing()
           }
         });
     },
@@ -419,7 +422,11 @@ export default {
     // 标记采图中，让滚动条滑到最右边……
     setGetPicing(){      
       let obj = this.$refs['DivPic']
-      obj.scrollTo({ left: obj.scrollWidth, behavior: 'smooth' })
+      console.log('obj',obj)
+      this.$nextTick(() => {
+        //obj.scrollTo({ left: obj.scrollWidth, behavior: 'smooth' })
+        obj.scrollLeft = obj.scrollWidth
+      })
     },
 
     // 采图

src/components/patientRegister/PatientRegisterEdit.vue

@@ -2604,9 +2604,9 @@ export default {
         this.printing = true
         if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('pacs') > -1) {
           if (this.merge_lis_pacs_label == '1') {
-            this.guidePrintEasy('0008', isPreview, toOutShell)
+            this.lisPrint('0002', isPreview, toOutShell)
               .then(res => {
-                return this.lisPrint('0002', isPreview, toOutShell)
+                return this.guidePrintEasy('0008', isPreview, toOutShell)
               })
               // .then(res => {
               //   return this.pacsPrint('0004', isPreview, toOutShell)
@@ -2621,12 +2621,12 @@ export default {
                 this.printing = false
               })
           } else {
-            this.guidePrintEasy('0008', isPreview, toOutShell)
+            this.lisPrint('0002', isPreview, toOutShell)
               .then(res => {
-                return this.lisPrint('0002', isPreview, toOutShell)
+                return this.pacsPrint('0004', isPreview, toOutShell)
               })
               .then(res => {
-                return this.pacsPrint('0004', isPreview, toOutShell)
+                return this.guidePrintEasy('0008', isPreview, toOutShell)
               })
               .then(res => {
                 resolve(res)
@@ -2640,9 +2640,9 @@ export default {
           }
 
         } else if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1) {
-          this.guidePrintEasy('0008', isPreview, toOutShell)
+          this.lisPrint('0002', isPreview, toOutShell)
             .then(res => {
-              return this.lisPrint('0002', isPreview, toOutShell)
+              return this.guidePrintEasy('0008', isPreview, toOutShell)
             })
             .then(res => {
               resolve(res)
@@ -2654,9 +2654,9 @@ export default {
               this.printing = false
             })
         } else if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('pacs') > -1) {
-          this.guidePrintEasy('0008', isPreview, toOutShell)
+          this.pacsPrint('0004', isPreview, toOutShell)
             .then(res => {
-              return this.pacsPrint('0004', isPreview, toOutShell)
+              return this.guidePrintEasy('0008', isPreview, toOutShell)
             })
             .then(res => {
               resolve(res)

src/components/patientRegister/PatientRegisterList.vue

@@ -1000,9 +1000,9 @@ export default {
       return new Promise((resolve, reject) => {
         // this.merge_lis_pacs_label == '1' 合并检验检查条码
         if (this.merge_lis_pacs_label == '1') {
-          this.guidePrintPromise("0008", false, row)
+          this.lisPrint(row, "0002", false)
             .then((res) => {
-              return this.lisPrint(row, "0002", false);
+              return this.guidePrintPromise("0008", false, row);
             })
             // .then((res) => {
             //   return this.pacsPrint(row, "0004", false);
@@ -1014,12 +1014,12 @@ export default {
               reject(err);
             });
         } else {
-          this.guidePrintPromise("0008", false, row)
+          this.lisPrint(row, "0002", false)
             .then((res) => {
-              return this.lisPrint(row, "0002", false);
+              return this.pacsPrint(row, "0004", false);
             })
             .then((res) => {
-              return this.pacsPrint(row, "0004", false);
+              return this.guidePrintPromise("0008", false, row);
             })
             .then((res) => {
               resolve(res);
@@ -1036,9 +1036,9 @@ export default {
     // 临时加
     printGuidePacs(row) {
       return new Promise((resolve, reject) => {
-        this.guidePrintPromise("0008", false, row)
+        this.pacsPrint(row, "0004", false)
           .then((res) => {
-            return this.pacsPrint(row, "0004", false);
+            return this.guidePrintPromise("0008", false, row);
           })
           .then((res) => {
             resolve(res);