From 0a16ffd3e627278bc317109ef7102f5673a1242d Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 12 Mar 2021 16:24:10 +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 | 59 +++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 49 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 5582db7..0f2728e 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 @@ -18,12 +18,6 @@ .panel-body{ overflow: hidden; } - .rowPanel{ - background: #ffffff; - padding: 0px 10px ; - padding-top: 10px; - margin: 0px 0px 10px 0px; - } .paginationStyle{ background: #ffffff; padding: 10px 10px; @@ -34,7 +28,7 @@ </head> <body> <div class="panel-body" id="app"> - <el-row class="rowPanel" > + <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> @@ -50,17 +44,28 @@ <el-table id="proj" :data="table.rows" :height="height" stripe @sort-change="sortChange"> <el-table-column prop="userId" - label="订单号" - width="180"> + label="" + width="300"> </el-table-column> <el-table-column prop="nickname" label="分销员昵称" width="180"> </el-table-column> + <el-table-column + prop="salesGrade" + label="分销等级" + width="180"> + <template slot-scope="scope"> + <el-select v-model="scope.row.proJbruserValue" @focus="getDatalist(scope.row)" placeholder="请选择" filterable allow-create> + <el-option v-for="item in salesGradeList " :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + </template> + </el-table-column> <el-table-column label="操作"> <template slot-scope="scope"> - <el-button type="text" size="small">设置为分销员</el-button> + <el-button type="text" size="small" @click="addSaleManApply(scope.row)">设置为分销员</el-button> </template> </el-table-column> </el-table> @@ -102,6 +107,8 @@ order:'', sort:'' }, + proJbruserValue : "", + salesGradeList: [], height:'calc(100vh - 240px)', }, created: function () { @@ -109,6 +116,38 @@ window.addEventListener("keydown", this.keydown); }, methods: { + //设置为分销员 + addSaleManApply(row){ + let _this = this; + let userId = row.userId; + let gradeId = row.proJbruserValue; + alert(gradeId); + let obj = { + userId: userId, + gradeId: gradeId, + } + AjaxProxy.requst({ + app: _this, + data:obj, + url: basePath + '/fenXiao/fenXiaoUser/addSaleManApply', + callback: function (data) { + _this.$message.success(data.info); + this.loadData(); + } + }); + }, + // select下拉框获取焦点的时候查询对应的下拉框数据源 + getDatalist(row) { + let _this = this; + AjaxProxy.requst({ + app: _this, + data:[], + url: basePath + '/fenXiao/fenXiaoUser/getShopSalesmanGrade', + callback: function (data) { + _this.salesGradeList = data.mapInfo.salesGrade; + } + }); + }, changePageSize(val) { this.table.pageSize = val; this.loadData(); -- Gitblit v1.9.1