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

src/xt_pages/dialysis/details/assessmentAfter.vue

         <li v-if="isShow('透析中进食')">
           <label>透析中进食: </label>
           <span class="content" >{{ this.record.dialysis_during ? this.record.dialysis_during : ""  }}</span>
-          <span class="unit">{{ this.record.dialysis_during ? "ml" : "" }}</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 36">{{ this.record.dialysis_during ? "ml" : "" }}</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id == 36">{{ this.record.dialysis_during ? "g" : "" }}</span>
         </li>
       </ul>
       <ul>

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

         </el-col>
 
         <el-col :span="8" v-if="isShow('透析中进食')">
-          <el-form-item label="透析中进食(ml): ">
+          <el-form-item label="透析中进食(ml): " v-if="template_id != 36">
+            <el-input v-model="form.dialysis_during"></el-input>
+          </el-form-item>
+          <el-form-item label="透析中进食(g): " v-if="template_id == 36">
             <el-input v-model="form.dialysis_during"></el-input>
           </el-form-item>
         </el-col>
 import { postAssessmentAfterDislysis } from '@/api/dialysis'
 import { uParseTime } from '@/utils/tools'
 import store from '@/store'
+import { parseTime } from '@/utils'
 
 import request from '@/utils/request'
 
     this.channels = this.$store.getters.channels
 
     var date = this.$route.query && this.$route.query.date
-    this.record_date = uParseTime(date, '{y}-{m}-{d}')
+    this.record_date = uParseTime(date, '{y}-{m}-{d}') ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
   },
   components: {
     MultiSelectBox

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

 import { uParseTime } from "@/utils/tools";
 import store from "@/store";
 import { getDataConfig } from "@/utils/data";
+import { parseTime } from '@/utils'
 
 import request from "@/utils/request";
 
   created() {
     // console.log("接诊评估", this.receiver_treatment_access);
     var date = this.$route.query && this.$route.query.date;
-    this.record_date = uParseTime(date, "{y}-{m}-{d}");
+    this.record_date = uParseTime(date, "{y}-{m}-{d}") ? uParseTime(date, "{y}-{m}-{d}") : parseTime(new Date(), '{y}-{m}-{d}');
 
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");

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

   import { postAssessmentBeforeDislysis, CreateDryWeight } from '@/api/dialysis'
   import store from '@/store'
   import { uParseTime } from '@/utils/tools'
+  import { parseTime } from '@/utils'
 
   import request from '@/utils/request'
 
 
       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.record_date = uParseTime(date, '{y}-{m}-{d}') ? uParseTime(date, "{y}-{m}-{d}") : parseTime(new Date(), '{y}-{m}-{d}')
       //获取皮肤
       this.skins = getDataConfig('hemodialysis','skin')
       console.log("皮肤",this.skins)

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

         this.loading = true
         let mode = '1'
 
-        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse).then(rs => {
+        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {

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

     created() {
      
       var date = this.$route.query && this.$route.query.date
-      this.record_date = uParseTime(date, '{y}-{m}-{d}')
+      this.record_date = uParseTime(date, '{y}-{m}-{d}') ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
 
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()

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

       submit: function() {
         this.loading = true
         let mode = "1"
-        finishDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode).then(rs => {
+        finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {

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

     var date = this.$route.query.date;
     var patient_id = this.$route.query.patient_id;
     this.patient_id = patient_id;
-    this.schedule_date = date;
+    this.schedule_date = date ? date : new Date(new Date().toLocaleDateString()).getTime();
     this.form.monitoring_date = date;
     // this.form.operate_date = parseInt((new Date()).getTime() / 1000)
     // this.form.monitoring_time = parseTime(new Date(), "{h}:{i}")