Merge branch 'mergeBranch' into redUrgent

# Conflicts:
#	src/SManagement/orderclue_detail/components/changeCustomer.vue

src/Form/publicCustomer/add.vue

@@ -211,7 +211,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="客户来源:" prop="source">
-                <el-input v-model="form.source" placeholder="客户来源"></el-input>
+                <selectTemp ref="sourceRef" placeholder="请选择来源" payload="cluesource" @selectChange="selectSource"></selectTemp>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -314,7 +314,7 @@ export default {
           { required: true, message: '还未选择客户类型', trigger: 'change' },
         ],
         source:[
-          { required: false, message: '请填写客户来源', trigger: 'change,blur'}
+          { required: true, message: '请选择客户来源', trigger: 'change'}
         ],
         sa_customerpoolid:[
           { required: true, message: '请选择公海池', trigger: 'change'}
@@ -577,6 +577,7 @@ export default {
       this.checkResults = ''
       this.value = ''
       this.businessShow = false
+      this.$refs.sourceRef.value = ''
       this.$emit('onSuccess')
     },
     cascaderChange (val) {
@@ -800,6 +801,9 @@ export default {
         this.form.contactsinfo.telephone = ''
       }
     },
+    selectSource(data){
+      this.form.source = data
+    }
   },
   mounted() {
 

src/Form/publicCustomer/edit.vue

@@ -208,8 +208,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户来源:" >
-                <el-input v-model="form.source" placeholder="客户来源"></el-input>
+              <el-form-item label="客户来源:" prop="source">
+                <selectTemp ref="sourceRef" placeholder="请选择来源" payload="cluesource" @selectChange="selectSource" :cluesource="form.source"></selectTemp>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -311,7 +311,7 @@ export default {
           { required: true, message: '还未选择客户类型', trigger: 'change' },
         ],
         source:[
-          { required: true, message: '请填写客户来源', trigger: 'blur'}
+          { required: true, message: '请选择客户来源', trigger: 'change'}
         ],
         contact: [
           { required: false, message: '请输入法人', trigger: 'change,blur' },
@@ -592,6 +592,9 @@ export default {
       })
       this.publicList = res.data
     },
+    selectSource(data){
+      this.form.source = data
+    }
   },
   mounted() {
 

src/Form/salerPrivatecustomer/add.vue

@@ -231,7 +231,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="客户来源:" prop="source">
-                <el-input v-model="form.source" placeholder="请输入客户来源" style="width: 100%"></el-input>
+                <selectTemp ref="sourceRef" placeholder="请选择来源" payload="cluesource" @selectChange="selectSource"></selectTemp>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -408,6 +408,9 @@ export default {
         province: [
           {required: true, message: '请选择省市县', trigger: 'blur'},
         ],
+        source: [
+          { required: true, message: '请选择客户来源', trigger: 'change' },
+        ],
         'contactsinfo.name': [
           {required: true, message: '请输入联系人姓名', trigger: 'change,blur'}
         ],
@@ -589,6 +592,7 @@ export default {
       this.businessShow = false
       this.areaCode = ''
       this.telephone = ''
+      this.$refs.sourceRef.value = ''
       this.$emit('onSuccess')
     },
     /*客户类型列表*/
@@ -843,6 +847,9 @@ export default {
         this.form.contactsinfo.telephone = ''
       }
     },
+    selectSource(data){
+      this.form.source = data
+    }
   }
 }
 </script>

src/Form/salerPrivatecustomer/edit.vue

@@ -207,7 +207,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="客户来源:" >
-                <el-input v-model="form.source" placeholder="请输入客户来源" style="width: 100%"></el-input>
+                <selectTemp ref="sourceRef" placeholder="请选择来源" payload="cluesource" @selectChange="selectSource" :cluesource="form.source"></selectTemp>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -370,6 +370,9 @@ export default {
         province: [
           { required: true, message: '请选择省市县', trigger: 'change,blur' },
         ],
+        source: [
+          { required: true, message: '请选择客户来源', trigger: 'change' },
+        ],
         'contactsinfo.name':[
           { required: false, message: '请输入联系人姓名', trigger: 'change,blur' }
         ],
@@ -727,6 +730,9 @@ export default {
       this.customerParam.content.pageNumber = val
       this.customerList()
     },
+    selectSource(data){
+      this.form.source = data
+    }
   }
 }
 </script>

src/HDrpManagement/projectChange/modules/detail.vue

@@ -528,6 +528,7 @@ export default {
 
           {label:'负责人',value:this.mainData.name ? this.mainData.name : '--'},
           {label:'结案/失败原因',value:this.mainData.status == '已结案'?this.mainData.endreason:this.mainData.status == '已失败'?this.mainData.defeattype + ','+ this.mainData.defeatreason:'--'},
+          {label:'项目来源',value:this.mainData.source ? this.mainData.source : '--'},
         /*  {label:'失败原因',value:this.mainData.defeatreason?this.mainData.defeattype + ','+ this.mainData.defeatreason:'--'},*/
        /*   {label:'修正比例',value:this.mainData.reward_rate ? Math.round((this.mainData.reward_rate * 100)*100)/100 + '%': '0%'},
           {label:'提成计算节点',value:this.mainData.reward_point ? this.mainData.reward_point : '--'},*/
@@ -626,6 +627,7 @@ export default {
          /* {label:'结案原因',value:this.mainData.endreason?this.mainData.endreason:'--'},
           {label:'失败原因',value:this.mainData.defeatreason?this.mainData.defeattype + ','+ this.mainData.defeatreason:'--'},*/
           {label:'结案/失败原因',value:this.mainData.status == '已结案'?this.mainData.endreason:this.mainData.status == '已失败'?this.mainData.defeattype + ','+ this.mainData.defeatreason:'--'},
+          {label:'项目来源',value:this.mainData.source ? this.mainData.source : '--'},
         ],
 
         systemInfo: [

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -214,7 +214,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="客户来源:" prop="source">
-                <el-input v-model="form.source" placeholder="请输入客户来源" style="width: 100%"></el-input>
+                <selectTemp ref="sourceRef" placeholder="请选择来源" payload="cluesource" @selectChange="selectSource"></selectTemp>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -333,6 +333,9 @@ export default {
         province: [
           { required: true, message: '请选择省市县', trigger: 'change,blur' },
         ],
+        source: [
+          { required: true, message: '请选择客户来源', trigger: 'change' },
+        ],
         'contactsinfo.name':[
           { required: true, message: '请输入联系人姓名', trigger: 'change,blur' }
         ],
@@ -871,6 +874,9 @@ export default {
       this.form.agentname = val.enterprisename
       this.agentsShow = false
     },
+    selectSource(data){
+      this.form.source = data
+    }
   },
   mounted() {