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

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -3365,6 +3365,8 @@ mu
                 ParamsQuery['mode'] = '1'
                 ParamsQuery['patient_id'] = this.patient.id
                 console.log('第一', ParamsQuery)
+             
+
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)

src/xt_pages/dialysis/details/index.vue

@@ -549,7 +549,7 @@
                   <span style="display: block;width: 45%;">处方脱水量：{{main_collection.prescription.prescription_water}}
                     <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460">ml</span>
                      <span v-else>L</span>
-                  </span> 
+                  </span>
                   <span style="display: block;width: 50%;">
                     血流量：{{ main_collection.prescription.blood_flow_volume }} ml/min
                   </span>
@@ -572,7 +572,7 @@
                   <div style="">透析器:
                    <span>{{main_collection.prescription.dialysis_dialyszers }}&nbsp;&nbsp; {{main_collection.prescription.dialysis_irrigation}}&nbsp;&nbsp; {{main_collection.prescription.dialysis_strainer}}</span>
                   </div>
-                 
+
                 </div>
               </div>
             </div>
@@ -2577,7 +2577,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679 || this.org_id==10702){
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679 || this.org_id==10702 || this.org_id==10721){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0
@@ -2756,7 +2756,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702){
+        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702 || this.org_id == 10721){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0
@@ -3290,7 +3290,7 @@ export default {
         }else{
           this.time_value
         }
-        
+
       }
     },
     timestamp(start_time) {
@@ -3299,7 +3299,7 @@ export default {
     }
 
   },
- 
+
   watch:{
     time_value:{
       handler(newValue,oldValue){