业务员详情新增提成明细

src/HDrpManagement/ProductMag/index.vue

@@ -26,7 +26,7 @@
         <to_examine v-if="tool.checkAuth($route.name,'toExamine')" class="inline-16"  :rowData="rowData" @examineSuccess="onSuccess" :disabled="rowData.length === 0"></to_examine>
         <counter_examine v-if="tool.checkAuth($route.name,'reverseReview')" class="inline-16" :rowData="rowData" @examineSuccess="onSuccess" :disabled="rowData.length === 0"></counter_examine>
         <priceLevelSetting class="inline-16" v-if="tool.checkAuth($route.name,'priceSet')" ></priceLevelSetting>
-        <commissionSchemeSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSchemeSet') && siteid === 'HY'"></commissionSchemeSet>
+        <commissionSchemeSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSchemeSet') "></commissionSchemeSet>
         <el-button class="inline-16" size="small" v-if="tool.checkAuth($route.name,'refreshStock')" type="primary" @click="refreshStock">刷新库存</el-button>
         <importFile
           v-if="tool.checkAuth($route.name,'export')"

src/HDrpManagement/projectChange/modules/detail.vue

@@ -18,7 +18,7 @@
     <!-- 使用此插槽可不传[tags] -->
 <!--    <tagPanl slot="tags" :data="tagObj" ownertable="sa_project" :id="mainData.sa_projectid" @onSuccess="queryMainData"/>-->
     <div slot="customOperationBef">
