feat：留资职位老数据置空等

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -544,7 +544,15 @@
         workScope: true,
         partnerNeeds: true,
         agree: true
-      }
+      },
+      jobJson: [
+        '总裁', 
+        '总经理',
+        '总监',
+        '经理',
+        '主管',
+        '职员'
+      ]
     },
     created() {
       // 大会员落地页免费体验
@@ -706,8 +714,7 @@
         }
         var zc = this.infoMap.position.indexOf('总裁') > -1
         var zjl = this.infoMap.position.indexOf('总经理') > -1
-        var source = this.ajaxParams.source !== 'article_original' &&  this.ajaxParams.source !== 'article_collection'
-        return !(zc || zjl) && source && this.infoMap.position
+        return !(zc || zjl) && this.infoMap.position
       }
     },
     methods: {
@@ -848,7 +855,7 @@
       setCheckForData (aKey, iKey, cKey, label) {
         this.ajaxParams[aKey] = cKey
         this.infoMap[iKey] = cKey
-        if (label === '职位' && cKey.indexOf('其他') !== -1) {
+        if (label === '职位' && this.jobJson.indexOf(cKey) === -1) {
             // this.infoMap[iKey] = '其他'
             // this.infoMap.position_other = cKey.split('/')[1]
             this.infoMap[iKey] = ''

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info_push.html

@@ -200,7 +200,15 @@
         "company": "",
         "position": "",
         "branch": ""
-      }
+      },
+      jobJson: [
+        '总裁', 
+        '总经理',
+        '总监',
+        '经理',
+        '主管',
+        '职员'
+      ]
     },
     mounted() {
       // source=message_bigmember app消息大会员留资地
@@ -274,8 +282,7 @@
         }
         var zc = this.infoMap.position.indexOf('总裁') > -1
         var zjl = this.infoMap.position.indexOf('总经理') > -1
-        var source = this.ajaxParams.source !== 'article_original' &&  this.ajaxParams.source !== 'article_collection'
-        return !(zc || zjl) && source  && this.infoMap.position
+        return !(zc || zjl) && this.infoMap.position
       }
     },
     methods: {
@@ -355,7 +362,7 @@
       setCheckForData (aKey, iKey, cKey, label) {
         this.ajaxParams[aKey] = cKey
         this.infoMap[iKey] = cKey
-        if (label === '职位' && cKey.indexOf('其他') !== -1) {
+        if (label === '职位' && this.jobJson.indexOf(cKey) === -1) {
             // this.infoMap[iKey] = '其他'
             // this.infoMap.position_other = cKey.split('/')[1]
             this.infoMap[iKey] = ''

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info_solution.html

@@ -57,6 +57,7 @@
                                    placeholder="请选择职位"></van-field>
                         <van-field class="other-input-group" @focus="infoCheckMap.position_other = ''"
                                    :error-message="infoCheckMap.position_other" v-model.trim="infoMap.position_other" v-show="infoMap.position === '其他'" label="职位" placeholder="请输入职位"></van-field>
+                        <van-field v-if="showBranch" v-model="infoMap.branch" label="部门" @click="openPop('部门')" readonly is-link placeholder="请选择部门"></van-field>
                     </div>
                 </div>
             </div>
@@ -136,14 +137,16 @@
         phone: '',
         company: '',
         position: '',
-        position_other: ''
+        position_other: '',
+        branch: ''
       },
       infoCheckMap: {
         name: '',
         phone: '',
         company: '',
         position: '',
-        position_other: ''
+        position_other: '',
+        branch: ''
       },
       isEchoInfoLoading: true,
       popInfo: {
@@ -177,6 +180,24 @@
             title: '职员',
             checked: false
           }
+        ],
+        '部门': [
+          {
+            title: '市场',
+            checked: false
+          },
+          {
+            title: '产品',
+            checked: false
+          },
+          {
+            title: '销售',
+            checked: false
+          },
+          {
+            title: '渠道',
+            checked: false
+          }
         ]
       },
       ajaxParams: {
@@ -185,8 +206,17 @@
         "source": utils.getParam('source'), // 推送消息点进来的 
         "company": "",
         "position": "",
-        'platform': 'app'
-      }
+        'platform': 'app',
+        "branch": ''
+      },
+      jobJson: [
+        '总裁', 
+        '总经理',
+        '总监',
+        '经理',
+        '主管',
+        '职员'
+      ]
     },
     mounted() {
       // source=message_bigmember app消息大会员留资地
@@ -237,8 +267,24 @@
             result = this.conditionMap[type].filter(v => v.checked).length
             break
           }
