剥离receiptorder附件

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -2,11 +2,12 @@
     <view class="orderDetailNewView">
 
         <view class="page-item" v-show="activeIndex === 0">
-            <pageOne @handleNextClick="handleNextClick" :orderDetail="detail" :orderId="orderId" />
+            <pageOne @handleNextClick="handleNextClick" :orderDetail="detail" :orderId="orderId"
+                :currentReceipt="currentReceiptInner" />
         </view>
         <view class="page-item" v-show="activeIndex === 1">
             <pageTwo @handleNextClick="handleNextClick" :orderDetail="detail" :orderId="orderId"
-                :followUpList="followUpList" />
+                :currentReceipt="currentReceiptInner" :followUpList="followUpList" />
         </view>
         <view class="page-item" v-show="activeIndex === 2">
             <pageThree @handleNextClick="handleNextClick" :orderDetail="detail" @handleNeedSave="handleNeedSave"
@@ -113,7 +114,7 @@ export default {
             console.log("all page data:", this.allFroms[nowPage])
             // 当点击到第三页时，更新第三页的图片列表
             if (nowPage === 'formTwo') {
-                this.$refs.pageThreeComp.getList('2', '3');
+                this.$refs.pageThreeComp.getList('2', '3', this.currentReceiptInner.id);
             }
         },
         // 没有recepitid就新增
@@ -137,7 +138,7 @@ export default {
                 "updateTime": this.detail.updateTime,
                 // "remark": ,    //发单备注，先不传
                 "params": this.detail.params,     //看接口文档
-                "id": this.detail.receiptId,
+                "id": this.currentReceiptInner.id,
                 "sendFormId": this.orderId, //接单中心的id，就是接单中心列表的id（发单id）
                 "clueId": this.detail.clueId,
                 "item": this.detail.item,
@@ -208,7 +209,7 @@ export default {
                 "updateTime": this.detail.updateTime,
                 // "remark": ,    //发单备注，先不传
                 "params": this.detail.params,     //看接口文档
-                "id": this.detail.receiptId,
+                "id": this.currentReceiptInner.id,
                 "sendFormId": this.orderId, //接单中心的id，就是接单中心列表的id（发单id）
                 "clueId": this.detail.clueId,
                 "item": warehouseInfo.item || '',

pages/orderDetailNew/components/pageFour.vue

@@ -291,7 +291,7 @@ export default {
                         remarks: data.receiptRemark?.split(';')[0] || '',//收单备注  截取备注第一部分
                     }
                     this.$nextTick(() => {
-                        this.getList()
+                        this.getShareList()
                     })
                 }
             },
@@ -436,7 +436,7 @@ export default {
         },
 
         //初始化分成比例
