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

src/api/dialysis.js

@@ -241,7 +241,7 @@ export function postDelMonitorInfo(params) {
 }
 
 export function CreateGroupAdvice(id, groupno, advices) {
-  console.log('中国人名', advices)
+ 
   return request({
     url: '/api/advice_remind/create?id=' + id + '&groupno=' + groupno,
     method: 'post',
@@ -290,3 +290,5 @@ export function GetDialysisGoodStatistics(params) {
 
   })
 }
+
+

src/xt_pages/data/druguseTemplate.vue

@@ -1817,7 +1817,7 @@
             var arr = this.templateForm.advice_name.split("(自备药)")
             this.templateForm.advice_name = arr[0]
         }
-        console.log("2222",this.templateForm)
+        // console.log("2222",this.templateForm)
 
         this.$refs[formName].validate(valid => {
           this.templateForm.single_dose = parseFloat(this.templateForm.single_dose)

src/xt_pages/dialysis/components/allSummary.vue

@@ -298,7 +298,7 @@ export default {
               }
 
 
-             console.log("2222222",arr)
+            //  console.log("2222222",arr)
 
 
               let newObj = {
@@ -323,7 +323,7 @@ export default {
 
               }
               }
-              console.log("list22222",this.list)
+              // console.log("list22222",this.list)
              }
           })
         },

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

@@ -3218,11 +3218,9 @@
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1));
       },
+     
     },
-    // created(){
-    //   var org_id =  this.$store.getters.xt_user.template_info.org_id
-    //   console.log("org_id-----",org_id)
-    // },
+  
     watch: {
       'dialysisPrescription.dialysis_duration_hour': function() {
         let dialysis_duration_minute = 0

src/xt_pages/dialysis/details/index.vue

@@ -970,7 +970,7 @@ export default {
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-          // console.log("患者排班信息99999999",schedual)
+          console.log("患者排班信息99999999",schedual)
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
@@ -1118,8 +1118,9 @@ export default {
           
           this.his_is_open = resp.data.is_open_config.is_open
           console.log(this.his_is_open)
-
-
+          
+          // var stockType =  resp.data.stockType
+          // console.log("stockTYPW",stockType)
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1
           }

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -544,7 +544,7 @@
                         </span>
                       </td>
                       <td>{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
-                      <td>{{ monitor.conductivity ? monitor.conductivity : "" }}
+                      <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}
                       </td>
                       <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
                         {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}

src/xt_pages/upload/fast/basicInfo.vue

@@ -198,7 +198,7 @@ export default {
     watch:{
         patient:{
             handler:function(val) {
-                console.log(1111111111111,val)
+                // console.log(1111111111111,val)
                 Object.keys(val).map((item,index) => {
                     this.$set(this.form, item, val[item])
                     this.$forceUpdate()