task record

pages/project/record/index.vue

@@ -88,6 +88,19 @@ export default {
                         );
                     },
                 },
+                {
+                    key: "creatorUserId",
+                    title: this.l("creatorUserId"),
+                    align: "left",
+                    high: true,
+                    type: 'user'
+                },
+                {
+                    key: "creationTime",
+                    title: this.l("creationTime"),
+                    align: "left",
+                    high: true,
+                },
                 {
                     title: '操作',
                     key: 'action',

pages/project/task/add.vue

@@ -15,6 +15,11 @@
             <UserSelect ref="userSelected" v-model="entity.userId" />
         </FormItem>
         </Col>
+        <Col :span="12">
+        <FormItem label="计划开始结束时间" prop="date">
+            <DatePicker type="datetimerange" format="yyyy-MM-dd" v-model="date" placeholder="请选择时间范围" @on-change="changeFormat" style="width: 300px"></DatePicker>
+        </FormItem>
+        </Col>
         <Col :span="24">
         <FormItem :label="l('note')" prop="note">
             <i-quill v-model="entity.note" :height="300" v-paste="handleImg" />
@@ -40,29 +45,16 @@ export default {
         return {
             disabled: false,
             entity: {
-                creationTime: null,
-                creatorUserId: null,
-                lastModificationTime: null,
-                lastModifierUserId: null,
-                isDeleted: null,
-                deletionTime: null,
-                deleterUserId: null,
                 title: "",
-                planId: null,
-                projectId: null,
+                planId: '',
+                projectId: '',
                 level: null,
                 status: null,
-                projectTitle: "",
-                planTitle: "",
                 userIds: "",
                 userId: "",
-                endDate: null,
                 note: "",
-                startDate: null,
-                plansToStartDate: null,
-                plansToEndTime: null,
-                completePercentage: null,
-                upTaskId: null
+                planStartDate: null,
+                planEndDate: null,
             },
             rules: {
                 name: [{
@@ -124,6 +116,10 @@ export default {
                 this.entity.id = 0;
             });
         },
+        changeFormat(val) {
+            this.entity.planStartDate = val[0];
+            this.entity.planEndDate = val[1];
+        },
         handleImg(e) {
             console.warn(e)
             let file = null

pages/project/task/detail.vue

@@ -11,7 +11,10 @@
         <Filed :span="6" :name="l('userId')">
             <User :value="parseInt(entity.userId)"></User>
         </Filed>
-        <Filed :span="24" :name="l('startDate')">
+        <Filed :span="12" name="计划起止日期">
+            <TimeDifference :timeValue="timeValuePlan" :work="1"></TimeDifference>
+        </Filed>
+        <Filed :span="12" name="实际起止日期">
             <TimeDifference :timeValue="timeValue" :work="1"></TimeDifference>
         </Filed>
 
@@ -38,6 +41,10 @@ export default {
                 startDate: "",
                 endDate: "",
             },
+            timeValuePlan: {
+                planStartDate: "",
+                planEndDate: "",
+            },
             rules: {
                 name: [{
                     required: true,
@@ -72,6 +79,10 @@ export default {
                         startDate: r.result.startDate,
                         endDate: r.result.endDate,
                     },
+                    this.timeValuePlan = {
+                        planStartDate: r.result.planStartDate,
+                        planEndDate: r.result.planEndDate,
+                    },
                     this.$emit('on-load')
                 // this.curId = v
                 //this.detail = () => import('../record/index1')

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" :set="false">
+        <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :lazy="true">
             <template slot="easySearch">
                 <Form ref="formInline" inline>
                     <FormItem>
@@ -248,19 +248,17 @@ export default {
                     hide: true
                 },
                 {
-                    key: "creationTime",
-                    title: this.l("creationTime"),
+                    key: "creatorUserId",
+                    title: this.l("creatorUserId"),
                     align: "left",
                     high: true,
-                    hide: true,
+                    type: 'user'
                 },
                 {
-                    key: "creatorUserId",
-                    title: this.l("creatorUserId"),
+                    key: "creationTime",
+                    title: this.l("creationTime"),
                     align: "left",
                     high: true,
-                    hide: true,
-                    type: 'user'
                 },
                 {
                     title: '操作',