Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/sellCommissionRules.vue

@@ -63,7 +63,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="5" :gutter="20">
-              <el-form-item label="提成比例：" prop="CommissionVariable">
+              <el-form-item label="提成比例：" prop="CommissionVariable"> 
                 <el-input
                   v-model="addMsg.CommissionVariable"
                   type="int"

src/components/SalesModule/customerTransfer.vue

@@ -786,6 +786,9 @@
 				this.getEmployee()
 			},
 	    	getEmployee() {
+          this.employeeMsg.departmentId=0
+          this.employeeMsg.RB_Group_id=this.getLocalStorage().RB_Group_id
+          this.employeeMsg.RB_Branch_id=-1
 				this.apipost('app_get_company_employee', this.employeeMsg, res => {
 					if(res.data.resultCode == 1) {
 						if(!this.isSelLayer)