优化接收单逻辑

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -20,7 +20,7 @@
         </view>
 
         <ul class="page">
-            <li @click="activeIndex = index" v-for="(tab, index) in tabs" :key="index"
+            <li @click="handleTabClick(index)" v-for="(tab, index) in tabs" :key="index"
                 :class="{ 'active': activeIndex === index }">{{ tab }}</li>
         </ul>
     </view>
@@ -172,12 +172,12 @@ export default {
                 "customName": this.pageThreeForm.customName,
             }
 
-            //调用接口保存收单表单
-            if (this.detail.receiptId) {
-                this.updateData(params);
-            } else {
-                this.saveData(params);
-            }
+            // //调用接口保存收单表单
+            // if (this.detail.receiptId) {
+            //     this.updateData(params);
+            // } else {
+            //     this.saveData(params);
+            // }
         },
         // 确认支付
         handleConfirmPay() {
@@ -223,7 +223,7 @@ export default {
                 "freight": warehouseInfo.freight || '',         //运费page4加上
                 "checkCodeFee": warehouseInfo.checkCodeFee || '',  //查码费
                 // "totalCost": "60230.00",   // 成本合计 =   运费 + 好处费 + 查码费 + 表款(支付总额) + 维修费。
-                "sellingPrice": this.topInfo.price,   //实际价格（售价）顶上tab里面的第三栏
+                // "sellingPrice": this.topInfo.price,   //实际价格（售价）顶上tab里面的第三栏
                 // "performance": "29772.00",  //sellingPrice - totalCost
                 "receiptRemark": warehouseInfo.remarks + ';' + warehouseInfo.uploadedImage || '',//"收单之后还需再跟进", 先不传
                 "repairAmount": warehouseInfo.repairAmount || '', //维修总金额 ，先不传
@@ -284,6 +284,10 @@ export default {
                 console.error("获取跟进记录失败:", error);
                 uni.$u.toast("获取跟进记录失败");
             }
+        },
+        handleTabClick(index) {
+            this.activeIndex = index;
+            this.$refs.pageThreeComp.getList('2', '3', this.currentReceiptInner.id, this.detail.itemBrand);
         }
     },
 

pages/orderDetailNew/components/pageFour.vue

@@ -420,7 +420,8 @@ export default {
         },
 
         // 确认入库方法
