增加剥离逻辑

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -113,7 +113,8 @@ export default {
             console.log("all page data:", this.allFroms[nowPage])
             // 当点击到第三页时，更新第三页的图片列表
             if (nowPage === 'formTwo') {
-                this.$refs.pageThreeComp.getList('2', '3', this.currentReceiptInner.id);
+                console.log('品牌', this.detail.brand)
+                this.$refs.pageThreeComp.getList('2', '3', this.currentReceiptInner.id, this.detail.itemBrand);
             }
         },
         // 没有recepitid就新增

pages/orderDetailNew/components/pageOne.vue

@@ -133,8 +133,8 @@ export default {
                 console.log('currentReceipt 变化了', newVal);
                 if (newVal) {
                     //刷新图片列表
-                    this.getList('2', '1', newVal.id);
-                    this.getList('2', '2', newVal.id);
+                    this.getList('2', '1', newVal.id, this.orderDetail.itemBrand);
+                    this.getList('2', '2', newVal.id, this.orderDetail.itemBrand);
                 }
             }
         },

pages/orderDetailNew/components/pageThree.vue

@@ -173,7 +173,7 @@ export default {
                 if (newVal) {
                     console.log('这里是page3的', newVal.tableFee)
                     this.paymentAmount = newVal.tableFee || '0.00'
-                    this.getList('2', '3', newVal.id);
+                    this.getList('2', '3', newVal.id, this.orderDetail.itemBrand);
                 }
             },
             deep: true,

pages/orderDetailNew/components/pageTwo.vue

@@ -173,7 +173,7 @@ export default {
             handler(newVal) {
                 if (newVal) {
                     this.approvedPrice = Number(newVal.sellingPrice) || 0;
-                    this.getList('2', '3', newVal.id);
+                    this.getList('2', '3', newVal.id, this.orderDetail.itemBrand);
                 }
             },
             deep: true,

pages/orderDetailNew/mixin/imgUploadAndDownLoad.js

@@ -25,15 +25,15 @@ export default {
                             })
                         }
                         // 删除成功后刷新列表
-                        this.getList('2', '1', this.currentReceipt.id);
-                        this.getList('2', '2', this.currentReceipt.id);
-                        this.getList('2', '3', this.currentReceipt.id);
+                        this.getList('2', '1', this.currentReceipt.id, this.orderDetail.itemBrand);
+                        this.getList('2', '2', this.currentReceipt.id, this.orderDetail.itemBrand);
+                        this.getList('2', '3', this.currentReceipt.id, this.orderDetail.itemBrand);
                     }
                 }
             })
         },
         //获取文件列表
-        async getList(type, orderFileType, receiptID) {
+        async getList(type, orderFileType, receiptID, itemBrand) {
             console.log('获取文件列表', type, receiptID)
             // console.log('当前的订单id', this.orderDetail.id)
             // console.log('当前的收单id', this.currentReceipt.id)
@@ -49,11 +49,25 @@ export default {
                 }
                 const response = await uni.$u.api.selectClueFileByDto(params)
                 if (orderFileType == '1') {
-                    this.trueUploadList = response.rows.filter(item => item.sourceId == receiptID) || []
+                    //如果itemBrand里面有逗号的话说明是多个品牌
+
+                    if (itemBrand.indexOf(',') != -1) {
+                        this.trueUploadList = response.rows.filter(item => item.sourceId == receiptID) || []
+                    } else {
+                        this.trueUploadList = response.rows
+                    }
                 } else if (orderFileType == '2') {
-                    this.chatRecordsUploadList = response.rows.filter(item => item.sourceId == receiptID) || []
+                    if (itemBrand.indexOf(',') != -1) {
+                        this.chatRecordsUploadList = response.rows.filter(item => item.sourceId == receiptID) || []
+                    } else {
+                        this.chatRecordsUploadList = response.rows
+                    }
                 } else if (orderFileType == '3') {
-                    this.detailImages = response.rows.filter(item => item.sourceId == receiptID) || []
+                    if (itemBrand.indexOf(',') != -1) {
+                        this.detailImages = response.rows.filter(item => item.sourceId == receiptID) || []
+                    } else {
+                        this.detailImages = response.rows
+                    }
                 }
             } catch (error) {
                 uni.$u.toast(`获取列表失败：${error}`)
@@ -89,9 +103,9 @@ export default {
 
                 this.bindOrder(p, receiptID);
 
-                this.getList('2', '1', this.currentReceipt.id);
-                this.getList('2', '2', this.currentReceipt.id);
-                this.getList('2', '3', this.currentReceipt.id);
+                this.getList('2', '1', this.currentReceipt.id, this.orderDetail.itemBrand);
+                this.getList('2', '2', this.currentReceipt.id, this.orderDetail.itemBrand);
+                this.getList('2', '3', this.currentReceipt.id, this.orderDetail.itemBrand);
 
 
             } catch (error) {