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

src/api/common/common.js

 }
 
 export function getConfigurationDetail(id, params) {
+  console.log('id=====', id)
   return request({
     url: 'com/api/getconfigurationdetail?id=' + id,
     method: 'get',
 }
 
 export function getFirstQuarter(params) {
-  console.log('params', params)
+  // console.log('params', params)
   return request({
     url: '/com/api/getfirstquarter',
     method: 'get',
     page: page,
     limit: limit
   }
-  console.log('params', params)
   return request({
     url: '/com/api/getpatientscontrol',
     method: 'get',
 }
 
 export function GetQualityControl(params) {
-  console.log('params是', params)
   return request({
     url: '/com/api/getqualitycontrol',
     method: 'Get',
     params: params
   })
 }
+
+export function getBloodPressureDetail(id, params) {
+  return request({
+    url: '/com/api/getbloodpressuredetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function UpdateBloodPrussre(id, data) {
+  console.log('data', data)
+  return request({
+    url: '/com/api/updatebloodprussre?id=' + id,
+    method: 'post',
+    data: data
+  })
+}
+
+export function getBloodPressureList(params) {
+  return request({
+    url: '/com/api/getbloodpressurelist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getMonthBloodList(params) {
+  return request({
+    url: '/com/api/getmonthbloodlist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/dialysis/details/assessmentBefore.vue

         </li>
         <li v-if="isShow('穿刺方式')">
           <label>穿刺方式 : </label>
-          <span class="content">{{ getWay(this.record.puncture_way) }}</span>
+          <!-- <span class="content">{{ getWay(this.record.puncture_way) }}</span> -->
+           <span class="content">{{record.puncture_way}}</span>
         </li>
         <li v-if="isShow('其他位置')">
           <label>其他位置</label>
 
         <li v-if="isShow('皮肤')">
           <label>皮肤:</label>
-          <span class="content">{{ getSkin(this.record.skin) }}</span>
+          <!-- <span class="content">{{ getSkin(this.record.skin) }}</span> -->
+          <span class="content">{{this.record.skin}}</span>
           <span class="unit"></span>
         </li>
 

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

                 <el-option label="有" value="1"></el-option>
                 <el-option label="无" value="2"></el-option>
               </el-select>
+
+              <!-- <el-select v-model="assessmentBeforeDislysis.catheter_bend" placeholder="请选择">
+                <el-option
+                  v-for="item in catheters"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select> -->
             </el-form-item>
           </el-col>
 
 
           <el-col :span="8">
             <el-form-item label="穿刺方式： " v-if="isShow('穿刺方式')">
-              <el-select v-model="assessmentBeforeDislysis.puncture_way">
+              <!-- <el-select v-model="assessmentBeforeDislysis.puncture_way">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
                 <el-option v-for="item in this.puncture_ways" :label="item.name" :value="item.id"
                            :key="item.id"></el-option>
-              </el-select>
+              </el-select> -->
+              <el-input v-model="assessmentBeforeDislysis.puncture_way" readonly
+                      @focus="showInnerDialog('13')">
+              </el-input>
             </el-form-item>
           </el-col>
 
                 <el-option label="是" value="1"></el-option>
                 <el-option label="否" value="2"></el-option>
               </el-select>
+
+             <!-- <el-select v-model="assessmentBeforeDislysis.is_hemorrhage" placeholder="请选择">
+                <el-option
+                  v-for="item in hemorrhages"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select> -->
             </el-form-item>
           </el-col>
 
 
           <el-col :span="8" v-if="isShow('皮肤')">
             <el-form-item label="皮肤： ">
-              <el-select v-model="assessmentBeforeDislysis.skin">
+              <!-- <el-select v-model="assessmentBeforeDislysis.skin">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
                 <el-option v-for="item in this.$store.getters.skin" :label="item.name" :value="item.id"
                            :key="item.id"></el-option>
-              </el-select>
+              </el-select> -->
+             
+              <el-input v-model="assessmentBeforeDislysis.skin" readonly
+                      @focus="showInnerDialog('12')">
+              </el-input>
             </el-form-item>
           </el-col>
 
     name: 'assessment-after-dislysis-dialog',
     data() {
       return {
+        hemorrhages:[
+          {value:0,label:'请选择'},
+          {value:1,label: '是'},
+          {value:2,label: '否'},
+        ],
+        catheters:[
+          {value:0,label:'请选择'},
+          {value:1,label:'有'},
+          {value:2,label:'无'}
+          ],
         showTxt: '',
         hasPermission: true,
         weight_adjust: {
           type: '' // 不同弹框类型，用来匹配数据
         },
         machineType: [],
-        puncture_ways: ''
+        puncture_ways: '',
+        skins:[]
 
       }
     },
       },
       show(assessment, lastDryWeightDislysis,last_predialysis_evaluation) {
         this.lastPredialysisEvaluation = last_predialysis_evaluation
-        console.log("22222222",this.lastPredialysisEvaluation)
+        if(this.lastPredialysisEvaluation.is_hemorrhage == 1){
+           this.lastPredialysisEvaluation.is_hemorrhage = "1"
+        }
+        if(this.lastPredialysisEvaluation.is_hemorrhage == 2){
+          this.lastPredialysisEvaluation.is_hemorrhage = "2"
+        }
+        if(this.lastPredialysisEvaluation.catheter_bend == 1){
+          this.lastPredialysisEvaluation.catheter_bend = "1"
+        }
+        if(this.lastPredialysisEvaluation.catheter_bend == 2){
+            this.lastPredialysisEvaluation.catheter_bend = "2"
+        }
+         console.log("22222222",this.lastPredialysisEvaluation)
+        // console.log("乐行",typeof(this.lastPredialysisEvaluation.is_hemorrhage))
         this.assessment = assessment
         this.getPermission()
         this.isVisibility = true
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.puncture_needle
             this.InnerDialogProps.isShowTextArea = false
 
+            break
+            case '12': // 皮肤
+            this.InnerDialogProps.values = this.skins
+            this.InnerDialogProps.titles = '皮肤'
+            this.InnerDialogProps.type = 'skin'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.skin
+            this.InnerDialogProps.isShowTextArea = false
+
+            break
+            case '13': // 穿刺方式
+            this.InnerDialogProps.values =  this.puncture_ways
+            this.InnerDialogProps.titles = '穿刺方式'
+            this.InnerDialogProps.type = 'puncture_way'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.puncture_way
+            this.InnerDialogProps.isShowTextArea = false
+
             break
         }
       },
           case 'puncture_needle':
             this.assessmentBeforeDislysis.puncture_needle = val.value.join(',')
             break
+          case 'skin':
+            this.assessmentBeforeDislysis.skin = val.value.join(',')
+            break
+          case 'puncture_way':
+            this.assessmentBeforeDislysis.puncture_way = val.value.join(',')
+            break
         }
       },
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       }, handleComfirm: function() {
+        
         var arr = this.assessmentBeforeDislysis
+        console.log("arr是多少----------",arr)
         for (let i = 0; i < this.machineType.length; i++) {
           if (arr.machine_type == this.machineType[i].id) {
             arr.machine_type = this.machineType[i].name
           }
         }
-        console.log('arr', arr)
+        // console.log('arr', arr)
         const ParamsQuery = arr
-        console.log('paramsquery', ParamsQuery)
+        // console.log('paramsquery', ParamsQuery)
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
         ParamsQuery['mode'] = '1'
 
-        console.log(this.predialysis_evaluation)
+        // console.log(this.predialysis_evaluation)
 
         if (this.predialysis_evaluation.id == 0) {
           ParamsQuery['mode'] = '1'
             })
 
             const assessment_before_dislysis_resp = response.data.data.assessmentBeforeDislysis
-            console.log("返回数据",assessment_before_dislysis_resp)
+            // console.log("返回数据",assessment_before_dislysis_resp)
             // prop
             var predialysis_evaluation = this.predialysis_evaluation
             for (var index in assessment_before_dislysis_resp) {
             module: 3
           }
         }).then(res => {
-          console.log(res)
-          console.log('透前', this.patient_prop)
-          console.log('透前', this.assessment)
+          // console.log(res)
+          // console.log('透前', this.patient_prop)
+           console.log('透前', this.assessment)
           if (res.data.state == 0) {
             this.hasPermission = false
           } else if (res.data.state == 1) {
       this.blood_access_noise = this.$store.getters.blood_access_noise
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
-
+      //获取皮肤
+      this.skins = getDataConfig('hemodialysis','skin')
+      console.log("皮肤",this.skins)
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){

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

           'vascular_access_desc'
         )
 
-        console.log('血管通路', this.blood_access_option)
+        // console.log('血管通路', this.blood_access_option)
         this.dialyzerPerfusionApparatus = getDataConfig(
           'hemodialysis',
           'dialyzer_perfusion_apparatus'
         )
-        console.log('灌流器', this.dialyzerPerfusionApparatus)
+       console.log('灌流器', this.dialyzerPerfusionApparatus)
 
         if (this.$route.query && this.$route.query.date) {
           var date = this.$route.query && this.$route.query.date
             }
 
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
+            // console.log('arr', arr)
 
 
             const ParamsQuery = arr
-            console.log('医嘱推送2', ParamsQuery)
+            // console.log('医嘱推送2', ParamsQuery)
 
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
               return
             }
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
+            // console.log('arr', arr)
 
 
             const ParamsQuery = arr
-            console.log('医嘱推送3', ParamsQuery)
+            // console.log('医嘱推送3', ParamsQuery)
 
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
                   type: 'success',
                   duration: 2000
                 })
-                console.log(hour + ':' + minute)
+                // console.log(hour + ':' + minute)
                 var date = new Date()
 
                 var hour =
 
 
             const ParamsQuery = arr
-            console.log('医嘱推送4', ParamsQuery)
+            // console.log('医嘱推送4', ParamsQuery)
 
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
-            console.log(this.prescription)
+            // console.log(this.prescription)
             let mode = ''
             if (this.prescription.creater <= 0) {
               mode = 1
           this.add_weight = parseFloat(weight_before - last_weight_after).toFixed(
             2
           )
-          console.log('体重增加', this.add_weight)
+          // console.log('体重增加', this.add_weight)
         }
 
         this.isVisibility = true
             var arr = this.dialysisPrescription
 
             const ParamsQuery = arr
-            console.log('night', ParamsQuery)
+            // console.log('night', ParamsQuery)
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
 
 
               const ParamsQuery = arr
-              console.log('ParamsQuerytwo', ParamsQuery)
+              // console.log('ParamsQuerytwo', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
               var arr = this.dialysisPrescription
 
               const ParamsQuery = arr
-              console.log('paramsquerythree', ParamsQuery)
+              // console.log('paramsquerythree', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
               var arr = this.dialysisPrescription
 
               const ParamsQuery = arr
-              console.log('paramsqueryfour', ParamsQuery)
-              console.log('创建者', this.prescription.creater)
+              // console.log('paramsqueryfour', ParamsQuery)
+              // console.log('创建者', this.prescription.creater)
               // if (this.prescription.creater <= 0) {
               //  mode = 1;
               // } else {
               }
 
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
+              // console.log('arr', arr)
 
 
               const ParamsQuery = arr
-              console.log('paramsqueryfive', ParamsQuery)
+              // console.log('paramsqueryfive', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
                 }
 
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
 
                 const ParamsQuery = arr
-                console.log('ParamsQuerysix', ParamsQuery)
+                // console.log('ParamsQuerysix', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
                 }
 
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
 
                 const ParamsQuery = arr
-                console.log('parasmqueryseven', parasmqueryseven)
+                // console.log('parasmqueryseven', parasmqueryseven)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
                 }
 
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
                 const ParamsQuery = arr
