From 509d10498313921fd795f73b8e7ae9ee43b0a81a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Apr 2021 14:24:29 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html
index 8be97f9..71bded8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html
@@ -28,18 +28,20 @@
</head>
<body>
<div class="panel-body" id="app">
- <el-row style="display:flex;align-items: center;">
- <el-form ref="form" :model="form" inline >
- <el-form-item prop="nickName">
- <el-input v-model="form.nickName" 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="nickName">
+ <el-input v-model="form.nickName" 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-row class="table-style" style="margin-left: 50px;">
<el-table id="proj" :data="table.rows" :height="height" stripe @sort-change="sortChange">
<el-table-column
label="会员">
@@ -124,10 +126,11 @@
addSaleManApply(row){
let _this = this;
let userId = row.userId;
+ let openId = row.openId;
let gradeId = row.proJbruserValue;
- alert(gradeId);
let obj = {
userId: userId,
+ openId: openId,
gradeId: gradeId,
}
AjaxProxy.requst({
--
Gitblit v1.9.1