Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -344,7 +344,7 @@
           >打印</el-button
         >
       </template>
-       <template v-if="org_template_info.template_id == 25">
+      <template v-if="org_template_info.template_id == 25">
         <el-button
           :loading="loading"
           size="small"
@@ -437,6 +437,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 32">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -672,6 +682,11 @@
             v-if="org_template_info.template_id == 31"
           >
           </DialysisPrintOrderThirtyOne>
+          <DialysisPrintOrderThirtyTwo
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 32"
+          >
+          </DialysisPrintOrderThirtyTwo>
         </div>
       </el-container>
     </div>
@@ -722,9 +737,11 @@ import DialysisPrintOrderTwentyEight from "./template/DialysisPrintOrderTwentyEi
 import DialysisPrintOrderTwentyNine from "./template/DialysisPrintOrderTwentyNine";
 import DialysisPrintOrderThirty from "./template/DialysisPrintOrderThirty";
 import DialysisPrintOrderThirtyOne from "./template/DialysisPrintOrderThirtyOne";
+import DialysisPrintOrderThirtyTwo from "./template/DialysisPrintOrderThirtyTwo";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtyTwo,
     DialysisPrintOrderThirtyOne,
     DialysisPrintOrderThirty,
     DialysisPrintOrderTwentyNine,
@@ -1091,13 +1108,6 @@ export default {
           style: style,
           scanStyles: false
         });
-      }else if (this.org_template_info.template_id == 25) {
-        printJS({
-          printable: "dialysis-print-box",
-          type: "html",
-          style: style5,
-          scanStyles: false
-        });
       } else if (this.org_template_info.template_id == 26) {
         printJS({
           printable: "dialysis-print-box",
@@ -1140,7 +1150,14 @@ export default {
           style: style3,
           scanStyles: false
         });
-      } 
+      } else if (this.org_template_info.template_id == 32) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style5,
+          scanStyles: false
+        });
+      }
     },
     printThisOnePage() {
       var ptime = Math.round(new Date().getTime() / 1000);

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -711,7 +711,6 @@
                 'record_time': this.record_date,
                 'admin_user_id':this.$store.getters.xt_user.user.id
 
-
               }
               axios.get('http://127.0.0.1:9532/api/refund/post', {
                 params: params

src/xt_pages/sign/signIn.vue

@@ -196,7 +196,7 @@ export default {
                 console.log('执行')
                 this.page++
                 let obj = {
-                    cmd: "queue/queuelist",
+                    cmd: "queuelistbyq",
                     data: {page:this.page,size:10,sort:1}
                 };
                 this.websocketSend(obj)
@@ -204,7 +204,7 @@ export default {
                 console.log('执行2222')
                 this.page = 1
                 let newobj = {
-                    cmd: "queue/queuelist",
+                    cmd: "queuelistbyq",
                     data: {page:this.page,size:10,sort:1}
                 };
                 this.websocketSend(newobj)