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

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

@@ -808,7 +808,7 @@
 
             break
           case '11': //
-            this.InnerDialogProps.values = this.$store.getters.puncture_needle
+            this.InnerDialogProps.values =getDataConfig('hemodialysis', 'puncture_needle')
             this.InnerDialogProps.titles = '穿刺针'
             this.InnerDialogProps.type = 'puncture_needle'
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.puncture_needle
@@ -816,7 +816,8 @@
 
             break
         }
-      }, innerDialogComfirm: function(val) {
+      },
+      innerDialogComfirm: function(val) {
         this.InnerDialogProps.visibility = false
         switch (val.type) {
           case 'last_dialysis_after':
@@ -857,7 +858,8 @@
             this.assessmentBeforeDislysis.puncture_needle = val.value.join(',')
             break
         }
-      }, innerDialogCancle: function() {
+      },
+      innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       }, handleComfirm: function() {
         var arr = this.assessmentBeforeDislysis

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

@@ -273,20 +273,23 @@
 
           <el-col :span="8" v-if="isShows('透析器/灌流器')">
             <el-form-item label="透析器/灌流器">
-              <el-select
-                v-model="dialysisPrescription.dialyzer_perfusion_apparatus"
-                placeholder="请选择"
-                style="width:100%;"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option
-                  v-for="(item, index) in dialyzerPerfusionApparatus"
-                  :label="item.name"
-                  :key="index+'r'"
-                  :value="item.id"
-                ></el-option>
-              </el-select>
+              <el-input v-model="dialysisPrescription.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
+
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.dialyzer_perfusion_apparatus"-->
+                <!--placeholder="请选择"-->
+                <!--style="width:100%;"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+                <!--<el-option-->
+                  <!--v-for="(item, index) in dialyzerPerfusionApparatus"-->
+                  <!--:label="item.name"-->
+                  <!--:key="index+'r'"-->
+                  <!--:value="item.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
             </el-form-item>
           </el-col>
 
@@ -709,7 +712,8 @@
         <el-time-picker
           format="HH:mm"
           value-format="HH:mm"
-          v-model="advice_start_time"
+          v-model="start_time"
+          @change="changeTime"
           :picker-options="{
       selectableRange: '00:00:00 - 23:59:00'
     }">
@@ -809,6 +813,14 @@
         <el-button type="primary" @click="cancleMsg()">确 定</el-button>
       </span>
     </el-dialog>
+
+    <multi-select-box
+      :propsForm="InnerDialogProps"
+      v-on:dialog-comfirm="innerDialogComfirm"
+      v-on:dialog-cancle="innerDialogCancle"
+    ></multi-select-box>
+
+
   </div>
 </template>
 
@@ -820,10 +832,12 @@
   import MsgTip from './MsgTip'
 
   import request from '@/utils/request'
