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

pages/orderDetailNew/components/pageFour.vue

@@ -552,7 +552,10 @@ export default {
         handleSelectOrg(item) {
             console.log(item.uuid, '当前选择的行的uuid')
             this.currentEditItem = item.uuid
-            this.showOrgPicker = true
+            // this.showOrgPicker = true
+            this.showPersonPicker = true
+            //把当前的组织赋值给当前的组件
+            this.columnsPersonList = this.columnsOrgList//获取到的分成人名单
         },
         //选择当前的分成人
         handleSelectPerson(item) {
@@ -561,15 +564,31 @@ export default {
             //获取当前选择组织的分成人名单
             // 获取当前行的关联id
             const deptId = item.deptId
-            const org = this.columnsOrgList[0].find(org => org.id == deptId)
-            console.log(org, '当前选择的行的组织')
+            //递归查找当前选择的组织
+            const org = this.findOrg(this.columnsOrgList[0], deptId)
+            // const org = this.columnsOrgList[0].find(org => org.id == deptId)
+            console.log(org, '当前选择的组织')
             if (org) {
                 this.columnsPersonList = [org.children]
             }
             // 把当前选择组织的分成人名单赋值给当前行的分成人选项列表
-
             this.showPersonPicker = true
         },
+        //递归查找当前选择的组织
+        findOrg(orgList, deptId) {
+            for (const org of orgList) {
+                if (org.id == deptId) {
+                    return org
+                }
+                if (org.children && org.children.length > 0) {
+                    const found = this.findOrg(org.children, deptId)
+                    if (found) {
+                        return found
+                    }
+                }
+            }
+            return null
+        },
 
         //确认选择组织
         handleOrgConfirmOrg({ columnIndex, value, values },) {

pages/orderDetailNew/components/pageTwo.vue

@@ -440,17 +440,22 @@ export default {
         },
         checkFollowUpContent() {
             // 检查跟进记录是否包含上面的三个选择
+            //每个检查到一个就不继续检查了
+            let hasContactMaster = false;
+            let hasPhotoTips = false;
+            let hasFace2face = false;
             this.followUpListInner.forEach(item => {
                 console.log('这里是跟进记录', item)
                 // 判断内容是否含有联系师傅，师傅拍图技巧，到达客户面对面，如果包含的话就上面对应的box就打上对勾
-                if (item.includes('联系师傅')) {
+                if (item.includes('联系师傅') && !hasContactMaster) {
                     this.selectedCheckbox.push('contact师傅');
                     // 联系师傅的手机号，已：为分割，取后面的内容
                     const phone = item.split(';')[1] || '';
                     console.log('联系师傅的手机号111111', phone)
                     this.formData.contactPhone = phone;
+                    hasContactMaster = true;
                 }
-                if (item.includes('师傅拍图技巧')) {
+                if (item.includes('师傅拍图技巧') && !hasPhotoTips) {
                     this.selectedCheckbox.push('photo技巧');
                     // 师傅拍图技巧的内容，已：为分割，取后面的内容
                     const photoTips = item.split(';')[1] || '';
@@ -459,9 +464,9 @@ export default {
                     //把url转为数组
                     const urlArray = urls.split(',').map(url => url.trim());
                     this.photoTipsImages = [...this.photoTipsImages, ...urlArray];
-
+                    hasPhotoTips = true;
                 }
-                if (item.includes('到达客户面对面')) {
+                if (item.includes('到达客户面对面') && !hasFace2face) {
                     this.selectedCheckbox.push('face2face');
                     // 到达客户面对面的内容，已：为分割，取后面的内容
                     const face2faceNotes = item.split(';')[1] || '';
@@ -470,6 +475,7 @@ export default {
                     //把url转为数组
                     const urlArray = urls.split(',').map(url => url.trim());
                     this.face2faceImages = [...this.face2faceImages, ...urlArray];
+                    hasFace2face = true;
                 }
             })
         },