Pārlūkot izejas kodu

Merge branch 'iteration_0802' into test

lex-xin 3 gadi atpakaļ
vecāks
revīzija
78dd4f2051
1 mainītis faili ar 4 papildinājumiem un 1 dzēšanām
  1. 4 1
      src/views/contentManager/contentOperation.vue

+ 4 - 1
src/views/contentManager/contentOperation.vue

@@ -80,7 +80,7 @@
         <el-form-item label="上架时间" v-if="type == 5 || type == 8 || type == 3" prop="actionTime">
           <el-date-picker style="width:400px;"
                         v-model="form.actionTime"
-                        :clearable="false"
+                        :clearable="true"
                         type="datetimerange"
                         :default-time="['00:00:00', '23:59:59']"
                         range-separator="至"
@@ -630,6 +630,9 @@ export default {
           if(actionTime && actionTime.length > 0) {
             form.onlineTime = dayjs(actionTime[0]).format('YYYY-MM-DD HH:mm:ss')
             form.offlineTime = dayjs(actionTime[1]).format('YYYY-MM-DD HH:mm:ss')
+          } else {
+            form.onlineTime = null
+            form.offlineTime = null
           }
 
           if (this.pageType == "create") {