From c0a513a1a79d73a3407834db6102799b0cea61b6 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 20 Apr 2023 11:48:49 +0800
Subject: [PATCH] 285

---
 .../fengdu/app/AppIntegratingAudit/components/Detail.vue | 2 +-
 .../AppIntegratingSupermarket/components/AddStore.vue    | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/project/fengdu/app/AppIntegratingAudit/components/Detail.vue b/project/fengdu/app/AppIntegratingAudit/components/Detail.vue
index d34498d6..e4561ede 100644
--- a/project/fengdu/app/AppIntegratingAudit/components/Detail.vue
+++ b/project/fengdu/app/AppIntegratingAudit/components/Detail.vue
@@ -36,7 +36,7 @@
             <ai-info-item label="事件附件" isLine>
               <div class="files">
                 <div class="file-item" v-for="(item, index) in info.files" :key="index">
-                  <img :src="item.url" v-viewer="{movable: true}" v-if="item.postfix !== '.mp4'">
+                  <img :src="item.url" v-viewer="{movable: true}" v-if="['.mp4', '.mov'].includes(item.postfix) !== '.mp4'">
                   <video controls v-else :src="item.url"></video>
                 </div>
               </div>
diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue b/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue
index 3256b284..f3cf410d 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue
@@ -305,7 +305,9 @@
 
       onConfirm () {
         this.isShow = false
-        this.form.goodsList = this.chooseList.map(v => {
+        let list = this.chooseList.filter(v => {
+          return this.form.goodsList.map(e => e.goodsId).indexOf(v.id) === -1
+        }).map(v => {
           return {
             goods: {
               ...v
@@ -317,6 +319,11 @@
             status: v.status
           }
         })
+
+        this.form.goodsList = [
+          ...this.form.goodsList ,
+          ...list
+        ]
       },
 
       getInfo (id) {