单接单闭环

pages/orderDetailNew/components/pageFour.vue

@@ -114,61 +114,66 @@
                 <!-- 分成信息表格 -->
                 <view class="split-table">
                     <u-row class="split-table-header">
-                        <u-col span="2">
+                        <u-col span="4">
                             <text class="header-text">关联</text>
                         </u-col>
                         <u-col span="2">
-                            <text class="header-text">账户类型</text>
-                        </u-col>
-                        <u-col span="2">
                             <text class="header-text">分成人</text>
                         </u-col>
+
                         <u-col span="2">
-                            <text class="header-text">比例(%)</text>
+                            <text class="header-text">比例</text>
                         </u-col>
-                        <u-col span="2">
-                            <text class="header-text">归属公司</text>
+                        <u-col span="1">
+                            <text class="header-text">类型</text>
+                        </u-col>
+                        <u-col span="1">
+                            <text class="header-text">公司</text>
                         </u-col>
                         <u-col span="2" class="action-column">
                             <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-col span="2">
+                        <u-col span="4">
                             <view class="table-cell">
-                                <select v-model="item.deptId" class="custom-select" @change="onAssociationChange(item)">
-                                    <option value="">无</option>
+                                <!-- <select v-model="item.deptId" class="custom-select">
                                     <option v-for="option in associationOptions" :key="option.id" :value="option.id">
                                         {{ option.label }}
                                     </option>
-                                </select>
-                            </view>
-                        </u-col>
-                        <u-col span="2">
-                            <view class="table-cell">
-                                <view :class="['account-type', item.accountType == '1' ? 'frontend' : 'backend']"
-                                    @click="toggleAccountType(item)" style="cursor: pointer;">
-                                    {{ item.accountType == '1' ? '前' : '后' }}
-                                </view>
+                                </select> -->
+                                <u-button @click='handleSelectOrg(item)' :text="item.orgName" plain></u-button>
                             </view>
                         </u-col>
+
                         <u-col span="2">
                             <view class="table-cell">
-                                <select v-model="item.userId" class="custom-select">
+                                <!-- <select v-model="item.userId" class="custom-select">
                                     <option value="">无</option>
                                     <option v-for="person in item.personOptions" :key="person.id" :value="person.id">
                                         {{ person.label }}
                                     </option>
-                                </select>
+                                </select> -->
+                                <u-button @click="handleSelectPerson(item)" :text="item.userName" plain></u-button>
                             </view>
                         </u-col>
+
+
                         <u-col span="2">
                             <view class="table-cell">
                                 <u--input v-model="item.commissionRate" type="number" class="percentage-input"
                                     @input="handlePercentageInput(item)" min="0" max="100" precision="0" />
                             </view>
                         </u-col>
-                        <u-col span="2">
+                        <u-col span="1">
+                            <view class="table-cell">
+                                <view :class="['account-type', item.accountType == '1' ? 'frontend' : 'backend']"
+                                    @click="toggleAccountType(item)" style="cursor: pointer;">
+                                    {{ item.accountType == '1' ? '前' : '后' }}
+                                </view>
+                            </view>
+                        </u-col>
+                        <u-col span="1">
                             <view class="table-cell">
                                 <view class="radio-wrapper" @click="toggleBelongToCompany(item)">
                                     <view :class="['radio-circle', item.isCompanyPerformance == '1' ? 'active' : '']">
@@ -180,7 +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)">
+                                <u-button type="error" plain shape="circle" size="mini" @click="deleteRow(item.id)"
+                                    class='delectBtn'>
                                     <u-icon name="trash" size="20rpx" color="#ff6b6b"></u-icon>
                                 </u-button>
                             </view>
@@ -197,11 +203,24 @@
                 <text style="margin-left: 8rpx;">确认入库</text>
             </u-button>
         </div>
+
+        <!-- 组织选择 -->
+        <u-picker :show="showOrgPicker" title="请选择组织" :columns="columnsOrgList" keyName="label"
+            @confirm="handleOrgConfirmOrg" @cancel='showOrgPicker = false'></u-picker>
+
+
+        <!-- 人员选择 -->
+        <u-picker :show="showPersonPicker" title="请选择分成人" :columns="columnsPersonList" keyName="label"
+            @confirm="handleConfirmPerson" @cancel='handleCancelPerson'></u-picker>
+
+        <u-toast ref="uToast"></u-toast>
+
     </view>
 </template>
 
 <script>
 export default {
+
     props: {
         orderDetail: {
             type: Object,
@@ -270,7 +289,9 @@ export default {
                         grossPerformance: data.grossPerformance || '',//毛业绩
                         remarks: data.receiptRemark.split(';')[0] || '',//收单备注  截取备注第一部分
                     }
-                    this.getList()
+                    this.$nextTick(() => {
+                        this.getList()
+                    })
                 }
             },
         }
@@ -296,16 +317,23 @@ export default {
 
             ],
             // 关联选项列表
-            associationOptions: [],
+            // associationOptions: [],
             // 分成人选项列表
-            personOptions: [],
+            // personOptions: [],
             // 表单验证规则
