Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test

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

@@ -480,6 +480,7 @@
                 <el-form-item :label="'上架日期'">
                   <el-date-picker
                     v-model="form.putOnTime"
+                    clearable
                     :disabled="methods == 0"
                     type="datetime"
                     :placeholder="'请选择'"
@@ -490,6 +491,7 @@
                 <el-form-item :label="'下架日期'">
                   <el-date-picker
                     v-model="form.putOffTime"
+                    clearable
                     :disabled="methods == 0"
                     type="datetime"
                     :placeholder="'请选择'"
@@ -500,6 +502,7 @@
                 <el-form-item :label="'预计发货时间'">
                   <el-date-picker
                     v-model="form.arrivalTime"
+                    clearable
                     :disabled="methods == 0"
                     type="datetime"
                     :placeholder="'请选择'"

src/views/goodsManage/goodsRelease/jcsz.vue

@@ -428,6 +428,7 @@
                 <el-form-item :label="'上架日期'">
                   <el-date-picker
                     v-model="form.putOnTime"
+                    clearable
                     type="datetime"
                     :placeholder="'请选择'"
                   />
@@ -437,6 +438,7 @@
                 <el-form-item :label="'下架日期'">
                   <el-date-picker
                     v-model="form.putOffTime"
+                    clearable
                     type="datetime"
                     :placeholder="'请选择'"
                   />
@@ -446,6 +448,7 @@
                 <el-form-item :label="'预计发货时间'">
                   <el-date-picker
                     v-model="form.arrivalTime"
+                    clearable
                     type="datetime"
                     :placeholder="'请选择'"
                   />