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

config/dev.env.js

@@ -7,7 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
+   BASE_API: '"http://api.xt.test.sgjyun.com"',
+  // BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -19,8 +19,8 @@ module.exports = {
 
     //  host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    // host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+    host: 'xt.test.sgjyun.com',
+    // host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/common/common.js

@@ -200,7 +200,6 @@ export function getTotalDialysisCount(startime, endtime) {
     startime: startime,
     endtime: endtime
   }
-  console.log('透析年龄======', params)
   return request({
     url: '/com/api/gettotaldialysiscount',
     method: 'get',
@@ -503,3 +502,11 @@ export function getMonthBloodList(params) {
     params: params
   })
 }
+
+export function getIdSlist(data, patientid) {
+  return request({
+    url: '/com/api/getidslist?patientid=' + patientid,
+    method: 'post',
+    data: data
+  })
+}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -711,7 +711,7 @@
                                     .weight_before -
                                     record.assessment_before_dislysis
                                       .additional_weight
-                                )
+                                ).toFixed(1)
                               : "/"
                           }}
                         </div>
@@ -1595,7 +1595,7 @@
                                     .weight_after -
                                     record.assessment_before_dislysis
                                       .additional_weight
-                                )
+                                ).toFixed(1)
                               : "/"
                           }}
                         </div>

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

@@ -1184,10 +1184,27 @@
         this.InnerDialogProps.visibility = true
         switch (val) {
           case '5': // 透析器/灌流器
+             var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
+             var newArr =  arr.split(",")
+            console.log("透析器/灌流器",newArr)
+            var Arr = []
+            for(let i=0;i<newArr.length;i++){
+              for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
+                 var newarr = newArr[i].toUpperCase()
+              
+                 var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
+            
+                 if(newarr == dialy){
+                    Arr.push(this.dialyzerPerfusionApparatus[j].name)
+                 }
+              }
+            }
+            var arrtwo = Arr.join(",")
+            console.log("Arr",arrtwo)
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
             this.InnerDialogProps.titles = '透析器/灌流器'
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
-            this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus.toUpperCase()
+            this.InnerDialogProps.selected = arrtwo
             this.InnerDialogProps.isShowTextArea = false
             break
         }
@@ -1301,18 +1318,18 @@
         )
 
          console.log('血管通路', this.blood_access_option)
-         var  dialyzerPerfusionApparatus = getDataConfig(
+         this.dialyzerPerfusionApparatus = getDataConfig(
           'hemodialysis',
           'dialyzer_perfusion_apparatus'
         )
        
-       dialyzerPerfusionApparatus.map(item => {
-         item.name = item.name.toUpperCase()
-       })
-       //去重
-        var arr = this.unique(dialyzerPerfusionApparatus)
-       this.dialyzerPerfusionApparatus = arr
-       console.log('灌流器', arr)
+      //  dialyzerPerfusionApparatus.map(item => {
+      //    item.name = item.name.toUpperCase()
+      //  })
+      //  //去重
+      //   var arr = this.unique(dialyzerPerfusionApparatus)
+      //  this.dialyzerPerfusionApparatus = arr
+      //  console.log('灌流器', arr)
 
         if (this.$route.query && this.$route.query.date) {
           var date = this.$route.query && this.$route.query.date

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

@@ -774,6 +774,8 @@ export default {
     // this.form.operate_date = parseInt((new Date()).getTime() / 1000)
     // this.form.monitoring_time = parseTime(new Date(), "{h}:{i}")
     this.form.operate_time = new Date().getTime()
+    var symptoms = getDataConfig('hemodialysis', 'symptoms')
+    
   },
   methods: {
     venousPressureChange(type) {

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

@@ -71,7 +71,7 @@
           <div style="width:160px">
 
             <div class="tableTitle">患者列表</div>
-            
+
 
             <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -619,6 +619,7 @@
         })
       }
     }, created() {
+      this.getCurrentOrgPatients()
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
@@ -630,7 +631,6 @@
       this.query.statistics_type = 1
       this.GetDialysisWeightChartData(this.query)
       this.GetDialysisWeightTableData(this.query)
-      this.getCurrentOrgPatients()
 
 
     }