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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13769"
+  "version": "2999.999.13776"
 }

src/pages/main/DialysisArea.vue

@@ -1147,12 +1147,12 @@ export default {
           it.sort = parseInt(it.device_number.sort)
         })
       })
-      if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 && this.$store.getters.user.template_info.org_id != 10340 && this.$store.getters.user.template_info.org_id != 10599 && this.$store.getters.user.template_info.org_id != 10597 && this.$store.getters.user.template_info.org_id != 10679 && this.$store.getters.user.template_info.org_id != 10702  && this.$store.getters.user.template_info.org_id != 10721) {
+      if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 && this.$store.getters.user.template_info.org_id != 10340 && this.$store.getters.user.template_info.org_id != 10599 && this.$store.getters.user.template_info.org_id != 10597 && this.$store.getters.user.template_info.org_id != 10679 && this.$store.getters.user.template_info.org_id != 10702  && this.$store.getters.user.template_info.org_id != 10721  && this.$store.getters.user.template_info.org_id != 10740) {
         arr5.map(item => {
           item.scheduals.sort(this.compare('bedNumber'))
         })
       }
-      if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490  || this.$store.getters.user.template_info.org_id == 10340  || this.$store.getters.user.template_info.org_id == 10599 || this.$store.getters.user.template_info.org_id == 10597  || this.$store.getters.user.template_info.org_id == 10679 || this.$store.getters.user.template_info.org_id == 10702 | this.$store.getters.user.template_info.org_id == 10721 ) {
+      if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490  || this.$store.getters.user.template_info.org_id == 10340  || this.$store.getters.user.template_info.org_id == 10599 || this.$store.getters.user.template_info.org_id == 10597  || this.$store.getters.user.template_info.org_id == 10679 || this.$store.getters.user.template_info.org_id == 10702 || this.$store.getters.user.template_info.org_id == 10721 || this.$store.getters.user.template_info.org_id == 10740 ) {
         arr5.map(item => {
           item.scheduals.sort(this.compare('sort'))
         })
@@ -1347,12 +1347,12 @@ export default {
           it.sort = parseInt(it.device_number.sort)
         })
       })
-      if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 &&  this.$store.getters.user.template_info.org_id != 10340 &&  this.$store.getters.user.template_info.org_id != 10599  &&  this.$store.getters.user.template_info.org_id != 10597  &&  this.$store.getters.user.template_info.org_id != 10679 &&  this.$store.getters.user.template_info.org_id != 10702  &&  this.$store.getters.user.template_info.org_id != 10721) {
+      if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 &&  this.$store.getters.user.template_info.org_id != 10340 &&  this.$store.getters.user.template_info.org_id != 10599  &&  this.$store.getters.user.template_info.org_id != 10597  &&  this.$store.getters.user.template_info.org_id != 10679 &&  this.$store.getters.user.template_info.org_id != 10702  &&  this.$store.getters.user.template_info.org_id != 10721  &&  this.$store.getters.user.template_info.org_id != 10740) {
         arr5.map(item => {
           item.scheduals.sort(this.compare('bedNumber'))
         })
       }
-      if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 10599 ||this.$store.getters.user.template_info.org_id == 10597 ||this.$store.getters.user.template_info.org_id == 10679 ||this.$store.getters.user.template_info.org_id == 10702 ||this.$store.getters.user.template_info.org_id == 10721 ) {
+      if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 10599 ||this.$store.getters.user.template_info.org_id == 10597 ||this.$store.getters.user.template_info.org_id == 10679 ||this.$store.getters.user.template_info.org_id == 10702 ||this.$store.getters.user.template_info.org_id == 10721 ||  this.$store.getters.user.template_info.org_id == 10740 ) {
         arr5.map(item => {
           item.scheduals.sort(this.compare('sort'))
         })
@@ -1618,12 +1618,12 @@ export default {
           it.sort = parseInt(it.device_number.sort)
         })
       })
-      if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 && this.$store.getters.user.template_info.org_id != 10340 && this.$store.getters.user.template_info.org_id != 10679 && this.$store.getters.user.template_info.org_id != 10702 && this.$store.getters.user.template_info.org_id != 10721) {
+      if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 && this.$store.getters.user.template_info.org_id != 10340 && this.$store.getters.user.template_info.org_id != 10679 && this.$store.getters.user.template_info.org_id != 10702 && this.$store.getters.user.template_info.org_id != 10721 && this.$store.getters.user.template_info.org_id != 10740) {
         arr5.map(item => {
           item.scheduals.sort(this.compare('bedNumber'))
         })
       }