-                console.log('eight', ParamsQuery)
+                // console.log('eight', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
             }
 
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
+            // console.log('arr', arr)
 
 
             const ParamsQuery = arr
-            console.log('night', ParamsQuery)
+            // console.log('night', ParamsQuery)
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '2'
               return
             }
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
+            // console.log('arr', arr)
 
 
             const ParamsQuery = arr
-            console.log('长期处方1', ParamsQuery)
+            // console.log('长期处方1', ParamsQuery)
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
                 return
               }
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
+              // console.log('arr', arr)
 
 
               const ParamsQuery = arr
-              console.log('长期处方2', ParamsQuery)
+              // console.log('长期处方2', ParamsQuery)
 
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               }
 
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
+              // console.log('arr', arr)
 
 
               const ParamsQuery = arr
-              console.log('长期处方3', ParamsQuery)
+              // console.log('长期处方3', ParamsQuery)
 
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
-              console.log(this.prescription)
+              // console.log(this.prescription)
 
               ParamsQuery['mode'] = '1'
 
                 return
               }
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
+              // console.log('arr', arr)
 
 
               const ParamsQuery = arr
-              console.log('长期处方5', ParamsQuery)
+              // console.log('长期处方5', ParamsQuery)
 
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
                 return
               }
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
+              // console.log('arr', arr)
 
 
               const ParamsQuery = arr