+          case '部门': {
+            result = this.conditionMap[type].filter(v => v.checked).length
+            break
+          }
         }
         return !result
+      },
+      showBranch () {
+        // 切换到总裁或总经理之后 把之前选择的部门清空
+        if (this.infoMap.position.indexOf('总裁') > -1 || this.infoMap.position.indexOf('总经理') > -1) {
+          this.infoMap.branch = ''
+          this.conditionMap['部门'].forEach(v => {
+            v.checked = false
+          })
+        }
+        var zc = this.infoMap.position.indexOf('总裁') > -1
+        var zjl = this.infoMap.position.indexOf('总经理') > -1
+        return !(zc || zjl) && this.infoMap.position
       }
     },
     methods: {
@@ -309,12 +355,14 @@
         if (data.company) {
           this.setCheckForData('company', 'company', data.company)
         }
-  
+        if (data.branch) {
+          this.setCheckForData('branch', 'branch', data.branch, '部门')
+        }
       },
       setCheckForData (aKey, iKey, cKey, label) {
         this.ajaxParams[aKey] = cKey
         this.infoMap[iKey] = cKey
-        if (label === '职位' && cKey.indexOf('其他') !== -1) {
+        if (label === '职位' && this.jobJson.indexOf(cKey) === -1) {
             // this.infoMap[iKey] = '其他'
             // this.infoMap.position_other = cKey.split('/')[1]
             this.infoMap[iKey] = ''
@@ -337,6 +385,11 @@
             this.setCheckForData('position', 'position', tempData[0].title)
             break
           }
+          case '部门': {
+            var tempData = this.conditionMap[type].filter(v => v.checked)
+            this.setCheckForData('branch', 'branch', tempData[0].title)
+            break
+          }
         }
         this.popInfo.show = false
       },
@@ -346,6 +399,10 @@
             this.popInfo.title = '职位'
             break
           }
+          case '部门': {
+            this.popInfo.title = '部门'
+            break
+          }
         }
         this.popInfo.label = type
         this.popInfo.show = true
@@ -410,6 +467,7 @@
         if (this.infoMap.position === '其他') {
           this.ajaxParams.position = '其他/' + this.infoMap.position_other
         }
