coys 2 년 전
부모
커밋
ac08ac1aa3
3개의 변경된 파일26개의 추가작업 그리고 9개의 파일을 삭제
  1. 15 0
      src/utils/date.js
  2. 2 2
      src/views/menu/monitoringCall/components/addInfo.vue
  3. 9 7
      src/views/menu/training/components/addTraining.vue

+ 15 - 0
src/utils/date.js

@@ -16,3 +16,18 @@ export function newDateDay(time) {
   d = d < 10 ? '0' + d : d
   return y + '-' + m+'-'+d
 }
+export function newDateTime(time) {
+  var date = new Date(time)
+  var y = date.getFullYear()
+  var m = date.getMonth() + 1
+  m = m < 10 ? '0' + m : m
+  var d = date.getDate()
+  d = d < 10 ? '0' + d : d
+  var hh =
+  (date.getHours() < 10 ? "0" + date.getHours() : date.getHours()) + ":";
+  var mm =
+  (date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()) +
+  ":";
+  var ss = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds()
+  return y + '-' + m+'-'+d+' '+hh+mm+ss
+}

+ 2 - 2
src/views/menu/monitoringCall/components/addInfo.vue

@@ -32,7 +32,7 @@
               show-toolbar
               :columns="hostList"
               @confirm="onConfirm"
-              @cancel="onCancel"
+              @cancel="showHost=false"
               @change="onChange"
             >
               <template #option="option">
@@ -63,7 +63,7 @@
               show-toolbar
               :columns="columns"
               @confirm="onConfirmPassage"
-              @cancel="onCancel"
+              @cancel="showStatus=false"
               @change="onChange"
             >
               <template #option="option">

+ 9 - 7
src/views/menu/training/components/addTraining.vue

@@ -37,7 +37,7 @@
         @click="showStartDate = true"
       />
       <van-popup v-model="showStartDate" position="bottom">
-        <van-datetime-picker type="date" @confirm="onConfirmDate" @cancel="showStartDate = false" />
+        <van-datetime-picker type="datetime" @confirm="onConfirmDate" @cancel="showStartDate = false" />
       </van-popup>
       <!-- 培训结束时间 -->
       <van-field
@@ -52,7 +52,7 @@
         @click="showEndDate = true"
       />
       <van-popup v-model="showEndDate" position="bottom">
-        <van-datetime-picker type="date" @confirm="onConfirmEndDate" @cancel="showEndDate = false" />
+        <van-datetime-picker type="datetime" @confirm="onConfirmEndDate" @cancel="showEndDate = false" />
       </van-popup>
       <!-- 培训内容 -->
       <van-field
@@ -100,8 +100,8 @@ import NavBar from '@/components/NavBar'
 import CheckPeople from '@/components/checkPeople/index.vue'
 import Upload from '@/components/upload/index.vue'
 import { gettrainingInfo,edittrainingInfo } from '@/api/training.js'
-import { newDateDay } from '@/utils/date.js'
-import { Dialog } from 'vant'
+import { newDateTime } from '@/utils/date.js'
+import { Dialog, Toast } from 'vant'
 export default {
   name: 'SocAppAddTraining',
   components: {
@@ -176,13 +176,13 @@ export default {
     },
     //开始时间确认
     onConfirmDate(val) {
-      this.form.trainingStartDateTime = newDateDay(val)
+      this.form.trainingStartDateTime = newDateTime(val)
       
       this.showStartDate = false
     },
     //结束时间
     onConfirmEndDate(val) {
-      this.form.trainingEndDateTime = newDateDay(val)
+      this.form.trainingEndDateTime = newDateTime(val)
       this.showEndDate = false
     },
     userListHandler(list){
@@ -226,7 +226,9 @@ export default {
             submitType:2,
             ...this.form
           }).then(res=>{
-
+            let { code ,msg}=res
+            Toast('登记成功')
+            this.$router.push('/training')
           })
         })
         .catch(() => {