-        async getList() {
+        async getShareList() {
             const { rows, total } = await uni.$u.api.selectCommissionList({
                 pageSize: 9999,
                 pageNum: 1,
@@ -479,7 +479,7 @@ export default {
             try {
                 await uni.$u.api.deleteClueCommissionForm(id)
                 uni.$u.toast('删除成功')
-                this.getList()
+                this.getShareList()
             } catch (error) {
                 uni.$u.toast('删除失败，请稍后重试')
             }

pages/orderDetailNew/components/pageOne.vue

@@ -19,7 +19,7 @@
                         <pic-comp :src="item.fileUrl"></pic-comp>
                         <view class="delete-btn" @click="deleteImage(item)">×</view>
                     </view>
-                    <view class="upload-btn" @click="uploadImage('truePic')">
+                    <view class="upload-btn" @click="uploadImage('truePic', currentReceipt.id)">
                         <u-icon name="plus" size="40" color="#999"></u-icon>
                     </view>
                 </view>
@@ -36,7 +36,7 @@
                         <pic-comp :src="item.fileUrl"></pic-comp>
                         <view class="delete-btn" @click="deleteImage(item)">×</view>
                     </view>
-                    <view class="upload-btn" @click="uploadImage('chatRecords')">
+                    <view class="upload-btn" @click="uploadImage('chatRecords', currentReceipt.id)">
                         <u-icon name="plus" size="40" color="#999"></u-icon>
                     </view>
                 </view>
@@ -101,7 +101,11 @@ export default {
         orderId: {
             type: String,
             default: '',
-        }
+        },
+        currentReceipt: {
+            type: Object,
+            default: () => { },
+        },
     },
     components: {
         picComp
@@ -119,12 +123,21 @@ export default {
         // 监听 props 变化，触发请求
         orderDetail: {
             handler(newVal) {
-                if (newVal) { // 确保 props 有值再执行
-                    this.getList('2', '1');
-                    this.getList('2', '2');
+                if (newVal) {
+                    console.log('orderDetail 变化了', newVal);
                 }
             }
-        }
+        },
+        currentReceipt: {
+            handler(newVal) {
+                console.log('currentReceipt 变化了', newVal);
+                if (newVal) {
+                    //刷新图片列表
+                    this.getList('2', '1', newVal.id);
+                    this.getList('2', '2', newVal.id);
+                }
+            }
+        },
     },
     methods: {
 

pages/orderDetailNew/components/pageThree.vue

@@ -56,7 +56,7 @@
                         </view>
 
                         <!-- 上传按钮 -->
-                        <view class="detail-upload-btn" @click="uploadImage('detailImages')">
+                        <view class="detail-upload-btn" @click="uploadImage('detailImages', currentReceipt.id)">
                             <u-icon name="plus" size="40rpx" color="#999"></u-icon>
                         </view>
                     </view>
@@ -164,7 +164,6 @@ export default {
                     this.paymentInfo.bankAccount = newVal.bankCardNumber || ''
                     this.paymentInfo.idNumber = newVal.idCard || ''
                     this.paymentAmount = newVal.tableFee || '0.00'
-                    this.getList('2', '3');
                 }
             },
             deep: true,
@@ -174,6 +173,7 @@ export default {
                 if (newVal) {
                     console.log('这里是page3的', newVal.tableFee)
                     this.paymentAmount = newVal.tableFee || '0.00'
+                    this.getList('2', '3', newVal.id);
                 }
             },
             deep: true,
@@ -364,19 +364,7 @@ export default {
             });
         },
 
-        // 确认未收按钮点击事件
-        confirmUnpaid() {
-            console.log('确认未收，评分：', this.unpaidRating);
-            this.unpaidModelShow = false;
-            // 可以在这里添加提交评分的逻辑
-        },
 
-        // 确认跟进细节按钮点击事件
-        confirmFollowUp() {
-            console.log('确认跟进细节：', this.followUpNotes);
-            this.followUpModelShow = false;
-            // 可以在这里添加提交跟进细节的逻辑
-        },
 
         // 确认转账按钮点击事件
         confirmTransfer() {
@@ -396,6 +384,36 @@ export default {
                 }
             });
         },
+
+        // 确认未收按钮点击事件
+        async confirmUnpaid() {
+            console.log('确认未收，评分：', this.unpaidRating);
+            this.unpaidModelShow = false;
+            // 可以在这里添加提交评分的逻辑
+            // 未收的时候，提交一个跟进记录     未收评分_数字
+            const res = await uni.$u.api.addOrderFollow({
+                orderId: this.orderId,
+                content: `未收评分_${this.unpaidRating}`,
+            })
+            if (res.code == 200) {
+                uni.$u.toast('提交未收评级成功');
+            }
+        },
+
+        // 确认跟进细节按钮点击事件
+        async confirmFollowUp() {
+            console.log('确认跟进细节：', this.followUpNotes);
+            this.followUpModelShow = false;
+            // 可以在这里添加提交跟进细节的逻辑
+            // 未收的时候，提交一个跟进记录     待跟进_内容
+            const res = await uni.$u.api.addOrderFollow({
+                orderId: this.orderId,
+                content: `待跟进_${this.followUpNotes}`,
+            })
+            if (res.code == 200) {
+                uni.$u.toast('提交待跟进记录成功');
+            }
+        },
     }
 }
 </script>

pages/orderDetailNew/components/pageTwo.vue

@@ -114,7 +114,7 @@
                             <pic-comp :src="item.fileUrl"></pic-comp>
                             <view class="detail-delete-btn" @click="deleteImage(item)">×</view>
                         </view>
-                        <view class="detail-upload-btn" @click="uploadImage('detailImages')">
+                        <view class="detail-upload-btn" @click="uploadImage('detailImages', currentReceipt.id)">
                             <u-icon name="plus" size="40rpx" color="#999"></u-icon>
                         </view>
                     </view>
@@ -144,14 +144,16 @@ export default {
             type: Array,
             default: () => [],
         },