-              console.log('长期处方6', ParamsQuery)
+              // console.log('长期处方6', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
                   return
                 }
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
 
                 const ParamsQuery = arr
-                console.log('长期处方7', ParamsQuery)
+                // console.log('长期处方7', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
                   return
                 }
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
 
                 const ParamsQuery = arr
-                console.log('长期处方8', ParamsQuery)
+                // console.log('长期处方8', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
                   return
                 }
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
                 const ParamsQuery = arr
-                console.log('长期处方9', ParamsQuery)
+                // console.log('长期处方9', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
               return
             }
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
+            // console.log('arr', arr)
 
             const ParamsQuery = arr
-            console.log('长期处方10', ParamsQuery)
+            // console.log('长期处方10', ParamsQuery)
 
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             }
           })
           .then(res => {
-            console.log(res)
-            console.log('predialysis.creater', this.pre.creater)
-            console.log('admin.id', this.$store.getters.xt_user.user.id)
+            // console.log(res)
+            // console.log('predialysis.creater', this.pre.creater)
+            // console.log('admin.id', this.$store.getters.xt_user.user.id)
             if (res.data.state == 0) {
               this.hasPermission = false
             } else if (res.data.state == 1) {

src/xt_pages/dialysis/details/index.vue

           console.log('receiver_treatment_access', receiver_treatment_access)
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
           console.log('透前评估', predialysis_evaluation)
+          
           if (predialysis_evaluation != null) {
             if (predialysis_evaluation.blood_access_part_id == -2) {
               predialysis_evaluation.blood_access_part_id = 0

src/xt_pages/qcd/patientComplianceDetails.vue

               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}g/L"
+                formatter: "{c}"
               }
             },
             //配置样式