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

src/api/schedule.js

   })
 }
 
-export function GetWeekSchedulePrintInitData(date) {
+export function GetWeekSchedulePrintInitData(date,type) {
   return request({
     url: '/api/schedule/print/initdata',
     method: 'get',
     params: {
-      date: date
+      date: date,
     }
   })
 }

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

                 <el-option v-for="item in this.$store.getters.skin" :label="item.name" :value="item.id"
                            :key="item.id"></el-option>
               </el-select> -->
-             
+
               <el-input v-model="assessmentBeforeDislysis.skin" readonly
                       @focus="showInnerDialog('12')">
               </el-input>
       },
       show(assessment, lastDryWeightDislysis,last_predialysis_evaluation) {
         this.lastPredialysisEvaluation = last_predialysis_evaluation
-        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){
+        if(this.lastPredialysisEvaluation != null) {
+          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"
-        }
-        if(this.lastPredialysisEvaluation.is_infect == 1){
-          this.lastPredialysisEvaluation.is_infect ="1"
-        }
-        if(this.lastPredialysisEvaluation.is_infect == 2){
-         this.lastPredialysisEvaluation.is_infect = "2"
+          }
+          if (this.lastPredialysisEvaluation.is_infect == 1) {
+            this.lastPredialysisEvaluation.is_infect = "1"
+          }
+          if (this.lastPredialysisEvaluation.is_infect == 2) {
+            this.lastPredialysisEvaluation.is_infect = "2"
+          }
         }
 
-         console.log("22222222",this.lastPredialysisEvaluation)
-        // console.log("乐行",typeof(this.lastPredialysisEvaluation.is_hemorrhage))
+
         this.assessment = assessment
         this.getPermission()
         this.isVisibility = true
 
         if (this.predialysis_evaluation.id == 0) {
 
-
           if (lastDryWeightDislysis != null) {
             this.weight_adjust.weight = lastDryWeightDislysis.dry_weight
             this.$set(
       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++) {

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

             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)
                  }
           'hemodialysis',
           'dialyzer_perfusion_apparatus'
         )
-       
+
       //  dialyzerPerfusionApparatus.map(item => {
       //    item.name = item.name.toUpperCase()
       //  })
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre,schedual,last) {
-        console.log(last)
-        console.log(pre)
 
         if(schedual.schedule_type == 1){
           this.start_time = new Date(2016, 9, 10, 7, 0,0)
         }
 
         if (this.predialysis == null || this.predialysis.id == 0) {
-          this.dialysisPrescription.niprocart = last.niprocart
-          this.dialysisPrescription.jms = last.jms
-          this.dialysisPrescription.fistula_needle_set = last.fistula_needle_set
-          this.dialysisPrescription.fistula_needle_set_16 = last.fistula_needle_set_16
-          this.dialysisPrescription.hemoperfusion = last.hemoperfusion
-          this.dialysisPrescription.dialyser_sterilised = last.dialyser_sterilised
-          this.dialysisPrescription.filtryzer = last.filtryzer
-          this.dialysisPrescription.target_ktv = last.target_ktv
-          this.dialysisPrescription.dialyzers = last.dialyzers
-          this.dialysisPrescription.injector = last.injector
-          this.dialysisPrescription.bloodlines = last.bloodlines
-          this.dialysisPrescription.tubing_hemodialysis = last.tubing_hemodialysis
-          this.dialysisPrescription.package = last.package
-          this.dialysisPrescription.a_liquid = last.a_liquid
-          weight_before = 0
+          if(last != null) {
+            this.dialysisPrescription.niprocart = last.niprocart
+            this.dialysisPrescription.jms = last.jms
+            this.dialysisPrescription.fistula_needle_set = last.fistula_needle_set
+            this.dialysisPrescription.fistula_needle_set_16 = last.fistula_needle_set_16
+            this.dialysisPrescription.hemoperfusion = last.hemoperfusion
+            this.dialysisPrescription.dialyser_sterilised = last.dialyser_sterilised
+            this.dialysisPrescription.filtryzer = last.filtryzer
+            this.dialysisPrescription.target_ktv = last.target_ktv
+            this.dialysisPrescription.dialyzers = last.dialyzers
+            this.dialysisPrescription.injector = last.injector
+            this.dialysisPrescription.bloodlines = last.bloodlines
+            this.dialysisPrescription.tubing_hemodialysis = last.tubing_hemodialysis
+            this.dialysisPrescription.package = last.package
+            this.dialysisPrescription.a_liquid = last.a_liquid
+            weight_before = 0
+          }
+
         } else {
           weight_before = this.predialysis.weight_before
         }
 
+
+
         if (weight_before > 0 && last_weight_after > 0) {
           this.add_weight = parseFloat(weight_before - last_weight_after).toFixed(
             2

src/xt_pages/workforce/schedule_print.vue

       GetWeekSchedulePrintInitData(date_str).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
-          var begin_day = parseInt(parseTime(resp.data.monday * 1000, '{d}'))
           for (let index = 0; index < this.schedules.length; index++) {
             const collection = this.schedules[index]
             collection.day = resp.data.days[index].split("-")[1]+"-"+resp.data.days[index].split("-")[2]