+  import multiSelectBox from './MultiSelectBox'
+
 
   export default {
     name: 'dialysisPrescriptionDialog',
-    components: { MsgTip },
+    components: { MsgTip,multiSelectBox },
     props: {
       schedual: {
         type: Object
@@ -1031,8 +1045,17 @@
     },
     data() {
       return {
+        InnerDialogProps: {
+          values: [],
+          visibility: false,
+          isShowTextArea: true,
+          customContent: '',
+          titles: '',
+          type: '' // 不同弹框类型，用来匹配数据
+        },
         advice_start_time: '',
         showTxt: '',
+        start_time:'',
         hasPermission: true,
         zhiShow: false,
         totalShow: false,
@@ -1146,6 +1169,34 @@
       }
     },
     methods: {
+      changeTime:function(val){
+        this.advice_start_time = val
+
+      },
+      showInnerDialog: function(val) {
+        this.InnerDialogProps.visibility = true
+        switch (val) {
+          case '5': // 透析器/灌流器
+            this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
+            this.InnerDialogProps.titles = '透析器/灌流器'
+            this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
+            this.InnerDialogProps.isShowTextArea = false
+            break
+        }
+      }, innerDialogComfirm: function(val) {
+        this.InnerDialogProps.visibility = false
+        switch (val.type) {
+          case 'dialyzer_perfusion_apparatus':
+            this.dialysisPrescription.dialyzer_perfusion_apparatus = val.value.join(',')
+            break
+
+        }
+      },
+      innerDialogCancle: function() {
+        this.InnerDialogProps.visibility = false
+      },
+
       getDryWeight() {
         if (this.dry_weight != null && this.dry_weight.id > 0) {
           return this.dry_weight.dry_weight
@@ -1326,13 +1377,6 @@
         }
         this.anticoagulant = this.$store.getters.anticoagulants_confit[thismode]
 
-        for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-          if (this.dialysisPrescription.dialyzer_perfusion_apparatus == this.dialyzerPerfusionApparatus[i].name) {
-            this.dialysisPrescription.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-              i
-              ].id
-          }
-        }
 
       },
       menuMsgTip: function() {
@@ -1372,16 +1416,7 @@
 
             var arr = this.dialysisPrescription
             console.log('arr', arr)
-            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-              if (
-                parseInt(arr.dialyzer_perfusion_apparatus) ==
-                  this.dialyzerPerfusionApparatus[i].id
-              ) {
-                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                  i
-                ].name
-              }
-            }
+
 
             const ParamsQuery = arr
             console.log('医嘱推送2', ParamsQuery)
@@ -1460,16 +1495,7 @@
             }
             var arr = this.dialysisPrescription
             console.log('arr', arr)
-            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-              if (
-                parseInt(arr.dialyzer_perfusion_apparatus) ==
-                  this.dialyzerPerfusionApparatus[i].id
-              ) {
-                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                  i
-                ].name
-              }
-            }
+
 
             const ParamsQuery = arr
             console.log('医嘱推送3', ParamsQuery)
@@ -1547,17 +1573,8 @@
             }
 
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
-            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-              if (
-                parseInt(arr.dialyzer_perfusion_apparatus) ==
-                  this.dialyzerPerfusionApparatus[i].id
-              ) {
-                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                  i
-                ].name
-              }
-            }
+
+
 
             const ParamsQuery = arr
             console.log('医嘱推送4', ParamsQuery)
@@ -1601,20 +1618,8 @@
               return
             }
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
-            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-              if (
-                parseInt(arr.dialyzer_perfusion_apparatus) ==
-                  this.dialyzerPerfusionApparatus[i].id
-              ) {
-                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                  i
-                ].name
-              }
-            }
 
             const ParamsQuery = arr
-            console.log('医嘱推送5', ParamsQuery)
 
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
@@ -1662,11 +1667,16 @@
       },
       show(pre,schedual) {
         if(schedual.schedule_type == 1){
-          this.advice_start_time = new Date(2016, 9, 10, 7, 0,0)
+          this.start_time = new Date(2016, 9, 10, 7, 0,0)
+          this.advice_start_time = "07:00"
         }else if(schedual.schedule_type == 2){
-          this.advice_start_time = new Date(2016, 9, 10, 12, 0,0)
+          this.start_time = new Date(2016, 9, 10, 12, 0,0)
+          this.advice_start_time = "12:00"
+
         }else if(schedual.schedule_type ==3){
-          this.advice_start_time = new Date(2016, 9, 10, 18, 0,0)
+          this.start_time = new Date(2016, 9, 10, 18, 0,0)
+          this.advice_start_time = "18:00"
+
         }
 
         if (pre.anticoagulant == 3) {
@@ -1784,13 +1794,6 @@
             }
 
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
-            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-              if (
-                parseInt(arr.dialyzer_perfusion_apparatus) == this.dialyzerPerfusionApparatus[i].id) {
-                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[i].name
-              }
-            }
 
             const ParamsQuery = arr
             console.log('night', ParamsQuery)
