coys

src/api/training.js

@@ -20,6 +20,15 @@ export function gettrainingInfo(query) {
     
   })
 }
+//编辑任务登记
+export function edittrainingInfo(data) {
+  return request({
+    url: `/core/eduTask`,
+    
+    method: 'put',
+    data
+  })
+}
 
 //新增调阅接口NFC||图片接口
 export function registration(data) {

src/components/upload/index.vue

@@ -65,20 +65,23 @@ export default {
       },
       //上传到服务器
       afterRead(fileObj){
+        
         console.log(fileObj,'flie');
         let formData = new FormData();
         formData.append("file", fileObj.file);
         upload(formData, "image").then((res) => {
           /*上传成功*/
-          let imgUrl =
-            process.env.NODE_ENV === "development"
-              ? process.env.VUE_APP_BASE_API + res.data.url
-              : window.origin + res.data.url;
+          
+          let imgUrl = process.env.NODE_ENV === "development"? process.env.VUE_APP_BASE_API + res.data.url : window.origin + res.data.url;
           let arr = [];
+          let emitList=[]
+          console.log(imgUrl);
+          
           arr.push({ name: res.data.name, url: imgUrl });
+          emitList.push(res.data.url)
           this.fileList = arr;
           //emit完整图片URL路径
-          this.$emit("input", this.listToString(this.fileList));
+          this.$emit("input",emitList);
           // //非完整图片URL路径
           // this.$emit("imgUrl", res.data.url);
         }).catch((err) => {

src/config/env.development.js

@@ -2,7 +2,7 @@
 module.exports = {
   title: 'soc-app-dev',
   baseUrl: 'http://localhost:9018', // 项目地址
-  baseApi: '/luojun', // 本地api请求地址,注意：如果你使用了代理，请设置成'/'
+  baseApi: '/luowei', // 本地api请求地址,注意：如果你使用了代理，请设置成'/'
   APPID: 'xxx',
   APPSECRET: 'xxx',
   $cdn: 'https://www.sunniejs.cn/static'  //静态资源

src/views/menu/monitoringCall/components/addInfo.vue

@@ -202,7 +202,8 @@ export default {
   },
   created() {
     this.init()
-    this.disabled=this.$route.params.id.split('_')[3]
+    this.disabled=+this.$route.params.id.split('_')[3]? true:false
+    console.log(this.disabled);
   },
 
   mounted() {},

src/views/menu/monitoringCall/index.vue

@@ -127,19 +127,19 @@ export default {
       let str = ''
       // 0待调阅，1调阅中，2已调阅，3已超期
       switch (value) {
-        case 0:
+        case '0':
           str = '待调阅'
 
           break
-        case 1:
+        case '1':
           str = '调阅中'
           break
 
-        case 2:
+        case '2':
           str = '已调阅'
           break
 
-        case 3:
+        case '3':
           str = '已超期'
           break
       }

src/views/menu/training/components/addTraining.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <NavBar />
-    <van-form @submit="onSubmit" class="bigbox">
+    <van-form  class="bigbox" ref="form" >
       <div class="mainItem">
         <div>标题</div>
         <div>{{trainingData?.title}}</div>
@@ -29,7 +29,7 @@
         readonly
         clickable
         name="datetimePicker"
-        :value="form.startDate"
+        :value="form.trainingStartDateTime"
         required
         :rules="[{ required: true, message: '培训开始时间不能为空' }]"
         label="培训开始时间"
@@ -44,7 +44,7 @@
         readonly
         clickable
         name="datetimePicker"
-        :value="form.endDate"
+        :value="form.trainingEndDateTime"
         required
         :rules="[{ required: true, message: '培训结束时间不能为空' }]"
         label="培训结束时间"
@@ -85,12 +85,12 @@
       <!-- 上传 -->
       <van-field readonly clickable name="uploader" label="上传图片">
         <template #input>
-          <Upload></Upload>
+          <Upload @input="listHandler"></Upload>
         </template>
       </van-field>
       <div class="btns">
-        <van-button type="info" native-type="submit">保存</van-button>
-        <van-button type="info" native-type="submit">提交</van-button>
+        <van-button type="info" >保存</van-button>
+        <van-button type="info"  @click="submitHandler">提交</van-button>
       </div>
     </van-form>
   </div>
@@ -99,7 +99,7 @@
 import NavBar from '@/components/NavBar'
 import CheckPeople from '@/components/checkPeople/index.vue'
 import Upload from '@/components/upload/index.vue'
-import { gettrainingInfo } from '@/api/training.js'
+import { gettrainingInfo,edittrainingInfo } from '@/api/training.js'
 import { newDateDay } from '@/utils/date.js'
 import { Dialog } from 'vant'
 export default {
@@ -119,12 +119,15 @@ export default {
         content:'',//培训内容
         note:'',//培训总结
         taskUserList:[],//人员数组
-        startDate: '', //开始时间
-        endDate: '' //开始时间
+        imageList:[],//图片数组
+        trainingStartDateTime: '', //开始时间
+        trainingEndDateTime: '' //开始时间
       },
       trainingData:{
 
       },
+      userPeopleList:[],//参与人员数组
+      lackPeopleList:[],//缺席人员数组
       showPicker: false, //培训类型显示隐藏
       showStartDate: false, //开始时间显示隐藏
       showEndDate: false, //结束时间显示隐藏
@@ -173,27 +176,65 @@ export default {
     },
     //开始时间确认
     onConfirmDate(val) {
-      this.form.startDate = newDateDay(val)
+      this.form.trainingStartDateTime = newDateDay(val)
       
       this.showStartDate = false
     },
     //结束时间
     onConfirmEndDate(val) {
-      this.form.endDate = newDateDay(val)
+      this.form.trainingEndDateTime = newDateDay(val)
       this.showEndDate = false
     },
     userListHandler(list){
       list.forEach(item => {
-        item.type=1
+        item.type=1,
+        item.userId=item.id
       });
-      this.taskUserList.concat(list)
+      
+      this.userPeopleList=(list)
     },
     lackUserListHandler(list){
       list.forEach(item => {
         item.type=2
+        item.userId=item.id
       });
-      this.taskUserList.concat(list)
+      
+      this.lackPeopleList=(list)
 
+    },
+    //上传附件成功
+    listHandler(list){
+      
+      console.log(list,'ssss');
+      this.form.imageList=list
+    },
+   
+    //表单提交
+    submitHandler(){
+      this.$refs.form.validate().then(()=>{
+        Dialog.confirm({
+        title: '',
+        message: '是否提交培训数据?'
+      })
+        .then(() => {
+          let obj=JSON.parse(JSON.stringify(this.form))
+          // obj.trainingStartDateTime=obj.trainingStartDateTime+' 00:00:00'
+          this.form.taskUserList.push(...this.userPeopleList,...this.lackPeopleList)
+          edittrainingInfo({
+            id:this.trainingData.id,
+            type:this.trainingData.type,
+            submitType:2,
+            ...this.form
+          }).then(res=>{
+
+          })
+        })
+        .catch(() => {
+          // on cancel
+        })
+      })
+      
+      
     }
   }
 }