Merge branch 'master' of http://106.52.242.177:3000/askqvn/crm-app into permission

manifest.json

@@ -124,7 +124,7 @@
         },
         "nativePlugins" : {
             "lemonjk-FileSelect" : {
-                "appid_android" : "uni.UNI0C0EF72",
+                "appid_android" : "uni.UNIDDAE2E0",
                 "__plugin_info__" : {
                     "name" : "FileSelect",
                     "description" : "文件选取插件",

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -2,25 +2,25 @@
     <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"
-                :receiptList="receiptList" @handleConfirmPay="handleConfirmPay" ref="pageThreeComp"
+                :currentReceipt="currentReceiptInner" @handleConfirmPay="handleConfirmPay" ref="pageThreeComp"
                 :orderId="orderId" />
         </view>
         <view class="page-item" v-show="activeIndex === 3">
             <pageFour @confirmInterStore="confirmInterStore" @handleNextClick="handleNextClick" :orderDetail="detail"
-                :receiptList="receiptList" />
+                :currentReceipt="currentReceiptInner" />
         </view>
 
         <ul class="page">
-            <li v-for="(tab, index) in tabs" :key="index" :class="{ 'active': activeIndex === index }"
-                @click="activeIndex = index">{{ tab }}</li>
+            <li v-for="(tab, index) in tabs" :key="index" :class="{ 'active': activeIndex === index }">{{ tab }}</li>
         </ul>
     </view>
 </template>
@@ -43,7 +43,11 @@ export default {
         orderId: {
             type: String,
             default: ''
-        }
+        },
+        currentReceipt: {
+            type: Object,
+            default: () => { },
+        },
     },
     components: {
         pageOne,
@@ -63,12 +67,15 @@ export default {
             },
             pageThreeForm: {},
             fileIds: '',
-            //收件信息page4
+            //收件信息page4,page3
             receiptList: [],
             //订单细节
             orderDetail: {},
             // 跟进记录
             followUpList: [],
+
+            //当前选中的收单订单
+            currentReceiptInner: {},
         }
     },
     name: 'OrderDetailNewView',
@@ -76,7 +83,7 @@ export default {
         orderId: {
             handler(newVal) {
                 if (newVal) {
-                    this.fetchReceiptList();
+                    // this.fetchReceiptList();
                 }
             }, immediate: true
         },
@@ -88,6 +95,14 @@ export default {
                 }
             },
             deep: true,
+        },
+        currentReceipt: {
+            handler(newVal) {
+                if (newVal) {
+                    this.currentReceiptInner = newVal;
+                    console.log('当前选中的收单订单里面', this.currentReceiptInner)
+                }
+            }
         }
 
     },
@@ -98,7 +113,8 @@ export default {
             console.log("all page data:", this.allFroms[nowPage])
             // 当点击到第三页时，更新第三页的图片列表
             if (nowPage === 'formTwo') {
-                this.$refs.pageThreeComp.getList('2', '3');
+                console.log('品牌', this.detail.brand)
+                this.$refs.pageThreeComp.getList('2', '3', this.currentReceiptInner.id, this.detail.itemBrand);
             }
         },
         // 没有recepitid就新增