-      if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 10679 || this.$store.getters.user.template_info.org_id == 10702 || this.$store.getters.user.template_info.org_id == 10721) {
+      if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 10679 || this.$store.getters.user.template_info.org_id == 10702 || this.$store.getters.user.template_info.org_id == 10721 || this.$store.getters.user.template_info.org_id == 10740) {
         arr5.map(item => {
           item.scheduals.sort(this.compare('sort'))
         })

src/pages/main/WaitingArea.vue

@@ -1203,7 +1203,7 @@ export default {
         arr2 = arr
       }
       console.log('机构ID', this.$store.getters.user.template_info.org_id)
-      if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 ||  this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587 || this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10599 || this.$store.getters.user.template_info.org_id == 10679  || this.$store.getters.user.template_info.org_id == 10702) {
+      if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 ||  this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587 || this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10599 || this.$store.getters.user.template_info.org_id == 10679  || this.$store.getters.user.template_info.org_id == 10702 || this.$store.getters.user.template_info.org_id == 10740 ) {
         console.log('进来23323223233223')
         arr2.map(item => {
           item.scheduals.map(it => {
@@ -1260,11 +1260,11 @@ export default {
           item.created_time = item.assessment_before_dislysis.created_time
           item.sort = item.device_number.sort
         })
-        if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 &&  this.$store.getters.user.template_info.org_id != 10340 &&  this.$store.getters.user.template_info.org_id != 10702) {
+        if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 &&  this.$store.getters.user.template_info.org_id != 10340 &&  this.$store.getters.user.template_info.org_id != 10702 &&  this.$store.getters.user.template_info.org_id != 10740  ) {
           arr4[0].scheduals.sort(this.compare('created_time'))
         }
 
-        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 ||  this.$store.getters.user.template_info.org_id == 10340 ||  this.$store.getters.user.template_info.org_id == 10702) {
+        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 ||  this.$store.getters.user.template_info.org_id == 10340 ||  this.$store.getters.user.template_info.org_id == 10702  || this.$store.getters.user.template_info.org_id == 10740 ) {
           arr4[0].scheduals.sort(this.compareOne('sort'))
         }
         console.log("arr4[0]", arr4[0])
@@ -1452,11 +1452,11 @@ export default {
           item.created_time = item.assessment_before_dislysis.created_time
           item.sort = item.device_number.sort
         })
-        if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 && this.$store.getters.user.template_info.org_id != 10340 && this.$store.getters.user.template_info.org_id != 10579 && this.$store.getters.user.template_info.org_id != 10587  && this.$store.getters.user.template_info.org_id != 10597 && this.$store.getters.user.template_info.org_id != 10599 && this.$store.getters.user.template_info.org_id != 10679 && this.$store.getters.user.template_info.org_id != 10702) {
+        if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 && this.$store.getters.user.template_info.org_id != 10340 && this.$store.getters.user.template_info.org_id != 10579 && this.$store.getters.user.template_info.org_id != 10587  && this.$store.getters.user.template_info.org_id != 10597 && this.$store.getters.user.template_info.org_id != 10599 && this.$store.getters.user.template_info.org_id != 10679 && this.$store.getters.user.template_info.org_id != 10702 && this.$store.getters.user.template_info.org_id != 10740) {
           arr4[0].scheduals.sort(this.compare('created_time'))
         }
 
-        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340  || this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587 || this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10599 || this.$store.getters.user.template_info.org_id == 10679 || this.$store.getters.user.template_info.org_id == 10702)  {
+        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340  || this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587 || this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10599 || this.$store.getters.user.template_info.org_id == 10679 || this.$store.getters.user.template_info.org_id == 10702 || this.$store.getters.user.template_info.org_id == 10740)  {
           arr4[0].scheduals.sort(this.compareOne('sort'))
         }
         this.allPatient = arr4
@@ -1473,7 +1473,7 @@ export default {
           item.sort = item.device_number.sort
         })
        
-        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340  || this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587 || this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10599 || this.$store.getters.user.template_info.org_id == 10702) {
+        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340  || this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587 || this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10599 || this.$store.getters.user.template_info.org_id == 10702 && this.$store.getters.user.template_info.org_id != 10740) {
           arr4[0].scheduals.sort(this.compareOne('sort'))
         }
         this.allPatient = arr4
@@ -1619,11 +1619,11 @@ export default {
           item.sort = item.device_number.sort
         })
 
-        if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490  && this.$store.getters.user.template_info.org_id != 10340 && this.$store.getters.user.template_info.org_id != 10679 && this.$store.getters.user.template_info.org_id != 10702) {
+        if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490  && this.$store.getters.user.template_info.org_id != 10340 && this.$store.getters.user.template_info.org_id != 10679 && this.$store.getters.user.template_info.org_id != 10702 && this.$store.getters.user.template_info.org_id != 10740 ) {
           arr4[0].scheduals.sort(this.compare('created_time'))
         }
 
