Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/utils/model/upload/index.vue

@@ -77,7 +77,7 @@ export default {
     },
     autoUpload:{
         type:Boolean,
-        default:true
+        default:false
     },
     fileList:{
         type:Array,

src/views/event/components/dialog/addEvent.vue

@@ -39,7 +39,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="文件上传">
-            <myUpload :file-list="files" @on-change="onchange"></myUpload>
+            <myUpload :file-list="files" @on-change="onchange" @on-remove="onRemove" style="height: 180px;"></myUpload>
           </el-form-item>
           <el-form-item label="事件描述" prop="description">
             <el-input type="textarea" :rows="2" v-model="formData[0].description" autocomplete="off" placeholder="请输入事件描述"
@@ -159,7 +159,9 @@ export default {
       },
       eventInput:'',
       //客户集合
-      clientList:[]
+      clientList: [],
+      // 文件数组
+      files:[],
     }
   },
   watch: {},
@@ -171,6 +173,31 @@ export default {
     await this.getCommonData()
   },
   methods: {
+    // 自定义组件文件删除
+    onRemove(file, fileList) {
+      let a=this.files.findIndex(item => {
+        return item.size == file.size
+      })
+      this.files.splice(a,1)
+    },
+    // 自定义组件文件监听
+    onchange(file,fileList) {
+      if (this.files && this.files.length>0) {
+        let a=this.files.findIndex(item => {
+          return item.size == file.size
+        })
+        if (a != -1) {
+          this.$message.error(`${file.raw.name}文件重复`)
+          this.files.splice(a,1,file.raw)
+        } else {
+          this.files.push(file.raw)
+        }
+      } else {
+        this.files.push(file.raw)
+      }
+      
+    },
+
     //获取客户信息
     getAdminClientList() {
       let params = {
@@ -214,6 +241,7 @@ export default {
         // this.$refs.select2.blur()
         this.$refs.ruleForm.resetFields()
       }
+      this.files=[]
       this.dialogVisible = false
     },
     // 请求应用场景(是通过字典还是接口待定)
@@ -283,7 +311,9 @@ export default {
     //提交保存、编辑事件接口
     addInterface(forms) {
       let formData = new FormData()
-      // formData.append('file')//文件数据
+      if (this.files && this.files.length>0) {
+        formData.append('guids',this.files)//文件数据
+      }
       formData.append('event', JSON.stringify(forms[0]))
       if (forms[0].id) {//编辑
         this.$api.updateEvent(formData).then(res => {