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

pages/project/task/detail.vue

@@ -30,14 +30,14 @@
                 <Col :span="8">
                 <FormItem label>
                     <span style="float:left">计划起止日期：&nbsp;</span>
-                    <DateRange :timeValue="timeValuePlan">
+                    <DateRange v-model="timeValuePlan" mode='d'>
                     </DateRange>
                 </FormItem>
                 </Col>
                 <Col :span="8">
                 <FormItem label>
                     <span style="float:left">实际起止日期：&nbsp;</span>
-                    <DateRange :timeValue="timeValue"></DateRange>
+                    <DateRange v-model="timeValue"></DateRange>
                 </FormItem>
                 </Col>
             </Row>

pages/project/task/index.vue

@@ -44,15 +44,6 @@
                                 -->
                             </Menu>
                         </div>
-                        <div class="taskTab" v-if="false">
-                            <Tabs value="statu2">
-                                <TabPane label="所有" name="statu1" />
-                                <TabPane label="未关闭" name="statu2" />
-                                <TabPane label="指派给我" name="statu3" />
-                                <TabPane label="由我参与" name="statu4" />
-                                <TabPane label="已延期" name="statu5" />
-                            </Tabs>
-                        </div>
                     </FormItem>
                     <FormItem prop="keys"><Input placeholder="请输入项目标题/计划名称/任务标题" v-model="easySearch.keys.value" v-width="240" /> </FormItem>
                     <FormItem><Button type="primary" @click="search">查询</Button></FormItem>
@@ -68,11 +59,6 @@
             <template slot="buttons">
                 <Button type="primary" @click="add" v-if="planId!=''">新增</Button>
             </template>
-            <template slot="batch">
-                <Button type="primary" class="mr10 ml10">开始</Button>
-                <Button type="primary" class="mr10 ml10">暂停</Button>
-                <Button type="primary" class="mr10 ml10">继续</Button>
-            </template>
         </DataGrid>
         <Modal v-model="modal" :title="title" width="1200" :fullscreen="fullScreen" footer-hide>
             <component :is="detail" :eid="curId" :pid="planId" :row="rowObj" @on-close="cancel" @on-ok="ok" />
@@ -110,6 +96,10 @@ export default {
                 planId: {
                     op: "In",
                     value: []
+                },
+                status: {
+                    op: "In",
+                    value: []
                 }
             },
             theme1: 'light',
@@ -164,7 +154,7 @@ export default {
                     title: this.l("status"),
                     align: "center",
                     high: true,
-                    width: 120,
+                    width: 100,
                     code: 'project.task.status'
                 },
 
@@ -180,14 +170,15 @@ export default {
                     title: '计划起止日期',
                     align: "center",
                     high: true,
-                    width: 200,
+                    width: 280,
                     render: (h, params) => {
                         return h('DateRange', {
                             props: {
-                                timeValue: {
+                                value: {
                                     startDate: params.row.plansToStartDate,
                                     endDate: params.row.plansToEndTime,
-                                }
+                                },
+                                mode: 'd'
                             }
                         })
                     }
@@ -197,14 +188,15 @@ export default {
                     title: '实际起止日期',
                     align: "center",
                     high: true,
-                    width: 200,
+                    width: 280,
                     render: (h, params) => {
                         return h('DateRange', {
                             props: {
-                                timeValue: {
+                                value: {
                                     startDate: params.row.startDate,
                                     endDate: params.row.endDate,
-                                }
+                                },
+                                mode: 'd'
                             }
                         })
                     }