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

pages/project/plan/index.vue

@@ -96,12 +96,13 @@ export default {
               h(
                 "op",
                 {
-                    key: "type",
-                    width: 90,
-                    title: this.l("type"),
-                    align: "left",
-                    high: true,
-                    code: "mes.project_plan.Type",
+                  attrs: {  icon: "md-arrow-dropright-circle",
+                  type: "icon",
+                  title: "派发",
+                  oprate: "edit",
+                  disable:params.row.status
+                 },
+                  on: { click: () => this.send(params.row.id) },
                 },
               ),
               h(
@@ -117,19 +118,15 @@ export default {
               h(
                 "op",
                 {
-                    key: "status",
-                    title: this.l("status"),
-                    align: "left",
-                    high: true,
-                    code: "mes.project_plan.Status",
-                },
-                {
-                    key: "startDate",
-                    title: this.l("startDate"),
-                    align: "left",
-                    high: true,
-                    type: "date"
-                },
+                  attrs: {  icon: "md-create",
+                  type: "icon",
+                  title: "编辑",
+                  oprate: "edit", },
+                  on: { click: () => this.edit(params.row.id) },
+                }
+              ),
+              h(
+                "op",
                 {
                 attrs: {  icon: "ios-trash",
                   type: "icon",

pages/project/project/detail.vue

@@ -46,7 +46,7 @@
                 <span>|</span>
             </li>
             <li>
-                <a @click="task">
+                <a @click="log">
                     <Icon type="md-create" />动态
                 </a>
                 &nbsp;
@@ -136,6 +136,10 @@ export default {
         group() {
             this.title = "项目成员";
              this.detail = () => import("../groupUser/index1");
+        },
+         log() {
+            this.title = "项目动态";
+             this.detail = () => import("../record/index1");
         },
         l(key) {
             key = "project_main" + "." + key;