Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-admin into bd-online

src/views/goodsManage/goodsList/goodsEdit/jcsz.vue

@@ -522,6 +522,7 @@
                     :disabled="methods==0"
                     type="datetime"
                     :placeholder="'请选择'"
+                    clearable
                   />
                 </el-form-item>
               </el-col>
@@ -532,6 +533,7 @@
                     :disabled="methods==0"
                     type="datetime"
                     :placeholder="'请选择'"
+                    clearable
                   />
                 </el-form-item>
               </el-col>
@@ -542,6 +544,7 @@
                     :disabled="methods==0"
                     type="datetime"
                     :placeholder="'请选择'"
+                    clearable
                   />
                 </el-form-item>
               </el-col>

src/views/goodsManage/goodsRelease/jcsz.vue

@@ -494,6 +494,7 @@
                     v-model="form.putOnTime"
                     type="datetime"
                     :placeholder="'请选择'"
+                    clearable
                   />
                 </el-form-item>
               </el-col>
@@ -503,6 +504,7 @@
                     v-model="form.putOffTime"
                     type="datetime"
                     :placeholder="'请选择'"
+                    clearable
                   />
                 </el-form-item>
               </el-col>
@@ -512,6 +514,7 @@
                     v-model="form.arrivalTime"
                     type="datetime"
                     :placeholder="'请选择'"
+                    clearable
                   />
                 </el-form-item>
               </el-col>

src/views/statistics/productSaleStatistics.vue

@@ -176,6 +176,8 @@ export default {
   created() {
     this.getSearch()
     this.getOthers()
+    this.select.startTime = this.timeRange[0]
+    this.select.endTime = this.timeRange[1]
   },
   methods: {
     isLocalSymbol,