no message

src/components/FinancialModule/domesticCommissionTW.vue

@@ -24,20 +24,20 @@
     <div class="flexOne domesticCommission">
         <div>
             <ul class="opUl">
-                <!-- <li>
+                <li>
                     <em>出团公司</em>
                     <el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" >
                         <el-option label="不限" :value="-1"></el-option>
                         <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
                             :value="item.Id"></el-option>
                     </el-select>
-                </li> -->
-                <li>
+                </li>
+                <!-- <li>
                     <em>期数名称</em>
                     <el-input maxlength="50" v-model="msg.Name" class="permiss-input w200"
                     @keyup.native.enter="msg.pageIndex=1,getList()"
                     :placeholder="$t('pub.pleaseImport')"></el-input>
-                </li>
+                </li> -->
                 <li>
                     <em>期数</em>
                     <el-select v-model="msg.PeriodsId" size="mini" filterable @change="msg.pageIndex=1,getList()">
@@ -62,12 +62,12 @@
             <tr>
                 <th>期数</th>
                 <th>名称</th>
-                <th>总金额</th>
+                <th>总提成</th>
                 <th>所属公司提成</th>
                 <th>财务单据</th>
                 <th width="150">汇率</th>
                 <th>操作信息</th>
-                <th>操作</th>
+                <th width="70">操作</th>
             </tr>
             <tr v-for="item in dataList">
                 <td>{{item.Periods}}</td>
@@ -110,16 +110,16 @@
                     <div>{{item.CreateStr}}</div>
                 </td>
                 <td>
-
-                    <el-tooltip class="item" effect="dark" content="查看用户" placement="top">
-                        <el-button type="primary" class="CM_look" @click="goUrl('domesticCommissionUserTW',item.Id)"
-                            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)" type="danger" class="CM_look" v-if="cMaker==true" 
-                            icon="iconfont icon-mui-icon-add" circle></el-button>
-                    </el-tooltip>
-
+                    <div style="display: flex;">
+                        <el-tooltip class="item" effect="dark" content="查看用户" placement="top">
+                            <el-button type="primary" class="CM_look" @click="goUrl('domesticCommissionUserTW',item.Id)"
+                                icon="iconfont icon-chakan" circle></el-button>
+                        </el-tooltip>
+                        <el-tooltip v-if="cMaker==true&&item.BranchCommission>0" class="item" effect="dark" content="制单" placement="top">
+                            <el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true" 
+                                icon="iconfont icon-mui-icon-add" circle></el-button>
+                        </el-tooltip>
+                    </div>
 
                 </td>
             </tr>
@@ -192,7 +192,7 @@
                     pageSize: 20,
                     Periods: 0,
                     Name: '',
-                    // OutBranchId:-1,
+                    OutBranchId:-1,
                 },
                 loading: false,
                 //数据源

src/components/FinancialModule/domesticCommissionUserTW.vue

@@ -68,7 +68,7 @@
                 <th>公司</th>
                 <th>部门</th>
                 <th>销售</th>
-                <th>人数</th>
+                <th>团的数量</th>
 
                 
                 <th>提成金额</th>