销售提成和销售详情

src/components/administrative/CommissionDetail.vue

 <template>
-  <div class="commissionDetails-box">
+  <div class="commissionDetails commissionDetails-box">
     <div class="query-box">
       <ul>
         <li>
@@ -206,10 +206,12 @@ export default {
         columnAlign: "left",
         isResize: true,
         width: 80,
-        result: "",
-        filterMultiple: false,
-        filters: [{}],
-        type: "text"
+        formatter: function(rowData, rowIndex, pagingIndex, field) {
+          if(rowData.leaveStr)
+          return `<div>${rowData.createByStr}<span style="color:red;display:inline-block">(${rowData.leaveStr})</span></div>`
+          else
+          return `<div>${rowData.createByStr}</div>`
+        }
       };
       let commissionMoney = {
         field: "commissionMoney",
@@ -294,7 +296,7 @@ export default {
         width: 80,
         formatter: function(rowData, rowIndex, pagingIndex, field) {
           if(rowData.periods!=that.stringPerons)
-            return `<div style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -10px;padding-left: 10px;'>${rowData.periods}</div>`
+            return `<div style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -5px;;padding-left: 10px;'>${rowData.periods}</div>`
           else
             return rowData.periods
         }
@@ -307,7 +309,14 @@ export default {
         isResize: true,
         width: 80,
         formatter: function(rowData, rowIndex, pagingIndex, field) {
-          return rowData.remark ? rowData.remark : ''
+          if(rowData.remark)
+          return `<div class="outDiv">
+          <div class="toolDiv">
+           <div class="triangle_border_up">
+          </div>${rowData.remark}</div>${rowData.remark}</div>`
+          else
+          return ''
+        
         }
       };
       let opera = {
@@ -437,7 +446,7 @@ export default {
   },
   created(){
       Vue.component('commission-table-operation',{
-      template:`<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`,
+      template:`<div style='border-bottom: 1px solid #e5e5e5;width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;box-sizing:border-box'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`,
       props:{
           rowData:{
               type:Object
@@ -461,7 +470,41 @@ export default {
 };
 </script>
 <style>
+.commissionDetails .triangle_border_up{
+    width:0;
+    height:0;
+    border-width:0 5px 5px;
+    border-style:solid;
+    border-color:transparent transparent #303133;/*透明 透明  灰*/
+    position:absolute;
+    top:-5px;
+}
+
+.commissionDetails .v-table-body-cell:hover .outDiv .toolDiv{
+  display: block;
+}
+.commissionDetails .v-table-body-cell{
+  overflow: initial;
+  cursor: pointer;
+}
+.commissionDetails .toolDiv{
+  position: absolute;
+  top: 25px;
+  background: #303133;
+  color: #fff;
+  z-index: 20000;
+  padding: 4px 15px;
+  max-width: 220px;
+  white-space: normal;
+  border-radius: 4px;
+  word-wrap:break-word;
+  display: none;
 
+}
+.commissionDetails .outDiv{
+  position: relative;
+
+}
 .commissionDetails-box .el-button.is-circle{padding: 5px !important;}
 .commissionDetails-box .v-table-body-cell span {
     display: block;

src/components/administrative/CommissionManagement.vue

@@ -20,7 +20,7 @@
         </li>
       </ul>
     </div>-->
-    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+    <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
         <th>期数</th>
         <th v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49">提成总金额</th>
@@ -58,10 +58,10 @@
             ></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="制单" placement="top">
-            <el-button
+            <el-button v-if="btnShow"
               type="primary"
               class="CM_look"
-              @click="generalFinancacls(item.branchMoney)"
+              @click="generalFinancacls(item)"
               icon="el-icon-plus"
               title="制单"
               circle
@@ -95,12 +95,18 @@ export default {
       dataList: [],
       total: 0,
       currentPage: 1,
-      userInfo: {}
+      userInfo: {},
+      btnShow:false,
     };
   },
   mounted() {
     this.getList();
     this.userInfo = this.getLocalStorage();
+    let userInfo = this.getLocalStorage();
+    let ActionMenuCode=userInfo.ActionMenuCode;
+      if(ActionMenuCode.indexOf('CommissionVoucher')!=-1){
+        this.btnShow=true;
+      }
   },
   methods: {
     handleCurrentChange(val) {
@@ -169,10 +175,14 @@ export default {
         null
       );
     },
-    generalFinancacls(money){
+    generalFinancacls(item){
+      if(item.financialsArray&&item.financialsArray.length>0){
+        this.Error("请不要多次制单！")
+        return;
+      }
       let obj = {
         CostType: 16,
-        Money: money,
+        Money: item.branchMoney,
         CurrencyId: 1,
         XSTC: 1,
       }