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

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

@@ -695,6 +695,13 @@ export default {
         this.form.observation_content = "";
         this.form.observation_content_other = "";
       }
+    }, "form.weight_after":function() {
+      if(this){
+
+
+
+      }
+
     }
   },
   methods: {
@@ -966,6 +973,10 @@ export default {
       this.isVisibility = true;
       this.predialysis = predialysis;
       // console.log("透后", predialysis);
+
+
+
+
       this.getPermission();
     },
 

src/xt_pages/dialysis/template/dialysisPrintOrderNine.vue

@@ -1977,13 +1977,9 @@
             <td width="30">医生</td>
             <td width="80">
               <div class="under-line">
-                &nbsp;
-                <span v-if="doctorForm.url === ''">{{
-                  doctorForm.doctor
-                }}</span>
-                <span v-if="doctorForm.url !== ''">
-                  <img style="height:20px" :src="doctorForm.url" />
-                </span>
+                &nbsp
+                <span v-if=" setAdminUserES(prescription.creater) == '' " >{{ getAdminUser(prescription.creater)}}</span >
+                <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else  />
               </div>
             </td>
             <td width="50">治疗护士</td>

src/xt_pages/workforce/components/tableWeeks.vue

@@ -58,7 +58,7 @@
       </el-table-column>
       <el-table-column label="透析模式" min-width="100" align="center">
         <template slot-scope="scope">
-          {{ modeOptions[scope.row.mode_id].name }}
+          {{scope.row.mode_id && modeOptions[scope.row.mode_id] ? modeOptions[scope.row.mode_id].name:'' }}
         </template>
       </el-table-column>
       <el-table-column label="透析器" min-width="100" align="center">
@@ -318,6 +318,7 @@
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
 
+
       this.week_type = new Date().getDay()
       if(this.week_type == 0){
         this.week_type = 7