sunran 3 роки тому
батько
коміт
5fb9e42b99

+ 35 - 12
src/views/weibao/components/vanUploader.vue

@@ -36,7 +36,7 @@
 import { uploadImage } from '../api/index.js'
 import { compressAccurately } from 'image-conversion'
 export default {
-  props: ['text'],
+  props: ['text', 'showimg'],
   data() {
     return {
       multiMediaUrl: [],
@@ -44,7 +44,19 @@ export default {
       fileList: [],
     }
   },
+  watch: {
+    showimg: {
+      handler(val, old) {
+        console.log(val, '123')
+        console.log(old, '78')
+      },
+    },
+  },
   methods: {
+    childrenClear() {
+      this.imgUrl = []
+      this.multiMediaUrl = []
+    },
     // 返回布尔值
     beforeRead(file) {
       if (file.length) {
@@ -84,9 +96,9 @@ export default {
         file.forEach(async (item) => {
           item.status = 'uploading'
           item.message = '上传中...'
-          const res = await compressAccurately(item.file, 400)
-          const obj = {}
-          obj.file = res
+          //   const res = await compressAccurately(item.file, 400)
+          //   const obj = {}
+          //   obj.file = res
           //添加入参
           formDate.append('file', item.file)
           this.uploading(formDate, item)
@@ -94,13 +106,26 @@ export default {
       } else {
         file.status = 'uploading'
         file.message = '上传中...'
-        const res = await compressAccurately(file.file, 400)
-        const obj = {}
-        obj.file = res
-        //添加入参
-        formDate.append('file', obj.file)
-        this.uploading(formDate, file)
+        console.log(file.file.name)
+        if (
+          file.file.name.indexOf('.png') != -1 ||
+          file.file.name.indexOf('.jpg') != -1 ||
+          file.file.name.indexOf('.jpeg') != -1
+        ) {
+          const res = await compressAccurately(file.file, 400)
+          console.log(res, 'res')
+          const obj = {}
+          obj.file = res
+          //添加入参
+          formDate.append('file', obj.file)
+          this.uploading(formDate, file)
+        } else {
+          //添加入参
+          formDate.append('file', file.file)
+          this.uploading(formDate, file)
+        }
       }
+      console.log(this.multiMediaUrl, 'this.multiMediaUrl')
     },
     async uploading(formDate, file) {
       var res = await uploadImage(formDate)
@@ -115,8 +140,6 @@ export default {
       return res.code
     },
     deleteUploader(v, index) {
-      console.log(index, 'inde')
-      //   this.fileList.splice(index.index, 1)
       this.$emit('getfileList', this.text, index.index)
     },
   },

+ 7 - 4
src/views/weibao/views/consultation/initiateConsultation.vue

@@ -70,8 +70,8 @@
             <van-field class="textarea" v-model="form.content" :rules="[{ required: true}]" rows="1" type="textarea" placeholder="请输入活动详情" />
           </van-col>
         </van-row>
-        <vanUploader :text="'图片'" @getfileList="getfileList"></vanUploader>
-        <vanUploader :text="'视频'" @getfileList="getfileList"></vanUploader>
+        <vanUploader :text="'图片'" ref="vanimg" @getfileList="getfileList"></vanUploader>
+        <vanUploader :text="'视频'" ref="vanvideo" @getfileList="getfileList"></vanUploader>
       </div>
       <div style="text-align:center;">
         <van-button native-type="submit">确 定</van-button>
@@ -208,8 +208,11 @@ export default {
       if (res.code == '0000') {
         this.$toast.success('成功')
         this.$emit('changactive', 1)
-        this.form = { fileList: [] }
-        this.fileList = []
+        this.form = { pics: [], videos: [] }
+        this.pics = []
+        this.videos = []
+        this.$refs.vanimg.childrenClear()
+        this.$refs.vanvideo.childrenClear()
       }
     },
     showPopup() {

+ 1 - 1
src/views/weibao/views/reporting/index.vue

@@ -4,7 +4,7 @@
     <div class="box" v-if="roleIdStr==14||roleIdStr==15">
       <van-tabs v-model="active" @change="changetabs" sticky offset-top="46">
         <van-tab title="发起报告">
-          <initiateConsultation @changactive="changactive"></initiateConsultation>
+          <initiateConsultation  @changactive="changactive"></initiateConsultation>
         </van-tab>
         <van-tab title="历史报告">
           <div class="casebox">

+ 8 - 4
src/views/weibao/views/reporting/initiateConsultation.vue

@@ -46,8 +46,8 @@
             <van-field class="textarea" v-model="form.content" :rules="[{ required: true}]" rows="1" type="textarea" placeholder="请输入报告内容" />
           </van-col>
         </van-row>
-        <vanUploader :text="'图片'" @getfileList="getfileList"></vanUploader>
-        <vanUploader :text="'视频'" @getfileList="getfileList"></vanUploader>
+        <vanUploader :text="'图片'" ref="vanimg" @getfileList="getfileList"></vanUploader>
+        <vanUploader :text="'视频'" ref="vanvideo" :showimg="showimg" @getfileList="getfileList"></vanUploader>
       </div>
       <div style="text-align:center;">
         <van-button native-type="submit">确 定</van-button>
@@ -76,6 +76,7 @@ export default {
       form: {
         fileList: [],
       },
+      showimg: true,
       dateshow: false,
       appendFile: '',
       mandatoryDate: new Date(),
@@ -176,8 +177,11 @@ export default {
       if (res.code == '0000') {
         this.$toast.success('成功')
         this.$emit('changactive', 1)
-        this.form = { fileList: [] }
-        this.fileList = []
+        this.form = { pics: [], videos: [] }
+        this.pics = []
+        this.videos = []
+        this.$refs.vanimg.childrenClear()
+        this.$refs.vanvideo.childrenClear()
       }
     },
     showPopup() {