+        this.ajaxParams.branch = this.infoMap.branch.indexOf('总裁') > -1 || this.infoMap.branch.indexOf('总经理') > -1 ?  '' : this.infoMap.branch
         var _this = this
         var loading = _this.showLoading()
         $.ajax({

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info_strud.html

@@ -72,6 +72,7 @@
                                    placeholder="请选择职位"></van-field>
                         <van-field class="other-input-group" @focus="infoCheckMap.position_other = ''"
                                    :error-message="infoCheckMap.position_other" v-model.trim="infoMap.position_other" v-show="infoMap.position === '其他'" label="职位" placeholder="请输入职位"></van-field>
+                        <van-field v-if="showBranch" v-model="infoMap.branch" label="部门" @click="openPop('部门')" readonly is-link placeholder="请选择部门"></van-field>
                     </div>
                 </div>
             </div>
@@ -163,7 +164,8 @@
         email: '',
         company: '',
         position: '',
-        position_other: ''
+        position_other: '',
+        branch: ''
       },
       infoCheckMap: {
         name: '',
@@ -172,7 +174,8 @@
         email: '',
         company: '',
         position: '',
-        position_other: ''
+        position_other: '',
+        branch: ''
       },
       isEchoInfoLoading: true,
       popInfo: {
@@ -206,6 +209,24 @@
             title: '职员',
             checked: false
           }
+        ],
+        '部门': [
+          {
+            title: '市场',
+            checked: false
+          },
+          {
+            title: '产品',
+            checked: false
+          },
+          {
+            title: '销售',
+            checked: false
+          },
+          {
+            title: '渠道',
+            checked: false
+          }
         ]
       },
       ajaxParams: {
@@ -215,7 +236,16 @@
         "mail": "",
         "company": "",
         "position": "",
-      }
+        "branch": ''
+      },
+      jobJson: [
+        '总裁', 
+        '总经理',
+        '总监',
+        '经理',
+        '主管',
+        '职员'
+      ]
     },
     mounted() {
       // source=message_bigmember app消息大会员留资地
@@ -272,8 +302,24 @@
             result = this.conditionMap[type].filter(v => v.checked).length
             break
           }
+          case '部门': {
+            result = this.conditionMap[type].filter(v => v.checked).length
+            break
+          }
         }
         return !result
+      },
+      showBranch () {
+        // 切换到总裁或总经理之后 把之前选择的部门清空
+        if (this.infoMap.position.indexOf('总裁') > -1 || this.infoMap.position.indexOf('总经理') > -1) {
+          this.infoMap.branch = ''
+          this.conditionMap['部门'].forEach(v => {
+            v.checked = false
+          })
+        }
+        var zc = this.infoMap.position.indexOf('总裁') > -1
+        var zjl = this.infoMap.position.indexOf('总经理') > -1
+        return !(zc || zjl) && this.infoMap.position
       }
     },
     methods: {
@@ -427,12 +473,14 @@
         if (data.company) {
           this.setCheckForData('company', 'company', data.company)
         }
-  
+        if (data.branch) {
+          this.setCheckForData('branch', 'branch', data.branch, '部门')
+        }
       },
       setCheckForData (aKey, iKey, cKey, label) {
         this.ajaxParams[aKey] = cKey
         this.infoMap[iKey] = cKey
-        if (label === '职位' && cKey.indexOf('其他') !== -1) {
+        if (label === '职位' && this.jobJson.indexOf(cKey) === -1) {
             // this.infoMap[iKey] = '其他'
             // this.infoMap.position_other = cKey.split('/')[1]
             this.infoMap[iKey] = ''
@@ -455,6 +503,11 @@
             this.setCheckForData('position', 'position', tempData[0].title)
             break
           }
+          case '部门': {
+            var tempData = this.conditionMap[type].filter(v => v.checked)
+            this.setCheckForData('branch', 'branch', tempData[0].title)
+            break
+          }
         }
         this.popInfo.show = false
       },
@@ -464,6 +517,10 @@
             this.popInfo.title = '职位'
             break
           }
+          case '部门': {
+            this.popInfo.title = '部门'
+            break
+          }
         }
         this.popInfo.label = type
         this.popInfo.show = true
@@ -560,6 +617,7 @@
         this.ajaxParams.mail = this.infoMap.email
         this.ajaxParams.company = this.infoMap.company
         this.ajaxParams.position = this.infoMap.position
+        this.ajaxParams.branch = this.infoMap.branch.indexOf('总裁') > -1 || this.infoMap.branch.indexOf('总经理') > -1 ?  '' : this.infoMap.branch
         if(this.setcodeShow) {
           this.ajaxParams.code = this.infoMap.vercode
         }

src/web/staticres/js/pc-collect-bid-info.js

