Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product

pages/produce/execute/components/orderlist.vue

@@ -37,13 +37,17 @@ export default {
     return {
       gnFlag: 0,
       listTasks: [],
-      dataLength: 0
+      dataLength: 0,
     };
   },
   props: {
     order: {
       type: String,
       default: '',
+    },
+    asc: {
+      type: Boolean,
+      default: true,
     }
   },
   created() {
@@ -53,7 +57,7 @@ export default {
     loadTree(value) {
       let parmse = {
         status: value,
-        isAsc: true
+        isAsc: this.asc
       };
       Api.getCardList(parmse).then(res => {
         if (res.success) {
@@ -82,6 +86,11 @@ export default {
     order(v)
     {
       //alert(v)
+    },
+    asc(v)
+    {
+      this.asc=v
+      this.loadTree(-9)
     }
   }
 };

pages/produce/execute/index.vue

@@ -21,11 +21,11 @@
           </Select>
         </div>
         <div class="select_t">
-          <Button class>时间正序排列</Button>
+          <Button @click="changeAsc">{{ascTitle}}</Button>
         </div>
       </div>
       <!-- 列表卡片主内容  -->
-      <orderlist ref="orderlist" :order="inputId" />
+      <orderlist ref="orderlist" :asc="asc" :order="inputId" />
     </Drawer>
     <!-- 功能区  -->
       <Drawer
@@ -59,6 +59,8 @@ export default {
       orderId: this.$route.query.id,
       condition: [],
       inputId: null,
+      asc:true,
+      ascTitle:'时间正序排序'
     };
   },
   created() {
@@ -76,9 +78,6 @@ export default {
   mounted() {},
   comments: {},
   methods: {
-    starFun() {
-      this.$Message.success("开工...");
-    },
     // getListLength(len){ this.listLength = len },
     // 返回工单列表
     goToOrder() {
@@ -124,6 +123,18 @@ export default {
            this.$Message.info("尊敬的用户，您没有该权限！")
         // this.detail = () => import("./testdata/index");
       } //测试数据
+    },
+    changeAsc()
+    {
+      this.asc=!this.asc
+      if(this.asc)
+      {
+        this.ascTitle='时间正序排序'
+      }
+      else
+      {
+        this.ascTitle='时间倒序排序'
+      }
     }
   },
   watch: {