+            showOrgPicker: false,
+            showPersonPicker: false,
+
+            columnsOrgList: [],
+            columnsPersonList: [],
 
         };
     },
     mounted() {
         // 获取分成人名单
-        this.getCommissionUserList();
+        this.$nextTick(() => {
+            this.getCommissionUserList();
+        })
     },
 
     methods: {
@@ -333,41 +361,20 @@ export default {
                 deptId: '',
                 accountType: '1',
                 userId: '',
-                personOptions: [],
                 percentage: 0,
-                isCompanyPerformance: '2'
+                isCompanyPerformance: '2',
+                orgName: '',
+                userName: '',
+                id: '',
             });
             // 重新计算所有行的比例
-            this.recalculatePercentage();
         },
 
-        // 重新计算分成比例
-        recalculatePercentage() {
-            // 分别计算前端和后端的行数
-            const frontendRows = this.profitSharingList.filter(item => item.accountType === 'frontend');
-            const backendRows = this.profitSharingList.filter(item => item.accountType === 'backend');
-
-            // 计算前端平均比例
-            if (frontendRows.length > 0) {
-                const frontendAvg = Math.floor(100 / frontendRows.length);
-                frontendRows.forEach(item => {
-                    item.percentage = frontendAvg;
-                });
-            }
 
-            // 计算后端平均比例
-            if (backendRows.length > 0) {
-                const backendAvg = Math.floor(100 / backendRows.length);
-                backendRows.forEach(item => {
-                    item.percentage = backendAvg;
-                });
-            }
-        },
         // 切换账户类型
         toggleAccountType(item) {
             item.accountType = item.accountType == '1' ? '2' : '1';
             // 重新计算分成比例
-            this.recalculatePercentage();
         },
         // 处理百分比输入
         handlePercentageInput(item) {
@@ -390,68 +397,41 @@ export default {
         toggleBelongToCompany(item) {
             item.isCompanyPerformance = item.isCompanyPerformance == '1' ? '2' : '1';
         },
-        // 关联选择变化时，更新分成人选项
-        onAssociationChange(item) {
-            if (item.deptId) {
-                const selectedOption = this.associationOptions.find(opt => opt.id === item.deptId);
-                item.personOptions = selectedOption ? selectedOption.children || [] : [];
-                item.userId = '';
-            } else {
-                item.personOptions = [];
-                item.userId = '';
-            }
-        },
-        // 确认入库方法
-        confirmWarehouseEntry() {
-            // 表单校验
-
-            if (this.validateProfitSharing()) {
 
-                //上传表单数据
-                this.$emit('confirmInterStore', {
-                    warehouseInfo: this.warehouseInfo,
-                })
+        // 确认入库方法
+        async confirmWarehouseEntry() {
+
+
+            //上传物流表单数据
+            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',
+                    })
+                },
+            });
 
-                //上传分成数据
-                this.addShare()
+            //跳转接单
 
-            }
 
         },
-        // 分成信息校验方法
-        validateProfitSharing() {
-            for (let i = 0; i < this.profitSharingList.length; i++) {
-                const item = this.profitSharingList[i];
-                if (!item.userId || !item.userId.trim()) {
-                    uni.showToast({
-                        title: `第${i + 1}行请选择分成人`,
-                        icon: 'none'
-                    });
-                    return false;
-                }
-
-                if (item.commissionRate <= 0 || item.commissionRate > 100) {
-                    uni.showToast({
-                        title: `第${i + 1}行分成比例必须在1-100之间`,
-                        icon: 'none'
-                    });
-                    return false;
-                }
-            }
 
-            return true;
-        },
         // 获取分成人名单
         async getCommissionUserList() {
             const commissionUserList = await uni.$u.api.getCustomerManagerAllList()
-            console.log(commissionUserList.data[0].children, '分成人名单')
-            this.associationOptions = commissionUserList.data[0].children
-            if (this.profitSharingList.length > 0) {
-                this.profitSharingList = this.profitSharingList.map(item => ({
-                    ...item,
-                    personOptions: item.deptId ? this.getPersonOptionsByDeptId(item.deptId) : []
-                }));
-            }
+            console.log('分成人名单', commissionUserList.data[0].children)
+            // this.associationOptions = commissionUserList.data[0].children
+            this.columnsOrgList = [commissionUserList.data[0].children]
         },
 
         //初始化分成比例
@@ -460,59 +440,39 @@ export default {
                 pageSize: 9999,
                 pageNum: 1,
             }, { sendFormId: this.receiptList[0].sendFormId, });
-            this.profitSharingList = rows.map(item => {
-                let personOptions = [];
-                if (item.deptId) {
-                    if (this.associationOptions.length > 0) {
-                        personOptions = this.getPersonOptionsByDeptId(item.deptId);
-                    } else {
-                        personOptions = [];
-                    }
-                }
-                return {
-                    ...item,
-                    personOptions
-                };
-            });
-            if (this.associationOptions.length === 0) {
-                await this.getCommissionUserList();
-            }
-            console.log('这里是分成比例', this.profitSharingList, '总数是', total);
+            console.log('分成比例表格数据', rows)
+            this.profitSharingList = rows
         },
 