@@ -267,9 +267,7 @@ var vmbid = new Vue({
       }
       var zc = this.form.job.indexOf('总裁') > -1
       var zjl = this.form.job.indexOf('总经理') > -1
-      var source = this.source !== 'article_original' &&  this.source !== 'article_collection'
-      console.log(!(zc || zjl), source, this.form.job)
-      return !(zc || zjl) && source && this.form.job
+      return !(zc || zjl) && this.form.job
     }
   },
   mounted() {

src/web/staticres/js/pc-collect-partner-info.js

@@ -330,8 +330,10 @@ var vmPartner = new Vue({
             _this.form.companyName = res.data.company ? res.data.company : ''
             if (res.data.position) {
               if (jobJson.indexOf(res.data.position) == -1) {
-                _this.form.job = '其他'
-                _this.form.otherJob = res.data.position.replace('其他/', '')
+                // _this.form.job = '其他'
+                // _this.form.otherJob = res.data.position.replace('其他/', '')
+                _this.form.job = ''
+                _this.form.otherJob = ''
               } else {
                 _this.form.job = res.data.position
               }

src/web/staticres/js/pc-collect-user-info.js

@@ -375,8 +375,7 @@ var vm = new Vue({
       }
       var zc = this.form.job.indexOf('总裁') > -1
       var zjl = this.form.job.indexOf('总经理') > -1
-      var source = this.source !== 'article_original' &&  this.source !== 'article_collection'
-      return !(zc || zjl) && source && this.form.job
+      return !(zc || zjl) && this.form.job
     }
   },
   mounted() {

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -555,7 +555,15 @@
         workScope: true,
         partnerNeeds: true,
         agree: true,
-      }
+      },
+      jobJson: [
+        '总裁', 
+        '总经理',
+        '总监',
+        '经理',
+        '主管',
+        '职员'
+      ]
     },
     created() {
       // 大会员落地页免费体验
@@ -722,8 +730,7 @@
         }
         var zc = this.infoMap.position.indexOf('总裁') > -1
         var zjl = this.infoMap.position.indexOf('总经理') > -1
-        var source = this.ajaxParams.source !== 'article_original' &&  this.ajaxParams.source !== 'article_collection'
-        return !(zc || zjl) && source && this.infoMap.position
+        return !(zc || zjl) && this.infoMap.position
       }
     },
     methods: {
@@ -883,7 +890,7 @@
       setCheckForData (aKey, iKey, cKey, label) {
         this.ajaxParams[aKey] = cKey
         this.infoMap[iKey] = cKey
-        if (label === '职位' && cKey.indexOf('其他') !== -1) {
+        if (label === '职位' && this.jobJson.indexOf(cKey) === -1) {
             // this.infoMap[iKey] = '其他'
             // this.infoMap.position_other = cKey.split('/')[1]
             this.infoMap[iKey] = ''

src/web/templates/frontRouter/wx/bigmember/free/perfect_info_solution.html

@@ -68,6 +68,7 @@
                                  placeholder="请选择职位"></van-field>
                       <van-field class="other-input-group" @focus="infoCheckMap.position_other = ''"
                                  :error-message="infoCheckMap.position_other" v-model.trim="infoMap.position_other" v-show="infoMap.position === '其他'" label="职位" placeholder="请输入职位"></van-field>
+                      <van-field v-if="showBranch" v-model="infoMap.branch" label="部门" @click="openPop('部门')" readonly is-link placeholder="请选择部门"></van-field>
                   </div>
               </div>
           </div>
@@ -147,14 +148,16 @@
         phone: '',
         company: '',
         position: '',
-        position_other: ''
+        position_other: '',
+        branch: ''
       },
       infoCheckMap: {
         name: '',
         phone: '',
         company: '',
         position: '',
-        position_other: ''
+        position_other: '',
+        branch: ''
       },
       isEchoInfoLoading: true,
       popInfo: {
@@ -188,6 +191,24 @@
             title: '职员',
             checked: false
           }
+        ],
+        '部门': [
+          {
+            title: '市场',
+            checked: false
+          },
+          {
+            title: '产品',
+            checked: false
+          },
+          {
+            title: '销售',
+            checked: false
+          },
+          {
+            title: '渠道',
+            checked: false
+          }
         ]
       },
       ajaxParams: {
@@ -196,8 +217,17 @@
         "source": utils.getParam('source'), // 推送消息点进来的 
         "company": "",
         "position": "",
-        'platform': 'wx'
-      }
+        'platform': 'wx',
+        "branch": ''
+      },
+      jobJson: [
+        '总裁', 
+        '总经理',
+        '总监',
+        '经理',
+        '主管',
+        '职员'
+      ]
     },
     mounted() {
       // source=message_bigmember app消息大会员留资地
@@ -254,8 +284,24 @@
             result = this.conditionMap[type].filter(v => v.checked).length
             break
           }
