coys

src/components/upload/index.vue

@@ -83,9 +83,9 @@ export default {
           
           arr.push({ name: res.data.name, url: imgUrl });
           emitList.push(res.data.url)
-          this.fileList = arr;
+          this.fileList.push(...arr)
           //emit完整图片URL路径
-          this.$emit("input",emitList);
+          this.$emit("input",this.fileList);
           // //非完整图片URL路径
           // this.$emit("imgUrl", res.data.url);
         }).catch((err) => {

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

@@ -261,7 +261,7 @@ export default {
         this.dataList = JSON.parse(JSON.stringify(res))
         this.dataList.forEach(item => {
           this.$set(item, 'situation', '0') //异常情况初始化默认值
-          this.$set(item, 'abnormalIllustrate', ' ') //情况说明初始化默认值
+          this.$set(item, 'abnormalIllustrate', '') //情况说明初始化默认值
         })
         this.getInfoHandler() //获取详情
       })
@@ -326,9 +326,12 @@ export default {
         this.falg = true
         return
       }
-
+      console.log( this.dataList);
+      
       this.dataList.forEach(item => {
+        
         if (item.situation == '1' && item.abnormalIllustrate == '') {
+          
           Toast(`${item.dictLabel}的异常情况说明不能为空!`)
           this.falg = true
         }

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

@@ -189,6 +189,8 @@ export default {
       list.forEach(item => {
         item.type=1,
         item.userId=item.id
+        item.userName=item.username
+        delete item.username
       });
       
       this.userPeopleList=(list)
@@ -196,7 +198,9 @@ export default {
     lackUserListHandler(list){
       list.forEach(item => {
         item.type=2
-        item.userId=item.id
+        item.userId=item.id,
+        item.userName=item.username
+        delete item.username
       });
       
       this.lackPeopleList=(list)
@@ -206,7 +210,7 @@ export default {
     listHandler(list){
       
       console.log(list,'ssss');
-      this.form.imageList=list
+      this.form.imageList.push(list)
     },
    
     //表单提交
@@ -218,13 +222,14 @@ export default {
       })
         .then(() => {
           let obj=JSON.parse(JSON.stringify(this.form))
+          obj.imageList=obj.imageList.join(',')
           // obj.trainingStartDateTime=obj.trainingStartDateTime+' 00:00:00'
-          this.form.taskUserList.push(...this.userPeopleList,...this.lackPeopleList)
+          obj.taskUserList.push(...this.userPeopleList,...this.lackPeopleList)
           edittrainingInfo({
             id:this.trainingData.id,
             type:this.trainingData.type,
             submitType:2,
-            ...this.form
+            ...obj
           }).then(res=>{
             let { code ,msg}=res
             Toast('登记成功')

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

@@ -4,7 +4,7 @@
 
     <div class="mainItem">
       <div>标题</div>
-      <div>抚琴路支行</div>
+      <div>{{trainingData}}</div>
     </div>
     <div class="mainItem">
       <div>单位名称</div>
@@ -64,6 +64,8 @@
 <script>
 import NavBar from '@/components/NavBar'
 import writingPad from '@/components/writingPad/index.vue'
+import { gettrainingInfo } from '@/api/training.js'
+
 export default {
   name: 'SocAppAddTraining',
   components: {
@@ -72,10 +74,19 @@ export default {
   },
   data() {
     return {
-      show: false
+      show: false,
+      trainingData:{},//详情数据
     }
   },
-
+  created(){
+     //获取详情信息
+     gettrainingInfo(this.$route.params.id).then(res=>{
+      let { code, data, msg } = res
+        if (code == 200) {
+          this.trainingData= data
+        }
+    })
+  },
   mounted() {},
 
   methods: {

src/views/menu/training/index.vue

@@ -360,8 +360,8 @@ export default {
       this.$router.push('/Addtraining/' + id)
     },
     //签名
-    signature() {
-      this.$router.push('/personnelSignature/' + '1111')
+    signature(id) {
+      this.$router.push('/personnelSignature/' + id)
     },
     onChange(picker, value, index) {},
     onCancel() {