Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -234,7 +234,7 @@
                 <ws-form-item v-if='serviceManagementType==1' label="入库日期" span="1" prop="inOutDate"
                   class="deliverydate">
                   <el-date-picker :disabled='recheck' v-model="deptBudgetList.inOutDate" placeholder="请选择入库日期"
-                    type="date" value-format="yyyy-MM-dd"></el-date-picker>
+                    type="date" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
                 </ws-form-item>
                 <ws-form-item v-if='serviceManagementType==1' label="运输方式" span="1" prop="outType">
                   <el-select :disabled='disablednotarize||recheck' v-model="deptBudgetList.outType"