Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/index.vue

@@ -2384,7 +2384,7 @@ export default {
         this.patient_id = schedual.patient_id
         this.date = schedual.schedule_date
          this.getScheduleDetail();
-        console.log('schedual',schedual);
+        // console.log('schedual',schedual);
         //this.getLongAdvice();
 
         var patient_id = schedual.patient_id

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -28,7 +28,7 @@
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
-          v-if="org_id == 10138 || org_id == 10278  "
+          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610"
         ></printThree>
         <printFour
           v-if="org_id == 9504 || org_id == 10028 || org_id == 10088  "

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -4,6 +4,8 @@
            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="">
+
           <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
           <div style="display:flex;">
               <div>单据号：<span
@@ -151,11 +153,14 @@
           </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="">
 
       </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="">
+
 
           <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
           <div style="display:flex;">
@@ -298,7 +303,9 @@
               </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-else src="https://kuyi.shengws.com/bailinbeier.png" 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="">
+
 
       </div>
   </div>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -4441,8 +4441,8 @@ export default {
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$message({ message: '预核验成功', type: 'success', duration: 5000 })
+                // that.order.is_upload_diagnose = 1
               }
 
             }
@@ -4480,8 +4480,7 @@ export default {
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$message({ message: '签名成功', type: 'success', duration: 5000 })
               }
 
             }
@@ -4518,8 +4517,7 @@ export default {
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$message({ message: '处方上传成功', type: 'success', duration: 5000 })
               }
 
             }
@@ -4556,8 +4554,7 @@ export default {
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$message({ message: '撤销成功', type: 'success', duration: 5000 })
               }
 
             }
@@ -4594,8 +4591,15 @@ export default {
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$confirm(response.data.data.info, '医保信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+
+                })
+
               }
 
             }
@@ -4632,8 +4636,14 @@ export default {
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$confirm(response.data.data.info, '医保信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+
+                })
               }
 
             }
@@ -4670,8 +4680,14 @@ export default {
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$confirm(response.data.data.info, '医保信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+
+                })
               }
 
             }