提成设置

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')"></commissionSet>
+      <commissionSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSet')" ownertable="sa_project" @setSuccess="queryMainData"></commissionSet>
     </div>
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
@@ -493,6 +493,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 : '--'},
+          {label:'提成计算节点',value:this.mainData.reward_point ? this.mainData.reward_point : '--'},
         ],
 
         systemInfo: [
@@ -586,6 +588,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 : '--'},
+          {label:'提成计算节点',value:this.mainData.reward_point ? this.mainData.reward_point : '--'},
         ],
 
         systemInfo: [

src/HManagement/marketing2/saler/area/detail/index.vue

@@ -10,7 +10,7 @@
         idname="sa_salearea_hrid"
         ownertable="sa_salearea_hr"
         tags=""
-        :tabs="['详细信息','领域授权','授权标准']"
+        :tabs="['详细信息','领域授权','授权标准','账户信息']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -30,8 +30,11 @@
         <TradefieldList :mainData="mainData"></TradefieldList>
       </div>
       <div slot="slot2">
-      <areaBase :data="mainData"></areaBase>
-    </div>
+        <areaBase :data="mainData"></areaBase>
+      </div>
+      <div slot="slot3">
+        <accountInfo :hrid="mainData.hrid"></accountInfo>
+      </div>
     </basicDetails>
   </div>
 </template>
@@ -42,9 +45,10 @@ import TradefieldList from './modules/tradefieldList'
 import areaBase from './modules/areaBase/index'
 import mindmap from "@/components/mindmap/index.vue";
 import PortraitDetail from './modules/Prortraitdetail.vue'
+import accountInfo from './modules/accountInfo.vue'
 
 export default {
-  components:{detailed,TradefieldList,areaBase,mindmap,PortraitDetail},
+  components:{detailed,TradefieldList,areaBase,mindmap,PortraitDetail,accountInfo},
   data () {
     return {
       mainData:{},

src/HManagement/marketing2/saler/area/detail/modules/accountInfo.vue

@@ -0,0 +1,55 @@
+<template>
+  <div>
+    <tableNewLayout :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 288px)" :width="true" :custom="true" >
+      <template v-slot:customcol="scope">
+        <div v-if="scope.column.columnname === 'balance'">
+          {{tool.formatAmount(scope.column.data[[scope.column.columnname]],2)}}
+        </div>
+        <div v-else-if="scope.column.columnname === 'expectedReward'">
+          {{tool.formatAmount(scope.column.data[[scope.column.columnname]],2)}}
+        </div>
+        <div v-else>
+          {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
+        </div>
+      </template>
+    </tableNewLayout>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "accountInfo",
+  props:["hrid"],
+  data(){
+    return {
+      tablecols:[],
+      list:[],
+      param:{
+        "id": 20240111085504,
+        "content": {
+          "hrid":'',
+          "pageSize": 20,
+          "pageNumner": 1
+        }
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      this.param.content.hrid = this.hrid
+      const res = await this.$api.requested(this.param)
+      this.list = res.data
+    }
+  },
+  mounted() {
+    this.listData()
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).accountTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/marketing2/saler/area/detail/modules/detailedData.vue

@@ -12,6 +12,8 @@
         <el-descriptions-item label="负责区域">{{ detailData.areaname?detailData.areaname:"--" }}</el-descriptions-item>
         <el-descriptions-item label="汇报对象">{{ detailData.reporthrname?detailData.reporthrname:"--" }}</el-descriptions-item>
         <el-descriptions-item label="最低授权折扣(%)" >{{ detailData.discountrate?Math.round((detailData.discountrate*100)*100)/100:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="提成比例" >{{ detailData.reward_rate?Math.round((detailData.reward_rate*100)*100)/100:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="提成计算节点">{{ detailData.reward_point?detailData.reward_point:"--" }}</el-descriptions-item>
       </el-descriptions>
     </div>
 
@@ -47,4 +49,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -19,6 +19,9 @@
         <!-- :tabs="['经销商团队','代理区域','营销类别','账户余额']" -->
 <!--        <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>
+      </div>
       <div slot="customOperation" >
         <!-- 此区域提供了自定义操作按钮 -->
         <el-button class="inline-16" type="primary" size="mini" @click="portraitShowFun">360°画像</el-button>
@@ -89,6 +92,7 @@ import bankCard from './modules/bankCard/index'
 import duplicatesCustomer from "@/components/duplicatesData/duplicatesCustomer";
 import mindmap from "@/components/mindmap/index.vue";
 import PortraitDetail from '@/HDrpManagement/customerPortrait/modules/detail.vue'
+import commissionSet from '@/components/commissionSet/index.vue'
 export default {
   name: "detail",
   data() {
@@ -136,7 +140,8 @@ export default {
     bankCard,
     duplicatesCustomer,
     mindmap,
-    PortraitDetail
+    PortraitDetail,
+    commissionSet
   },
   watch:{
     /*$route (val) {

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

@@ -46,7 +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="提成比例">
+          <span >{{ data.reward_rate?Math.round((data.reward_rate * 100)*100)/100:"--" }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="提成计算节点">
+          <span >{{ data.reward_point?data.reward_point:"--" }}</span>
+        </el-descriptions-item>
 
 
       </el-descriptions>

src/components/commissionSet/index.vue

@@ -1,31 +1,31 @@
 <template>
   <div>
     <el-button  size="mini" type="primary" @click="onShow">设置提成</el-button>
-    <el-dialog title="设置提成" :visible.sync="dialogFormVisible" width="500px" append-to-body :show-close="false">
+    <el-dialog title="设置提成" :visible.sync="dialogFormVisible" width="650px" append-to-body :show-close="false">
       <div slot="title" style="font-size: 15px">
         设置提成
       </div>
       <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+        <el-form :model="form" :rules="rules" ref="form" label-width="130px" label-position="right" size="mini">
           <el-col :span="24">
-            <el-form-item label="提成计算节点" prop="reward_point">
+            <el-form-item label="提成计算节点：" prop="reward_point">
               <el-radio-group v-model="form.reward_point">
                 <el-radio :label="'订单审核'">订单审核</el-radio>
-                <el-radio :label="'订单审核'">订单审核</el-radio>
-                <el-radio :label="'发票审核'">发票审核</el-radio>
+                <el-radio :label="'物流单审核'">物流单审核</el-radio>
+                <el-radio :label="'开票审核'">开票审核</el-radio>
                 <el-radio :label="'核销单审核'">核销单审核</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item  label="提成比例" prop="reward_rate">
-              <el-input  v-model="form.reward_rate" placeholder="请填写百分比"></el-input>
+          <el-col :span="24">
+            <el-form-item  label="提成比例：" prop="reward_rate">
+              <el-input   v-model="form.reward_rate" placeholder="请填写百分比"></el-input>
             </el-form-item>
           </el-col>
         </el-form>
       </el-row>
       <div class="dialog-footer">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose(dialogFormVisible = false)" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
       </div>
     </el-dialog>
@@ -58,9 +58,9 @@ export default {
           { required: true, message: '选择提成计算节点', trigger: 'change'},
         ],
         reward_rate:[
-          { required: true, message: '设置提成比例', trigger: 'blur'},
-          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '输入不合法，请输入数值',trigger: 'change,blur'},
-          { validator: NumberSize, trigger: 'blur'}
+          { required: true, message: '设置提成比例', trigger: 'change'},
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '输入不合法，请输入数值',trigger: 'change'},
+          { validator: NumberSize, trigger: 'change'}
         ]
       }
     }
@@ -74,6 +74,7 @@ export default {
         if (!valid) return false
         this.form.ownertable = this.ownertable
         this.form.ownerid = this.$route.query.id
+        this.form.reward_rate = (this.form.reward_rate / 100).toFixed(4)
         const res = await this.$api.requested({
           "id": 20240111084904,
           "content": this.form
@@ -81,8 +82,12 @@ export default {
         this.tool.showMessage(res,()=>{
           this.dialogFormVisible = false
           this.$refs.form.resetFields()
+          this.$emit('setSuccess')
         })
       })
+    },
+    onClose(){
+      this.$refs.form.resetFields()
     }
   }
 }