no message

src/components/FinancialModule/MonthlyCostStatement/index.vue

@@ -84,6 +84,43 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+                  <!--
+                  <el-col :span="4">
+                    <el-form-item label="账户类型：">
+                      <el-select  filterable  v-model='msg.AccountType' >
+                        <el-option value="" label="不限"></el-option>
+                        <el-option v-for='item in AccList'
+                                   :label='item.Name'
+                                   :value='item.ID'
+                                   :key='item.ID'>
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="4">
+                    <el-form-item label="交易方式：">
+                      <el-select  filterable  v-model='msg.TradeWay' @change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''"  >
+                        <el-option value="0" label="不限"></el-option>
+                        <el-option v-for='item in BranchAccountList'
+                                   :label='item.Name'
+                                   :value='item.ID'
+                                   :key='item.ID'>
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="4">
+                    <el-form-item label="收付款账户：">
+                      <el-select  filterable  v-model='msg.BankID'>
+                        <el-option value="" label="不限"></el-option>
+                        <el-option v-for='item in accountList'
+                                   :label='item.Name'
+                                   :value='item.ID'
+                                   :key='item.ID'>
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col> -->
                   <el-col :span="4">
                     <el-form-item label="金额：">
                       <el-input v-model="msg.sMoney" class="w64d5" @keyup.native="checkPrice(msg,'sMoney')"></el-input>-<el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5"></el-input>

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -178,7 +178,10 @@
           <td>{{item.UserName}}</td>
           <td>{{item.LineName}}</td>
           <td style="width: 100px;">{{item.PeopleCount?item.PeopleCount:'-'}}</td>
-          <td>{{item.TCProfit?item.TCProfit:'-'}}</td>
+          <td>
+            {{item.TCProfit?item.TCProfit:'-'}}
+           <p v-if="item.DeductProfit&&item.DeductProfit>0">抵扣利润：-{{item.DeductProfit}}</p>
+          </td>
           <td>{{item.Way==1?'人头奖励':'利润比例'}}</td>
           <td>{{item.Rate&&item.Way==2?item.Rate+'%':item.Rate&&item.Way==1?item.Rate+'/人':'-'}}</td>
           <td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>

src/components/administrative/empBankAccount.vue

@@ -97,13 +97,48 @@
 		</div>
 		<div class="query-box">
 			<ul>
-
+        <li>
+          <span style="margin-left: 80px"><em>账户分类</em>
+              <el-select
+                v-model="msg.AccountClassify"
+                :placeholder="$t('pub.pleaseSel')"
+                @change="changeTitle"
+              >
+          <el-option label="不限" value="" key="0"> </el-option>
+                <el-option
+                  :label="$t('fnc.yinhang')"
+                  value="2"
+                  key="2"
+                ></el-option>
+                <el-option
+                  :label="$t('ground.xunizhanghu')"
+                  value="3"
+                  key="3"
+                ></el-option>
+                <el-option label="微信支付宝" value="4" key="4"></el-option>
+              </el-select>
+          </span>
+        </li>
+        <li>
+          <span><em>关键字</em>
+              <el-input
+                type="text"
+                v-model="msg.KeyWord"
+              ></el-input>
+          </span>
+        </li>
 				<li>
+          <input
+            type="button"
+            @click="getList"
+            class="normalBtn"
+            value="查询"
+          />
 					<input type="button" @click="outerVisible = true,dialogTitle=$t('ground.xinzengzhanghu'),resetForm('addMsg')" class="normalBtn" :value="$t('pub.addBtn')" />
 				</li>
 			</ul>
 		</div>
-		<table class="empBankAccountTable" border="0" cellspacing="0" cellpadding="0">
+		<table class="empBankAccountTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
 			<tr>
 				<th>{{$t("ground.zhanghumingcheng")}}</th>
 				<th>{{$t("fnc.w_zhbieming")}}</th>
@@ -160,6 +195,7 @@
 	export default {
 		data() {
 			return {
+        loading: true,
 				accountList: [],
 				nameA: this.$t("ground.zhanghumingcheng2"),
 				nameB: this.$t("fnc.khuren"),
@@ -184,6 +220,8 @@
 					pageIndex:1,
 					pageSize:15,
 					Type:'',
+          AccountClassify: '',
+          KeyWord: ''
 				},
 				getCompanyMsg:{
 					RB_Group_Id:'0',
@@ -253,11 +291,13 @@
 				}
 			},
 			getList() {     //获取列表数据
+
 				this.apipost("admin_get_GetEmpBankAccountPageList", this.msg, res => {
 					 if(res.data.resultCode==1){
 						this.list = res.data.data.pageData;
 						this.total = res.data.data.count;
 					 }else{}
+           this.loading = false
 				}, err => {})
 			},
 			// getCompany(){

src/components/administrative/empBankAccountAll.vue

@@ -320,6 +320,7 @@
       border="0"
       cellspacing="0"
       cellpadding="0"
+      v-loading="loading"
     >
       <tr>
         <th>{{ $t("fnc.khleixing") }}</th>
@@ -555,6 +556,7 @@ export default {
             this.total = res.data.data.count;
           } else {
           }
+          this.loading = false
         },
         (err) => {}
       );