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

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,12 +14,12 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485  " :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 &&org_id !=0 " :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
      <list-print-three v-if="org_id == 10215 || org_id==9675  || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
-      <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <print-two10265  v-if="org_id == 10265 || org_id ==0 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -15,12 +15,12 @@
             ></TR>
           
           <TR>
-            <TD colspan="1">个人编码:{{ order.psn_no }}</TD>
-            <TD>住院号：{{ order.mdtrt_id }}</TD>
-            <TD>姓名：{{ order.psn_name }}</TD>
-            <TD>性别：{{ patient.gender == 1 ? "男" : "女" }}</TD>
+            <TD colspan="2">个人编码:{{ order.psn_no }}</TD>
+            <TD colspan="2">住院号：{{ order.mdtrt_id }}</TD>
           </TR>
           <TR>
+            <TD>姓名：{{ order.psn_name }}</TD>
+            <TD>性别：{{ patient.gender == 1 ? "男" : "女" }}</TD>
             <TD> 入院科室：血液透析室 </TD>
             <TD> 出院科室：血液透析室 </TD>
           </TR>

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/printOne.vue

@@ -16,7 +16,19 @@
           :key="index"
       >
         <img style="width:100%;height:80px" v-if="org_id == 10138 " src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
-        <img style="width:100%;height:80px" v-if="org_id == 10278 || org_id==0" src="https://kuyi.shengws.com/beierlog.png" alt="">
+        <img style="width:100%;height:80px" v-if="org_id == 10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
+        <span v-if="org_id == 10610 ">
+          <img
+            src="@/assets/img/penggang_top.jpg"
+            style="width: 100%;height:80px"
+            alt=""
+        /></span>
+        <span v-if="org_id == 10537 ||org_id ==0">
+          <img
+            src="	https://kuyi.shengws.com/xuwenshou.jpg"
+            style="width: 100%;height:80px"
+            alt=""/>
+        </span>
         <div class="printTitle">检验申请单</div>
 
         <div style="border: 1px solid #000;margin-bottom: 10px;">
@@ -133,8 +145,20 @@
           </div>
         </div>
 
-        <img style="width:100%;" v-if="org_id == 10138 || org_id == 0" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
+        <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
+        <span v-if="org_id == 10610 ">
+            <img
+              src="@/assets/img/penggang_bottom.jpg"
+              style="width: 100%;height:80px"
+              alt=""
+        /></span>
+        <span v-if="org_id == 10537 ||org_id ==0">
+        <img
+          src="@/assets/img/xuwendizhi.jpg"
+          style="width: 100%;height:80px"
+          alt=""
+        /></span>
       </div>
 
     </div>
@@ -142,7 +166,7 @@
 </template>
 <script>
 import { uParseTime } from '@/utils/tools'
