增加打标签功能

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -10,12 +10,12 @@
         </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">
@@ -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)
+                }
+            }
         }
 
     },
@@ -238,16 +253,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

@@ -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,7 +288,7 @@ 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()
@@ -439,7 +440,7 @@ export default {
             const { rows, total } = await uni.$u.api.selectCommissionList({
                 pageSize: 9999,
                 pageNum: 1,
-            }, { sendFormId: this.receiptList[0].sendFormId, });
+            }, { sendFormId: this.currentReceipt.sendFormId, });
             console.log('分成比例表格数据', rows)
             this.profitSharingList = rows
         },
@@ -455,10 +456,10 @@ export default {
                 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,
                 }

pages/orderDetailNew/components/pageThree.vue

@@ -150,8 +150,8 @@ export default {
             type: String,
             default: '',
         },
-        receiptList: {
-            type: Array,
+        currentReceipt: {
+            type: Object,
             default: () => { },
         },
     },
@@ -169,11 +169,11 @@ export default {
             },
             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'
                 }
             },
             deep: true,

pages/orderDetailNew/index.vue

@@ -19,7 +19,12 @@
             </template>
         </u-navbar>
 
-        <orderDetailNewView :detail="receiptDetail" :topInfo="topInfo" :orderId="orderId" />
+        <u-sticky bgColor="#fff">
+            <u-tabs keyName="brand" :list="receiptList" @click="clickReceipt"></u-tabs>
+        </u-sticky>
+
+        <orderDetailNewView :detail="receiptDetail" :topInfo="topInfo" :orderId="orderId"
+            :currentReceipt="currentReceipt" />
 
         <!-- 通用模态窗 -->
         <custom-modal :visible="modalVisible" :title="modalConfig.title" :value="modalConfig.value"
@@ -56,6 +61,11 @@ export default {
             clueId: '',
             // 订单详情
             receiptDetail: {},
+
+            //接单单个订单的receiptList
+            receiptList: [],
+            //当前选中的收单订单
+            currentReceipt: {}
         }
     },
     onLoad(option) {
@@ -69,6 +79,8 @@ export default {
 
         //查询订单详情
         this.getOrderDetail();
+        //获取收单列表
+        this.getReceiptList();
     },
     methods: {
         handleBrandClick() {
@@ -105,7 +117,20 @@ export default {
             this.currentEditField = ''
         },
         handleAddClick() {
+
             console.log('加一单')
+            //判断如果当前有收单的id是‘’的话，说明是新增的收单订单
+            if (this.receiptList.some(item => item.id === '')) {
+                uni.$u.toast('请先保存新增的收单订单')
+                return
+            }
+
+            this.receiptList.push({
+                "id": "",//订单id
+                "sendFormId": this.orderId,
+                "clueId": this.clueId,
+                "brand": "新加一单",
+            });
         },
 
         //查询订单详情
@@ -114,10 +139,22 @@ 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 || [];
+            }
+        },
+        clickReceipt(item) {
+            // console.log('点击了', item);
+            this.currentReceipt = item;
         }
     }
 }

pages/pagereceivecenter/pagereceivecenter.vue

@@ -13,6 +13,10 @@ export default {
                 pageNum: 1,
                 total: 0
             },
+            tagModalVisible: false,
+            tagList: [],
+            currentTags: [],
+            currentOrder: {}
         }
     },
     onLoad() {
@@ -55,9 +59,20 @@ 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: (res) => {
+                        if (res.confirm) {
+                            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') {
                 //在忙
@@ -74,6 +89,11 @@ export default {
             } 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)
@@ -84,11 +104,19 @@ export default {
         },
         // 跳转订单详情
         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 +127,26 @@ 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;
+        },
     }
 }
 </script>
@@ -113,7 +161,8 @@ 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>
@@ -147,7 +196,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 +225,16 @@ 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>
     </view>
 </template>