no message

src/components/administrative/empBankAccount.vue

@@ -9,7 +9,7 @@
   .empBankAccountTable tr{background: #fff;text-align: left;}
   .empBankAccountTable tr:nth-child(2n+1){background: #E5E5E5;}
   .empBankAccountTable tr td{height: 60px; padding-left:20px; border-right: 1px solid #DCDCDC; border-bottom: 1px solid #DCDCDC;}
-  
+
  .popTable{width: 80%; font-size:14px; color: #333; background: #ccc;}
   .popTable tr{border-bottom: 2px solid #333;}
   .popTable tr th{background: #BDBDBD;height:30px; font-size: 12px; text-align: left; text-indent: 20px;}
@@ -97,7 +97,7 @@
 		</div>
 		<div class="query-box">
 			<ul>
-			
+
 				<li>
 					<input type="button" @click="outerVisible = true,dialogTitle=$t('ground.xinzengzhanghu'),resetForm('addMsg')" class="normalBtn" :value="$t('pub.addBtn')" />
 				</li>
@@ -137,7 +137,7 @@
 						    <el-button  @click="outerVisible = true,dialogTitle=$t('ground.xiugaizhanghu'),updateData(item.ID)"  type="primary"  style='background:#409EFF; border-color:#409EFF' icon="iconfont icon-bianji-smal" ></el-button>
 						 </el-tooltip>
 						 <el-tooltip class="item" effect="dark" :content="item.Status=='1'? $t('fnc.qiyong'):$t('pub.fressSel')" placement="top-start">
-						    <el-button v-if='item.Status==1'  @click="deleteData(item.ID)"  type="primary"  style='background:#09D49D; border-color:#09D49D' icon="iconfont icon-qidong" ></el-button>
+              <el-button v-if='item.Status==1'  @click="deleteData(item.ID)"  type="primary"  style='background:#09D49D; border-color:#09D49D' icon="iconfont icon-qidong" ></el-button>
 						    <el-button v-if='item.Status==0'  @click="deleteData(item.ID)"  type="primary"  style='background:#E95252; border-color:#E95252' icon="iconfont icon-dongjie" ></el-button>
 						 </el-tooltip>
 						 <el-tooltip class="item" effect="dark" :content="$t('ground.mingxi')" placement="top-start">
@@ -345,7 +345,7 @@
 						BAId:id
 					}, res => {
 						if(res.data.resultCode == 1) {
-							this.$message.success(thi.$t('pub.saveYes'))
+							this.$message.success(this.$t('pub.saveYes'))
 							this.getList();
 						}
 					}, err => {})
@@ -389,7 +389,7 @@
 		  this.addMsg.AccountHolder='';
 		  this.addMsg.CardNum='';
 		  this.addMsg.AccountAlias='';
-		 
+
         }
 		}
 	}

src/components/sale/ExpectedCommission.vue

@@ -128,7 +128,7 @@
         <template v-if="CommissionInfor">
         <!-- <p>总提成：<span>{{CommissionInfor.TotalCMoney}}</span></p> -->
         <p>总订单数：<span>{{CommissionInfor.SalesOrderNum+CommissionInfor.JapanOrderNum+CommissionInfor.EuropeOrderNum+GNOrderNum}}</span></p>
-        <p>总人头数：<span>{{CommissionInfor.PeopleNum+CommissionInfor.EuropePNum+CommissionInfor.SalesPeopleNum+CommissionInfor.JapanPeopleNum+CommissionInfor.EuropePeopleNum+GNEopleNum}}</span></p>
+        <p>总人头数：<span>{{CommissionInfor.OtherPNum+CommissionInfor.PeopleNum+CommissionInfor.EuropePNum+CommissionInfor.SalesPeopleNum+CommissionInfor.JapanPeopleNum+CommissionInfor.EuropePeopleNum+GNEopleNum}}</span></p>
         <p>总预期奖金：<span>{{CommissionJJ}}</span></p>
         <p>总预期提成：<span>{{CommissionTC}}</span></p>
         </template>
@@ -463,6 +463,7 @@
     },
     data() {
       return {
+        jianjinNum: 0,
         isExpansion: false,
         CommissionJJ:0,
         CommissionTC:0,
@@ -716,7 +717,7 @@
                 this.DomesticLine.Rlist[0],
                 this.DomesticLine.Rlist[1]]
               this.newRlist = [this.DomesticLine.Rlist[2]]
-              let arr1 =[this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney]
+              let arr1 =[this.CommissionInfor.OtherMoney,this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney]
               let arr2 =[this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission]
               this.CommissionJJ = this.CalculatePrice(arr1,0)
               this.CommissionTC = this.CalculatePrice(arr2,2)