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

@@ -65,6 +65,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 46">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
       <template v-if="org_template_info.template_id == 5">
         <div>
           <el-button

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -105,7 +105,7 @@
           <template slot-scope="scope">
             <div style="width: 100%; height: 100%">
               <tr class="color" v-for="(item,index) in scope.row.orderOut" :key="index">
-                 <td>{{item.good_number}}</td>
+                 <td style="border:none;">{{item.good_number}}</td>
               </tr>
 
             </div>