~jiangyouyao/beauty-erp.git

parent: 90ebe500 | patch | commit | ignore whitespace

xiaoyong931011

2021-03-14 0cb21bc650d8225d77d3bbb353395d3070f9029b

分销员后台0315

3 files modified

	zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html	18 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html	76 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html	16 ●●●●● patch \| view \| raw \| blame \| history

 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html

@@ -28,15 +28,17 @@
</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"  >

 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">

 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html

@@ -37,11 +37,11 @@
        <el-row>
            <el-tabs v-model="activeName" >
                <el-tab-pane label="分销员管理" name="first">
                    <el-row style="display:flex;align-items: center;">
                        <el-col>
                    <el-row >
                        <el-col :span="6" style="display:flex;align-items: center;">
                            <el-button type="primary" @click="addSaleMan()">新增分销员</el-button>
                        </el-col>
                        <el-col>
                        <el-col :span="12" style="display: flex;align-items: center;">
                            <el-form ref="form" :model="form" inline >
                                <el-form-item label="审核状态" prop="shenheState">
                                    <el-select v-model="form.shenheState" placeholder="请选择">
@@ -63,9 +63,11 @@
                                <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-col>
                        <el-col :span="6" style="display:flex;align-items: center;">
                            <el-button type="primary" @click="search" >搜索</el-button>
                            <el-button @click="resetForm('form')">重置</el-button>
                        </el-col>
                    </el-row>
                    <el-row class="table-style" >
@@ -370,9 +372,9 @@
                    url: basePath + '/fenXiao/fenXiaoUser/addFyfa',
                    callback: function (data) {
                        _this.$message.success(data.info);
                        _this.loadFyfaSetting();
                    }
                });
                _this.loadFyfaSetting();
            },
            updateFyfa(row){
                let _this = this;
@@ -567,7 +569,7 @@
            openUpdateSaleManGrade(row){
                layer.full(layer.open({
                    type: 2,
                    title: "修改等级",
                    title: "查看",
                    maxmin: true,
                    area: [MUI.SIZE_L, '500px'],
                    content : [ basePath + '/admin/redirect/fenxiao/fenxiao-update?userId=' + row.userId+'&applyId='+row.id ]

			@@ -28,15 +28,17 @@
			</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" >

			@@ -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">

			@@ -37,11 +37,11 @@
			<el-row>
			<el-tabs v-model="activeName" >
			<el-tab-pane label="分销员管理" name="first">
			<el-row style="display:flex;align-items: center;">
			<el-col>
			<el-row >
			<el-col :span="6" style="display:flex;align-items: center;">
			<el-button type="primary" @click="addSaleMan()">新增分销员</el-button>
			</el-col>
			<el-col>
			<el-col :span="12" style="display: flex;align-items: center;">
			<el-form ref="form" :model="form" inline >
			<el-form-item label="审核状态" prop="shenheState">
			<el-select v-model="form.shenheState" placeholder="请选择">
			@@ -63,9 +63,11 @@
			<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-col>
			<el-col :span="6" style="display:flex;align-items: center;">
			<el-button type="primary" @click="search" >搜索</el-button>
			<el-button @click="resetForm('form')">重置</el-button>
			</el-col>
			</el-row>
			<el-row class="table-style" >
			@@ -370,9 +372,9 @@
			url: basePath + '/fenXiao/fenXiaoUser/addFyfa',
			callback: function (data) {
			_this.$message.success(data.info);
			_this.loadFyfaSetting();
			}
			});
			_this.loadFyfaSetting();
			},
			updateFyfa(row){
			let _this = this;
			@@ -567,7 +569,7 @@
			openUpdateSaleManGrade(row){
			layer.full(layer.open({
			type: 2,
			title: "修改等级",
			title: "查看",
			maxmin: true,
			area: [MUI.SIZE_L, '500px'],
			content : [ basePath + '/admin/redirect/fenxiao/fenxiao-update?userId=' + row.userId+'&applyId='+row.id ]