Merge remote-tracking branch 'origin/20220812' into 20220812

src/xt_pages/Pharmacy/DispensingDetails.vue

@@ -71,7 +71,7 @@
         :class="signAndWeighBoxPatients"
         border
       >
-        <el-table-column type="index" label="序号" align="center">
+        <el-table-column type="index" label="序号" align="center" width="100">
         </el-table-column>
         <el-table-column label="患者名称" align="center">
           <template slot-scope="scope">
@@ -212,4 +212,25 @@ export default {
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 15px !important;
+  height: 15px !important;
+}
 </style>

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -223,21 +223,19 @@
         </div>
       </div>
 
-      <el-dialog
-        title="设置"
-        :visible.sync="dialogVisible"
-        width="30%">
-        <span>请选择药品是否要通过药房管理出库</span>
-        <span>
+      <el-dialog title="设置" :visible.sync="dialogVisible" width="30%">
+        <span style="font-size: 17px">请选择药品是否要通过药房管理出库</span>
+        <span style="display: block; padding: 18px 25px">
           <el-radio v-model="is_open" label="1">是</el-radio>
           <el-radio v-model="is_open" label="2">否</el-radio>
         </span>
-        <span>
+        <div style="height: 50px; background: #c7ebfc; border-radius: 5px;padding: 7px;">
+          <i class="el-icon-info" style="color: #3399ff;font-size: 17px;"></i>
           若选择为是，则通过药房发药的药品都会在发药之后进行出库，否则按原来的方式进行出库管理
-        </span>
+        </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="SaveSetting">确 定</el-button>
+          <el-button type="primary" @click="SaveSetting">保 存</el-button>
         </span>
       </el-dialog>
     </div>
@@ -616,4 +614,25 @@ export default {
     justify-content: flex-end;
   }
 }
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 15px !important;
+  height: 15px !important;
+}
 </style>

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -529,4 +529,25 @@ export default {
     justify-content: flex-end;
   }
 }
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 15px !important;
+  height: 15px !important;
+}
 </style>

src/xt_pages/Pharmacy/print/drugPrint.vue

@@ -150,7 +150,9 @@ export default {
       //     scanStyles: false,
       //   });
       this.printJson({
-        title: `<div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">${this.org_name}医院 领药单</div>
+        title: `
+        <div>
+        <div style="width: 940px;text-align:center;font-size:16px;font-weight:bold;">${this.org_name}医院 领药单</div>
         <div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;font-size:14px;">
         <div style="width: 230px;padding: 10px 0;">药品名称：${this.name}</div>
         <div style="width: 230px;padding: 10px 0;">规格：${this.specifications}</div>
@@ -213,6 +215,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/deep/ .el-dialog{
+  width: 60%;
+}
 .print_style {
   position: absolute;
   right: 10px;

src/xt_pages/Pharmacy/print/patientPrint.vue

@@ -13,6 +13,7 @@
       <div class="list_title">
         <div>患者名称：{{name}}</div>
         <div>发药状态：{{state}}</div>
+        <div>日期：</div>
       </div>
 
       <el-table