Merge branch 'wzf' of http://git.shengws.com/zhangbj/xt_pad into wzf

src/pages/main/today/statOrder.vue

@@ -93,16 +93,16 @@
 </template>
 
 <script>
-import { parseTime } from "@/utils";
+import { parseTime } from '@/utils'
 
 export default {
-  name: "statOrder",
-  data() {
+  name: 'statOrder',
+  data () {
     return {
-      title: "临时医嘱 ",
+      title: '临时医嘱 ',
       template_id: 0,
       tableDate: []
-    };
+    }
   },
   props: {
     doctor_map: {
@@ -111,93 +111,94 @@ export default {
     advice_groups: {
       type: Array,
       default: () => {
-        return [];
+        return []
       }
     }
   },
 
   methods: {
-    setAdvices(advices) {
+    setAdvices (advices) {
       if (advices == null) {
-        advices = [];
+        advices = []
       }
-      this.tableDate.splice(0, this.tableDate.length);
-      this.tableDate.push(...advices);
+      this.tableDate.splice(0, this.tableDate.length)
+      this.tableDate.push(...advices)
     },
-    parseTime(time, layout) {
+    parseTime (time, layout) {
       if (time == 0) {
-        return "";
+        return ''
       }
-      return parseTime(time, layout);
+      return parseTime(time, layout)
     },
-    createMedicalOrder(row) {
+    createMedicalOrder (row) {
       if (row.parent_id > 0) {
-        var spliceIndex = -1;
+        var spliceIndex = -1
         for (let index = this.tableDate.length - 1; ; index--) {
           if (this.tableDate[index].parent_id === row.parent_id) {
-            spliceIndex = index;
-            break;
+            spliceIndex = index
+            break
           } else if (this.tableDate[index].id === row.parent_id) {
-            spliceIndex = index;
-            break;
+            spliceIndex = index
+            break
           }
         }
         if (spliceIndex > -1) {
-          spliceIndex += 1;
+          spliceIndex += 1
           if (spliceIndex === this.tableDate.length) {
-            this.tableDate.push(row);
+            this.tableDate.push(row)
           } else {
-            var swapData = this.tableDate.splice(spliceIndex);
-            this.tableDate.push(row);
-            this.tableDate = this.tableDate.concat(swapData);
+            var swapData = this.tableDate.splice(spliceIndex)
+            this.tableDate.push(row)
+            this.tableDate = this.tableDate.concat(swapData)
           }
         }
       } else {
-        this.tableDate.unshift(row);
+        this.tableDate.unshift(row)
       }
     },
-    delMedicalOrder(row) {
+    delMedicalOrder (row) {
       if (row.parent_id > 0) {
-        var rslen = this.tableDate.length;
+        var rslen = this.tableDate.length
         for (let i = 0; i < rslen; i++) {
           if (this.tableDate[i].id == row.id) {
-            this.tableDate.splice(i, 1);
-            break;
+            this.tableDate.splice(i, 1)
+            break
           }
         }
       } else {
-        var resetTableData = this.tableDate;
-        this.tableDate = [];
-        var that = this;
-        var rslen = resetTableData.length;
+        var resetTableData = this.tableDate
+        this.tableDate = []
+        var that = this
+        var rslen = resetTableData.length
         for (let i = 0; i < rslen; i++) {
           if (
             resetTableData[i].id != row.id &&
             resetTableData[i].parent_id != row.id
           ) {
-            that.tableDate.push(resetTableData[i]);
+            that.tableDate.push(resetTableData[i])
           }
         }
       }
     },
-    executionMedicalOrder(row) {
-      var alen = this.tableDate.length;
+    executionMedicalOrder (row) {
+      var alen = this.tableDate.length
       for (let index = 0; index < alen; index++) {
         if (this.tableDate[index].id == row.id) {
-          this.tableDate[index].execution_state = 1;
-          this.tableDate[index].execution_staff = row.execution_staff;
-          this.tableDate[index].execution_time = row.execution_time;
-          this.tableDate[index].checker = row.checker;
-          break;
+          this.tableDate[index].execution_state = 1
+          this.tableDate[index].execution_staff = row.execution_staff
+          this.tableDate[index].execution_time = row.execution_time
+          this.tableDate[index].checker = row.checker
+          break
         }
       }
     }
   },
-  created() {
-    this.template_id = this.$store.getters.user.template_info.template_id;
-    console.log("this是什么东西", this.advice_groups);
+  created () {
+    this.template_id = this.$store.getters.user.template_info.template_id
+    console.log('this是什么东西', this.advice_groups)
   }
-};
+}
+
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

src/pages/monitoring/index.vue

@@ -62,7 +62,7 @@
           </li>
         </ul>
       </div>
-      <!-- <van-list
+      <van-list
         v-model="loading"
         :finished="finished"
         finished-text="  "
@@ -167,8 +167,8 @@
             alt
           />
         </div>
-      </van-list>-->
-      <div class="monitoringTable">
+      </van-list>
+      <!-- <div class="monitoringTable">
         <el-table :data="tableData" border style="width: 100%" class="newTable">
           <el-table-column fixed prop="name" label="姓名" width="80" align="center">
             <template slot-scope="scope">{{scope.row.patient.name}}</template>
@@ -224,7 +224,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </div>
+      </div> -->
     </div>
     <side-bar :active_index="1"></side-bar>
     <mt-datetime-picker
@@ -278,6 +278,7 @@ export default {
   },
   methods: {
     clickfunction: function(val) {
+      console.log("val是什么 ",val)
       this.$router.push({
         path: "/details",
         query: {
@@ -352,6 +353,7 @@ export default {
             this.schedule_date = item.schedule_date;
             arr3.push(item.patient);
           });
+          console.log("arr3",arr3)
           this.tableData = arr2;
         }
       });