Pārlūkot izejas kodu

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

csx 5 gadus atpakaļ
vecāks
revīzija
9134314505

+ 1 - 1
src/xt_pages/dialysis/bulletinBoard.vue Parādīt failu

235
         } else {
235
         } else {
236
           if (r.data.boards.length == 0) {
236
           if (r.data.boards.length == 0) {
237
             this.currentPage = 1;
237
             this.currentPage = 1;
238
-            this.getBoards();
238
+            // this.getBoards();
239
           } else {
239
           } else {
240
             this.today = r.data.today;
240
             this.today = r.data.today;
241
             this.week =
241
             this.week =

+ 7 - 2
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Parādīt failu

600
       visible: false,
600
       visible: false,
601
       edit: false,
601
       edit: false,
602
       current_row_class: "current-box-class",
602
       current_row_class: "current-box-class",
603
-
603
+      creator:0,
604
       patient_id: 0,
604
       patient_id: 0,
605
       schedule_date: 0,
605
       schedule_date: 0,
606
       template_id: 0,
606
       template_id: 0,
773
         this.$message.error("请选择一条监测记录");
773
         this.$message.error("请选择一条监测记录");
774
         return;
774
         return;
775
       }
775
       }
776
+      this.creator = this.table_current_row.creator
777
+      console.log( this.table_current_row)
778
+      console.log( this.table_current_row.creator)
779
+      console.log(this.creator)
776
       this.setEditMonitor(this.table_current_row);
780
       this.setEditMonitor(this.table_current_row);
777
       this.$refs.table.setCurrentRow(null);
781
       this.$refs.table.setCurrentRow(null);
778
       this.edit = true;
782
       this.edit = true;
785
     },
789
     },
786
     tableCurrentRowChange: function(currentRow) {
790
     tableCurrentRowChange: function(currentRow) {
787
       this.table_current_row = currentRow;
791
       this.table_current_row = currentRow;
792
+
788
       // console.log("tableCurrentRowChange", currentRow)
793
       // console.log("tableCurrentRowChange", currentRow)
789
     },
794
     },
790
     setEditMonitor: function(monitor) {
795
     setEditMonitor: function(monitor) {
965
       let mode = "1"
970
       let mode = "1"
966
        if(this.form.id > 0){
971
        if(this.form.id > 0){
967
          mode = "2"
972
          mode = "2"
968
-         if(this.form.monitoring_nurse > 0 && this.form.monitoring_nurse != this.$store.getters.xt_user.user.id){
973
+         if(this.creator > 0 && this.creator!= this.$store.getters.xt_user.user.id){
969
           mode = "3"
974
           mode = "3"
970
          }
975
          }
971
       }
976
       }