-        getPersonOptionsByDeptId(deptId) {
-            const selectedOption = this.associationOptions.find(opt => opt.id === deptId);
-            return selectedOption ? selectedOption.children || [] : [];
-        },
 
 
-        //添加分成比例
-        async addProfitSharingList(data) {
-            if (data.id) {
-                //编辑
-                await uni.$u.api.clueCommissionUpdate(data);
-            } else {
-                //新增
-                await uni.$u.api.clueCommissionAdd(data);
-            }
-        },
+
+
+
+
         addShare() {
-            console.log('开始上传')
-            this.profitSharingList.forEach(item => {
-                this.addProfitSharingList({
-                    id: item.id,
+            this.profitSharingList.forEach(async item => {
+                const data = {
+                    id: item.id || '',
                     accountType: item.accountType == '1' ? 1 : 2,
                     clueId: this.receiptList[0].clueId,
                     commissionRate: item.commissionRate,
                     isCompanyPerformance: item.isCompanyPerformance == '1' ? 1 : 2,
                     sendFormId: this.receiptList[0].sendFormId,
                     userId: item.userId,
-                    userName: item.personOptions.find(opt => opt.id == item.userId)?.label || '',
-                });
+                    userName: item.userName,
+                }
+                if (item.id) {
+                    //更新
+                    await uni.$u.api.clueCommissionUpdate(data);
+                } else {
+                    //新增
+                    await uni.$u.api.clueCommissionAdd(data);
+                }
             });
-            uni.$u.toast('上传成功')
         },
-        //删除分成
+
+        //删除分成ok
         async deleteRow(id) {
             console.log(id, 'id')
             try {
@@ -520,10 +480,71 @@ export default {
                 uni.$u.toast('删除成功')
                 this.getList()
             } catch (error) {
-                uni.$u.toast('删除失败，请稍后重试', error)
+                uni.$u.toast('删除失败，请稍后重试')
+            }
+        },
+
+        //打开选择框
+        handleSelectOrg(item) {
+            console.log(item.id, '当前选择的行的id')
+            this.currentEditItem = item.id
+            this.showOrgPicker = true
+        },
+        //选择当前的分成人
+        handleSelectPerson(item) {
+            console.log(item, '当前选择的行')
+            this.currentEditItem = item.id
+            //获取当前选择组织的分成人名单
+            // 获取当前行的关联id
+            const deptId = item.deptId
+            const org = this.columnsOrgList[0].find(org => org.id == deptId)
+            console.log(org, '当前选择的行的组织')
+            if (org) {
+                this.columnsPersonList = [org.children]
             }
+            // 把当前选择组织的分成人名单赋值给当前行的分成人选项列表
+
+            this.showPersonPicker = true
         },
 
+        //确认选择组织
+        handleOrgConfirmOrg({ columnIndex, value, values },) {
+            console.log(value, '选择的组织')
+            //把值赋值给当前行
+            this.profitSharingList.forEach(item => {
+                if (item.id == this.currentEditItem) {
+                    item.orgName = value[0].label
+                    item.deptId = value[0].id
+                    // item.personOptions = value[0].children
+                    //将当前的行的分成人清空
+                    item.userId = ''
+                    item.userName = ''
+                }
+            })
+
+
+            this.showOrgPicker = false
+        },
+
+        //确认选择人
+        handleConfirmPerson({ columnIndex, value, values },) {
+            console.log(value, '选择的人')
+            //把值赋值给当前行
+            this.profitSharingList.forEach(item => {
+                if (item.id == this.currentEditItem) {
+                    item.userName = value[0].label
+                    item.userId = value[0].id
+                }
+            })
+            this.columnsPersonList = []
+            this.showPersonPicker = false
+        },
+        // 取消选择人
+        handleCancelPerson() {
+            this.columnsPersonList = []
+            this.showPersonPicker = false
+        }
+
     }
 };
 </script>
@@ -841,12 +862,7 @@ export default {
     padding: 0 5rpx;
 }
 
-/* 调整输入框样式 */
-.percentage-input {
-    width: 80%;
-    height: 50rpx;
-    font-size: 28rpx;
-}
+
 
 /* 归属公司单选框样式 */
 .radio-wrapper {
@@ -902,4 +918,23 @@ export default {
         padding: 0 10rpx;
     }
 }
+
+.u-button {
+    height: 60rpx;
+}
+
+.delectBtn {
+    height: 40rpx;
+
+    .u-button {
+        width: 40rpx;
+    }
+
+
+
+}
+
+.delectBtn ::v-deep .u-button--mini {
+    min-width: 20rpx !important;
+}
 </style>

pages/orderDetailNew/components/pageTwo.vue

@@ -150,7 +150,7 @@ export default {
         orderDetail: {
             handler(newVal) {
                 if (newVal) {
-                    this.approvedPrice = newVal.itemPrice || 0;
+                    this.approvedPrice = Number(newVal.itemPrice) || 0;
                     this.getList('2', '3');
                 }
             },