-import { getAllDoctorList } from '@/api/project/project'
+import { getAllDoctorList,getPrescriptionPrint } from '@/api/project/project'
 import { getInitData } from '@/api/his/his'
 
 export default {

src/xt_pages/outpatientDoctorStation/batch_print_template/batchPrintThree.vue

@@ -20,6 +20,18 @@
               style="width: 100%"
               alt=""
             /></span>
+            <span v-if="org_id == 10610 ">
+              <img
+                src="@/assets/img/penggang_top.jpg"
+                style="width: 100%"
+                alt=""
+            /></span>
+            <span v-if="org_id == 10537 ||org_id ==0">
+              <img
+                src="	https://kuyi.shengws.com/xuwenshou.jpg"
+                style="width: 100%"
+                alt=""/>
+            </span>
           <div class="printTitle">
             处方笺
             <span
@@ -232,6 +244,18 @@
             style="width: 100%"
             alt=""
           /></span>
+          <span v-if="org_id == 10610 ">
+            <img
+              src="@/assets/img/penggang_bottom.jpg"
+              style="width: 100%"
+              alt=""
+          /></span>
+          <span v-if="org_id == 10537 ||org_id ==0">
+          <img
+            src="@/assets/img/xuwendizhi.jpg"
+            style="width: 100%"
+            alt=""
+          /></span>
           <!-- <div class="doctorBox">
               <p>医师：{{item.doctor?item.doctor:""}}</p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>

src/xt_pages/outpatientDoctorStation/batch_print_template/index.vue

@@ -13,7 +13,7 @@
       </template> -->
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 0">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10610 &&org_id != 10537 && org_id != 0">
         <printOne v-if="org_id != 10215" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
 <!--        <batch-print-two v-if="org_id == 10088 || org_id == 0" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></batch-print-two>-->
 <!--        <print-six v-if="org_id == 10088 || org_id == 0" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></print-six>-->

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/index.vue

@@ -13,9 +13,9 @@
       </template> -->
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id != 0" :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id != 10610 &&org_id != 10537 && org_id != 0" :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
 <!--        <printTwo v-else :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>-->
-        <treat-batch-print v-if="org_id == 10138 || org_id == 10278 || org_id == 0"   :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></treat-batch-print>
+        <treat-batch-print v-if="org_id == 10138 || org_id == 10278 || org_id == 10610 || org_id == 10537 || org_id == 0"   :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></treat-batch-print>
       </div>
   </div>
 </template>

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/treatBatchPrint.vue

@@ -22,6 +22,18 @@
           style="width: 100%"
           alt=""
         /></span>
+        <span v-if="org_id == 10610 ">
+          <img
+            src="@/assets/img/penggang_top.jpg"
+            style="width: 100%"
+            alt=""
+        /></span>
+        <span v-if="org_id == 10537 ||org_id ==0">
+          <img
+            src="	https://kuyi.shengws.com/xuwenshou.jpg"
+            style="width: 100%"
+            alt=""/>
+        </span>
       <div class="printTitle">
         治疗单
         <span
@@ -210,6 +222,18 @@
         style="width: 100%"
         alt=""
       /></span>
+      <span v-if="org_id == 10610 ">
+        <img
+          src="@/assets/img/penggang_bottom.jpg"
+          style="width: 100%"
+          alt=""
+      /></span>
+      <span v-if="org_id == 10537 ||org_id ==0">
+      <img
+        src="@/assets/img/xuwendizhi.jpg"
+        style="width: 100%"
+        alt=""
+      /></span>
       <div style="page-break-after: always"></div>
 
     </div>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3779,6 +3779,7 @@ export default {
                     retail_price: temp3[b].drug.retail_price.toString(),
                     remark: '',
                     day: '1',
+                    is_medicine:0,
                     prescribing_number: temp3[b].prescribing_number,
                     single_dose_unit: temp3[b].drug.drug_dose_unit,
                     prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
@@ -3844,6 +3845,7 @@ export default {
                     prescribing_number_unit: temp[b].prescribing_number_unit,
                     medical_insurance_number: temp[b].medical_insurance_number,
                     drug: temp[b],
+                    is_medicine:0,
                     groupno: index + temp_index,
                     hosp_appr_flag: '1',
                     execution_state: 2
@@ -3959,6 +3961,8 @@ export default {
                   retail_price: temp3[b].drug.retail_price.toString(),
                   remark: '',
                   day: '1',
+                  is_medicine:0,
+
                   prescribing_number: temp3[b].prescribing_number,
                   single_dose_unit: temp3[b].drug.drug_dose_unit,
                   prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
@@ -4030,7 +4034,9 @@ export default {
                   drug: temp[b],
                   groupno: index + temp_index,
                   hosp_appr_flag: '1',
-                  execution_state: 2
+                  execution_state: 2,
+                  is_medicine:0,
+
 
                 }
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -82,7 +82,7 @@
                                   style="width:50%" placeholder=""></el-input>
                         <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
                         <el-select :disabled="scope.row.is_medicine == 1" v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
-                                   @change="getPrescribingNumberUnit(scope.row)">
+                                   @change="getPrescribingNumberUnit(scope)">
                             <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
                             <el-option :label="scope.row.drug.max_unit"
                                        v-if="scope.row.drug.min_unit != scope.row.drug.max_unit"
@@ -372,8 +372,7 @@
         })
 
       }, deleteDrug: function(index, row) {
-        console.log(row)
-        if (row.is_medicine == 1){
+        if (row.hasOwnProperty('is_medicine')&&row.is_medicine == 1){
           this.$message.error('该处方包含已发药的药品，无法删除')
           return
         }
@@ -526,11 +525,11 @@
 
       },
       getAllChangeTwo(scope) {
-        console.log("战国阿道夫阿道夫阿道夫",scope)
-        if (scope.row.is_medicine == 1){
-          this.$message.error('该处方包含已发药的药品，无法修改')
-          return
-        }
+        // console.log("战国阿道夫阿道夫阿道夫",scope)
+        // if (scope.row.hasOwnProperty('is_medicine')&&scope.row.is_medicine == 1){
+        //   this.$message.error('该处方包含已发药的药品，无法修改')
+        //   return
+        // }
         if(this.$store.getters.xt_user.org_id != 10206) {
           console.log('yyyyyyyy',scope);
           if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
@@ -575,7 +574,7 @@
       },
 
       getPrescribingNumberUnit(scope) {
-        if (scope.row.is_medicine == 1){
+        if (scope.row.hasOwnProperty('is_medicine')&&scope.row.is_medicine == 1){
           this.$message.error('该处方包含已发药的药品，无法修改')
           return
         }
@@ -609,10 +608,10 @@
         }
       },
       changePrescribingNumber(scope) {
-        if (scope.row.is_medicine == 1){
-          this.$message.error('该处方包含已发药的药品，无法修改')
-          return
-        }
+        // if (scope.row.hasOwnProperty('is_medicine')&&scope.row.is_medicine == 1){
+        //   this.$message.error('该处方包含已发药的药品，无法修改')
+        //   return
+        // }
         //  var max_number = 0
         //  if(scope.row.prescribing_number_unit == scope.row.drug.max_unit){
         //     max_number = parseInt(scope.row.prescribing_number) * scope.row.drug.min_number