Merge remote-tracking branch 'origin/dev' into dev

src/views/system/ManuallyCreatingTasks/index.vue

@@ -164,10 +164,19 @@
             </div>
             <div class="top">
               <div class="toptop">
-                <el-radio
-                  v-model="item.checked2"
-                  :label="2"
-                  @change="handleCheckAllChange2($event, item, index)"
+                <el-radio  v-model="item.checked2" :label="2" @change="handleCheckAllChange2($event, item, index)">
+                  <span style="width: 78px">指定时间：</span>
+                <el-date-picker
+                   format="yyyy-MM-dd HH:mm:ss"
+                   value-format="yyyy-MM-dd HH:mm:ss"
+                  v-model="item.nodePlanTime"
+                  type="datetime"
+                  placeholder="选择日期时间"
+                  :picker-options="pickerOptions"
+                  @input="input(item,index)"
+                  @focus="setCurrentTime(item,index)"
+                  :default-time="currentDate"
+                  ref="datePicker"
                 >
                   <span style="width: 78px">指定时间：</span>
                   <el-date-picker