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

src/components/finance/marketCommissionfrom.vue

@@ -298,6 +298,20 @@ export default {
             this.addMsg.CourseList = this.getId(this.selectData.CourseList,2)
             this.addMsg.EmpList = this.getId(this.selectData.EmpList,3)
             this.addMsg.ChildEmpList = this.getId(this.selectData.ChildEmpList,3)
+            
+            if(this.addMsg.EmpList.length== this.employeeList.length){
+                this.personnel=true
+            }else{
+                this.personnel=false
+            }
+    
+            if(this.addMsg.ChildEmpList.length== this.employeeList.length){
+                this.branch=true
+            }else{
+                this.branch=false
+            }
+            
+           
         }
     },
     mounted() {
@@ -356,7 +370,6 @@ export default {
             
             if (!this.$refs.Name.hasError && !this.$refs.CourseRate.hasError && !this.$refs.FirstRate.hasError) {
                
-                console.log(this.addMsg)
                 let msg = JSON.parse(JSON.stringify(this.addMsg))
                 if (this.addMsg.SchoolIds && this.addMsg.SchoolIds.length == 0) {
                     this.$q.notify({
@@ -382,7 +395,6 @@ export default {
                  msg.ChildEmpList =  this.getList(this.employeeList,this.addMsg.ChildEmpList,3,)//部门人员
                 for(let i=0;i<msg.RateList.length;i++){
                     let x = msg.RateList[i]
-                    console.log(x.StartValue)
                     if(x.StartValue==='' ){
                          this.$q.notify({
                             type: 'negative',
@@ -408,7 +420,6 @@ export default {
                         return
                     }
                 }
-                console.log(msg,'222222')
                 this.$emit('success',msg)
             }
         },
@@ -453,7 +464,7 @@ export default {
             }else{//部门人员全选
                 if(this.branch== true){
                     this.addMsg.ChildEmpList = []
-                    this.myEmployeeList.forEach(x=>{
+                    this.employeeList.forEach(x=>{
                         this.addMsg.ChildEmpList.push(x.Id)
                     })
                 }else{
@@ -464,13 +475,13 @@ export default {
         },
         getpersonnel(type){
             if(type==1){//人员全选
-                 if(this.addMsg.EmpList.length== this.myEmployeeList.length){
+                 if(this.addMsg.EmpList.length== this.employeeList.length){
                     this.personnel=true
                 }else{
                     this.personnel=false
                 }
             }else{//部门人员全选
-                if(this.addMsg.ChildEmpList.length== this.myEmployeeList.length){
+                if(this.addMsg.ChildEmpList.length== this.employeeList.length){
                     this.branch=true
                 }else{
                     this.branch=false

src/pages/financial/market/commissionRule.vue

@@ -36,6 +36,10 @@
     font-size: 20px;
     font-weight: 500;
     color: #1f2329;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    
 }
 </style>
 <template>
@@ -44,7 +48,10 @@
       <div class="col row wrap q-mr-lg q-col-gutter-md"></div>
     </div>
     <template>
-      <div class="cycle_Title">市场顾问提成规则</div>
+      <div class="cycle_Title">
+        业绩提成规则
+        <q-btn color="accent" size="sm" icon="add" label="新增规则" @click="AddMsg()" />
+      </div>
       <div
         class="cm_content"
         style="width: 100%;margin-bottom: 35px;margin-top: 10px;"
@@ -192,10 +199,7 @@
         v-if="dataList.length == 0"
         style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;"
       >暂无数据</div>
-      <div style="width: 100%;display: flex;justify-content: flex-end;margin-top: 10px;">
-        <q-btn color="accent" size="sm" icon="add" label="新增规则" @click="AddMsg()" />
-        <!-- <q-btn color="accent" size="sm" label="保存" @click="setMsg()" style="margin-left: 15px;" /> -->
-      </div>
+     
     </template>
     <marketCommissionfrom
       v-if="persistent"