收发单逻辑修改

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -20,7 +20,8 @@
         </view>
 
         <ul class="page">
-            <li v-for="(tab, index) in tabs" :key="index" :class="{ 'active': activeIndex === index }">{{ tab }}</li>
+            <li @click="activeIndex = index" v-for="(tab, index) in tabs" :key="index"
+                :class="{ 'active': activeIndex === index }">{{ tab }}</li>
         </ul>
     </view>
 </template>
@@ -113,7 +114,6 @@ export default {
             console.log("all page data:", this.allFroms[nowPage])
             // 当点击到第三页时，更新第三页的图片列表
             if (nowPage === 'formTwo') {
-                console.log('品牌', this.detail.brand)
                 this.$refs.pageThreeComp.getList('2', '3', this.currentReceiptInner.id, this.detail.itemBrand);
             }
         },
@@ -142,7 +142,7 @@ export default {
                 "sendFormId": this.orderId, //接单中心的id，就是接单中心列表的id（发单id）
                 "clueId": this.detail.clueId,
                 "item": this.detail.item,
-                "brand": this.detail.brand,
+                // "brand": this.topInfo.brand,
                 // "needCheckCode": 1,   //先不传
                 // "code": null,         //先不传
                 // "paymentAmount": null, //支付总额page3 先不传
@@ -159,7 +159,7 @@ export default {
                 // "grossPerformance": "7443.00",   //毛利 performance*splitRatio
                 // "expressOrderNo": null,   //快递单号+后续加上一个键加上图url
                 "fileIds": this.fileIds,  //传第三部里面排序完成之后的id的数组，参考编辑收单里面的附件传的方法
-                "model": this.detail.model,
+                // "model": this.detail.model,
                 // "splitRatio": "25",   //分成比例，先不传
                 "customerServiceName": "1", //默认传1，判断入库的类型，回收类入库，销售类入库，维保类入库，第四步传，增加选项下拉
                 "deptId": this.detail.deptId,
@@ -195,7 +195,7 @@ export default {
                 })
                 uni.$u.toast(response.msg || '支付成功')
             } catch (error) {
-                uni.$u.toast(`支付失败：${response.msg}`)
+                uni.$u.toast(`支付失败：${error}`)
             }
         },
         //确认入库
@@ -213,7 +213,7 @@ export default {
                 "sendFormId": this.orderId, //接单中心的id，就是接单中心列表的id（发单id）
                 "clueId": this.detail.clueId,
                 "item": warehouseInfo.item || '',
-                "brand": this.detail.brand,
+                // "brand": this.detail.brand,
                 // "needCheckCode": 1,   //先不传
                 "code": warehouseInfo.codeStorage || '',         //先不传
                 // "paymentAmount": null, //支付总额page3 先不传
@@ -230,7 +230,7 @@ export default {
                 "grossPerformance": warehouseInfo.grossPerformance || '',   //毛利 performance*splitRatio
                 "expressOrderNo": warehouseInfo.expressOrderNo,   //快递单号+后续加上一个键加上图url
                 "fileIds": this.fileIds,  //传第三部里面排序完成之后的id的数组，参考编辑收单里面的附件传的方法
-                "model": this.detail.model,
+                // "model": this.detail.model,
                 // "splitRatio": "25",   //分成比例，先不传
                 "customerServiceName": "1", //默认传1，判断入库的类型，回收类入库，销售类入库，维保类入库，第四步传，增加选项下拉
                 "deptId": this.detail.deptId,
@@ -321,9 +321,11 @@ export default {
         height: 70rpx;
         line-height: 80rpx;
         text-align: center;
-        margin-bottom: 10rpx;
+        margin-bottom: 20rpx;
         transition: all 0.3s ease-in-out;
         font-weight: 800;
+        /* 阴影 */
+        box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
     }
 
     li.active {

pages/orderDetailNew/components/pageFour.vue

@@ -290,9 +290,7 @@ export default {
                         grossPerformance: data.grossPerformance || '',//毛业绩
                         remarks: data.receiptRemark?.split(';')[0] || '',//收单备注  截取备注第一部分
                     }
-                    this.$nextTick(() => {
-                        this.getShareList()
-                    })
+                    this.getShareList()
                 }
             },
         }
@@ -326,6 +324,7 @@ export default {
             showPersonPicker: false,
 
             columnsOrgList: [],
+            //传入的分成人名单
             columnsPersonList: [],
 
         };
@@ -362,21 +361,41 @@ export default {
                 deptId: '',
                 accountType: '1',
                 userId: '',
-                percentage: 0,
+                commissionRate: 0,
                 isCompanyPerformance: '2',
                 orgName: '',
                 userName: '',
                 id: '',
                 uuid: Math.random()//唯一标识，仅vfor使用
             });
