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

src/xt_pages/dialysis/bulletinBoard.vue

@@ -235,7 +235,7 @@ export default {
         } else {
           if (r.data.boards.length == 0) {
             this.currentPage = 1;
-            this.getBoards();
+            // this.getBoards();
           } else {
             this.today = r.data.today;
             this.week =

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

@@ -600,7 +600,7 @@ export default {
       visible: false,
       edit: false,
       current_row_class: "current-box-class",
-
+      creator:0,
       patient_id: 0,
       schedule_date: 0,
       template_id: 0,
@@ -773,6 +773,10 @@ export default {
         this.$message.error("请选择一条监测记录");
         return;
       }
+      this.creator = this.table_current_row.creator
+      console.log( this.table_current_row)
+      console.log( this.table_current_row.creator)
+      console.log(this.creator)
       this.setEditMonitor(this.table_current_row);
       this.$refs.table.setCurrentRow(null);
       this.edit = true;
@@ -785,6 +789,7 @@ export default {
     },
     tableCurrentRowChange: function(currentRow) {
       this.table_current_row = currentRow;
+
       // console.log("tableCurrentRowChange", currentRow)
     },
     setEditMonitor: function(monitor) {
@@ -965,7 +970,7 @@ export default {
       let mode = "1"
        if(this.form.id > 0){
          mode = "2"
-         if(this.form.monitoring_nurse > 0 && this.form.monitoring_nurse != this.$store.getters.xt_user.user.id){
+         if(this.creator > 0 && this.creator!= this.$store.getters.xt_user.user.id){
           mode = "3"
          }
       }