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

src/pages/advice/DialysisAdviceTable.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="mainBox">
     <van-sticky>
-    <div class="floatLeft">
-      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
-      <span class="titleName">透析医嘱</span>
-    </div>
+      <div class="floatLeft">
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
+        <span class="titleName">透析医嘱</span>
+      </div>
     </van-sticky>
     <div class="choice">
       <ul>
@@ -122,7 +122,7 @@
                 <!-- <td
                   v-if="advice_index == 0"
                   :rowspan="group.advices.length"
-                >{{ getAdaviceType(advice.advice_type, advice.parent_id) }}</td> -->
+                >{{ getAdaviceType(advice.advice_type, advice.parent_id) }}</td>-->
                 <td v-if="advice_index == 0" :rowspan="group.advices.length">
                   {{
                   advice.parent_id == 0
@@ -461,6 +461,14 @@ export default {
               }
             }
           }
+
+          arrTwo.map((item, index) => {
+            // console.log(item);
+            // item.doctor_advice.map((items, i) => {
+            //   console.log(items);
+            // });
+            item.doctor_advice.sort(this.compare("start_time"));
+          });
           console.log("arrTwo", arrTwo);
           schedules = arrTwo;
           var zoneMap = {};
@@ -499,7 +507,14 @@ export default {
         }
       });
     },
-    adviceDesc(advice) {}
+    adviceDesc(advice) {},
+    compare(property) {
+      return function(a, b) {
+        var value1 = a[property];
+        var value2 = b[property];
+        return value1 - value2;
+      };
+    }
   }
 };
 </script>