-      <commissionSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSet')" ownertable="sa_project" @setSuccess="queryMainData"></commissionSet>
+      <commissionSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSet')" ownertable="sa_project" @setSuccess="queryMainData" :data="mainData"></commissionSet>
     </div>
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
@@ -280,7 +280,7 @@ export default {
     /*  this.mainData = res.data*/
       this.siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       this.mainData = Object.assign({},this.mainData,res.data)
-      if (this.mainData.reward_point){
+     /* if (this.mainData.reward_point){
         let point = ''
         for (var i = 0;i< this.mainData.reward_point.length;i++){
           if (i === this.mainData.reward_point.length -1){
@@ -290,7 +290,7 @@ export default {
           }
         }
         this.mainData.reward_point = point
-      }
+      }*/
 
     /*  if (this.mainData.discountrate > 1){
         this.mainData.discountrate = Math.round(this.mainData.discountrate)
@@ -505,8 +505,8 @@ export default {
 
 
           {label:'负责人',value:this.mainData.name ? this.mainData.name : '--'},
-          {label:'修正比例',value:this.mainData.reward_rate ? Math.round((this.mainData.reward_rate * 100)*100)/100 + '%': '0%'},
-          {label:'提成计算节点',value:this.mainData.reward_point ? this.mainData.reward_point : '--'},
+       /*   {label:'修正比例',value:this.mainData.reward_rate ? Math.round((this.mainData.reward_rate * 100)*100)/100 + '%': '0%'},
+          {label:'提成计算节点',value:this.mainData.reward_point ? this.mainData.reward_point : '--'},*/
         ],
 
         systemInfo: [

src/SDrpManagement/salerIncome/detail/components/commissionDetails.vue

@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <div class="mt-10 inline-16">
+      <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+      </el-input>
+    </div>
+    <tableNewLayout :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 376px)" :width="true" :custom="true" fixedName="operation">
+      <template v-slot:customcol="scope">
+        <div v-if="scope.column.columnname === 'remarks'">
+          {{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]]:'--'}}
+<!--          {{scope.column.data.sourcenote !== '' && scope.column.data.remarks !== ''?'系统备注:' + scope.column.data.sourcenote + ';人工备注:' + scope.column.data.remarks :
+            scope.column.data.sourcenote !== ''?'系统备注:' + scope.column.data.sourcenote : scope.column.data.remarks !== ''?'人工备注:' + scope.column.data.remarks:'&#45;&#45;'}}-->
+        </div>
+        <div v-else-if="scope.column.columnname === 'orderprice'">
+          {{tool.formatAmount(scope.column.data[[scope.column.columnname]],2)}}
+        </div>
+        <div v-else-if="scope.column.columnname === 'price'">
+          {{tool.formatAmount(scope.column.data[[scope.column.columnname]],2)}}
+        </div>
+        <div v-else-if="scope.column.columnname === 'rate'">
+          {{Math.round((scope.column.data[[scope.column.columnname]]*100)*100)/100}}%
+        </div>
+        <div v-else-if="scope.column.columnname === 'allocation_rate'">
+          {{Math.round((scope.column.data[[scope.column.columnname]]*100)*100)/100}}%
+        </div>
+        <div v-else>
+          {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
+        </div>
+      </template>
+    </tableNewLayout>
+    <div  class="container normal-panel" style="text-align:right">
+      <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[20, 20, 100, 200]"
+          :page-size="20"
+          layout="total,sizes, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "commissionDetails",
+  data(){
+    return {
+      param:{
+        "id": 20240111131304,
+        "content": {
+          "sa_hrcashbillid":"",
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          }
+        }
+      },
+      tablecols:[],
+      list:[],
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData(){
+      this.param.content.sa_hrcashbillid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.list = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+  },
+  mounted() {
+    this.listData()
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).commissionDetailsTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/SDrpManagement/salerIncome/detail/index.vue

@@ -12,7 +12,7 @@
         :mainAreaData="mainAreaData"
         :titleText="mainData.billno"
         @pageChange="pageChange"
-        :tabs="['支出','详细信息']"
+        :tabs="['提成明细','支出','详细信息']"
         @onEditSuccess="queryMainData"
         :statusCheck="[{key:'status',value:'审核'}]"
     >
@@ -20,9 +20,12 @@
         <toExamine class="inline-16" v-if="tool.checkAuth($route.name,'toExamine')" @examineSuccess="queryMainData" :status="mainData.status"></toExamine>
       </div>
       <div slot="slot0" class="normal-panel">
-        <expenditure></expenditure>
+        <commissionDetails></commissionDetails>
       </div>
       <div slot="slot1" class="normal-panel">
+        <expenditure></expenditure>
+      </div>
+      <div slot="slot2" class="normal-panel">
         <baseInfo  :detailInfo="detailInfo"></baseInfo>
       </div>
     </basicDetails>
@@ -33,9 +36,10 @@
 import baseInfo from '@/components/baseInfo/index.vue'
 import expenditure from './components/expenditure.vue'
 import toExamine from './modules/toExamine.vue'
+import commissionDetails from "@/SDrpManagement/salerIncome/detail/components/commissionDetails";
 export default {
   name: "index",
-  components:{baseInfo,expenditure,toExamine},
+  components:{baseInfo,expenditure,toExamine,commissionDetails},
   data(){
     return {
       mainData:[],

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -20,7 +20,7 @@
 <!--        <tagPanl slot="tags" :data="tags" :id="mainData.sa_customersid" @onSuccess="queryMainData"/>-->
       </div>
       <div slot="customOperationBef">
-        <commissionSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSet')" ownertable="sa_customers" @setSuccess="queryMainData"></commissionSet>
+        <commissionSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSet')" ownertable="sa_customers" @setSuccess="queryMainData" :data="mainData"></commissionSet>
       </div>
       <div slot="customOperation" >
         <!-- 此区域提供了自定义操作按钮 -->
@@ -229,7 +229,7 @@ export default {
       })
      /* this.mainData = res.data*/
       this.mainData = Object.assign({},this.mainData,res.data)
-      if (this.mainData.reward_point){
+      /*if (this.mainData.reward_point){
         let point = ''
         for (var i = 0;i< this.mainData.reward_point.length;i++){
           if (i === this.mainData.reward_point.length -1){
@@ -239,7 +239,7 @@ export default {
           }
         }
         this.mainData.reward_point = point
-      }
+      }*/
       this.$refs['details'].param.content.type = this.$route.query.tabIndex
       this.$refs['details'].param.content.isExport = false
       this.changeDataStructure()

src/SDrpManagement/salerPrivatecustomer/detail/modules/detailedData.vue

@@ -46,12 +46,12 @@
         </el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" label="负责人">{{ data.leader?data.leader.length !== 0 ?data.leader[0].name:'--':"--" }}</el-descriptions-item>
 
-        <el-descriptions-item label-class-name="my-label" label="修正比例" v-if="siteid === 'HY'">
+<!--        <el-descriptions-item label-class-name="my-label" label="修正比例" v-if="siteid === 'HY'">
           <span >{{ data.reward_rate?Math.round((data.reward_rate * 100)*100)/100 + '%':"0%" }}</span>
         </el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" label="提成计算节点" v-if="siteid === 'HY'">
-          <span >{{ data.reward_point?data.reward_point:"--" }}</span>
-        </el-descriptions-item>
+          <span >{{ data.reward_point?data.reward_point:"&#45;&#45;" }}</span>
+        </el-descriptions-item>-->
 
 
       </el-descriptions>

src/components/commissionSetNew/index.vue

@@ -35,7 +35,7 @@
 <script>
 export default {
   name: "index",
-  props:["ownertable"],
+  props:["ownertable","data"],
   data(){
     var NumberSize = (rule, value, callback) => {
       if (value === ''){
@@ -68,6 +68,11 @@ export default {
   methods:{
     onShow(){
       this.dialogFormVisible = true
+      console.log(this.data,'数据输出111')
+      console.log(this.form.reward_point)
+      console.log( this.form.reward_rate)
+      this.form.reward_point = this.form.reward_point?this.data.reward_point.length > 0?this.data.reward_point:[]:[]
+      this.form.reward_rate = this.form.reward_rate || this.form.reward_rate == 0?Math.round((this.data.reward_rate * 100)*100)/100:0
     },
     onSubmit(){
       this.$refs.form.validate(async (valid)=>{