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

src/xt_pages/data/components/drugs.vue

@@ -64,7 +64,7 @@
     <div style="display:flex; align-items:center;margin-bottom:10px;">
         <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
         <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
-        <el-link target="_blank" href="https://kuyi.shengws.com/drug_template.xlsx" :underline="false"
+        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/drug_template.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -81,7 +81,7 @@
           type="primary"
           size="small"
         >下载日志
-        </el-button>
+        </el-button> -->
       </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"

src/xt_pages/data/components/project.vue

@@ -41,7 +41,7 @@
         <div style="display:flex; align-items:center;margin-bottom:10px;">
         <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
         <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
-        <el-link target="_blank" href="https://kuyi.shengws.com/project_template.xlsx" :underline="false"
+        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/project_template.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -60,7 +60,7 @@
           type="primary"
           size="small"
         >下载日志
-        </el-button>
+        </el-button> -->
       </div>
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"  @selection-change="handleSelectionChange">
             <el-table-column

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -495,6 +495,34 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 36">
+        <div>
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage"
+            type="primary"
+            >打印全部</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisOnePage"
+            type="primary"
+            >打印纪录单</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisTwoPage"
+            type="primary"
+            >打印医嘱单</el-button
+          >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -750,6 +778,11 @@
             v-if="org_template_info.template_id == 35"
           >
           </DialysisPrintOrderThirtyFive>
+          <DialysisPrintOrderThirtySix
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 36"
+          >
+          </DialysisPrintOrderThirtySix>
         </div>
       </el-container>
     </div>
@@ -804,9 +837,11 @@ import DialysisPrintOrderThirtyTwo from "./template/DialysisPrintOrderThirtyTwo"
 import DialysisPrintOrderThirtyThree from "./template/DialysisPrintOrderThirtyThree";
 import DialysisPrintOrderThirtyFour from "./template/DialysisPrintOrderThirtyFour";
 import DialysisPrintOrderThirtyFive from "./template/DialysisPrintOrderThirtyFive";
+import DialysisPrintOrderThirtySix from "./template/DialysisPrintOrderThirtySix";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtySix,
     DialysisPrintOrderThirtyFive,
     DialysisPrintOrderThirtyFour,
     DialysisPrintOrderThirtyThree,
@@ -1249,6 +1284,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 36) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {
@@ -1301,6 +1343,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if(this.org_template_info.template_id == 36){
+        printJS({
+          printable: "dialysis-print-box-1-1",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisTwoPage() {
@@ -1353,6 +1402,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if(this.org_template_info.template_id == 36){
+        printJS({
+          printable: "dialysis-print-box-1-2",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     getNumber() {

src/xt_pages/outpatientRegistration/index.vue

@@ -688,7 +688,8 @@
             cb([])
           }
         })
-      }, readingSZ() {
+      }, 
+      readingSZ() {
         var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
           this.$message.error('请先选择读卡类型')
@@ -737,7 +738,6 @@
           .catch(function(error) {
 
           })
-
       },
 
       reading(medicalInsuranceCard) {