no message

src/components/FinancialModule/ImpressionTicketCommissionConfiguration.vue

@@ -66,7 +66,7 @@
           >
             
             <tr>
-              <td rowspan="2" width="100" style="min-width: 100px;">工资</td>
+              <td rowspan="2" width="100" style="min-width: 100px;">追加工资</td>
               <th style="min-width: 220px;"
                 v-for="( son , sIndex ) in item.WageRateList"
                 :key="sIndex"
@@ -80,7 +80,7 @@
             </th>
             </tr>
             <tr>
-              <td style="min-width: 220px;" v-for="( son , sIndex ) in item.WageRateList" :key="sIndex">{{ son.Rate }}</td>
+              <td style="min-width: 220px;" v-for="( son , sIndex ) in item.WageRateList" :key="sIndex"> + {{ son.Rate }}</td>
             </tr>
           </table>
         </div>
@@ -172,7 +172,7 @@
             </div>
             <div>
               <el-form-item 
-              :label="form.WageRateList.length>0?`工资 ${index+1} `:` ` " 
+              :label="form.WageRateList.length>0?`追加工资 ${index+1} `:` ` " 
               :prop="`WageRateList.${index}.Rate`" 
               :rules="rules.Rate"
               label-width="100px"

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketCommission.vue

@@ -48,7 +48,7 @@
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
             <tr>
                 <th>期数</th>
-                <th>总工资</th>
+                <th>总追加工资</th>
                 <th>总提成</th>
                 <th>总年终</th>
                 <th>财务单据</th>
@@ -58,7 +58,7 @@
             <tr v-for="item in dataList">
                 <td>{{item.Periods}}</td>
                 <td>
-                    <p>{{item.SumWage}}</p>
+                    <p>+ {{item.SumWage}}</p>
 
                 </td>
                 <td>{{item.SumCommission}}</td>

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue

@@ -23,7 +23,12 @@
       text-decoration: underline;
       color: red;
     }
-  
+    .cursor-p{
+        cursor: pointer;
+    }
+    .cursor-p:hover{
+        color: #409EFF;
+    }
   </style>
   <template>
     <div class="flexOne domesticCommissiondetails">
@@ -78,8 +83,9 @@
           <th>订单号</th>
           <th>订单利润</th>
           <th>应发</th>
-          <th>提成</th>
+          <th>当期提成</th>
           <th>提成比例</th>
+          <th>依据类型</th>
           <th>年终</th>
           <th>年终比例</th>
           <th>期数</th>
@@ -98,28 +104,45 @@
           <td>{{item.YCommission}}</td>
           <td>{{item.Commission}}</td>
           <td>{{item.CommissionRate}}%</td>
-          <td>{{item.BonusMoney}}</td>
-          <td>{{item.BonusRate}}%</td>
+          <td @click="GenerateScale(item)">
+            <span
+              :class="item.WageReId?'cursor-p':''">{{item.WageType==1?'新员工比例':item.WageType==2?'上季度定档':'-'}}</span>
+          </td>
+          <td>{{item.BranchName!='微途科技'?item.BonusMoney:'-'}}</td>
+          <td>{{item.BranchName!='微途科技'?item.BonusRate+'%':'-'}}</td>
           <td>{{item.Month}}</td>
           <td>{{item.Remark?item.Remark:'-'}}</td>
         </tr>
         <tr v-if="dataList.length==0">
-          <td style="text-align:center" colspan="13">暂无数据</td>
+          <td style="text-align:center" colspan="15">暂无数据</td>
         </tr>
       </table>
       <!-- 分页 -->
       <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
         layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
       </el-pagination>
-  
+      <!-- 查看生成比例 -->
+      <el-dialog custom-class='w1006' title="员工生成比例" :visible.sync="outerVisible" center>
+        <inAccordanceWith v-if="objNew" :msgNew="objNew"></inAccordanceWith>
+        <div slot="footer" class="dialog-footer">
+          <button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
+          <button class="normalBtn" type="primary" @click="outerVisible = false">确定</button>				
+        </div>
+		  </el-dialog>
     </div>
   </template>
   
   <script>
+    import inAccordanceWith from "./inAccordanceWithDialog"
     import moment from "moment"
     export default {
+      components:{
+        inAccordanceWith
+      },
       data() {
         return {
+          objNew:{},
+          outerVisible:false,
           Month: moment().format("YYYY-MM"),
           msg: {
             pageIndex: 1,
@@ -163,6 +186,13 @@
         }
       },
       methods: {
+        GenerateScale(item){
+          if(!item.WageReId){
+              return
+          }
+          this.objNew = item
+          this.outerVisible = true
+        },
         GetCommissionPeroidsList() { //期数下拉
             this.crmapipost(
                 "/api/Commission/GetCommissionPeroidsList",{},res => {