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

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

@@ -43,7 +43,11 @@
             </span>
 
             <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702">
-              体重增长：{{predialysis&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
+              体重增长：
+              <span v-if="predialysis!=null && last_record!=null">
+                {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
+              </span>
+            
             
             </span>
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>

src/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo.vue

@@ -984,6 +984,7 @@
       },
       //新
       getSelfDrugWarehouseInfoById(id){
+        
         getSelfDrugWarehouseInfoById(id).then(response=>{
            if(response.data.state == 1){
              var info = response.data.data.info

src/xt_pages/stock/selfPreparedMedicine/warehouseInfo.vue

@@ -149,13 +149,13 @@
 
         <el-table-column label="患者名称" align="center">
           <template slot-scope="scope">
-             {{scope.row.patient_id}}
+             {{getPatientName(scope.row.patient_id)}}
           </template>
         </el-table-column>
 
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
-            {{scope.row.creater}}
+            {{getAdminUserName(scope.row.creater)}}
           </template>
         </el-table-column>
 
@@ -459,6 +459,7 @@ export default {
       dealerList:[],
       drugTypeList:[],
       isShow:false,
+      doctorList:[],
     };
   },
 
@@ -480,6 +481,7 @@ export default {
           console.log("list",list)
           var total = response.data.data.total
           this.total = total
+          this.doctorList = response.data.data.doctorList
           console.log("total",total)
         }
       })
@@ -616,7 +618,7 @@ export default {
     },
 
     handleEdit: function (index, row) {
-
+      
       this.$router.push({path:"/stock/selfwarehouse/info/edit?id="+row.id+"&is_sys="+row.is_sys+"&is_check="+row.is_check})
       
     },
@@ -957,6 +959,24 @@ export default {
           }
         }
         return dealer_name
+      },
+      getPatientName(id){
+         var name = ""
+         for(let i=0;i<this.patientList.length;i++){
+            if(id == this.patientList[i].id){
+               name = this.patientList[i].name
+            }
+         }
+         return name
+      },
+      getAdminUserName(admin_user_id){
+         var user_name = ""
+         for(let i=0;i<this.doctorList.length;i++){
+            if(admin_user_id == this.doctorList[i].admin_user_id){
+              user_name = this.doctorList[i].user_name
+            }
+         }
+         return user_name
       }