kevin_zhangl 3 лет назад
Родитель
Сommit
3adf6e2218

+ 6 - 12
backendApi/modules/v1/controllers/BonusController.php

@@ -2839,20 +2839,14 @@ class BonusController extends BaseController {
             $memberCode = Yii::$app->request->get('memberCode');
             $userId = Info::getUserIdByUserName(trim($memberCode));
 
-            $perfList = [];
-            // 查询传入会员的安置网下级
-            $memberList = UserNetwork::getFirstFloorChildren($userId);
-            if ($memberList) {
-                foreach ($memberList as $member) {
-                    // 查询会员的业绩
-                    $perfMarket = UserPerf::getPerfMarket($member['USER_ID']);
-                    // 查询会员名
-                    $perfMarket['USER_NAME'] = Info::getUserNameByUserId($member['USER_ID']);
-                    $perfList[] = $perfMarket;
-                }
+            // 查询传入会员的综合业绩
+            $perfMarket = UserPerf::getPerfMarket($userId);
+            if ($perfMarket) {
+                $perfMarket['USER_NAME'] = $memberCode;
+                return static::notice(['allData' => $perfMarket]);
             }
 
-            return static::notice(['allData' => $perfList]);
+            return static::notice('暂无数据', 400);
         } else if (\Yii::$app->request->isPost) {
             $formModel = new PerfAdjustmentForm();
             $formModel->scenario = 'perfAdjustment';

+ 36 - 59
backendEle/src/views/bonus/perf-adjustment.vue

@@ -10,50 +10,50 @@
 
       <div style="margin-top: 45px;">
         <el-row>
-          <el-col :span="8" v-show="show" v-for="(item, index) in tableList" :key="index">
+          <el-col :span="15" v-show="show">
             <div class="grid-content bg-purple" style="width: 100%;">
               <el-card class="box-card" shadow="hover" style="margin: 15px;">
-                <el-form :model="item" status-icon  label-width="100px" width="100%" class="demo-ruleForm">
+                <el-form :model="perfForm" status-icon ref="perfForm" label-width="100px" width="100%" class="demo-ruleForm">
                   <el-form-item label="会员编号" prop="USER_NAME">
-                    <el-input type="text" size="small" v-model="item.USER_ID" v-show="false"></el-input>
-                    <el-input type="text" size="small" v-model="item.USER_NAME" readonly prefix-icon="el-icon-user"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.USER_ID" v-show="false"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.USER_NAME" readonly prefix-icon="el-icon-user"></el-input>
                   </el-form-item>
 
                   <el-divider><i class="el-icon-s-data"></i> 一市场业绩</el-divider>
                   <el-form-item label="综合结余" prop="SURPLUS_1L">
-                    <el-input type="text" size="small" v-model="item.SURPLUS_1L" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_1L" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
                   </el-form-item>
                   <el-form-item label="首单结余" prop="SURPLUS_1L_ZC">
-                    <el-input type="text" size="small" v-model="item.SURPLUS_1L_ZC" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_1L_ZC" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
                   </el-form-item>
                   <el-form-item label="复消结余" prop="SURPLUS_1L_FX">
-                    <el-input type="text" size="small" v-model="item.SURPLUS_1L_FX" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_1L_FX" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
                   </el-form-item>
 
                   <el-divider><i class="el-icon-s-data"></i> 二市场业绩</el-divider>
                   <el-form-item label="综合结余" prop="SURPLUS_2L">
-                    <el-input type="text" size="small" v-model="item.SURPLUS_2L" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_2L" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
                   </el-form-item>
                   <el-form-item label="首单结余" prop="SURPLUS_2L_ZC">
-                    <el-input type="text" size="small" v-model="item.SURPLUS_2L_ZC" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_2L_ZC" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
                   </el-form-item>
                   <el-form-item label="复消结余" prop="SURPLUS_2L_FX">
-                    <el-input type="text" size="small" v-model="item.SURPLUS_2L_FX" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_2L_FX" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
                   </el-form-item>
 
                   <el-divider><i class="el-icon-s-data"></i> 三市场业绩</el-divider>
                   <el-form-item label="综合结余" prop="SURPLUS_3L">
-                    <el-input type="text" size="small" v-model="item.SURPLUS_3L" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_3L" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
                   </el-form-item>
                   <el-form-item label="首单结余" prop="SURPLUS_3L_ZC">
-                    <el-input type="text" size="small" v-model="item.SURPLUS_3L_ZC" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_3L_ZC" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
                   </el-form-item>
                   <el-form-item label="复消结余" prop="SURPLUS_3L_FX">
-                    <el-input type="text" size="small" v-model="item.SURPLUS_3L_FX" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_3L_FX" autocomplete="off" prefix-icon="el-icon-s-data"></el-input>
                   </el-form-item>
 
                   <el-form-item>
-                    <el-button type="primary" size="small" @click="handlePerfAdjustment(index)">确定</el-button>
+                    <el-button type="primary" size="small" @click="handlePerfAdjustment('perfForm')">确定</el-button>
                   </el-form-item>
                 </el-form>
               </el-card>
@@ -75,47 +75,19 @@ export default {
       loading: false,
       memberCode: '',
       show: false,
-      tableList: [
-        {
-          USER_ID: '',
-          USER_NAME: '',
-          SURPLUS_1L: '',
-          SURPLUS_1L_ZC: '',
-          SURPLUS_1L_FX: '',
-          SURPLUS_2L: '',
-          SURPLUS_2L_ZC: '',
-          SURPLUS_2L_FX: '',
-          SURPLUS_3L: '',
-          SURPLUS_3L_ZC: '',
-          SURPLUS_3L_FX: '',
-        },
-        {
-          USER_ID: '',
-          USER_NAME: '',
-          SURPLUS_1L: '',
-          SURPLUS_1L_ZC: '',
-          SURPLUS_1L_FX: '',
-          SURPLUS_2L: '',
-          SURPLUS_2L_ZC: '',
-          SURPLUS_2L_FX: '',
-          SURPLUS_3L: '',
-          SURPLUS_3L_ZC: '',
-          SURPLUS_3L_FX: '',
-        },
-        {
-          USER_ID: '',
-          USER_NAME: '',
-          SURPLUS_1L: '',
-          SURPLUS_1L_ZC: '',
-          SURPLUS_1L_FX: '',
-          SURPLUS_2L: '',
-          SURPLUS_2L_ZC: '',
-          SURPLUS_2L_FX: '',
-          SURPLUS_3L: '',
-          SURPLUS_3L_ZC: '',
-          SURPLUS_3L_FX: '',
-        }
-      ],
+      perfForm: {
+        USER_ID: '',
+        USER_NAME: '',
+        SURPLUS_1L: '',
+        SURPLUS_1L_ZC: '',
+        SURPLUS_1L_FX: '',
+        SURPLUS_2L: '',
+        SURPLUS_2L_ZC: '',
+        SURPLUS_2L_FX: '',
+        SURPLUS_3L: '',
+        SURPLUS_3L_ZC: '',
+        SURPLUS_3L_FX: '',
+      },
     }
   },
   methods: {
@@ -128,14 +100,19 @@ export default {
         });
         return false;
       }
+
+      // 清除上一次的填充结果
+      this.$refs['perfForm'].resetFields();
+      this.show = false;
+
       return network.getData(`bonus/perf-adjustment`, { memberCode : this.memberCode }).then(response => {
-        this.tableList = response.allData;
-        this.show = response.allData.length > 0;
+        this.perfForm = response.allData;
+        this.show = true;
         this.loading = false;
       }).catch(error => {
         this.$message({
           message: error,
-          type: 'error'
+          type: 'warning'
         });
 
         this.loading = false;
@@ -149,7 +126,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.loading = true;
-        return network.postData(`bonus/perf-adjustment`, this.tableList[formName]).then(response => {
+        return network.postData(`bonus/perf-adjustment`, this.perfForm).then(response => {
           this.$message({
             message: response,
             type: 'success'