wucl %!s(int64=2) %!d(string=hai) anos
pai
achega
676aca027c

+ 1 - 1
src/views/brokerage/collect.vue

@@ -106,7 +106,7 @@
             <el-tag type="success">{{ row.marketerAdvanceBrokerageDone===true?'是':'否'}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="客户经理提成金额(元)" align="center" width="160">
+        <el-table-column label="相关营销人员总提成(元)" align="center" width="180">
           <template slot-scope="{row}">
             <span>{{ row.marketerBrokerageAmount}}</span>
           </template>

+ 8 - 0
src/views/brokerage/detail.vue

@@ -28,6 +28,8 @@
           class="filter-item"
         >
           <el-option label="市场人员规则" value="LAND_MARKETER_RULE"/>
+          <el-option label="营销主管规则" value="LAND_SUPERVISOR_RULE"/>
+          <el-option label="营销经理规则" value="LAND_MANAGER_RULE"/>
           <el-option label="参与人员规则" value="LAND_OTHER_RULE"/>
         </el-select>
         <el-select
@@ -194,6 +196,12 @@
         if (val === 'LAND_MARKETER_RULE'){
           return '市场人员规则';
         }
+        if (val === 'LAND_SUPERVISOR_RULE'){
+          return '营销主管规则';
+        }
+        if (val === 'LAND_MANAGER_RULE'){
+          return '营销经理规则';
+        }
       },
       brokerageMode(val){
         if (val === 'PERSONAL'){

+ 6 - 0
src/views/brokerage/sequence.vue

@@ -185,6 +185,12 @@
         if (val === 'LAND_MARKETER_RULE'){
           return '市场人员规则';
         }
+        if (val === 'LAND_SUPERVISOR_RULE'){
+          return '营销主管规则';
+        }
+        if (val === 'LAND_MANAGER_RULE'){
+          return '营销经理规则';
+        }
       },
       brokerageMode(val){
         if (val === 'PERSONAL'){

+ 6 - 0
src/views/brokerage/sequenceDetail.vue

@@ -170,6 +170,12 @@
         if (val === 'LAND_MARKETER_RULE'){
           return '市场人员规则';
         }
+        if (val === 'LAND_SUPERVISOR_RULE'){
+          return '营销主管规则';
+        }
+        if (val === 'LAND_MANAGER_RULE'){
+          return '营销经理规则';
+        }
       },
       brokerageMode(val){
         if (val === 'PERSONAL'){

+ 12 - 2
src/views/set/brokerage.vue

@@ -82,7 +82,7 @@
         </el-tab-pane>
         <el-tab-pane label="岗位抽成率" >
           <el-alert
-            title="根据不同的管理层岗位确定该岗位人员抽成比例,用于计算客户经理的直接或间接领导提成金额"
+            title="根据不同的管理层岗位确定该岗位人员抽成比例一般用于市场部门,用于计算客户经理的直接或间接领导提成金额;"
             type="info"
             show-icon
             :closable="false">
@@ -121,7 +121,17 @@
                   <span>{{ row.postName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="抽成率" min-width="30" align="center">
+              <el-table-column label="提成规则" min-width="200" align="center">
+                <template slot-scope="{row}">
+                  <el-select v-model="row.brokerageRule" style="width: 200px;margin-left: 20px;" clearable filterable class="filter-item">
+                    <el-option key="LAND_MARKETER_RULE" label="土地规划部市场人员规则" value="LAND_MARKETER_RULE" />
+                    <el-option key="LAND_SUPERVISOR_RULE" label="土地规划部营销主管规则" value="LAND_SUPERVISOR_RULE" />
+                    <el-option key="LAND_MANAGER_RULE" label="土地规划部营销经理规则" value="LAND_MANAGER_RULE" />
+                    <el-option key="LAND_OTHER_RULE" label="土地规划部参与人员规则" value="LAND_OTHER_RULE" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="抽成率" min-width="60" align="center">
                 <template slot-scope="{row}">
                   <el-input v-model="row.brokerageRatio" placeholder="请输入数字">
                     <i slot="suffix" style="font-size:normal;margin-right: 10px;line-height: 30px">%</i>