From 72396cbbb60d0418dd4cb63f310532fc70a28c10 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 17:59:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html | 80 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
index 39b2425..4fe4e60 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
@@ -114,15 +114,17 @@
<el-row>
<el-tabs v-model="activeName" >
<el-tab-pane label="分销员管理" name="first">
- <el-row style="display:flex;align-items: center;">
- <el-form ref="form" :model="form" inline >
- <el-form-item prop="userName">
- <el-input v-model="form.userName" placeholder="请输入会员姓名"></el-input>
- </el-form-item>
+ <el-row style="display:flex;align-items: center;text-align: right;">
+ <el-col>
+ <el-form ref="form" :model="form" inline >
+ <el-form-item prop="userName" >
+ <el-input v-model="form.userName" placeholder="请输入会员姓名"></el-input>
+ </el-form-item>
- <el-button type="primary" @click="search" >搜索</el-button>
- <el-button @click="resetForm('form')">重置</el-button>
- </el-form>
+ <el-button type="primary" @click="search" >搜索</el-button>
+ <el-button @click="resetForm('form')">重置</el-button>
+ </el-form>
+ </el-col>
</el-row>
<el-row class="table-style" >
<el-table id="proj" :data="fxyList.rows" :height="height" stripe:true @sort-change="sortChange">
@@ -179,15 +181,17 @@
</el-tab-pane>
<el-tab-pane label="邀请下级" name="second">
- <el-row style="display:flex;align-items: center;">
- <el-form ref="formlow" :model="formlow" inline >
- <el-form-item prop="userName">
- <el-input v-model="formlow.userName" placeholder="请输入会员姓名"></el-input>
- </el-form-item>
+ <el-row style="display:flex;align-items: center;text-align: right;">
+ <el-col>
+ <el-form ref="formlow" :model="formlow" inline >
+ <el-form-item prop="userName">
+ <el-input v-model="formlow.userName" placeholder="请输入会员姓名"></el-input>
+ </el-form-item>
- <el-button type="primary" @click="searchlow" >搜索</el-button>
- <el-button @click="resetFormlow('formlow')">重置</el-button>
- </el-form>
+ <el-button type="primary" @click="searchlow" >搜索</el-button>
+ <el-button @click="resetFormlow('formlow')">重置</el-button>
+ </el-form>
+ </el-col>
</el-row>
<el-row class="table-style" >
<el-table id="proj" :data="lowLevelList.rows" :height="height" stripe:true @sort-change="sortChange">
@@ -237,25 +241,27 @@
</el-tab-pane>
<el-tab-pane label="收益订单" name="third">
- <el-row style="display:flex;align-items: center;">
- <el-form ref="formOrder" :model="formOrder" inline >
- <el-form-item label="结算状态" prop="orderType">
- <el-select v-model="formOrder.orderType" placeholder="请选择">
- <el-option
- v-for="item in orderTypeList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item prop="userName">
- <el-input v-model="formOrder.userName" placeholder="请输入会员姓名"></el-input>
- </el-form-item>
- <el-button type="primary" @click="searchFormOrder" >搜索</el-button>
- <el-button @click="resetFormOrder('formOrder')">重置</el-button>
- </el-form>
+ <el-row style="display:flex;align-items: center;text-align: right;">
+ <el-col>
+ <el-form ref="formOrder" :model="formOrder" inline >
+ <el-form-item label="结算状态" prop="orderType">
+ <el-select v-model="formOrder.orderType" placeholder="请选择">
+ <el-option
+ v-for="item in orderTypeList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item prop="userName">
+ <el-input v-model="formOrder.userName" placeholder="请输入会员姓名"></el-input>
+ </el-form-item>
+ <el-button type="primary" @click="searchFormOrder" >搜索</el-button>
+ <el-button @click="resetFormOrder('formOrder')">重置</el-button>
+ </el-form>
+ </el-col>
</el-row>
<el-row class="table-style" >
<el-table id="proj" :data="orderLevelList.rows" :height="height" stripe:true @sort-change="sortChange">
@@ -332,6 +338,7 @@
<script>
//获取传输的USERID对象
var userId = $.query.get("userId");
+ var applyId = $.query.get("applyId");
var app = new Vue({
el: '#app',
@@ -442,6 +449,7 @@
order:_this.form.order,
sort:_this.form.sort,
userId:userId,
+ applyId:applyId,
}
},
//查询
@@ -486,6 +494,7 @@
order:_this.formlow.order,
sort:_this.formlow.sort,
userId:userId,
+ applyId:applyId,
}
},
//查询
@@ -531,6 +540,7 @@
order:_this.formOrder.order,
sort:_this.formOrder.sort,
userId:userId,
+ applyId:applyId,
}
},
//查询
--
Gitblit v1.9.1