+          case '部门': {
+            result = this.conditionMap[type].filter(v => v.checked).length
+            break
+          }
         }
         return !result
+      },
+      showBranch () {
+        // 切换到总裁或总经理之后 把之前选择的部门清空
+        if (this.infoMap.position.indexOf('总裁') > -1 || this.infoMap.position.indexOf('总经理') > -1) {
+          this.infoMap.branch = ''
+          this.conditionMap['部门'].forEach(v => {
+            v.checked = false
+          })
+        }
+        var zc = this.infoMap.position.indexOf('总裁') > -1
+        var zjl = this.infoMap.position.indexOf('总经理') > -1
+        return !(zc || zjl) && this.infoMap.position
       }
     },
     methods: {
@@ -325,12 +371,14 @@
         if (data.company) {
           this.setCheckForData('company', 'company', data.company)
         }
-  
+        if (data.branch) {
+          this.setCheckForData('branch', 'branch', data.branch, '部门')
+        }
       },
       setCheckForData (aKey, iKey, cKey, label) {
         this.ajaxParams[aKey] = cKey
         this.infoMap[iKey] = cKey
-        if (label === '职位' && cKey.indexOf('其他') !== -1) {
+        if (label === '职位' && this.jobJson.indexOf(cKey) === -1) {
             // this.infoMap[iKey] = '其他'
             // this.infoMap.position_other = cKey.split('/')[1]
             this.infoMap[iKey] = ''
@@ -353,6 +401,11 @@
             this.setCheckForData('position', 'position', tempData[0].title)
             break
           }
+          case '部门': {
+            var tempData = this.conditionMap[type].filter(v => v.checked)
+            this.setCheckForData('branch', 'branch', tempData[0].title)
+            break
+          }
         }
         this.popInfo.show = false
       },
@@ -362,6 +415,10 @@
             this.popInfo.title = '职位'
             break
           }
+          case '部门': {
+            this.popInfo.title = '部门'
+            break
+          }
         }
         this.popInfo.label = type
         this.popInfo.show = true
@@ -426,6 +483,7 @@
         if (this.infoMap.position === '其他') {
           this.ajaxParams.position = '其他/' + this.infoMap.position_other
         }