-            // 重新计算所有行的比例
+            //重新计算全部行的分成比例
+            this.calculateTotalPercentage();
+        },
+        // 重新计算全部行的分成比例
+        calculateTotalPercentage() {
+            //获取选择前端的行的数量
+            const frontItems = this.profitSharingList.filter(item => item.accountType == '1');
+            const backItems = this.profitSharingList.filter(item => item.accountType == '2');
+            const totalFrontItems = frontItems.length;
+            const totalBackItems = backItems.length;
+            console.log('选择前端的行的数量====>', totalFrontItems)
+            console.log('选择后端的行的数量====>', totalBackItems)
+            //把profitSharingList中的前端行的分成比例按照 100/数量 重新计算
+            this.profitSharingList.map(item => {
+                if (item.accountType == '1') {
+                    item.commissionRate = (100 / totalFrontItems).toFixed()
+                }
+                if (item.accountType == '2') {
+                    item.commissionRate = (100 / totalBackItems).toFixed()
+                }
+            })
         },
-
 
         // 切换账户类型
         toggleAccountType(item) {
             item.accountType = item.accountType == '1' ? '2' : '1';
             // 重新计算分成比例
+            this.calculateTotalPercentage();
         },
         // 处理百分比输入
         handlePercentageInput(item) {
@@ -452,15 +471,18 @@ export default {
 
         //初始化分成比例
         async getShareList() {
+
+            console.log('当前收单信息', this.currentReceipt.id)
             const { rows, total } = await uni.$u.api.selectCommissionList({
                 pageSize: 9999,
                 pageNum: 1,
             }, { sendFormId: this.currentReceipt.sendFormId, });
             console.log('分成比例表格数据', rows)
-            rows.map(item => {
+            const newRows = rows.filter(item => item.receiptFormId == this.currentReceipt.id)
+            newRows.map(item => {
                 item.uuid = Math.random()//唯一标识
             })
-            this.profitSharingList = rows
+            this.profitSharingList = newRows
         },
 
 
@@ -481,6 +503,7 @@ export default {
                     sendFormId: this.currentReceipt.sendFormId,
                     userId: item.userId,
                     userName: item.userName,
+                    receiptFormId: this.currentReceipt.id,//关联的收单id
                 }
                 if (item.id) {
                     //更新
@@ -495,19 +518,34 @@ export default {
         //删除分成
         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.getShareList()
-            } catch (error) {
-                uni.$u.toast('删除失败，请稍后重试')
-            }
+            // 确认删除
+            uni.showModal({
+                title: '确认删除',
+                content: '是否确认删除当前行分成比例？',
+                success: async (res) => {
+                    if (res.confirm) {
+                        //如果没有id说明是新增的，直接删除数组中的项
+                        if (!id) {
+                            this.profitSharingList = this.profitSharingList.filter(item => item.uuid != uuid)
+                            uni.$u.toast('删除成功')
+                            this.calculateTotalPercentage();
+
+                            return
+                        }
+                        try {
+                            await uni.$u.api.deleteClueCommissionForm(id)
+                            uni.$u.toast('删除成功')
+                            this.getShareList()
+                        } catch (error) {
+                            uni.$u.toast('删除失败，请稍后重试')
+                        }
+                        //重新计算全部行的分成比例
+                        this.calculateTotalPercentage();
+                    } else {
+                        uni.$u.toast('已取消删除')
+                    }
+                }
+            })
         },
 
         //打开选择框
@@ -554,16 +592,33 @@ export default {
 
         //确认选择人
         handleConfirmPerson({ columnIndex, value, values },) {
-            console.log(value, '选择的人')
+            console.log(value[0], '选择的人')
+            console.log(value[0].isUser, '是否是用户')
             //把值赋值给当前行
-            this.profitSharingList.forEach(item => {
-                if (item.uuid == this.currentEditItem) {
-                    item.userName = value[0].label
-                    item.userId = value[0].id
-                }
-            })
-            this.columnsPersonList = []
-            this.showPersonPicker = false
+            if (value[0].isUser) {
+                //当前选择是用户
+                this.profitSharingList.forEach(item => {
+                    if (item.uuid == this.currentEditItem) {
+                        item.userName = value[0].label
+                        item.userId = value[0].id
+                    }
+                })
+                this.columnsPersonList = []
+                this.showPersonPicker = false
+            } else {
+                //当前选择是组织
+                // 把组织的label赋值给当前的行的关联
+                this.profitSharingList.forEach(item => {
+                    if (item.uuid == this.currentEditItem) {
+                        item.orgName = value[0].label
+                        item.deptId = value[0].id
+                    }
+                })
+                const childrens = value[0].children
+                console.log('当前分公司的内部分成人', childrens)
+
+                this.columnsPersonList = [childrens]
+            }
         },
         // 取消选择人
         handleCancelPerson() {

pages/orderDetailNew/components/pageOne.vue

@@ -133,20 +133,17 @@ export default {
                 console.log('currentReceipt 变化了', newVal);
                 if (newVal) {
                     //刷新图片列表
-                    this.getList('2', '1', newVal.id, this.orderDetail.itemBrand);
-                    this.getList('2', '2', newVal.id, this.orderDetail.itemBrand);
+                    setTimeout(() => {
+                        this.getList('2', '1', newVal.id, this.orderDetail.itemBrand);
+                        this.getList('2', '2', newVal.id, this.orderDetail.itemBrand);
+                    }, 100)
+
                 }
             }
         },
     },
     methods: {
 
-
-
-
-
-
-
         // 电话卡片点击事件
         handlePhoneClick() {
             console.log('电话卡片被点击', '电话号码:', this.orderDetail.phone)

pages/orderDetailNew/components/pageThree.vue

@@ -44,15 +44,15 @@
                         </view>
 
                         <!-- 图片列表 -->
-                        <view class="detail-image-item" v-for="(item, index) in detailImages" :key="'detail-' + index"
-                            :class="{
+                        <view class="detail-image-item" v-for="(item, index) in detailImages.slice(0, 6)"
+                            :key="'detail-' + index" :class="{
                                 'dragging': draggingIndex === index,
                                 'can-drop': canDropIndex === index
                             }" @touchstart.stop="onTouchStart($event, index)" @touchmove.stop="onTouchMove($event)"
                             @touchend.stop="onTouchEnd" @touchcancel.stop="onTouchEnd">
                             <pic-comp :src="item.fileUrl"></pic-comp>
                             <view class="image-type-tag">{{ getImageType(index) }}</view>
-                            <view class="detail-delete-btn" @click.stop="deleteImage(item)">×</view>
+                            <view class="detail-delete-btn" @click.stop="handleYinCang(item, index)">×</view>
                         </view>
 
                         <!-- 上传按钮 -->
@@ -130,6 +130,9 @@
                 <!-- 确认转账按钮 -->
                 <u-button type="primary" size="large" @click="confirmTransfer"
                     style="margin-top: 40rpx;">确认转账</u-button>
+                <u-button type="primary" :plain="true" @click="payNowModelShow = false" size="large"
+                    style="margin-top: 40rpx;">取消</u-button>
+
             </view>
         </u-modal>
     </view>
@@ -173,7 +176,9 @@ export default {
                 if (newVal) {
                     console.log('这里是page3的', newVal.tableFee)
                     this.paymentAmount = newVal.tableFee || '0.00'
-                    this.getList('2', '3', newVal.id, this.orderDetail.itemBrand);
+                    setTimeout(() => {
+                        this.getList('2', '3', newVal.id, this.orderDetail.itemBrand);
+                    }, 100);
                 }
             },
             deep: true,
@@ -419,6 +424,15 @@ export default {
                 uni.$u.toast('提交待跟进记录成功');
             }
         },
+        handleYinCang(item, index) {
+            console.log('删除图片:', item, '索引:', index);
+            // 从detailImages数组中移除当前项，后续图片会自动前移
+            const itemIndex = this.detailImages.findIndex(img => img.fileUrl === item.fileUrl);
+            if (itemIndex !== -1) {
+                this.detailImages.splice(itemIndex, 1);
+                uni.$u.toast('图片已隐藏');
+            }
+        }
     }
 }
 </script>

pages/orderDetailNew/components/pageTwo.vue

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

pages/orderDetailNew/mixin/imgUploadAndDownLoad.js

@@ -34,12 +34,12 @@ export default {
         },
         //获取文件列表
         async getList(type, orderFileType, receiptID, itemBrand) {
-            console.log('获取文件列表', type, receiptID)
+            console.log('获取文件列表', itemBrand, type, receiptID, orderFileType)
             // console.log('当前的订单id', this.orderDetail.id)
             // console.log('当前的收单id', this.currentReceipt.id)
             try {
                 const params = {
-                    clueId: this.orderDetail.clueId,
+                    clueId: this.currentReceipt.clueId,
                     sourceId: this.currentReceipt.id,//默认先用receiptID查,如果没有返回情况下用orderID查
                     type,
                     orderFileType,

pages/pagereceivecenter/pagereceivecenter.vue

@@ -204,7 +204,11 @@ export default {
                             <view class="mainLindInfo">
                                 <view class="itemName">{{ item.item || '暂无项目' }}</view>
                                 <view>发单人:{{ item.createNickName || '未知' }}</view>
-                                <view>{{ item.sendDate || '暂无时间' }}</view>
+                                <view>机构：{{ item.orgName || '暂无机构' }}</view>
+                                <view>电话：{{ item.phone || '暂无电话' }}</view>
+                                <view>所属人：{{ item.clueOwnerName || '暂无所属人' }}</view>
+                                <view>运营人：{{ item.clueOperationName || '暂无运营人' }}</view>
+                                <view>发单日期：{{ item.sendDate || '暂无时间' }}</view>
                             </view>
                         </view>
 

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