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

src/components/FinancialModule/OPRules.vue

@@ -107,11 +107,11 @@
                     <el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="系列" v-show="form.LineIdList.length==1 && form.LineIdList[0]!=-1">
+            <!-- <el-form-item label="系列" v-show="form.LineIdList.length==1 && form.LineIdList[0]!=-1">
                 <el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LtIdList" >
                     <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'></el-option>
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="描述">
                 <el-input class="w220" v-model="form.Description"></el-input>
             </el-form-item>
@@ -236,6 +236,7 @@ export default {
        this.getLineList();
        this.getList();
        this.getEmployeeList();
+       this.getDepartment();
        
     },
     methods:{
@@ -294,7 +295,7 @@ export default {
                 FInternMoney:item.FInternMoney,
             }
             this.departmentMsg.RB_Branch_Id=item.BranchId;
-            this.getDepartment();
+            
             this.getLineTeamList();
         },
         RulesOk(formName){
@@ -307,10 +308,10 @@ export default {
                     this.Error("请选择分负责OP！")
                     return;
                 }
-                if(this.form.FZLEmployeeIdList.length==0){
-                    this.Error("请选择分助理！")
-                    return;
-                }
+                // if(this.form.FZLEmployeeIdList.length==0){
+                //     this.Error("请选择分助理！")
+                //     return;
+                // }
                 if(this.form.FInternMoney==0){
                     this.Error("请填写分负责人金额！")
                     return;
@@ -415,9 +416,9 @@ export default {
 
        linkageDepartment(val){
             this.departmentMsg.RB_Branch_Id=this.form.BranchId;
-            this.departmentList=[];
+            // this.departmentList=[];
             this.form.DepartmentId=-1;
-            this.getDepartment();
+            // this.getDepartment();
 
             if(this.departmentMsg.RB_Branch_Id==0){
                 this.stateShow=false;
@@ -432,12 +433,13 @@ export default {
        },
        getDepart(id){
            this.form.DepartmentId= id;
-           this.$forceUpdate();
+        //    this.$forceUpdate();
        },
       getDepartment() {
         this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
             if(res.data.resultCode == 1) {
                 this.departmentList = res.data.data;
+                console.log("this.departmentList",this.departmentList)
             }
         }, err => {})				
      },