修改查询业绩

backendApi/modules/v1/controllers/BonusController.php

@@ -2808,20 +2808,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('No data', 400);
         } else if (\Yii::$app->request->isPost) {
             $formModel = new PerfAdjustmentForm();
             $formModel->scenario = 'perfAdjustment';

backendEle/src/views/bonus/perf-adjustment.vue

@@ -8,84 +8,41 @@
         <el-button type="primary" icon="el-icon-search" size="small" @click="getData()">Confirm<!-- 确定 --></el-button>
       </div>
 
-      <div style="margin-top: 45px;">
+      <div style="margin-top: 25px;" v-show="show">
         <el-row>
-          <el-col :span="11">
-            <div class="grid-content bg-purple" v-show="leftPerfFormShow" style="width: 100%">
+          <el-col :span="16">
+            <div class="grid-content bg-purple" style="width: 100%">
               <el-card class="box-card" shadow="hover">
-                <el-form :model="leftPerfForm" status-icon ref="leftPerfForm" label-width="120px" width="100%" class="demo-ruleForm">
+                <el-form :model="perfForm" status-icon ref="perfForm" label-width="250px" width="100%" class="demo-ruleForm">
                   <el-form-item label="Member Code" prop="USER_NAME">
-                    <el-input type="text" size="small" v-model="leftPerfForm.USER_ID" v-show="false" width="100%"></el-input>
-                    <el-input type="text" size="small" v-model="leftPerfForm.USER_NAME" readonly disabled></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.USER_ID" v-show="false" width="100%"></el-input>
+                    <el-input type="text" size="small" v-model="perfForm.USER_NAME" readonly></el-input>
                   </el-form-item>
 
-                  <el-divider content-position="left">L. Market Balance Performance</el-divider>
-                  <el-form-item label="Balance" prop="SURPLUS_1L"><!--综合结余业绩-->
-                    <el-input type="text" size="small" v-model="leftPerfForm.SURPLUS_1L" autocomplete="off"></el-input>
+                  <el-divider><span style="font-weight: bold;">L. Market Balance Performance</span></el-divider>
+                  <el-form-item label="Balance Performance" prop="SURPLUS_1L"><!--综合结余业绩-->
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_1L" autocomplete="off"></el-input>
                   </el-form-item>
-                  <el-form-item label="Entry" prop="SURPLUS_1L_ZC"><!--首单结余业绩-->
-                    <el-input type="text" size="small" v-model="leftPerfForm.SURPLUS_1L_ZC" autocomplete="off"></el-input>
+                  <el-form-item label="Entry Balance Performance" prop="SURPLUS_1L_ZC"><!--首单结余业绩-->
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_1L_ZC" autocomplete="off"></el-input>
                   </el-form-item>
-                  <el-form-item label="Reconditioning" prop="SURPLUS_1L_FX"><!--复消结余业绩-->
-                    <el-input type="text" size="small" v-model="leftPerfForm.SURPLUS_1L_FX" autocomplete="off"></el-input>
+                  <el-form-item label="Reconditioning Balance Performance" prop="SURPLUS_1L_FX"><!--复消结余业绩-->
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_1L_FX" autocomplete="off"></el-input>
                   </el-form-item>
 
-                  <el-divider content-position="left">R. Market Balance Performance</el-divider>
-                  <el-form-item label="Balance" prop="SURPLUS_2L"><!--综合结余业绩-->
-                    <el-input type="text" size="small" v-model="leftPerfForm.SURPLUS_2L" autocomplete="off"></el-input>
+                  <el-divider><span style="font-weight: bold;">R. Market Balance Performance</span></el-divider>
+                  <el-form-item label="Balance Performance" prop="SURPLUS_2L"><!--综合结余业绩-->
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_2L" autocomplete="off"></el-input>
                   </el-form-item>
-                  <el-form-item label="Entry Balance" prop="SURPLUS_2L_ZC">
-                    <el-input type="text" size="small" v-model="leftPerfForm.SURPLUS_2L_ZC" autocomplete="off"></el-input>
+                  <el-form-item label="Entry Balance Performance" prop="SURPLUS_2L_ZC">
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_2L_ZC" autocomplete="off"></el-input>
                   </el-form-item>
-                  <el-form-item label="Reconditioning" prop="SURPLUS_2L_FX"><!--复消结余业绩-->
-                    <el-input type="text" size="small" v-model="leftPerfForm.SURPLUS_2L_FX" autocomplete="off"></el-input>
+                  <el-form-item label="Reconditioning Balance Performance" prop="SURPLUS_2L_FX"><!--复消结余业绩-->
+                    <el-input type="text" size="small" v-model="perfForm.SURPLUS_2L_FX" autocomplete="off"></el-input>
                   </el-form-item>
 
                   <el-form-item>
-                    <el-button type="primary" size="small" @click="handlePerfAdjustment('leftPerfForm')">Save</el-button>
-                  </el-form-item>
-                </el-form>
-              </el-card>
-            </div>
-          </el-col>
-
-          <el-col :span="2" v-show="rightPerfFormShow">
-            <div class="grid-content bg-purple" v-show="rightPerfFormShow" style="width: 100%; height: 100px;"></div>
-          </el-col>
-
-          <el-col :span="11">
-            <div class="grid-content bg-purple" v-show="rightPerfFormShow" style="width: 100%; ">
-              <el-card class="box-card" shadow="hover">
-                <el-form :model="rightPerfForm" status-icon ref="rightPerfForm" label-width="120px" width="100%" class="demo-ruleForm">
-                  <el-form-item label="Member Code" prop="USER_NAME">
-                    <el-input type="text" size="small" v-model="rightPerfForm.USER_ID" v-show="false"></el-input>
-                    <el-input type="text" size="small" v-model="rightPerfForm.USER_NAME" readonly disabled></el-input>
-                  </el-form-item>
-
-                  <el-divider content-position="left" >L. Market Balance Performance</el-divider>
-                  <el-form-item label="Balance" prop="SURPLUS_1L"><!--综合结余业绩-->
-                    <el-input type="text" size="small" v-model="rightPerfForm.SURPLUS_1L" autocomplete="off"></el-input>
-                  </el-form-item>
-                  <el-form-item label="Entry" prop="SURPLUS_1L_ZC"><!--首单结余业绩-->
-                    <el-input type="text" size="small" v-model="rightPerfForm.SURPLUS_1L_ZC" autocomplete="off" ></el-input>
-                  </el-form-item>
-                  <el-form-item label="Reconditioning" prop="SURPLUS_1L_FX"><!--复消结余业绩-->
-                    <el-input type="text" size="small" v-model="rightPerfForm.SURPLUS_1L_FX" autocomplete="off"></el-input>
-                  </el-form-item>
-
-                  <el-divider content-position="left">R. Market Balance Performance</el-divider>
-                  <el-form-item label="Balance" prop="SURPLUS_2L"><!--综合结余业绩-->
-                    <el-input type="text" size="small" v-model="rightPerfForm.SURPLUS_2L" autocomplete="off"></el-input>
-                  </el-form-item>
-                  <el-form-item label="Entry" prop="SURPLUS_2L_ZC"><!--首单结余业绩-->
-                    <el-input type="text" size="small" v-model="rightPerfForm.SURPLUS_2L_ZC" autocomplete="off"></el-input>
-                  </el-form-item>
-                  <el-form-item label="Reconditioning" prop="SURPLUS_2L_FX"><!--复消结余业绩-->
-                    <el-input type="text" size="small" v-model="rightPerfForm.SURPLUS_2L_FX" autocomplete="off"></el-input>
-                  </el-form-item>
-
-                  <el-form-item>
-                    <el-button type="primary" size="small" @click="handlePerfAdjustment('rightPerfForm')">Save</el-button>
+                    <el-button type="primary" size="small" @click="handlePerfAdjustment('perfForm')">Save</el-button>
                   </el-form-item>
                 </el-form>
               </el-card>
@@ -106,20 +63,8 @@ export default {
     return {
       loading: false,
       memberCode: '',
-      tableList: [],
-      leftPerfFormShow: false,
-      rightPerfFormShow: false,
-      leftPerfForm: {
-        USER_ID: '',
-        USER_NAME: '',
-        SURPLUS_1L: '',
-        SURPLUS_1L_ZC: '',
-        SURPLUS_1L_FX: '',
-        SURPLUS_2L: '',
-        SURPLUS_2L_ZC: '',
-        SURPLUS_2L_FX: '',
-      },
-      rightPerfForm: {
+      show: false,
+      perfForm: {
         USER_ID: '',
         USER_NAME: '',
         SURPLUS_1L: '',
@@ -142,24 +87,18 @@ export default {
         return false;
       }
 
-      return network.getData(`bonus/perf-adjustment`, { memberCode : this.memberCode }).then(response => {
-        this.tableList = response.allData;
-
-        this.leftPerfFormShow = this.tableList.length >= 1;
-        this.rightPerfFormShow = this.tableList.length === 2;
-
-        if (this.leftPerfFormShow) {
-          this.leftPerfForm = this.tableList[0];
-        }
-        if (this.rightPerfFormShow) {
-          this.rightPerfForm = this.tableList[1];
-        }
+      // 清除上一次的填充结果
+      this.$refs['perfForm'].resetFields();
+      this.show = false;
 
+      return network.getData(`bonus/perf-adjustment`, { memberCode : this.memberCode }).then(response => {
+        this.perfForm = response.allData;
+        this.show = true;
         this.loading = false;
       }).catch(error => {
         this.$message({
           message: error,
-          type: 'error'
+          type: 'warning'
         });
 
         this.loading = false;
@@ -173,8 +112,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.loading = true;
-        const formData = formName === 'leftPerfForm' ? this.leftPerfForm : this.rightPerfForm;
-        return network.postData(`bonus/perf-adjustment`, formData).then(response => {
+        return network.postData(`bonus/perf-adjustment`, this.perfForm).then(response => {
           this.$message({
             message: response,
             type: 'success'