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

src/router/modules/dialysis.js

@@ -1035,6 +1035,18 @@ export default {
         noCache: true
       }
     },
+    {//78
+      path: '/dialysis/print/batch/seventyeight',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_seventyeight'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_seventyeight',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/flow',
       component: () => import('@/xt_pages/dialysis/dialysisFlow'),

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -964,6 +964,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 78 ">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1475,6 +1487,11 @@
           <DialysisPrintOrderSeventyseven v-bind:childResponse="childResponse"
           v-if="org_template_info.template_id == 77">
           </DialysisPrintOrderSeventyseven>
+
+          <DialysisPrintOrderSeventyeight v-bind:childResponse="childResponse"
+          v-if="org_template_info.template_id == 78">
+
+          </DialysisPrintOrderSeventyeight>
         </div>
       </el-container>
     </div>
@@ -1570,6 +1587,7 @@ import DialysisPrintOrderSop from './template/DialysisPrintOrderSop'
 import DialysisPrintOrderseventyfive from './template/DialysisPrintOrderseventyfive'
 import DialysisPrintOrderSeventysix from './template/DialysisPrintOrderSeventysix'
 import DialysisPrintOrderSeventyseven from './template/DialysisPrintOrderSeventyseven'
+import DialysisPrintOrderSeventyeight from './template/DialysisPrintOrderSeventyeight'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1651,6 +1669,7 @@ export default {
     DialysisPrintOrderseventyfive,
     DialysisPrintOrderSeventysix,
     DialysisPrintOrderSeventyseven,
+    DialysisPrintOrderSeventyeight,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2347,6 +2366,13 @@ export default {
           style: style2,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 78 ) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -139,6 +139,7 @@
         </template>
       </el-table-column>
     </el-table>
+
     <el-table
       v-if="prescription.type == 2"
       :data="prescription.project"
@@ -169,6 +170,7 @@
       >
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
+
       <el-table-column
         align="center"
         prop="statistical_classification"
@@ -181,6 +183,13 @@
             : "耗材"
         }}</template>
       </el-table-column>
+
+      <el-table-column align="center" prop="name" width="80" label="规格/型号">
+        <template slot-scope="scope">
+          <div>{{ scope.row.spec }}</div>
+        </template>
+      </el-table-column>
+
       <el-table-column
         align="center"
         prop="single_dose"
@@ -191,6 +200,7 @@
           >{{ scope.row.single_dose }}{{ scope.row.unit }}</template
         >
       </el-table-column>
+      
       <el-table-column
         align="center"
         prop="delivery_way"
@@ -199,6 +209,7 @@
       >
         <template slot-scope="scope">{{ scope.row.delivery_way }}</template>
       </el-table-column>
+
       <el-table-column
         align="center"
         prop="execution_frequency"
@@ -209,6 +220,7 @@
           scope.row.execution_frequency
         }}</template>
       </el-table-column>
+
       <el-table-column
         align="center"
         prop="number_days"
@@ -217,11 +229,13 @@
       >
         <template slot-scope="scope">{{ scope.row.number_days }}天</template>
       </el-table-column>
+
       <el-table-column align="center" prop="total" width="50" label="总量">
         <template slot-scope="scope">
           <div>{{ scope.row.total }} {{ scope.row.unit }}</div>
         </template>
       </el-table-column>
+      
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">{{ scope.row.price }}元</template>
       </el-table-column>
@@ -238,11 +252,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="80" label="规格/型号">
-        <template slot-scope="scope">
-          <div>{{ scope.row.spec }}</div>
-        </template>
-      </el-table-column>
+      
 
       <el-table-column align="center" prop="name" width="60" label="金额">
         <template slot-scope="scope">