@@ -1832,17 +1835,7 @@
               }
 
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
-              for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                if (
-                  parseInt(arr.dialyzer_perfusion_apparatus) ==
-                  this.dialyzerPerfusionApparatus[i].id
-                ) {
-                  arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                    i
-                    ].name
-                }
-              }
+
 
               const ParamsQuery = arr
               console.log('ParamsQuerytwo', ParamsQuery)
@@ -1890,17 +1883,6 @@
               }
 
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
-              for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                if (
-                  parseInt(arr.dialyzer_perfusion_apparatus) ==
-                  this.dialyzerPerfusionApparatus[i].id
-                ) {
-                  arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                    i
-                    ].name
-                }
-              }
 
               const ParamsQuery = arr
               console.log('paramsquerythree', ParamsQuery)
@@ -1965,12 +1947,7 @@
               }
 
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
-              for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                if (parseInt(arr.dialyzer_perfusion_apparatus) == this.dialyzerPerfusionApparatus[i].id) {
-                  arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[i].name
-                }
-              }
+
               const ParamsQuery = arr
               console.log('paramsqueryfour', ParamsQuery)
               console.log('创建者', this.prescription.creater)
@@ -2018,16 +1995,7 @@
 
               var arr = this.dialysisPrescription
               console.log('arr', arr)
-              for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                if (
-                  parseInt(arr.dialyzer_perfusion_apparatus) ==
-                  this.dialyzerPerfusionApparatus[i].id
-                ) {
-                  arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                    i
-                    ].name
-                }
-              }
+
 
               const ParamsQuery = arr
               console.log('paramsqueryfive', ParamsQuery)
@@ -2070,16 +2038,7 @@
 
                 var arr = this.dialysisPrescription
                 console.log('arr', arr)
-                for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                  if (
-                    parseInt(arr.dialyzer_perfusion_apparatus) ==
-                    this.dialyzerPerfusionApparatus[i].id
-                  ) {
-                    arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                      i
-                      ].name
-                  }
-                }
+
 
                 const ParamsQuery = arr
                 console.log('ParamsQuerysix', ParamsQuery)
@@ -2128,16 +2087,7 @@
 
                 var arr = this.dialysisPrescription
                 console.log('arr', arr)
-                for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                  if (
-                    parseInt(arr.dialyzer_perfusion_apparatus) ==
-                    this.dialyzerPerfusionApparatus[i].id
-                  ) {
-                    arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                      i
-                      ].name
-                  }
-                }
+
 
                 const ParamsQuery = arr
                 console.log('parasmqueryseven', parasmqueryseven)
@@ -2207,16 +2157,7 @@
 
                 var arr = this.dialysisPrescription
                 console.log('arr', arr)
-                for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                  if (
-                    parseInt(arr.dialyzer_perfusion_apparatus) ==
-                    this.dialyzerPerfusionApparatus[i].id
-                  ) {
-                    arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                      i
-                      ].name
-                  }
-                }
+
                 const ParamsQuery = arr
                 console.log('eight', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
@@ -2255,16 +2196,7 @@
 
             var arr = this.dialysisPrescription
             console.log('arr', arr)
-            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-              if (
-                parseInt(arr.dialyzer_perfusion_apparatus) ==
-                this.dialyzerPerfusionApparatus[i].id
-              ) {
-                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                  i
-                  ].name
-              }
-            }
+
 
             const ParamsQuery = arr
             console.log('night', ParamsQuery)
@@ -2336,16 +2268,7 @@
             }
             var arr = this.dialysisPrescription
             console.log('arr', arr)
-            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-              if (
-                parseInt(arr.dialyzer_perfusion_apparatus) ==
-                this.dialyzerPerfusionApparatus[i].id
-              ) {
-                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                  i
-                  ].name
-              }
-            }
+
 
             const ParamsQuery = arr
             console.log('长期处方1', ParamsQuery)
@@ -2393,16 +2316,7 @@
               }
               var arr = this.dialysisPrescription
               console.log('arr', arr)