-        confirmWarehouseEntry() {
+        async confirmWarehouseEntry() {
+
 
             console.log('确认入库', this.orderDetail.id)
 
@@ -429,15 +430,32 @@ export default {
                 content: `是否确认入库改订单：${this.orderDetail.item}？`,
                 success: async (res) => {
                     if (res.confirm) {
+                        //修改状态
                         await uni.$u.api.oderForm({
                             status: "3",
                             id: this.orderDetail.id,
                         });
 
+                        await uni.$u.api.updateReceiptForm({
+                            id: this.currentReceipt.id,
+                            code: this.warehouseInfo.codeStorage || '',//编码
+                            expressOrderNo: this.warehouseInfo.expressOrderNo || '',//快递单号
+                            item: this.warehouseInfo.item || '',//收单物品
+                            checkCodeFee: this.warehouseInfo.checkCodeFee || '',//查码费
+                            tableFee: this.warehouseInfo.watchPrice || '',//表款
+                            benefitFee: this.warehouseInfo.benefitFee || '',//好处费
+                            freight: this.warehouseInfo.freight || '',//运费
+                            repairAmount: this.warehouseInfo.repairAmount || '',//维修金额
+                            grossPerformance: this.warehouseInfo.grossPerformance || '',//毛业绩
+                            receiptRemark: this.warehouseInfo.remarks + ';' + this.warehouseInfo.uploadedImage || '',//收单备注
+                        });
+
                         //上传物流表单数据
-                        this.$emit('confirmInterStore', {
-                            warehouseInfo: this.warehouseInfo,
-                        })
+                        // this.$emit('confirmInterStore', {
+                        //     warehouseInfo: this.warehouseInfo,
+                        // })
+                        //保存入库信息
+
 
                         //上传分成数据
                         await this.addShare()

pages/orderDetailNew/components/pageThree.vue

@@ -166,7 +166,7 @@ export default {
                     this.paymentInfo.bankName = newVal.bankName || ''
                     this.paymentInfo.bankAccount = newVal.bankCardNumber || ''
                     this.paymentInfo.idNumber = newVal.idCard || ''
-                    this.paymentAmount = newVal.tableFee || '0.00'
+                    // this.paymentAmount = newVal.tableFee || '0.00'
                 }
             },
             deep: true,
@@ -354,19 +354,35 @@ export default {
         },
 
         // 立即支付按钮点击事件
-        handlePayNowClick() {
+        async handlePayNowClick() {
+            //保存
+            await uni.$u.api.updateReceiptForm({
+                id: this.currentReceipt.id,
+                tableFee: this.paymentAmount,
+                fileIds: this.detailImages.map(item => item.id).join(',')
+            });
+
+            //保存上面的支付信息
+            await uni.$u.api.updateClueOrderForm({
+                id: this.orderDetail.id,
+                customName: this.paymentInfo.customName || '',
+                bankName: this.paymentInfo.bankName || '',
+                bankCardNumber: this.paymentInfo.bankAccount || '',
+                idCard: this.paymentInfo.idNumber || '',
+            });
+
             console.log('点击了立即支付按钮');
             this.payNowModelShow = true;
 
             //让父组件保存数据
-            this.$emit('handleNeedSave', {
-                fileIds: this.detailImages.map(item => item.id).join(','),
-                nowPage: 'formThree',
-                form: {
-                    ...this.paymentInfo,
-                    paymentAmount: this.paymentAmount
-                }
-            });
+            // this.$emit('handleNeedSave', {
+            //     fileIds: this.detailImages.map(item => item.id).join(','),
+            //     nowPage: 'formThree',
+            //     form: {
+            //         ...this.paymentInfo,
+            //         paymentAmount: this.paymentAmount
+            //     }
+            // });
         },
 
 
@@ -380,14 +396,28 @@ export default {
             this.$emit('handleConfirmPay');
         },
         // 下一步按钮点击事件
-        handleNextClick() {
-            console.log('page3点击了下一步按钮', this.detailImages);
-            this.$emit('handleNextClick', {
-                nowPage: 'formThree',
-                form: {
-                    ...this.paymentInfo
-                }
+        async handleNextClick() {
+            await uni.$u.api.updateReceiptForm({
+                id: this.currentReceipt.id,
+                tableFee: this.paymentAmount,
+                fileIds: this.detailImages.map(item => item.id).join(',')
+            });
+
+            await uni.$u.api.updateClueOrderForm({
+                id: this.orderDetail.id,
+                customName: this.paymentInfo.customName || '',
+                bankName: this.paymentInfo.bankName || '',
+                bankCardNumber: this.paymentInfo.bankAccount || '',
+                idCard: this.paymentInfo.idNumber || '',
             });
+
+            console.log('page3点击了下一步按钮', this.detailImages);
+            // this.$emit('handleNextClick', {
+            //     nowPage: 'formThree',
+            //     form: {
+            //         ...this.paymentInfo
+            //     }
+            // });
         },
 
         // 确认未收按钮点击事件

pages/orderDetailNew/components/pageTwo.vue

@@ -236,6 +236,12 @@ export default {
 
         // 下一步按钮点击事件
         async handleNextClick() {
+            //调接口保存当前的核准价
+            await uni.$u.api.updateReceiptForm({
+                id: this.currentReceipt.id,
+                sellingPrice: this.approvedPrice,
+            });
+
             // 创建一个只包含被勾选checkbox对应数据的对象
             const result = {};