no message

src/components/FinancialModule/MonthlyCostStatement/index.vue

@@ -807,10 +807,6 @@ export default {
                   if(this.total==0){
                       this.DataList=[];
                   }else{
-                      data.forEach(x=>{
-                          // this.columns[0].filters.push({label:x.FrID,value:x.FrID})
-                          x.modelShow = false;
-                      })
                       this.DataList = data;
                   }
                   this.loading=false;

src/components/FinancialModule/OpCommission/OPcommissionPeriods.vue

@@ -245,12 +245,13 @@
                   Money=item.SumPrice
               }
                   let obj = {
-                      CostType: 16,//112
+                      CostType: 112,
                       Money: Money,
                       CurrencyId: 1,
                       XSTC: 1,
                       OtherType:73,
                       ReFinanceId: item.ID,
+                      SelectState: true,
                       isRB_Branch_Id: true,
                       RB_Branch_Id: this.msg.OutBranchId,
                   }
@@ -261,11 +262,11 @@
                       IsUploadPic: 1,
                       orderObj: JSON.stringify(obj)
                   }
-                  if(this.msg.OutBranchId>-1){
-                      query.id = 30
+                  if(this.msg.OutBranchId > 0){
+                      query.id = 31
                       query.Name = "分公司OP提成单"
                   }else{
-                      query.id = 28
+                      query.id = 29
                       query.Name = "总部OP提成单"
                   }
 

src/components/FinancialModule/ServiceCommission/ServiceCommission.vue

@@ -103,7 +103,7 @@
                            {{item.OPFinanceIdList.length == y+1 ?'':'、'}}
                         </span>
                     </div>
-                    
+
                 </td>
                 <td :rowspan="1">
                     <div>{{item.CreateByStr}}</div>
@@ -116,7 +116,7 @@
                                 icon="iconfont icon-chakan" circle></el-button>
                         </el-tooltip>
                         <el-tooltip v-if="cMaker==true" class="item" effect="dark" content="制单" placement="top">
-                            <el-button @click="YijianZD(item,1)" type="danger" class="CM_look" v-if="cMaker==true" 
+                            <el-button @click="YijianZD(item,1)" type="danger" class="CM_look" v-if="cMaker==true"
                                 icon="iconfont icon-mui-icon-add" circle></el-button>
                         </el-tooltip>
                     </div>
@@ -126,11 +126,11 @@
                                 icon="iconfont icon-chakan" circle></el-button>
                         </el-tooltip>
                         <el-tooltip v-if="cMaker==true" class="item" effect="dark" content="制单" placement="top">
-                            <el-button @click="YijianZD(item,2)" type="danger" class="CM_look" v-if="cMaker==true" 
+                            <el-button @click="YijianZD(item,2)" type="danger" class="CM_look" v-if="cMaker==true"
                                 icon="iconfont icon-mui-icon-add" circle></el-button>
                         </el-tooltip>
                     </div>
-                    
+
 
 
                 </td>
@@ -215,7 +215,7 @@
                         if (res.data.resultCode == 1) {
                             this.PeriodsList = res.data.data;
                             // if(this.PeriodsList && this.PeriodsList.length>0){
-                            //     this.msg.Periods = Number(this.PeriodsList[0].Id) 
+                            //     this.msg.Periods = Number(this.PeriodsList[0].Id)
                             // }
 
 
@@ -285,7 +285,7 @@
                 );
             },
             YijianZD(item,type) {
-                let Money 
+                let Money
                 if(this.msg.OutBranchId>-1){
                     if(type==1){
                         if(item.BranchCommission>0){
@@ -302,7 +302,7 @@
                             return;
                         }
                     }
-                    
+
                 }else{
                     Money=item.SumPrice
                 }
@@ -329,7 +329,7 @@
                         query.id = 28
                         query.Name = "总部销售提成单"
                     }
-                    
+
                     this.$router.push({
                         path: "/addFinancialDocuments",
                         query
@@ -353,7 +353,7 @@
                         IsUploadPic: 1,
                         orderObj: JSON.stringify(obj)
                     }
-                    if (this.msg.OutBranchId > -1) {
+                    if (this.msg.OutBranchId > 0) {
                         query.id = 31
                         query.Name = "分公司销售提成单"
                     } else {
@@ -366,7 +366,7 @@
                         query
                     });
                 }
-                
+
 
             },
             gofinancialdetail(item){
@@ -383,4 +383,4 @@
 
         }
     }
-</script>
+</script>
\ No newline at end of file

src/components/FinancialModule/addFinancialDocuments.vue

@@ -558,7 +558,7 @@
                 <el-select filterable v-model='da.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')"
                   @change="getCostTypeName(da.CostTypeId, daIn),getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)"
                   class=" _border_b_1">
-                  <el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
+                  <el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID' :disabled="SelectDisablsed!=item.ID">
                   </el-option>
                 </el-select>
               </td>
@@ -1871,6 +1871,7 @@
 
           if (res.data.resultCode == 1) {
             this.GetCostTypeList = res.data.data;
+            console.log(this.GetCostTypeList,'======')
             if (type) {
               this.msg.detailList.forEach(x => {
                 this.GetCostTypeList.forEach(y => {

src/components/FinancialModule/domestic/OPsalesCommission.vue

@@ -246,7 +246,7 @@
                     IsUploadPic: 1,
                     orderObj: JSON.stringify(obj)
                 }
-                if (this.msg.OutBranchId > -1) {
+                if (this.msg.OutBranchId > 0) {
                     query.id = 31
                     query.Name = "分公司销售提成单"
                 } else {
@@ -274,4 +274,4 @@
 
         }
     }
-</script>
+</script>
\ No newline at end of file