-              for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                if (
-                  parseInt(arr.dialyzer_perfusion_apparatus) ==
-                  this.dialyzerPerfusionApparatus[i].id
-                ) {
-                  arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                    i
-                    ].name
-                }
-              }
+
 
               const ParamsQuery = arr
               console.log('长期处方2', ParamsQuery)
@@ -2458,16 +2372,7 @@
 
               var arr = this.dialysisPrescription
               console.log('arr', arr)
-              for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                if (
-                  parseInt(arr.dialyzer_perfusion_apparatus) ==
-                  this.dialyzerPerfusionApparatus[i].id
-                ) {
-                  arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                    i
-                    ].name
-                }
-              }
+
 
               const ParamsQuery = arr
               console.log('长期处方3', ParamsQuery)
@@ -2536,16 +2441,7 @@
               }
               var arr = this.dialysisPrescription
               console.log('arr', arr)
-              for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                if (
-                  parseInt(arr.dialyzer_perfusion_apparatus) ==
-                  this.dialyzerPerfusionApparatus[i].id
-                ) {
-                  arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                    i
-                    ].name
-                }
-              }
+
 
               const ParamsQuery = arr
               console.log('长期处方5', ParamsQuery)
@@ -2593,16 +2489,7 @@
               }
               var arr = this.dialysisPrescription
               console.log('arr', arr)
-              for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                if (
-                  parseInt(arr.dialyzer_perfusion_apparatus) ==
-                  this.dialyzerPerfusionApparatus[i].id
-                ) {
-                  arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                    i
-                    ].name
-                }
-              }
+
 
               const ParamsQuery = arr
               console.log('长期处方6', ParamsQuery)
@@ -2650,16 +2537,7 @@
                 }
                 var arr = this.dialysisPrescription
                 console.log('arr', arr)
-                for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                  if (
-                    parseInt(arr.dialyzer_perfusion_apparatus) ==
-                    this.dialyzerPerfusionApparatus[i].id
-                  ) {
-                    arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                      i
-                      ].name
-                  }
-                }
+
 
                 const ParamsQuery = arr
                 console.log('长期处方7', ParamsQuery)
@@ -2713,16 +2591,7 @@
                 }
                 var arr = this.dialysisPrescription
                 console.log('arr', arr)
-                for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                  if (
-                    parseInt(arr.dialyzer_perfusion_apparatus) ==
-                    this.dialyzerPerfusionApparatus[i].id
-                  ) {
-                    arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                      i
-                      ].name
-                  }
-                }
+
 
                 const ParamsQuery = arr
                 console.log('长期处方8', ParamsQuery)
@@ -2796,16 +2665,6 @@
                 }
                 var arr = this.dialysisPrescription
                 console.log('arr', arr)
-                for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-                  if (
-                    parseInt(arr.dialyzer_perfusion_apparatus) ==
-                    this.dialyzerPerfusionApparatus[i].id
-                  ) {
-                    arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                      i
-                      ].name
-                  }
-                }
 
                 const ParamsQuery = arr
                 console.log('长期处方9', ParamsQuery)
@@ -2850,16 +2709,6 @@
             }
             var arr = this.dialysisPrescription
             console.log('arr', arr)
-            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-              if (
-                parseInt(arr.dialyzer_perfusion_apparatus) ==
-                this.dialyzerPerfusionApparatus[i].id
-              ) {
-                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                  i
-                  ].name
-              }
-            }
 
             const ParamsQuery = arr
             console.log('长期处方10', ParamsQuery)
@@ -3095,13 +2944,7 @@
           this.totalShow = true
         }
 
-        for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-          if (this.dialysisPrescription.dialyzer_perfusion_apparatus == this.dialyzerPerfusionApparatus[i].name) {
-            this.dialysisPrescription.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-              i
-              ].id
-          }
-        }
+
       },
       handlePatientInfo() {
         this.isVisibility = false