时间控件样式优化

@@ -78,7 +78,7 @@
 
     export default {
         components:{
-            comGrid: grid
+            comGrid1: grid
         },
         data() {
             return {
@@ -121,10 +121,10 @@
         ready() {
             this.fetchData1();
             this.fetchData2();
-            /*
+/*
             this.$broadcast('grid-reload',{
-                type:1,
-                reqTime:this.dateFormat(new Date(),"YYYYMMdd"),
+                type: 1,
+                reqTime: util.dateFormat(new Date(),"YYYYMMdd"),
                 beginTime:"",
                 endTime:"",
                 productSkn:"",

@@ -28,6 +28,7 @@
 </template>
 
 <script>
+    import util from 'util';
     import grid from '../../../../components/grid/index';
     import card from './card';
     import filer from './filter';
@@ -44,10 +45,13 @@
         data() {
             return {
                 params:{
-                    skn:"",
-                    sku:"",
+                    beginTime:"",
+                    endTime:"",
+                    productSkn:"",
+                    productSkc:"",
+                    productSku:"",
                     factoryCode:"",
-                    type:-1
+                    sortId:""
                 },
                 grid:{
                     url:'/report/getStorageOutRptList',
@@ -73,6 +77,9 @@
                 }
             }
         },
+        ready() {
+
+        },
         methods: {
             submit(){
                 console.log(this.params);

 <template>
     <div class="panel-col">
+        <calendar :type="'date'" :value.sync="startDate" :placeholder="'开始时间'"></calendar>
+    </div>
+    <div class="panel-col">
+        <calendar :type="'datetime'" :value.sync="endDate" :placeholder="'结束时间'"></calendar>
+    </div>
+    <div class="panel-col">
         <input type="text" class="form-control" placeholder="SKN" v-model="params.skn">
     </div>
     <div class="panel-col">
@@ -10,7 +16,7 @@
     </div>
     <div class="panel-col">
         <select class="form-control" v-model="params.type">
-            <option value="-1">目录</option>
+            <option value="-1">一级目录</option>
             <option value="0">衣服</option>
             <option value="1">裤子</option>
             <option value="2">鞋子</option>
@@ -19,15 +25,20 @@
 </template>
 
 <script>
+    import calendar from '../../../../components/calendar/index';
+
     export default {
+        components: {
+            calendar:calendar
+        },
         props:{
             params:{type:Object, default:{}}
         },
-        data(){
-
-        },
-        methods:{
-
+        data() {
+            return{
+                startDate: "2015-12-10",
+                endDate: "2015-12-15"
+            }
         }
     }
 </script>
\ No newline at end of file

@@ -27,6 +27,7 @@
 </template>
 
 <script>
+    import util from 'util';
     import grid from '../../../../components/grid/index';
     import card from './card';
     import filer from './filter';
@@ -43,10 +44,13 @@
         data() {
             return {
                 params:{
-                   skn:"",
-                   sku:"",
-                   factoryCode:"",
-                   type:-1
+                    beginTime:"",
+                    endTime:"",
+                    productSkn:"",
+                    productSkc:"",
+                    productSku:"",
+                    factoryCode:"",
+                    sortId:""
                 },
                 grid:{
                     url:'/report/getStorageInRptList',
@@ -72,6 +76,9 @@
                 }
             }
         },
+        ready() {
+
+        },
         methods: {
             submit(){
                 console.log(this.params);

  <style>
+.datepicker{
+    padding: 10px;
+}
 .datepicker.vue-show{
     display:block;
 }
@@ -7,13 +10,15 @@
 }
 .calendar-button{
     float:right;
+    margin: 5px 5px 0;
 }
 .calendar-time{
     text-align:center;
+    margin: 5px 0;
 }
  </style>
 <template>
-    <input type="text" @click="showCalendar" v-model="value" placeholder="请输入日期" class="form-control">
+    <input type="text" @click="showCalendar" v-model="value" placeholder="{{placeholder}}" class="form-control">
     <div @click.stop=""  @touchstart.stop="" class="datepicker datepicker-dropdown dropdown-menu vue-show" v-show="show" :style="{'left':x+'px','top':y+'px'}" transition="calendar" transition-mode="out-in">
         <div class="datepicker-days vue-show-imo">
             <table class=" table-condensed">
@@ -81,6 +86,10 @@ module.exports = {
             twoWay: true,
             default:""   
         },
+        placeholder: {
+            type: String,
+            default:"请输入日期"
+        },
         x: {
             type: Number,
             default:0 
@@ -360,7 +369,7 @@ module.exports = {
             var that=this;
             that.show=true;
             that.x=e.target.offsetLeft;
-            that.y=e.target.offsetTop+e.target.offsetHeight+8;
+            that.y=e.target.offsetTop+e.target.offsetHeight+0;
             var bindHide=function(e){
                 e.stopPropagation();
                 that.show=false;