Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test

src/views/configManage/retailLevel/jxpz.vue

@@ -37,27 +37,26 @@
             label="奖衔名称"
           />
           <el-table-column width="150" align="center" prop="totalCheck" label="累计业绩" />
-          <el-table-column width="110" align="center" prop="rangeRatio" label="福利级差比例" />
+          <el-table-column width="110" align="center" prop="communityCheck" label="小区业绩" />
-          <el-table-column width="110" align="center" prop="monthRepurchaseRatio" label="复购级差比例" />
+          <el-table-column width="110" align="center" prop="placeDeptNum" label="考核部门数量" />
           <el-table-column
             align="center"
-            prop="benefitAvgRatio"
+            prop="pkCheckAwardsLeftVal"
-            label="福利平均比例"
+            label="考核奖衔"
             width="110"
           />
           <el-table-column
             align="center"
-            prop="benefitShareRatio"
+            prop="rangeRatio"
-            label="福利加权比例"
+            label="级差比例"
             width="110"
           />
           <el-table-column
             align="center"
-            prop="shareTotalCheck"
+            prop="sameLevelRatio"
-            label="分红累计业绩"
+            label="平级比例"
           />
-          <el-table-column width="80" align="center" prop="placeDeptNum" label="部门数量" />
+
-          <el-table-column width="150" align="center" prop="shareCommunityCheck" label="分红小部门业绩" />
           <el-table-column
             align="center"
             prop="time"
@@ -140,52 +139,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="福利级差比例" prop="rangeRatio">
+            <el-form-item label="小区业绩" prop="communityCheck">
               <el-input
-                v-model="form.rangeRatio"
+                v-model="form.communityCheck"
                 clearable
                 placeholder=""
               />
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="复购级差比例" prop="monthRepurchaseRatio">
+            <el-form-item label="考核部门数量" prop="placeDeptNum">
-              <el-input
-                v-model="form.monthRepurchaseRatio"
-                clearable
-                placeholder=""
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="福利平均比例" prop="benefitAvgRatio">
-              <el-input
-                v-model="form.benefitAvgRatio"
-                clearable
-                placeholder=""
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="福利加权比例" prop="benefitShareRatio">
-              <el-input
-                v-model="form.benefitShareRatio"
-                clearable
-                placeholder=""
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="分红累计业绩" prop="shareTotalCheck">
-              <el-input
-                v-model="form.shareTotalCheck"
-                clearable
-                placeholder=""
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="部门数量" prop="placeDeptNum">
               <el-input
                 v-model="form.placeDeptNum"
                 clearable
@@ -194,14 +157,36 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="分红小部门业绩" prop="shareCommunityCheck">
+            <el-form-item label="考核奖衔" prop="pkCheckAwardsLeft">
+              <el-select v-model="form.pkCheckAwardsLeft" clearable placeholder="">
+                <el-option
+                  v-for="item in tableData"
+                  :key="item.pkId"
+                  :label="item.awardsName"
+                  :value="item.pkId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="级差比例" prop="rangeRatio">
               <el-input
-                v-model="form.shareCommunityCheck"
+                v-model="form.rangeRatio"
                 clearable
                 placeholder=""
               />
             </el-form-item>
           </el-col>
+          <el-col :span="11">
+            <el-form-item label="平级比例" prop="sameLevelRatio">
+              <el-input
+                v-model="form.sameLevelRatio"
+                clearable
+                placeholder=""
+              />
+            </el-form-item>
+          </el-col>
+
           <el-col :span="11">
             <el-form-item required label="奖衔属性" prop="awardsValue">
               <el-select v-model="form.awardsValue" clearable placeholder="">