+        this.ajaxParams.branch = this.infoMap.branch.indexOf('总裁') > -1 || this.infoMap.branch.indexOf('总经理') > -1 ?  '' : this.infoMap.branch
         var _this = this
         var loading = _this.showLoading()
         $.ajax({

src/web/templates/frontRouter/wx/bigmember/free/perfect_info_strud.html

@@ -83,6 +83,7 @@
                                  placeholder="请选择职位"></van-field>
                       <van-field class="other-input-group" @focus="infoCheckMap.position_other = ''"
                                  :error-message="infoCheckMap.position_other" v-model.trim="infoMap.position_other" v-show="infoMap.position === '其他'" label="职位" placeholder="请输入职位"></van-field>
+                      <van-field v-if="showBranch" v-model="infoMap.branch" label="部门" @click="openPop('部门')" readonly is-link placeholder="请选择部门"></van-field>
                   </div>
               </div>
           </div>
@@ -174,7 +175,8 @@
         email: '',
         company: '',
         position: '',
-        position_other: ''
+        position_other: '',
+        branch: ''
       },
       infoCheckMap: {
         name: '',
@@ -183,7 +185,8 @@
         email: '',
         company: '',
         position: '',
-        position_other: ''
+        position_other: '',
+        branch: ''
       },
       isEchoInfoLoading: true,
       popInfo: {
@@ -217,6 +220,24 @@
             title: '职员',
             checked: false
           }
+        ],
+        '部门': [
+          {
+            title: '市场',
+            checked: false
+          },
+          {
+            title: '产品',
+            checked: false
+          },
+          {
+            title: '销售',
+            checked: false
+          },
+          {
+            title: '渠道',
+            checked: false
+          }
         ]
       },
       ajaxParams: {
@@ -226,7 +247,16 @@
         "mail": "",
         "company": "",
         "position": "",
-      }
+        "branch": ''
+      },
+      jobJson: [
+        '总裁', 
+        '总经理',
+        '总监',
+        '经理',
+        '主管',
+        '职员'
+      ]
     },
     mounted() {
       // source=message_bigmember app消息大会员留资地
@@ -283,8 +313,24 @@
             result = this.conditionMap[type].filter(v => v.checked).length
             break
           }
+          case '部门': {
+            result = this.conditionMap[type].filter(v => v.checked).length
+            break
+          }
         }
         return !result
+      },
+      showBranch () {
+        // 切换到总裁或总经理之后 把之前选择的部门清空
+        if (this.infoMap.position.indexOf('总裁') > -1 || this.infoMap.position.indexOf('总经理') > -1) {
+          this.infoMap.branch = ''
+          this.conditionMap['部门'].forEach(v => {
+            v.checked = false
+          })
+        }
+        var zc = this.infoMap.position.indexOf('总裁') > -1
+        var zjl = this.infoMap.position.indexOf('总经理') > -1
+        return !(zc || zjl) && this.infoMap.position
       }
     },
     methods: {
@@ -438,12 +484,14 @@
         if (data.company) {
           this.setCheckForData('company', 'company', data.company)
         }
-  
+        if (data.branch) {
+          this.setCheckForData('branch', 'branch', data.branch, '部门')
+        }
       },
       setCheckForData (aKey, iKey, cKey, label) {
         this.ajaxParams[aKey] = cKey
         this.infoMap[iKey] = cKey
-        if (label === '职位' && cKey.indexOf('其他') !== -1) {
+        if (label === '职位' && this.jobJson.indexOf(cKey) === -1) {
             // this.infoMap[iKey] = '其他'
             // this.infoMap.position_other = cKey.split('/')[1]
             this.infoMap[iKey] = ''
@@ -466,6 +514,11 @@
             this.setCheckForData('position', 'position', tempData[0].title)
             break
           }
+          case '部门': {
+            var tempData = this.conditionMap[type].filter(v => v.checked)
+            this.setCheckForData('branch', 'branch', tempData[0].title)
+            break
+          }
         }
         this.popInfo.show = false
       },
@@ -475,6 +528,10 @@
             this.popInfo.title = '职位'
             break
           }
+          case '部门': {
+            this.popInfo.title = '部门'
+            break
+          }
         }
         this.popInfo.label = type
         this.popInfo.show = true
@@ -577,6 +634,7 @@
         if (this.infoMap.position === '其他') {
           this.ajaxParams.position = '其他/' + this.infoMap.position_other
         }
+        this.ajaxParams.branch = this.infoMap.branch.indexOf('总裁') > -1 || this.infoMap.branch.indexOf('总经理') > -1 ?  '' : this.infoMap.branch
         var _this = this
         var loading = _this.showLoading()
         $.ajax({