task record project

pages/project/project/detail.vue

@@ -123,15 +123,15 @@ export default {
             this.detail = () => import("../plan");
         },
         task() {
-            this.curId = this.eid;
+            //this.curId = this.eid;
             this.title = "任务";
-            //this.detail = () => import("../task/index");
-            this.$router.push({
-                name: "project-task",
-                params: {
-                    id: this.curId
-                }
-            });
+            this.detail = () => import("../task/index");
+            // this.$router.push({
+            //     name: "project-task",
+            //     params: {
+            //         id: this.curId
+            //     }
+            // });
         },
         group() {
             this.title = "项目成员";

pages/project/record/add.vue

@@ -4,7 +4,7 @@
 
         <Col :span="12">
         <FormItem :label="l('workHour')" prop="workHour">
-            <InputNumber v-model="entity.workHour"></InputNumber>
+            <InputNumber v-model="entity.workHour" :min="0"></InputNumber>
         </FormItem>
         </Col>
         <Col :span="12">
@@ -51,7 +51,7 @@ export default {
                 deleterUserId: null,
                 projectId: "",
                 planId: "",
-                workHour: null,
+                workHour: 0,
                 status: null,
                 title: "",
                 note: "",

pages/project/task/index.vue

@@ -9,7 +9,7 @@
         </a>
     </div>
     <Content class="content" :class="!showMenu?'con_bord':''">
-        <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :lazy="true">
+        <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :lazy="true" :set="false">
             <template slot="easySearch">
                 <Form ref="formInline" inline>
                     <FormItem>
@@ -56,11 +56,13 @@
                     </FormItem>
                     <FormItem prop="keys"><Input placeholder="请输入项目标题/计划名称/任务标题" v-model="easySearch.keys.value" v-width="240" /> </FormItem>
                     <FormItem><Button type="primary" @click="search">查询</Button></FormItem>
+                    <!--
                     <FormItem>
                         <Button @click="highSearch" type="text">
                             <Icon type="md-search" />高级
                         </Button>
                     </FormItem>
+                    -->
                 </Form>
             </template>
             <template slot="buttons">
@@ -251,7 +253,6 @@ export default {
                                     type: "icon",
                                     oprate: "edit",
                                     title: params.row.status == 0 ? "开始" : params.row.status == 2 ? "继续" : '',
-                                    // color: "#19be6b",
                                     //disable: (params.row.status == 0 || params.row.status == 2) ? false : true
                                 },
                                 on: {
@@ -263,7 +264,6 @@ export default {
                             //         icon: "ios-pause",
                             //         type: "icon",
                             //         title: "暂停",
-                            //         //color: "#19be6b",
                             //         //disable: params.row.status == 1 ? false : true
                             //     },
                             //     on: {
@@ -276,7 +276,6 @@ export default {
                                     type: "icon",
                                     oprate: "edit",
                                     title: "完成",
-                                    //color: "#19be6b",
                                     //disable: (params.row.status != 0 && params.row.status != 3) ? false : true
                                 },
                                 on: {
@@ -289,7 +288,6 @@ export default {
                                     type: "icon",
                                     oprate: "add",
                                     title: "新增记录",
-                                    //color: "#19be6b",
                                     // disable: (params.row.status != 3 && params.row.status != 4) ? false : true
                                 },
                                 on: {
@@ -302,7 +300,6 @@ export default {
                                     type: "icon",
                                     oprate: "edit",
                                     title: "修改",
-                                    // color: "#2b85e4",
                                     //disable: (params.row.status == 0 || params.row.status == 2) ? false : true
                                 },
                                 on: {
@@ -315,7 +312,6 @@ export default {
                                     type: "icon",
                                     title: "删除",
                                     oprate: 'delete',
-                                    //color: "#ed4014",
                                     // disable: (params.row.status == 0 || params.row.status == 3) ? false : true
                                 },
                                 on: {
@@ -335,6 +331,9 @@ export default {
             planIdsCur: []
         }
     },
+    props: {
+        eid: String
+    },
     async fetch({
         store,
         params
@@ -342,15 +341,18 @@ export default {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
     created() {
-        if (this.$route.params.id != '') {
-            this.projectId = this.$route.params.id
-            this.easySearch.projectId.value = this.$route.params.id
+        if (this.eid != '') {
+            this.projectId = this.eid
+            this.easySearch.projectId.value = this.eid
         }
         this.treeHeight = window.innerHeight - 150;
     },
     mounted() {
+        if (this.eid != "") {
+            this.easySearch.projectId.value = this.eid
             this.$refs.grid.reload(this.easySearch);
-        console.log(this.easySearch);
+        }
+
     },
     methods: {
         ok() {
@@ -427,7 +429,7 @@ export default {
                 },
                 projectId: {
                     op: "Equal",
-                    value: this.$route.params.id
+                    value: this.eid
                 },
             };
             this.$refs.grid.reload(where);
@@ -470,7 +472,7 @@ export default {
         addRecord(id) {
             this.curId = id;
             this.title = "新增记录";
-            this.fullScreen = true;
+            this.fullScreen = false;
             this.detail = () => import('../record/add')
             this.modal = true;
         },
@@ -478,6 +480,13 @@ export default {
             let vkey = "project_task" + "." + key;
             return this.$t(vkey) || key
         }
+    },
+    watch: {
+        eid(v) {
+            if (v != "") {
+                this.eid = v
+            }
+        }
     }
 }
 </script>