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

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

                           <template
                             v-if="
                               record.prescription &&
-                              record.prescription.creater
+                              record.prescription.prescription_doctor
                             "
                           >
                             <span
                               v-if="
                                 setAdminUserES(
                                   record.prescription,
-                                  'creater'
+                                  'prescription_doctor'
                                 ) == ''
                               "
                               >{{
                                 getAdminUser(
                                   record.prescription,
-                                  "creater"
+                                  "prescription_doctor"
                                 )
                               }}</span
                             >
                               :src="
                                 setAdminUserES(
                                   record.prescription,
-                                  'creater'
+                                  'prescription_doctor'
                                 )
                               "
                               alt=""

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

                             : "/"
                         }}
                          </span>
-                         {{dialysisOrder.dialysis_irrigation  }}
+                         {{dialysisOrder.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
 
                       </div>
                     </div>
                       导管：
                       <div
                         class="under_line"
-                        style="min-width: 120px; text-align: center"
+                        style="width: 120px; text-align: center;white-space: normal"
                       >
                         {{
                           afterdialysis.catheter ? afterdialysis.catheter : "/"
                   </div>
                 </td>
               </tr>
+              <!--  -->
               <tr v-if="(org_id ==10677 || org_id == 0) && dialysisOrder.quality_nurse_id>0">
                 <td colspan="7" >
                   <div

src/xt_pages/hospitalStation/doctorDesk.vue

           </div>
 
       </div>
-
+      <!-- 电子处方打印弹窗 -->
       <el-dialog
               title="打印"
               :visible.sync="centerDialogVisible"
         })
       }else{
         const style =
-        '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
+        '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 24px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
         printJS({
           printable: 'printMain',
           type: 'html',

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

         <div>透析号：{{ patient.dialysis_no }}</div>
         <div>性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
         <div>年龄：{{ patient.age }} 岁</div>
-        <div v-if="$store.getters.xt_user.org_id  != 0">处方日期：{{ gettime(order.setl_time) }}
+        <div v-if="$store.getters.xt_user.org_id  == 10644">处方日期：{{ gettime(order.setl_time) }}
           <!-- {{ hospital.in_hosptial_time }} 至
           {{ hospital.out_hosptial_time }} -->
         </div>

src/xt_pages/outpatientCharges/statementPrint.vue

           org_id == 10138 ||
           org_id == 9504 ||
           org_id == 10028 ||
-          org_id == 10278 || org_id == 10610 || org_id == 0
+          org_id == 10278 ||
+          org_id == 10610 ||
+          org_id==10537
         "
       >
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
-          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id == 0"
+          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id==10537"
         ></printThree>
         <printFour
-          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088  "
+          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088 || org_id == 0"
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
       <!--      ></printFive>-->
 
       <printSeven
-        v-if="org_id == 10387"
+        v-if="org_id == 10387 "
         :info="info"
         :paramsObj="paramsObj"
         :balanceAccounts="balanceAccounts"
       <printthirteen :info="info" v-if="org_id == 10510"></printthirteen>
       <!-- 广水原生堂 -->
       <printfourteen :info="info" v-if="(org_id == 10088 ) && this.paramsObj.balance_accounts_type == 1"></printfourteen>
+      <!-- 盱眙恒硕 -->
+      <printfivetheen :info="info" v-if="org_id == 10633 || org_id == 0"></printfivetheen>
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 0 &&   org_id != 10610 &&
+            org_id != 0 &&   org_id != 10610 && org_id !=10537 &&
             org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&org_id != 10510 &&org_id != 10088 &&org_id != 0   && this.paramsObj.balance_accounts_type == 1">
       </printOne>
 
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 10278 && org_id != 10610  && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&org_id != 10510  && org_id != 0 && this.paramsObj.balance_accounts_type == 2">
+            org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&org_id != 10510  && org_id != 0 && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
 
     </div>
 import printtwelve from './statementTemplate/printtwelve'
 import printthirteen from './statementTemplate/printthirteen'
 import printfourteen from './statementTemplate/printfourteen'
+import printfivetheen from './statementTemplate/printfivetheen'
 export default {
   name: 'dialysisPrintOrder',
   components: {
     printEleven,
     printtwelve,
     printthirteen,
-    printfourteen
+    printfourteen,
+    printfivetheen,
   },
   props: {
     paramsObj: Object
           })
 
         }else if (
-          this.$store.getters.xt_user.org_id == 10480 || this.$store.getters.xt_user.org_id == 0
+          this.$store.getters.xt_user.org_id == 10480
         ) {
           const style =
-            '@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table tr td {padding: 2px;line-height: 30px;border: 1px solid black;text-align: center;}'
+            '@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;} .statementTable {border-collapse: collapse;} table tr td {padding: 2px;line-height: 30px;border: 1px solid black;text-align: center;}'
           printJS({
             printable: 'statement-print',
             type: 'html',
             style: style,
             scanStyles: false
           })
+        }else if (
+          this.$store.getters.xt_user.org_id == 10633 || this.$store.getters.xt_user.org_id == 0
+        ) {
+          const style =
+            '@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;} .statementTable {border-collapse: collapse;} table tr td {padding: 2px;line-height: 30px;border: 1px solid black;}'
+          printJS({
+            printable: 'statement-print',
+            type: 'html',
+            style: style,
+            scanStyles: false
+          })
+
         } else {
           const style =
-            '@media print {#statement-print{font-size:16px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}'
+            '@media print {#statement-print{font-size:16px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;} .statementTable{border-collapse: collapse;} table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}'
           printJS({
             printable: 'statement-print',
             type: 'html',

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

           <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
           <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
         <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10610" src="https://kuyi.shengws.com/156.jpg" alt="">
+        <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10537" src="https://kuyi.shengws.com/xuwenshou.jpg" alt="">
 
           <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
           <div style="display:flex;">
           </div>
           <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
           <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
-        <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/157.jpg" alt="">
-
+          <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/157.jpg" alt="">
+          <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/xuwenwei.jpg" alt="">
       </div>
       <div v-else id='prescription-print' class="prescription-print" style="position: relative;">
           <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
           <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
         <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10610" src="https://kuyi.shengws.com/156.jpg" alt="">
+        <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10537" src="https://kuyi.shengws.com/xuwenshou.jpg" alt="">
 
 
           <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
           </div>
           <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
           <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10278"src="https://kuyi.shengws.com/bailinbeier.png" alt="">
-        <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/157.jpg" alt="">
-
+          <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/157.jpg" alt="">
+          <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/xuwenwei.jpg" alt="">
 
       </div>
   </div>

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

       />
       <img
         style="width: 100%; height: 80px"
-        v-if="org_id == 10610 || org_id == 0"
+        v-if="org_id == 10610"
         src="@/assets/img/penggang_top.jpg"
         alt=""
       />
+      <img
+        style="width: 100%; height: 80px"
+        v-if="org_id == 10537 || org_id == 0"
+        src="https://kuyi.shengws.com/xuwenshou.jpg"
+        alt=""
+      />
       <div class="printTitle" v-if="org_id ==10598||org_id==0">孝感源生堂血液透析中心</div>
       <div class="printTitle">检验申请单</div>
 
       />
       <img
         style="width: 100%"
-        v-if="org_id == 10610 || org_id == 0"
+        v-if="org_id == 10610"
         src="@/assets/img/penggang_bottom.jpg"
         alt=""
       />
+      <img
+        style="width: 100%"
+        v-if="org_id == 10537 || org_id == 0"
+        src="https://kuyi.shengws.com/xuwenwei.jpg"
+        alt=""
+      />
     </div>
   </div>
 </template>

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

         </el-select>
       </el-form-item>
 
-      <el-form-item label="发病日期: " prop="name" style="width: 49%">
+      <el-form-item label="就诊日期: " prop="name" style="width: 49%">
         <el-date-picker
           style="width: 100%"
           v-model="start_time"

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

 <template>
     <div id='prescriptionPrint'>
         <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
-
+            <span v-if="org_id == 10537 || org_id ==0">
+              <img
+                src="	https://kuyi.shengws.com/xuwenshou.jpg"
+                style="width: 100%"
+                alt=""/>
+            </span>
             <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;" >
                 <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
                     <span>费别</span>
 
             <div class="printTitle">{{orgname}}</div>
             <div class="printTitle">处方、治疗单</div>
-<!-- class="infoTitle" -->
+            <!-- class="infoTitle" -->
             <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
                 <div style="width: 300px;">门诊编号：</div>
                 <div style="width: 300px;">电脑号：</div>
                     <td style="width:16px;"></td>
                 </tr>
             </table>
+            <span v-if="org_id == 10537 || org_id ==0">
+            <img
+              src="https://kuyi.shengws.com/xuwenwei.jpg"
+              style="width: 100%"
+              alt=""
+            /></span>
         </div>
 
 

src/xt_pages/stock/drugs/historyDrugInvetory.vue

             </el-table-column>
             <el-table-column label="入库数量"  align="center">
               <template slot-scope="scope">
-                {{scope.row.warehousing_count}}
+                {{scope.row.warehousing_count}}{{scope.row.max_unit}}
               </template>
             </el-table-column>
             <el-table-column label="有效期"  align="center">

src/xt_pages/stock/drugs/newDrugInventory.vue

                 list[i].drug_name = list[i].XtBaseDrug.drug_name
                 list[i].specification_name = list[i].XtBaseDrug.dose +list[i].XtBaseDrug.dose_unit + "*"+list[i].XtBaseDrug.min_number +list[i].XtBaseDrug.min_unit+"/"+list[i].XtBaseDrug.max_unit
                 list[i].warehouseing_unit = list[i].max_unit
-                list[i].max_unit = list[i].XtBaseDrug.max_unit
-                list[i].min_unit = list[i].XtBaseDrug.min_unit
+                list[i].base_max_unit = list[i].XtBaseDrug.max_unit
+                list[i].base_min_unit = list[i].XtBaseDrug.min_unit
                 list[i].last_stock_max_number = ""
                 list[i].last_stock_min_number = ""
                 list[i].min_number = list[i].XtBaseDrug.min_number