Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-17 0c60f5608fc8f738eb138e32f583c329ed5aa81d

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

@@ -113,7 +113,7 @@
    </el-row>
    <el-row>
        <el-tabs v-model="activeName" >
            <el-tab-pane label="分销员管理" name="first">
            <el-tab-pane label="绑定客户" name="first">
                <el-row style="display:flex;align-items: center;text-align: right;">
                    <el-col>
                        <el-form ref="form" :model="form" inline >
@@ -135,7 +135,7 @@
                                label="客户">
                            <template slot-scope="scope">
                                <img :src="scope.row.avatarUrl" width="40" height="40" class="head_pic"/>
                                {{scope.row.nickName}}
                                {{scope.row.nickname}}
                            </template>
                        </el-table-column>
                        <el-table-column
@@ -161,7 +161,7 @@
                        <el-table-column label="操作" width="240">
                            <template slot-scope="scope">
                                <el-row style="display:flex;">
                                    <el-button type="primary" size="mini" @click="openExaminesaleMan(scope.row)">解绑</el-button>
                                    <el-button type="primary" size="mini" @click="openExamineSaleMan(scope.row)">解绑</el-button>
                                </el-row>
                            </template>
                        </el-table-column>
@@ -202,7 +202,7 @@
                                label="客户">
                            <template slot-scope="scope">
                                <img :src="scope.row.avatarUrl" width="40" height="40" class="head_pic"/>
                                {{scope.row.nickName}}
                                {{scope.row.nickname}}
                            </template>
                        </el-table-column>
                        <el-table-column
@@ -221,7 +221,7 @@
                        <el-table-column label="操作" width="240">
                            <template slot-scope="scope">
                                <el-row style="display:flex;">
                                    <el-button type="primary" size="mini" @click="openExaminesaleMan(scope.row)">解绑</el-button>
                                    <el-button type="primary" size="mini" @click="openExamineSaleMan(scope.row)">解绑</el-button>
                                </el-row>
                            </template>
                        </el-table-column>
@@ -272,6 +272,20 @@
                        <el-table-column
                                prop="orderMoney"
                                label="实付金额">
                        </el-table-column>
                        <el-table-column
                                label="订单状态">
                            <template slot-scope="scope">
                                <span v-if="scope.row.orderState == 1">待付款</span>
                                <span v-if="scope.row.orderState == 2">待配送</span>
                                <span v-if="scope.row.orderState == 3">待收货</span>
                                <span v-if="scope.row.orderState == 4">待评价</span>
                                <span v-if="scope.row.orderState == 5">已评价</span>
                                <span v-if="scope.row.orderState == 6">申请退款</span>
                                <span v-if="scope.row.orderState == 7">退款成功</span>
                                <span v-if="scope.row.orderState == 8">退款拒绝</span>
                                <span v-if="scope.row.orderState == 9">已取消</span>
                            </template>
                        </el-table-column>
                        <el-table-column
                                prop="storeName"
@@ -402,6 +416,7 @@
            //加载分类
            loadInfo() {
                let _this = this;
                _this.loadParamSettingBasic();
                _this.loadParamSetting();
                _this.loadParamSettinglow();
                _this.loadParamSettingOrder();
@@ -424,6 +439,22 @@
                    }
                });
            },
            //加载基本数据信息
            loadParamSettingBasic() {
                let _this = this;
                let data={
                    userId:userId,
                    applyId:applyId,
                };
                AjaxProxy.requst({
                    app: _this,
                    data:data,
                    url: basePath + '/fenXiao/fenXiaoUser/loadParamSettingBasic',
                    callback: function (data) {
                        _this.basicdetail = data.mapInfo.basicdetail;
                    }
                });
            },
            //绑定客户
            loadParamSetting() {
                let _this = this;
@@ -433,11 +464,11 @@
                AjaxProxy.requst({
                    app: _this,
                    data:data,
                    url: basePath + '/fenXiao/fenXiaoUser/findShopSalesmanDetail',
                    url: basePath + '/fenXiao/fenXiaoUser/loadParamSetting',
                    callback: function (data) {
                        _this.basicdetail = data.mapInfo.basicdetail;
                        _this.fxyList.rows = data.mapInfo.customDetailRecords;
                        _this.fxyList.total = data.mapInfo.customDetailTotal;
                        _this.loadParamSettingBasic();
                    }
                });
            },
@@ -478,11 +509,11 @@
                AjaxProxy.requst({
                    app: _this,
                    data:data,
                    url: basePath + '/fenXiao/fenXiaoUser/findShopSalesmanDetail',
                    url: basePath + '/fenXiao/fenXiaoUser/loadParamSettinglow',
                    callback: function (data) {
                        _this.basicdetail = data.mapInfo.basicdetail;
                        _this.lowLevelList.rows = data.mapInfo.customLowRecords;
                        _this.lowLevelList.total = data.mapInfo.customLowTotal;
                        _this.loadParamSettingBasic();
                    }
                });
            },
@@ -524,10 +555,11 @@
                AjaxProxy.requst({
                    app: _this,
                    data:data,
                    url: basePath + '/fenXiao/fenXiaoUser/findShopSalesmanDetail',
                    url: basePath + '/fenXiao/fenXiaoUser/loadParamSettingOrder',
                    callback: function (data) {
                        _this.orderLevelList.rows = data.mapInfo.orderRecords;
                        _this.orderLevelList.total = data.mapInfo.orderTotal;
                        _this.loadParamSettingBasic();
                    }
                });
            },
@@ -586,6 +618,7 @@
            },
            //解绑
            openExamineSaleMan(row) {
                alert(this.activeName);
                this.$confirm('是否解绑?', '解绑', {
                    distinguishCancelAndClose: true,//设置关闭按钮和不通过按钮的区别
                    confirmButtonText: '同意',
@@ -617,7 +650,13 @@
                    url: basePath + '/fenXiao/fenXiaoUser/unbundlingSaleMan',
                    callback: function (data) {
                        _this.$message.success(data.info);
                        this.loadInfo();
                        if(this.activeName == 'first'){
                            _this.loadParamSetting();
                        }
                        if(this.activeName == 'second'){
                            _this.loadParamSettinglow();
                        }
                        _this.loadParamSettingBasic();
                    }
                });
            },