+        currentReceipt: {
+            type: Object,
+            default: () => { },
+        },
 
     },
     watch: {
         orderDetail: {
             handler(newVal) {
                 if (newVal) {
-                    this.approvedPrice = Number(newVal.itemPrice) || 0;
-                    this.getList('2', '3');
                 }
             },
             deep: true,
@@ -167,6 +169,15 @@ export default {
             },
             deep: true,
         },
+        currentReceipt: {
+            handler(newVal) {
+                if (newVal) {
+                    this.approvedPrice = Number(newVal.sellingPrice) || 0;
+                    this.getList('2', '3', newVal.id);
+                }
+            },
+            deep: true,
+        },
     },
     components: {
         picComp
@@ -278,7 +289,6 @@ export default {
                 const data = `师傅拍图技巧;${photoTips};${urls}`;
                 console.log('urls9999999', data)
 
-                // 调用接口上传
                 await uni.$u.api.addOrderFollow({
                     orderId: this.orderId,
                     content: data,
@@ -291,7 +301,6 @@ export default {
 
 
                 const data = `到达客户面对面;${face2faceNotes};${urls}`;
-                // 调用接口上传
 
                 await uni.$u.api.addOrderFollow({
                     orderId: this.orderId,

pages/orderDetailNew/index.vue

@@ -19,9 +19,9 @@
             </template>
         </u-navbar>
 
-        <u-sticky bgColor="#fff">
-            <u-tabs keyName="brand" :list="receiptList" @click="clickReceipt"></u-tabs>
-        </u-sticky>
+
+        <u-tabs keyName="brand" :list="receiptList" @click="clickReceipt"></u-tabs>
+
 
         <orderDetailNewView :detail="receiptDetail" :topInfo="topInfo" :orderId="orderId"
             :currentReceipt="currentReceipt" />
@@ -60,9 +60,9 @@ export default {
     data() {
         return {
             topInfo: {
-                brand: 'Hermes',
-                model: 'Birkin 30',
-                price: '125,000'
+                brand: '',
+                model: '',
+                price: ''
             },
             modalVisible: false,
             currentEditField: '',
@@ -89,7 +89,7 @@ export default {
                 brand: '',
             },
             brandColumns: [
-                ['中国', '美国', '日本']
+                []
             ],
             //当前选择的品牌
             currentAddBrand: {}
@@ -183,10 +183,17 @@ export default {
             if (res.code === 200) {
                 this.receiptList = res.data || [];
             }
+
+            // this.currentReceipt = this.receiptList[0] || {};
+            this.clickReceipt(this.receiptList[0])
         },
         clickReceipt(item) {
             // console.log('点击了', item);
             this.currentReceipt = item;
+            console.log(item)
+            this.topInfo.brand = item.brand || '暂无';
+            this.topInfo.model = item.model || '暂无';
+            this.topInfo.price = item.sellingPrice || '暂无';
         },
         async handleAddOneConfirm() {
             console.log('确认添加', this.currentAddBrand)
@@ -195,9 +202,11 @@ export default {
             await uni.$u.api.addReceiptForm({
                 brand: this.currentAddBrand.dictValue,
                 sendFormId: this.orderId,
-
             })
-
+            //刷新收单列表
+            this.getReceiptList();
+            //关闭模态窗
+            this.addOneModelShow = false
         }
     }
 }

pages/orderDetailNew/mixin/imgUploadAndDownLoad.js

@@ -25,21 +25,22 @@ export default {
                             })
                         }
                         // 删除成功后刷新列表
-                        this.getList('2', '1');
-                        this.getList('2', '2');
-                        this.getList('2', '3');
+                        this.getList('2', '1', this.currentReceipt.id);
+                        this.getList('2', '2', this.currentReceipt.id);
+                        this.getList('2', '3', this.currentReceipt.id);
                     }
                 }
             })
         },
         //获取文件列表
-        async getList(type, orderFileType) {
-            console.log('获取文件列表', type, orderFileType)
-
+        async getList(type, orderFileType, receiptID) {
+            console.log('获取文件列表', type, receiptID)
+            // console.log('当前的订单id', this.orderDetail.id)
+            // console.log('当前的收单id', this.currentReceipt.id)
             try {
                 const params = {
                     clueId: this.orderDetail.clueId,
-                    sourceId: this.orderId,
+                    sourceId: this.currentReceipt.id,//默认先用receiptID查,如果没有返回情况下用orderID查
                     type,
                     orderFileType,
                     isDuplicate: '1',//先传1
@@ -48,11 +49,11 @@ export default {
                 }
                 const response = await uni.$u.api.selectClueFileByDto(params)
                 if (orderFileType == '1') {
-                    this.trueUploadList = response.rows || []
+                    this.trueUploadList = response.rows.filter(item => item.sourceId == receiptID) || []
                 } else if (orderFileType == '2') {
-                    this.chatRecordsUploadList = response.rows || []
+                    this.chatRecordsUploadList = response.rows.filter(item => item.sourceId == receiptID) || []
                 } else if (orderFileType == '3') {
-                    this.detailImages = response.rows || []
+                    this.detailImages = response.rows.filter(item => item.sourceId == receiptID) || []
                 }
             } catch (error) {
                 uni.$u.toast(`获取列表失败：${error.message}`)
@@ -61,7 +62,8 @@ export default {
             }
         },
         // 选择图片
-        uploadImage(type) {
+        uploadImage(type, receiptID) {
+            console.log('当前上传的receiptID是', receiptID)
             uni.chooseImage({
                 count: 9, // 最多选择9张
                 sizeType: ['compressed'], // 压缩图片
@@ -69,7 +71,7 @@ export default {
                 success: (res) => {
                     const tempFilePaths = res.tempFilePaths
                     console.log('上传的图片路径:11', tempFilePaths)
-                    this.uploadToServer(tempFilePaths, type)
+                    this.uploadToServer(tempFilePaths, type, receiptID)
                 },
                 fail: (err) => {
                     console.error('选择图片失败:', err)
@@ -77,7 +79,7 @@ export default {
             })
         },
         // 上传到服务器
-        async uploadToServer(filePaths, type) {
+        async uploadToServer(filePaths, type, receiptID) {
             // 实际的上传逻辑
             try {
                 //实物图的话就是1,聊天记录的话就是2,高清细节图的话就是3
@@ -85,11 +87,11 @@ export default {
                 console.log('当前上传的图片类型是', p)
                 const res = await Promise.all(filePaths.map(filePath => this.uploadFile(filePath, p)));
 
-                this.bindOrder(p);
+                this.bindOrder(p, receiptID);
 
-                this.getList('2', '1');
-                this.getList('2', '2');
-                this.getList('2', '3');
+                this.getList('2', '1', this.currentReceipt.id);
+                this.getList('2', '2', this.currentReceipt.id);
+                this.getList('2', '3', this.currentReceipt.id);
 
 
             } catch (error) {
@@ -124,11 +126,13 @@ export default {
             }
         },
         //绑定订单
-        async bindOrder(orderFileType) {
+        async bindOrder(orderFileType, receiptID) {
+            console.log('当前的收单id', receiptID)
             const res = await uni.$u.api.saveClueFile({
                 clueId: this.orderDetail.clueId,//线索id
                 list: this.bindList,
-                sourceId: this.orderId,//订单id,sendformid
+                // sourceId: this.orderId,//订单id,sendformid,之前是绑定在orderId上面,现在要修改绑定到receiptID上面
+                sourceId: receiptID,//receiptId,绑定的收单id
                 type: '2',
                 orderFileType: orderFileType
             });

pages/pagereceivecenter/pagereceivecenter.vue

@@ -168,13 +168,13 @@ export default {
                         @click.stop="toOrderDetail(item)">
                         <view class="bandAndPrice">
                             <view class="bandName">{{ item.itemBrand || '暂无品牌' }}</view>
-                            <view class="price">￥{{ item.priceRange }}</view>
+                            <view class="price">￥{{ item.priceRange || '?' }}</view>
                         </view>
 
                         <view class="mainLind">
-                            <view class="mainLindImg">
-                                <image :src="'/static/acceptOrder/orderCardPic.jpg'" alt="" />
-                            </view>
+                            <!-- <view class="mainLindImg">
+                                <image :src="'/static/acceptOrder/orderCardPic.jpg'" v-if="item.src" />
+                            </view> -->
                             <view class="mainLindInfo">
                                 <view class="itemName">{{ item.item || '暂无项目' }}</view>
                                 <view>发单人:{{ item.createNickName || '未知' }}</view>