-        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id ==10490 || this.$store.getters.user.template_info.org_id ==10340  || this.$store.getters.user.template_info.org_id ==10679  || this.$store.getters.user.template_info.org_id ==10702) {
+        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id ==10490 || this.$store.getters.user.template_info.org_id ==10340  || this.$store.getters.user.template_info.org_id ==10679  || this.$store.getters.user.template_info.org_id ==10702 || this.$store.getters.user.template_info.org_id ==10740 ) {
           arr4[0].scheduals.sort(this.compareOne('sort'))
         }
         this.allPatient = arr4

src/pages/main/dialog/hisOrder.vue

@@ -14,9 +14,9 @@
       </van-sticky>
       <van-tabs v-model="activeTab" sticky class="hisOrderTabs">
         <van-tab v-for="(item,index) in prescriptions" :key="index" :name='item.name'>
-          <template #title>{{ item.name }}
+          <!-- <template #title>{{ item.name }}
             <van-icon name="close" @click="deletePrescription(item.id,item.order_status,item.name)"/>
-          </template>
+          </template> -->
           <van-sticky>
             <div class="newAdd" @click="newAdd"><img src="../../../assets/images/his1.png" alt="">
               <p>新增</p></div>
@@ -42,8 +42,8 @@
                 <div style="flex:1">
                   处方内容：<span class="preContent">{{subItem.drug_name}}</span>
                 </div>
-                <van-icon name="delete" class="deleteIcon"
-                          @click="deleteHisDoctorAdvice(subItem.advice_id, item.order_status,item.name,subIndex)"/>
+                <!-- <van-icon name="delete" class="deleteIcon"
+                          @click="deleteHisDoctorAdvice(subItem.advice_id, item.order_status,item.name,subIndex)"/> -->
               </div>
               <div class="preCell">
                 <div class="preCellOne">
@@ -124,8 +124,8 @@
                 <div style="flex:1">
                   处方内容：<span class="preContent">{{subItem.project_name}}</span>
                 </div>
-                <van-icon name="delete" class="deleteIcon"
-                          @click="deleteProject(subItem.id,item.order_status,item.name,subIndex)"/>
+                <!-- <van-icon name="delete" class="deleteIcon"
+                          @click="deleteProject(subItem.id,item.order_status,item.name,subIndex)"/> -->
               </div>
               <div class="preCell">
                 <div class="preCellOne preCellTwo">
@@ -1202,7 +1202,8 @@
 
 
 
-      }, deleteHisDoctorAdvice(id, order_status, name, subIndex) {
+      },
+       deleteHisDoctorAdvice(id, order_status, name, subIndex) {
 
         if (order_status == 2) {
           this.$toast({

src/pages/main/newActionBar/consumables.vue

@@ -585,7 +585,7 @@ export default {
           var dialyszerArr = []
           var irrigationArr = []
           var dialysisStrainerArr = []
-          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10402 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10489 && this.$store.getters.user.template_info.org_id != 10215 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10265 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10278 && this.$store.getters.user.template_info.org_id != 10480 && this.$store.getters.user.template_info.org_id != 10598 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10610 && this.$store.getters.user.template_info.org_id != 10265 && this.$store.getters.user.template_info.org_id != 10164 && this.$store.getters.user.template_info.org_id != 10726 && this.$store.getters.user.template_info.org_id != 10721 && this.$store.getters.user.template_info.org_id != 10731 && this.$store.getters.user.template_info.org_id != 10726) {
+          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10402 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10489 && this.$store.getters.user.template_info.org_id != 10215 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10265 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10278 && this.$store.getters.user.template_info.org_id != 10480 && this.$store.getters.user.template_info.org_id != 10598 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10610 && this.$store.getters.user.template_info.org_id != 10265 && this.$store.getters.user.template_info.org_id != 10164 && this.$store.getters.user.template_info.org_id != 10726 && this.$store.getters.user.template_info.org_id != 10721 && this.$store.getters.user.template_info.org_id != 10731 && this.$store.getters.user.template_info.org_id != 10726 && this.$store.getters.user.template_info.org_id != 10644 && this.$store.getters.user.template_info.org_id != 10721) {
             if (prescription != null && res.data.dialysis_goods[0].good_user_detail.length == 0) {
               var dialysisDialyszers = prescription.dialysis_dialyszers
               var arr = dialysisDialyszers.split(',')

src/pages/main/newActionBar/doctorAdvice.vue

@@ -775,6 +775,9 @@ export default {
                 
                 Toast.success('单位不统一,执行失败!')
               }
+              if(response.data.data.msg == 12){
+                Toast.success('请选择正确的自备药!')
+              }
             } else {
               for (let index = 0; index < group.advices.length; index++) {
                 const adv = group.advices[index]