@@ -122,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,
@@ -136,7 +152,7 @@ export default {
                 // "freight": 30,         //运费page4加上
                 // "checkCodeFee": null,  //查码费
                 // "totalCost": "60230.00",   // 成本合计 =   运费 + 好处费 + 查码费 + 表款(支付总额) + 维修费。
-                "sellingPrice": this.topInfo.price.replace(/,/g, ''),   //实际价格（售价）顶上tab里面的第三栏
+                "sellingPrice": this.topInfo.price,   //实际价格（售价）顶上tab里面的第三栏
                 // "performance": "29772.00",  //sellingPrice - totalCost
                 // "receiptRemark":     //"收单之后还需再跟进", 先不传
                 // "repairAmount": null, //维修总金额 ，先不传
@@ -193,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 || '',
@@ -207,7 +223,7 @@ export default {
                 "freight": warehouseInfo.freight || '',         //运费page4加上
                 "checkCodeFee": warehouseInfo.checkCodeFee || '',  //查码费
                 // "totalCost": "60230.00",   // 成本合计 =   运费 + 好处费 + 查码费 + 表款(支付总额) + 维修费。
-                "sellingPrice": this.topInfo.price.replace(/,/g, ''),   //实际价格（售价）顶上tab里面的第三栏
+                "sellingPrice": this.topInfo.price,   //实际价格（售价）顶上tab里面的第三栏
                 // "performance": "29772.00",  //sellingPrice - totalCost
                 "receiptRemark": warehouseInfo.remarks + ';' + warehouseInfo.uploadedImage || '',//"收单之后还需再跟进", 先不传
                 "repairAmount": warehouseInfo.repairAmount || '', //维修总金额 ，先不传
@@ -238,16 +254,16 @@ export default {
 
         },
         // 获取收单列表
-        async fetchReceiptList() {
-            try {
-                const res = await uni.$u.api.clueReceiptFormListByOrderId(this.orderId);
-                console.log('这里是收件列表', res)
-                this.receiptList = res.data || [];
-            } catch (error) {
-                console.error("获取收单列表失败:", error);
-                uni.$u.toast("获取收单列表失败");
-            }
-        },
+        // async fetchReceiptList() {
+        //     try {
+        //         const res = await uni.$u.api.clueReceiptFormListByOrderId(this.orderId);
+        //         console.log('这里是收件列表', res.data)
+        //         this.receiptList = res.data || [];
+        //     } catch (error) {
+        //         console.error("获取收单列表失败:", error);
+        //         uni.$u.toast("获取收单列表失败");
+        //     }
+        // },
 
         //获取跟进记录
         async getFollowUpList() {

pages/orderDetailNew/components/pageFour.vue

@@ -134,7 +134,7 @@
                             <text class="header-text">操作</text>
                         </u-col>
                     </u-row>
-                    <u-row v-for="(item, index) in profitSharingList" :key="item.id" class="split-table-row">
+                    <u-row v-for="(item, index) in profitSharingList" :key="item.uuid" class="split-table-row">
                         <u-col span="4">
                             <view class="table-cell">
                                 <!-- <select v-model="item.deptId" class="custom-select">
@@ -185,8 +185,8 @@
                         </u-col>
                         <u-col span="2" class="action-column">
                             <view class="table-cell">
-                                <u-button type="error" plain shape="circle" size="mini" @click="deleteRow(item.id)"
-                                    class='delectBtn'>
+                                <u-button type="error" plain shape="circle" size="mini"
+                                    @click="deleteRow(item.id, item.uuid)" class='delectBtn'>
                                     <u-icon name="trash" size="20rpx" color="#ff6b6b"></u-icon>
                                 </u-button>
                             </view>
@@ -226,16 +226,17 @@ export default {
             type: Object,
             default: () => { },
         },
-        receiptList: {
-            type: Array,
+        currentReceipt: {
+            type: Object,
             default: () => { },
         },
     },
 
     watch: {
-        receiptList: {
+        currentReceipt: {
             handler(newVal) {
                 if (newVal) {
+                    console.log('这里是page4', newVal)
                     // "searchValue": null,
                     // "createBy": "12234",
                     // "createTime": "2025-12-25 13:39:25",
@@ -275,11 +276,11 @@ export default {
                     // "bankCardNumber": "333",
                     // "bankName": "222",
                     // "customName": "111"
-                    const data = newVal[0]
+                    const data = newVal
                     this.warehouseInfo = {
                         codeStorage: data.code,//编码
                         expressOrderNo: data.expressOrderNo || '',//快递单号
-                        uploadedImage: data.receiptRemark.split(';')[1] || '',//物流图片 截取备注第二部分
+                        uploadedImage: data.receiptRemark?.split(';')[1] || '',//物流图片 截取备注第二部分
                         item: data.item || '',//收单物品
                         checkCodeFee: data.checkCodeFee || '',//查码费
                         watchPrice: data.tableFee || '',//表款
@@ -287,10 +288,10 @@ export default {
                         freight: data.freight || '',//运费
                         repairAmount: data.repairAmount || '',//维修金额
                         grossPerformance: data.grossPerformance || '',//毛业绩
-                        remarks: data.receiptRemark.split(';')[0] || '',//收单备注  截取备注第一部分
+                        remarks: data.receiptRemark?.split(';')[0] || '',//收单备注  截取备注第一部分
                     }
                     this.$nextTick(() => {
-                        this.getList()
+                        this.getShareList()
                     })
                 }
             },
@@ -366,6 +367,7 @@ export default {
                 orgName: '',
                 userName: '',
                 id: '',
+                uuid: Math.random()//唯一标识，仅vfor使用
             });
             // 重新计算所有行的比例
         },
@@ -399,31 +401,45 @@ export default {
         },
 
         // 确认入库方法
-        async confirmWarehouseEntry() {
+        confirmWarehouseEntry() {
 
+            console.log('确认入库', this.orderDetail.id)
 
-            //上传物流表单数据
-            this.$emit('confirmInterStore', {
-                warehouseInfo: this.warehouseInfo,
+            uni.showModal({
+                title: '确认入库',
+                content: `是否确认入库改订单：${this.orderDetail.item}？`,
+                success: async (res) => {
+                    if (res.confirm) {
+                        await uni.$u.api.oderForm({
+                            status: "3",
+                            id: this.orderDetail.id,
+                        });
+
+                        //上传物流表单数据
+                        this.$emit('confirmInterStore', {
+                            warehouseInfo: this.warehouseInfo,
+                        })
+
+                        //上传分成数据
+                        await this.addShare()
+
+                        this.$refs.uToast.show({
+                            type: "success",
+                            message: "入库成功",
+                            iconUrl: "https://uviewui.com/demo/toast/success.png",
+                            complete() {
+                                uni.navigateTo({
+                                    url: '/pages/pagereceivecenter/pagereceivecenter',
+                                })
+                            },
+                        });
+
+                    } else if (res.cancel) {
+                        // 用户点击了取消，不执行任何操作
+                        uni.$u.toast('已取消入库');
+                    }
+                }
             })
-
-            //上传分成数据
-            await this.addShare()
-
-            this.$refs.uToast.show({
-                type: "success",
-                message: "入库成功",
-                iconUrl: "https://uviewui.com/demo/toast/success.png",
-                complete() {
-                    uni.navigateTo({
-                        url: '/pages/pagereceivecenter/pagereceivecenter',
-                    })
-                },
-            });
-
-            //跳转接单
-
-
         },
 
         // 获取分成人名单
@@ -435,12 +451,15 @@ export default {
         },
 
         //初始化分成比例
-        async getList() {
+        async getShareList() {
             const { rows, total } = await uni.$u.api.selectCommissionList({
                 pageSize: 9999,
                 pageNum: 1,
-            }, { sendFormId: this.receiptList[0].sendFormId, });
+            }, { sendFormId: this.currentReceipt.sendFormId, });
             console.log('分成比例表格数据', rows)
+            rows.map(item => {
+                item.uuid = Math.random()//唯一标识
+            })
             this.profitSharingList = rows
         },
 
@@ -450,15 +469,16 @@ export default {
 
 
 
+        //上传分成
         addShare() {
             this.profitSharingList.forEach(async item => {
                 const data = {
                     id: item.id || '',
                     accountType: item.accountType == '1' ? 1 : 2,
-                    clueId: this.receiptList[0].clueId,
+                    clueId: this.currentReceipt.clueId,
                     commissionRate: item.commissionRate,
                     isCompanyPerformance: item.isCompanyPerformance == '1' ? 1 : 2,
-                    sendFormId: this.receiptList[0].sendFormId,
+                    sendFormId: this.currentReceipt.sendFormId,
                     userId: item.userId,
                     userName: item.userName,
                 }
@@ -472,13 +492,19 @@ export default {
             });
         },
 
-        //删除分成ok
-        async deleteRow(id) {
-            console.log(id, 'id')
+        //删除分成
+        async deleteRow(id, uuid) {
+            console.log(id, 'id', uuid, 'uuid')
+            //如果没有id说明是新增的，直接删除数组中的项
+            if (!id) {
+                this.profitSharingList = this.profitSharingList.filter(item => item.uuid != uuid)
+                uni.$u.toast('删除成功')
+                return
+            }
             try {
                 await uni.$u.api.deleteClueCommissionForm(id)
                 uni.$u.toast('删除成功')
-                this.getList()
+                this.getShareList()
             } catch (error) {
                 uni.$u.toast('删除失败，请稍后重试')
             }
@@ -486,14 +512,14 @@ export default {
 
         //打开选择框
         handleSelectOrg(item) {
-            console.log(item.id, '当前选择的行的id')
-            this.currentEditItem = item.id
+            console.log(item.uuid, '当前选择的行的uuid')
+            this.currentEditItem = item.uuid
             this.showOrgPicker = true
         },
         //选择当前的分成人
         handleSelectPerson(item) {
             console.log(item, '当前选择的行')
-            this.currentEditItem = item.id
+            this.currentEditItem = item.uuid
             //获取当前选择组织的分成人名单
             // 获取当前行的关联id
             const deptId = item.deptId
@@ -512,7 +538,7 @@ export default {
             console.log(value, '选择的组织')
             //把值赋值给当前行
             this.profitSharingList.forEach(item => {
-                if (item.id == this.currentEditItem) {
+                if (item.uuid == this.currentEditItem) {
                     item.orgName = value[0].label
                     item.deptId = value[0].id
                     // item.personOptions = value[0].children
@@ -531,7 +557,7 @@ export default {
             console.log(value, '选择的人')
             //把值赋值给当前行
             this.profitSharingList.forEach(item => {
-                if (item.id == this.currentEditItem) {
+                if (item.uuid == this.currentEditItem) {
                     item.userName = value[0].label
                     item.userId = value[0].id
                 }

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.orderDetail.itemBrand);
+                    this.getList('2', '2', newVal.id, this.orderDetail.itemBrand);
+                }
+            }
+        },
     },
     methods: {
 
@@ -139,16 +152,26 @@ export default {
             console.log('电话卡片被点击', '电话号码:', this.orderDetail.phone)
             if (this.orderDetail.phone) {
                 //拨打电话
-                uni.makePhoneCall({
-                    phoneNumber: this.orderDetail.phone,
+                // uni.makePhoneCall({
+                //     phoneNumber: this.orderDetail.phone,
+                //     success: () => {
+                //         this.$store.commit("call/SET_FORM", {
+                //             clueId: this.orderDetail.clueId,
+                //             type: "3",
+                //             callee: this.orderDetail.phone,
+                //         });
+                //     },
+                // });
+                //先暂时复制电话号码
+                uni.setClipboardData({
+                    data: this.orderDetail.phone,
                     success: () => {
-                        this.$store.commit("call/SET_FORM", {
-                            clueId: this.orderDetail.clueId,
-                            type: "3",
-                            callee: this.orderDetail.phone,
-                        });
-                    },
-                });
+                        uni.showToast({
+                            title: '电话号码已复制',
+                            icon: 'none'
+                        })
+                    }
+                })
             } else {
                 uni.showToast({
                     title: '该订单暂时没有电话号码',
@@ -180,20 +203,20 @@ export default {
         // 下一步
         handleNextClick() {
             // 校验表单
-            if (!this.form.truePic.length) {
-                uni.showToast({
-                    title: '请上传实物图',
-                    icon: 'none'
-                })
-                return
-            }
-            if (!this.form.chatRecords.length) {
-                uni.showToast({
-                    title: '请上传聊天记录',
-                    icon: 'none'
-                })
-                return
-            }
+            // if (!this.form.truePic.length) {
+            //     uni.showToast({
+            //         title: '请上传实物图',
+            //         icon: 'none'
+            //     })
+            //     return
+            // }
+            // if (!this.form.chatRecords.length) {
+            //     uni.showToast({
+            //         title: '请上传聊天记录',
+            //         icon: 'none'
+            //     })
+            //     return
+            // }
             this.$emit('handleNextClick', {
                 nowPage: 'formOne',
                 form: this.form,

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>
@@ -150,8 +150,8 @@ export default {
             type: String,
             default: '',
         },
-        receiptList: {
-            type: Array,
+        currentReceipt: {
+            type: Object,
             default: () => { },
         },
     },
@@ -164,16 +164,16 @@ export default {
                     this.paymentInfo.bankAccount = newVal.bankCardNumber || ''
                     this.paymentInfo.idNumber = newVal.idCard || ''
                     this.paymentAmount = newVal.tableFee || '0.00'
-                    this.getList('2', '3');
                 }
             },
             deep: true,
         },
-        receiptList: {
+        currentReceipt: {
             handler(newVal) {
                 if (newVal) {
-                    console.log('这里是page3的', newVal[0].tableFee)
-                    this.paymentAmount = newVal[0].tableFee || '0.00'
+                    console.log('这里是page3的', newVal.tableFee)
+                    this.paymentAmount = newVal.tableFee || '0.00'
+                    this.getList('2', '3', newVal.id, this.orderDetail.itemBrand);
                 }
             },
             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,41 @@ export default {
                 }
             });
         },
+
+        // 确认未收按钮点击事件
+        async confirmUnpaid() {
+            console.log('确认未收，评分：', this.unpaidRating);
+            this.unpaidModelShow = false;
+            // 可以在这里添加提交评分的逻辑
+            // 未收的时候，提交一个跟进记录     未收评分_数字
+            const res = await uni.$u.api.addOrderFollow({
+                orderId: this.orderId,
+                content: `未收评分_${this.unpaidRating}`,
+            })
+            await uni.$u.api.oderForm({
+                status: "4",
+                id: this.orderId,
+            });
+
+            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, this.orderDetail.itemBrand);
+                }
+            },
+            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,33 @@
             </template>
         </u-navbar>
 
-        <orderDetailNewView :detail="receiptDetail" :topInfo="topInfo" :orderId="orderId" />
 
-        <!-- 通用模态窗 -->
+        <u-tabs keyName="brand" :list="receiptList" @click="clickReceipt"></u-tabs>
+
+
+        <orderDetailNewView :detail="receiptDetail" :topInfo="topInfo" :orderId="orderId"
+            :currentReceipt="currentReceipt" />
+
+
+
+        <!-- 加一单选择模态窗 -->
+        <u-modal :show="addOneModelShow" :title="'加一单'" showCancelButton @cancel="addOneModelShow = false"
+            @confirm="handleAddOneConfirm">
+            <u-button type="primary" plain @click="showBrandSelector = true;"
+                :text="currentAddBrand.dictLabel || '点击请选择品牌'"></u-button>
+        </u-modal>
+        <!-- 加一单品牌选择器 -->
+        <u-picker :show="showBrandSelector" @confirm="handleBrandConfirm" :columns="brandColumns"
+            @cancel='showBrandSelector = false' keyName="dictLabel"></u-picker>
+
+
+
+        <!-- 修改当前品牌选择器 -->
+        <u-picker :show="editBrandSelector" @confirm="handleEditBrandConfirm" :columns="brandColumns"
+            @cancel='editBrandSelector = false' keyName="dictLabel"></u-picker>
+
+
+        <!-- 修改当前型号、价格弹窗 -->
         <custom-modal :visible="modalVisible" :title="modalConfig.title" :value="modalConfig.value"
             :placeholder="modalConfig.placeholder" @cancel="handleModalCancel" @confirm="handleModalConfirm" />
     </view>
@@ -39,11 +63,10 @@ export default {
     data() {
         return {
             topInfo: {
-                brand: 'Hermes',
-                model: 'Birkin 30',
-                price: '125,000'
+                brand: '',
+                model: '',
+                price: ''
             },
-            modalVisible: false,
             currentEditField: '',
             modalConfig: {
                 title: '',
@@ -56,6 +79,25 @@ export default {
             clueId: '',
             // 订单详情
             receiptDetail: {},
+
+            //接单单个订单的receiptList
+            receiptList: [],
+            //当前选中的收单订单
+            currentReceipt: {},
+            // 新加一件的信息
+            addOneModelShow: false,
+            showBrandSelector: false,
+            checkModel: {
+                brand: '',
+            },
+            brandColumns: [
+                []
+            ],
+            //当前选择的品牌
+            currentAddBrand: {},
+            //修改当前品牌选择器
+            editBrandSelector: false,
+            modalVisible: false,
         }
     },
     onLoad(option) {
@@ -69,43 +111,109 @@ export default {
 
         //查询订单详情
         this.getOrderDetail();
+        //获取收单列表
+        this.getReceiptList();
+
+
     },
     methods: {
         handleBrandClick() {
-            this.openModal('brand', '请输入品牌', this.topInfo.brand, '请输入品牌')
+            //修改当前选中订单的品牌brand
+            //打开品牌选择器
+            this.editBrandSelector = true
+
+            //获取品牌列表
+            this.$getDicts('crm_form_brand').then(res => {
+                this.brandColumns = [res]
+            })
         },
         handleModelClick() {
-            this.openModal('model', '请输入型号', this.topInfo.model, '请输入型号')
+            //修改当前选中订单的型号model
+            //打开型号修改弹窗
+            this.modalConfig = {
+                title: '修改型号',
+                value: this.currentReceipt.model,
+                placeholder: '请输入型号'
+            }
+            this.currentEditField = 'model'
+            this.modalVisible = true
+
         },
         handlePriceClick() {
-            this.openModal('price', '请输入价格', this.topInfo.price, '请输入价格')
-        },
-        openModal(field, title, value, placeholder) {
-            this.currentEditField = field
+            //修改当前选中订单的价格sellingPrice
+            //打开价格修改弹窗
             this.modalConfig = {
-                title,
-                value,
-                placeholder
+                title: '修改价格',
+                value: this.currentReceipt.sellingPrice?.toString(),
+                placeholder: '请输入价格'
             }
+            this.currentEditField = 'price'
             this.modalVisible = true
         },
-        handleModalInput(value) {
-            this.modalConfig.value = value
+
+        async handleModalConfirm(value) {
+            console.log('修改的当前的', this.currentEditField, '是', value)
+            if (this.currentEditField === 'model') {
+                //修改当前选中receiptDetail的型号
+                const res = await uni.$u.api.updateReceiptForm({
+                    model: value,
+                    id: this.currentReceipt.id
+                });
+                if (res.code == 200) {
+                    uni.$u.toast('修改成功')
+                }
+            } else if (this.currentEditField === 'price') {
+                //修改当前选中receiptDetail的价格
+                const res = await uni.$u.api.updateReceiptForm({
+                    sellingPrice: value,
+                    id: this.currentReceipt.id
+                });
+                if (res.code == 200) {
+                    uni.$u.toast('修改成功')
+                }
+            }
+            this.getReceiptList();
+            this.modalVisible = false
         },
         handleModalCancel() {
             this.modalVisible = false
-            this.currentEditField = ''
         },
-        handleModalConfirm(newValue) {
-            if (this.currentEditField) {
-                this.topInfo[this.currentEditField] = newValue
-            }
 
-            this.modalVisible = false
-            this.currentEditField = ''
-        },
-        handleAddClick() {
+
+        async handleAddClick() {
+
             console.log('加一单')
+            //判断如果当前有收单的id是‘’的话，说明是新增的收单订单
+            //打开模态窗
+            //选择品牌，型号。价格
+            this.addOneModelShow = true
+
+            this.$getDicts('crm_form_brand').then(res => {
+                console.log('品牌', res)
+                this.brandColumns = [res]
+            })
+        },
+        async handleEditBrandConfirm(data) {
+            console.log('修改的当前的品牌是', data.value[0])
+            console.log('修改的当前的品牌的value是', data.value[0].dictValue)
+
+            //修改当前选中receiptDetail的品牌
+            const res = await uni.$u.api.updateReceiptForm({
+                brand: data.value[0].dictValue,
+                id: this.currentReceipt.id
+            });
+            if (res.code === 200) {
+                uni.$u.toast('修改成功')
+            }
+            this.getReceiptList();
+            this.editBrandSelector = false
+        },
+        handleBrandConfirm(data) {
+            console.log('选择的品牌', data.value[0])
+            this.currentAddBrand = data.value[0]
+            this.checkModel.brand = this.currentAddBrand.dictLabel
+            //关闭品牌选择器
+            this.showBrandSelector = false
         },
 
         //查询订单详情
@@ -114,10 +222,42 @@ export default {
                 .getClueSendFormVoByOrderId({
                     id: this.orderId,
                 })
-            console.log('订单详情', res);
+            console.log('订单详情', res.data);
             if (res.code === 200) {
                 this.receiptDetail = res.data;
             }
+        },
+        //获取收单列表
+        async getReceiptList() {
+            const res = await uni.$u.api.clueReceiptFormListByOrderId(this.orderId);
+            console.log('这里是收件列表page', res)
+            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)
+
+            //调新加一单的接口
+            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.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) {
-            console.log('获取文件列表', type, orderFileType)
-
+        async getList(type, orderFileType, receiptID, itemBrand) {
+            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,20 +49,35 @@ export default {
                 }
                 const response = await uni.$u.api.selectClueFileByDto(params)
                 if (orderFileType == '1') {
-                    this.trueUploadList = response.rows || []
+                    //如果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 || []
+                    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 || []
+                    if (itemBrand.indexOf(',') != -1) {
+                        this.detailImages = response.rows.filter(item => item.sourceId == receiptID) || []
+                    } else {
+                        this.detailImages = response.rows
+                    }
                 }
             } catch (error) {
-                uni.$u.toast(`获取列表失败：${error.message}`)
+                uni.$u.toast(`获取列表失败：${error}`)
                 this.trueUploadList = []
                 this.chatRecordsUploadList = []
             }
         },
         // 选择图片
-        uploadImage(type) {
+        uploadImage(type, receiptID) {
+            console.log('当前上传的receiptID是', receiptID)
             uni.chooseImage({
                 count: 9, // 最多选择9张
                 sizeType: ['compressed'], // 压缩图片
@@ -69,7 +85,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 +93,7 @@ export default {
             })
         },
         // 上传到服务器
-        async uploadToServer(filePaths, type) {
+        async uploadToServer(filePaths, type, receiptID) {
             // 实际的上传逻辑
             try {
                 //实物图的话就是1,聊天记录的话就是2,高清细节图的话就是3
@@ -85,11 +101,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.orderDetail.itemBrand);
+                this.getList('2', '2', this.currentReceipt.id, this.orderDetail.itemBrand);
+                this.getList('2', '3', this.currentReceipt.id, this.orderDetail.itemBrand);
 
 
             } catch (error) {
@@ -124,11 +140,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

@@ -13,6 +13,12 @@ export default {
                 pageNum: 1,
                 total: 0
             },
+            tagModalVisible: false,
+            tagList: [],
+            currentTags: [],
+            currentOrder: {},
+            followUpModelShow: false,
+            followUpNotes: '',
         }
     },
     onLoad() {
@@ -55,9 +61,24 @@ export default {
                 //去接单
                 console.log('去接单', order)
 
-                //跳转接单form
-                uni.navigateTo({
-                    url: `/pages/orderDetailNew/index?orderId=${order.id}&item=${order.item}&type=${this.type}&clueId=${order.clueId}`,
+                //打开模态窗二次确认，确认后跳转接单form
+                uni.showModal({
+                    title: '确认接单',
+                    content: `是否确认接单订单：${order.item}？`,
+                    success: async (res) => {
+                        if (res.confirm) {
+                            await uni.$u.api.oderForm({
+                                status: "2",
+                                id: order.id,
+                            });
+                            uni.navigateTo({
+                                url: `/pages/orderDetailNew/index?orderId=${order.id}&item=${order.item}&type=${this.type}&clueId=${order.clueId}`,
+                            })
+                        } else if (res.cancel) {
+                            // 用户点击了取消，不执行任何操作
+                            uni.$u.toast('已取消接单');
+                        }
+                    }
                 })
             } else if (btnType == 'isBusy') {
                 //在忙
@@ -71,24 +92,42 @@ export default {
             } else if (btnType == 'willFollow') {
                 //待跟进
                 console.log('待跟进', order)
+                //打开模态窗
+                this.followUpModelShow = true;
+                this.currentOrder = order
             } else if (btnType == 'tag') {
                 //打标签
                 console.log('打标签', order)
+                //打开模态窗
+                this.tagModalVisible = true;
+                this.getAllTags();
+                this.currentTags = order.tags.map(tag => tag.id);
+                this.currentOrder = order
             } else if (btnType == 'share') {
                 //一键分享
                 console.log('一键分享', order)
             } else if (btnType == 'oneFollow') {
                 //待跟进
                 console.log('待跟进', order)
+                this.followUpModelShow = true;
+                this.currentOrder = order
             }
         },
         // 跳转订单详情
         toOrderDetail(order) {
+            //点卡片看详情
+            // if (order.status == '1' || order.status == '2') {
             uni.navigateTo({
                 url: `/pages/orderDetailNew/index?orderId=${order.id}&item=${order.item}&type=${this.type}&clueId=${order.clueId}`,
             })
+            // } else {
+            //     uni.$u.toast('当前订单无法查看详情');
+            //     return;
+            // }
+
+
         },
-        
+
         //滑动加载
         scrolltolower() {
             console.log('到底了');
@@ -99,6 +138,44 @@ export default {
             this.getOrderList();
         },
 
+        //获取全部标签
+        async getAllTags() {
+            const res = await uni.$u.api.getClueTagGroupVoList({ tagGroupApplication: '2' })
+            console.log('全部标签', res.data[0].clueTagDataList)
+            this.tagList = res.data[0].clueTagDataList;
+        },
+        cancelTag() {
+            this.tagModalVisible = false;
+        },
+        async confirmTag() {
+            console.log('确认打标签', this.currentTags)
+            // 这里可以添加打标签的逻辑
+            const allTags = this.currentTags.map(tag => tag).join(',');
+            console.log('allTags', allTags)
+            await uni.$u.api.updateTags({
+                id: this.currentOrder.id,
+                allTags: allTags,
+            })
+            this.tagModalVisible = false;
+            uni.$u.toast('标签更新成功');
+            //更新当前订单的标签
+            this.currentOrder.tags = this.tagList.filter(tag => this.currentTags.includes(tag.id));
+        },
+
+        // 确认跟进细节按钮点击事件
+        async confirmFollowUp() {
+            console.log('确认跟进细节：', this.followUpNotes);
+            this.followUpModelShow = false;
+            // 可以在这里添加提交跟进细节的逻辑
+            // 未收的时候，提交一个跟进记录     待跟进_内容
+            const res = await uni.$u.api.addOrderFollow({
+                orderId: this.currentOrder.id,
+                content: `待跟进_${this.followUpNotes}`,
+            })
+            if (res.code == 200) {
+                uni.$u.toast('提交待跟进记录成功');
+            }
+        },
     }
 }
 </script>
@@ -113,16 +190,17 @@ export default {
                     <!-- <orderCard v-for="item in orderList" :key="item.receiptId + item.id" :order="item"
                         @handleBtnClick="handleBtnClick">
                     </orderCard> -->
-                    <view class="orderCard" v-for="item in orderList"  :key="item.receiptId + item.id" @click.stop="toOrderDetail(item)">
+                    <view class="orderCard" v-for="item in orderList" :key="item.receiptId + item.id"
+                        @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>
@@ -147,7 +225,8 @@ export default {
 
                             <view class="btnGroup"
                                 v-if="item && (item.status == '2' || item.status == null || item.status === undefined)">
-                                <view class="card-button willFollow" @click.stop="handleBtnClick('willFollow', item)">待跟进
+                                <view class="card-button willFollow" @click.stop="handleBtnClick('willFollow', item)">
+                                    待跟进
                                 </view>
                                 <view class="card-button isBusy" @click.stop="handleBtnClick('tag', item)">打标签</view>
                             </view>
@@ -175,7 +254,25 @@ export default {
 
 
 
+        <!-- 打标签模态窗 -->
+        <u-modal :show="tagModalVisible" title="选择标签" @confirm="confirmTag" @cancel="cancelTag">
+            <view class="slot-content">
+                <u-checkbox-group v-model="currentTags" placement="column">
+                    <u-checkbox :customStyle="{ marginBottom: '8px' }" v-for="(item, index) in tagList" :key="item.id"
+                        :label="item.name" :name="item.id">
+                    </u-checkbox>
+                </u-checkbox-group>
+            </view>
+        </u-modal>
+
+        <u-modal :show="followUpModelShow" :title="'填写跟进细节'" :showConfirmButton="false">
+            <view class="modal-content">
+                <u--textarea v-model="followUpNotes" placeholder="请输入情况" confirm-type="done"
+                    style="width: 400rpx; margin-bottom: 30rpx;"></u--textarea>
 
+                <u-button type="primary" size="large" @click="confirmFollowUp">确认</u-button>
+            </view>
+        </u-modal>
     </view>
 </template>
 

store/modules/user.js

@@ -28,8 +28,8 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			ip: "https://crm.nanjingshiyu.com/prod-api", // ip
-			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			// ip: "https://crm.nanjingshiyu.com/prod-api", // ip
+			ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip