Skip to content

E
ElectricitySheep
Commit 11472c06 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents be4abfbd d72f9867
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1324 additions and 154 deletions
src/components/UserMan/tinyMerchant/wdExamine.vue
View file @ 11472c06
......@@ -9,11 +9,11 @@
</div>
<div class="content">
<div>
<div class="searchInput" style="width:230px">
<el-input style="display:inline-block;width:205px;height:30px"
placeholder="请输入用户id"
@keyup.enter.native="msg.pageIndex=1,getList()"
@keyup.enter.native="msg.pageIndex=1,getList()"
@clear="msg.pageIndex=1,getList()"
v-model="msg.UserId"
size="small"
......@@ -24,7 +24,7 @@
<div class="searchInput" style="width:230px">
<el-input style="display:inline-block;width:205px;height:30px"
placeholder="请输入微店名称"
@keyup.enter.native="msg.pageIndex=1,getList()"
@keyup.enter.native="msg.pageIndex=1,getList()"
@clear="msg.pageIndex=1,getList()"
v-model="msg.Name"
size="small"
......@@ -35,7 +35,7 @@
<div class="searchInput" style="width:230px">
<el-input style="display:inline-block;width:205px;height:30px"
placeholder="请输入用户名称"
@keyup.enter.native="msg.pageIndex=1,getList()"
@keyup.enter.native="msg.pageIndex=1,getList()"
@clear="msg.pageIndex=1,getList()"
v-model="msg.NickName"
size="small"
......@@ -64,7 +64,7 @@
<div flex="dir:left cross:center">
{{scope.row.UserName}}
</div>
</template>
</template>
</el-table-column>
<el-table-column prop="Commission" label="可提现佣金">
<el-table-column prop="Moblie" label="总佣金">
......@@ -72,7 +72,7 @@
<p>{{scope.row.Commission?scope.row.Commission.toFixed(2):'0.00'}}</p>
<p>{{scope.row.TotalCommission?scope.row.TotalCommission.toFixed(2):'0.00'}}</p>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column prop="AuditStatusName" label="申请状态"> </el-table-column>
<el-table-column prop="AuditDate" label="审核时间"> </el-table-column>
......@@ -81,7 +81,7 @@
<el-table-column
prop="address"
label="操作">
<template slot-scope="scope">
......@@ -93,16 +93,16 @@
<img @click="pending(scope.row,2)" v-if="scope.row.AuditStatus==1" class="app-order-icon"
src="../../../assets/img/userman/nopass.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加备注" placement="top-start" v-if="scope.row.AuditStatus==2">
<img @click="openRemark(5,scope.row)" style="width:32px;height:32px" src="../../../assets/img/userman/add_remark.png" alt="" v-if="scope.row.AuditStatus==2">
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start" v-if="scope.row.AuditStatus==2">
<img @click="pending(scope.row,3)" style="width:32px;height:32px" src="../../../assets/img/userman/add_remark.png" alt="" v-if="scope.row.AuditStatus==2">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start" v-if="scope.row.AuditStatus==2">
<img @click="Delete(3,scope.row)" style="width:32px;height:32px" src="../../../assets/img/userman/del.png" alt="" v-if="scope.row.AuditStatus==2">
<img @click="pending(scope.row,4)" style="width:32px;height:32px" src="../../../assets/img/userman/del.png" alt="" v-if="scope.row.AuditStatus==2">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改微店佣金" placement="top-start" v-if="scope.row.AuditStatus==2">
<img @click="openYongjin(scope.row)" style="width:32px;height:32px" src="../../../assets/img/userman/edit.png" alt="" v-if="scope.row.AuditStatus==2">
</el-tooltip>
</template>
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right"
......@@ -125,12 +125,25 @@
<el-form-item label-width="100px" label="可提现佣金">
<el-input v-model="yjMsg.Commission" @keyup.native="checkInteger(yjMsg,'Commission')" style="width:210px;"></el-input>
</el-form-item>
</el-form>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="yjDialog = false">取 消</el-button>
<el-button size="small" type="primary" @click="setCommission">确 定</el-button>
</span>
</el-dialog>
<!-- 修改备注 -->
<el-dialog title="提示" :visible.sync="reasonDig" width="500px">
<el-form :model="RemarkMsg" ref="RemarkMsg" label-width="0">
<p style="margin-bottom:10px">请输入备注</p>
<el-form-item>
<el-input size="small" v-model="RemarkMsg.Remark" type="textarea" :rows="3"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="reasonDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="czsubmitForm()" :loading="tjloading">确 定</el-button>
</span>
</el-dialog>
</div>
</div>
</template>
......@@ -140,6 +153,8 @@
return {
loading:false,
yjDialog:false,
reasonDig:false,
tjloading:false,
value:'',
options:[],
tableData:[],
......@@ -152,7 +167,7 @@
NickName:'',
},
total:0,
AuditStatusList: [],
activeName: 'first',
yjMsg:{
......@@ -160,7 +175,8 @@
Commission:0
},
yjNickName:'',
TotalCommission:''
TotalCommission:'',
RemarkMsg:{},
};
},
created() {
......@@ -168,7 +184,7 @@
this.GetAuditStatus()
},
methods: {
GetAuditStatus() {
this.apipost("/api/user/GetDistributorAuditStatusEnumList", {}, res => {
this.AuditStatusList = res.data.data;
......@@ -178,7 +194,7 @@
this.msg.AuditStatus = val.$attrs.dataId;
this.getList();
},
getList(){
this.loading=true;
this.apipost("/api/SmallShops/GetSmallShopsPageList", this.msg, res => {
......@@ -188,12 +204,12 @@
let pageData=res.data.data.pageData;
this.tableData=pageData;
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
......@@ -206,6 +222,7 @@
this.yjMsg.Commission=row.Commission?row.Commission:0.00;
this.yjDialog=true;
},
//修改佣金
setCommission(){
this.apipost("/api/SmallShops/SetSmallShopsCommission",this.yjMsg, res => {
......@@ -228,33 +245,59 @@
text = '同意审核！'
}else if(type==2){
text = '拒绝审核！'
}else if(type == 4){
text = '是否删除当前微店！'
}
let that=this;
if(type ==3){
msg.Remark = row.Remark;
that.RemarkMsg = msg
that.reasonDig = true;
}else {
that.$confirm(text, {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/SmallShops/SetSmallShopsAudit',msg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
this.apipost('/api/SmallShops/SetSmallShopsAudit',msg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
}
},
czsubmitForm(){
this.tjloading= true;
this.apipost('/api/SmallShops/SetSmallShopsAudit',this.RemarkMsg,
res => {
this.tjloading= false
if (res.data.resultCode === 1) {
this.reasonDig= false
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}
},
mounted() {
}
};
......@@ -267,16 +310,16 @@
float: right;
}
.usersList .app-image{
background-position: center center;
width: 50px;
background-position: center center;
width: 50px;
height: 50px;
border-radius:0%;
border-radius:0%;
float: left;
margin-right: 8px;
}
.usersList .blue{
color:#409EFF;
}
.usersList .content .searchInput{
border: 1px solid #DCDFE6;
......
src/components/UserMan/tinyMerchant/wdOrder.vue 0 → 100644
View file @ 11472c06
This diff is collapsed.
src/components/UserMan/tinyMerchant/wdWithdrawal.vue 0 → 100644
View file @ 11472c06
This diff is collapsed.
src/components/orderMan/LiveOrder.vue
View file @ 11472c06
......@@ -32,15 +32,17 @@
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="下单开始日期" end-placeholder="下单结束日期">
</el-date-picker>
<el-button type="primary" size="mini" @click="getList()" style="margin-left:10px;position:relative;top:-1px;">查询</el-button>
</div>
<el-table :data="tableData" ref="multipleTable" v-loading="loading" border style="width: 100%"
@select="selectSingle" @select-all="selectAll">
<el-table :data="tableData" ref="multipleTable" v-loading="loading" border style="width: 100%">
<!-- <el-table-column type="selection" width="55">
</el-table-column> -->
<el-table-column width="55">
<template slot="header" slot-scope="scope">
<el-checkbox v-model="isCheckAll" @change="getCheckdData(tableData,'')"></el-checkbox>
<el-checkbox v-model="isCheckAll" @change="getCheckAll(tableData)"></el-checkbox>
</template>
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isChecked" @change="getCheckdData(tableData,scope.row)"></el-checkbox>
<el-checkbox v-model="scope.row.isChecked" :disabled="scope.row.isCanCheck" @change="getSingleCheck(tableData,scope.row)"></el-checkbox>
</template>
</el-table-column>
<el-table-column prop="OrderNo" label="订单号/订单Id" width="200">
......@@ -111,10 +113,10 @@
<el-dialog title="修改" :visible.sync="updateDialog" width="400px">
<el-form label-width="50px">
<el-form-item label="数量" v-if="updateMsg.Type==1||updateMsg.Type==2">
<el-input size="small" v-model="updateMsg.LivePeopleNum"></el-input>
<el-input size="small" @keyup.native="checkInteger(updateMsg,'LivePeopleNum')" v-model="updateMsg.LivePeopleNum"></el-input>
</el-form-item>
<el-form-item label="金额" v-if="updateMsg.Type==1||updateMsg.Type==3">
<el-input size="small" v-model="updateMsg.LiveCommission"></el-input>
<el-input size="small" @keyup.native="checkPrice(updateMsg,'LiveCommission')" v-model="updateMsg.LiveCommission"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
......@@ -155,7 +157,6 @@
ERPEmpId: 0,
updateDialog: false,
isCheckAll: false, //全选
//修改信息
updateMsg: {
Ids: '',
......@@ -167,7 +168,11 @@
isSingleCheck: false, //有过单选
firstPeoNum: -1,
AccountList: [], //账户下拉
checkedDan: [] //选中数
checkedDan: [], //选中数
isCheckAll: false, //全选
findRow:{},
}
},
created() {
......@@ -197,14 +202,12 @@
this.loading = true;
this.apipost("/api/order/GetLiveGoodsOrderPageList", this.msg, res => {
this.loading = false;
console.log(res, 'res');
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
var myData = res.data.data.pageData;
var tempArray=[];
myData.forEach(x => {
x.isChecked = false;
x.isCanCheck=false;
})
this.tableData = JSON.parse(JSON.stringify(myData));
} else {
......@@ -232,6 +235,7 @@
this.getList();
this.Success(res.data.message);
this.ComCheckedArr = [];
this.findRow={};
} else {
this.Error(res.data.message);
}
......@@ -252,74 +256,64 @@
}
}
},
//单选
selectSingle(selection, row) {
this.isSingleCheck = true;
if (selection.length > 0) {
this.firstPeoNum = selection[0].LivePeopleNum;
selection.forEach(x => {
if (x.LivePeopleNum != this.firstPeoNum) {
this.$refs.multipleTable.toggleRowSelection(x);
this.Error('主播数量不一致,不能勾选！');
}
});
}
this.ComCheckedArr = selection;
},
getCheckdData(tabledata, row) {
console.log(tabledata, 'tabledata');
//自定义单选
getSingleCheck(tableData,row){
this.ComCheckedArr=[];
//单选
if (row) {
var findRow = tabledata.find(eItem => eItem.isChecked == true);
console.log("findRow", findRow);
if (findRow) {
tabledata.forEach(x => {
if (x.isChecked) {
if (x.LivePeopleNum != findRow.LivePeopleNum) {
this.Info("11111")
x.isChecked = false;
}
this.ComCheckedArr.push(x);
this.findRow = tableData.find(eItem => eItem.isChecked == true);
if(this.findRow){
tableData.forEach(x=>{
if(x.LivePeopleNum!=this.findRow.LivePeopleNum){
x.isCanCheck=true;
}
})
}
} else {
var findRow = tabledata[0];
if (findRow) {
tabledata.forEach(x => {
if (x.LivePeopleNum == findRow.LivePeopleNum) {
x.isChecked = this.isCheckAll;
if(x.isChecked){
this.ComCheckedArr.push(x);
}
})
}
})
}else{
tableData.forEach(x=>{
x.isCanCheck=false;
})
this.isCheckAll=false;
this.findRow={};
}
console.log(this.ComCheckedArr,'ComCheckedArr');
},
//多选
selectAll(selection) {
//有过单选
this.$refs.multipleTable.clearSelection();
// this.$refs.multipleTable.toggleRowSelection(false);
this.ComCheckedArr = [];
if (this.isSingleCheck) {
selection.forEach(x => {
if (x.LivePeopleNum == this.firstPeoNum) {
this.$refs.multipleTable.toggleRowSelection(x, true);
this.ComCheckedArr.push(x);
}
});
} else {
var firstPeoNum = selection[0].LivePeopleNum
selection.forEach(x => {
if (x.LivePeopleNum == firstPeoNum) {
this.$refs.multipleTable.toggleRowSelection(x, true);
this.ComCheckedArr.push(x);
//自定义多选
getCheckAll(tableData){
this.ComCheckedArr=[];
if(this.isCheckAll){
//有过单选
if(JSON.stringify(this.findRow) != "{}"){
this.findRow = tableData.find(eItem => eItem.isChecked == true);
tableData.forEach(x=>{
if(x.LivePeopleNum==this.findRow.LivePeopleNum){
x.isChecked=true;
this.ComCheckedArr.push(x);
}else{
x.isCanCheck=true;
}
})
}else{
if(tableData.length>0){
var firstData = tableData[0];
tableData.forEach(x=>{
if(x.LivePeopleNum==firstData.LivePeopleNum){
x.isChecked=true;
this.ComCheckedArr.push(x);
}else{
x.isCanCheck=true;
}
})
}
});
}
}else{
tableData.forEach(x=>{
x.isChecked=false;
x.isCanCheck=false;
})
this.findRow={};
}
},
//点击批量修改金额
batchUpMoney() {
if (this.ComCheckedArr == 0) {
......@@ -359,7 +353,8 @@
}
var _index = this.finMsg.AccountIds.indexOf(0);
if (_index > -1) {
this.Error('请选择第' + _index + '个账户');
this.Error('请选择第' + (_index+1) + '个账户');
return;
}
if (this.ComCheckedArr.length > 0) {
this.ComCheckedArr.forEach(x => {
......@@ -384,7 +379,6 @@
this.apipost("/api/Supplier/GetClientBankAccountList", {}, res => {
if (res.data.resultCode == 1) {
this.AccountList = res.data.data;
console.log(this.AccountList, 'AccountList');
} else {
this.Error(res.data.message)
}
......@@ -404,36 +398,4 @@
box-sizing: border-box;
}
.LiveOrder .LiveOrderTable {
width: 100%;
border-collapse: collapse;
}
.LiveOrder .LiveOrderTable tr th {
height: 48px;
font-size: 14px;
color: #909399;
border: 1px solid #EBEEF5;
font-weight: bold;
}
.LiveOrder .LiveOrderTable tr {
background: #fff;
text-align: center;
height: 50px;
}
.LiveOrder .LiveOrderTable tr td {
font-size: 14px;
border: 1px solid #EBEEF5;
}
.LiveOrder .fx_inner:hover td {
background-color: #F5F7FA;
}
.LiveOrder .LiveOrderTable td {
transition: background-color .25s ease;
}
</style>
src/router/index.js
View file @ 11472c06
......@@ -115,13 +115,13 @@ export default new Router({
path: '/groupEmpower',
name: 'groupEmpower',
component: resolve => require(['@/components/empower/groupEmpower'], resolve),
},
},
//授权中心 授权管理
{
path: '/empowerManage',
name: 'empowerManage',
component: resolve => require(['@/components/empower/empowerManage'], resolve),
},
},
//授权中心 授权详情
{
path: '/empowerEdit',
......@@ -139,27 +139,27 @@ export default new Router({
path: '/procurementMange',
name: 'procurementMange',
component: resolve => require(['@/components/empower/procurementMange'], resolve),
},
},
//授权中心 物料仓库
{
path: '/Materialwarehouse',
name: 'Materialwarehouse',
component: resolve => require(['@/components/empower/Materialwarehouse'], resolve),
},
},
//授权中心 入库
{
path: '/putinStorage',
name: 'putinStorage',
component: resolve => require(['@/components/empower/putinStorage'], resolve),
},
},
//授权中心 打印
{
path: '/printManage',
name: 'printManage',
component: resolve => require(['@/components/empower/printManage'], resolve),
},
},
]
},
{
......@@ -298,7 +298,7 @@ export default new Router({
name: 'RecommendRebate',
component: resolve => require(['@/components/UserMan/RecommendRebate'], resolve),
},
// 用户管理 优惠券管理
{
path: '/usersCoupon',
......@@ -323,6 +323,18 @@ export default new Router({
name: 'wdExamine',
component: resolve => require(['@/components/UserMan/tinyMerchant/wdExamine'], resolve),
},
// 用户管理 微店订单
{
path: '/wdOrder',
name: 'wdOrder',
component: resolve => require(['@/components/UserMan/tinyMerchant/wdOrder'], resolve),
},
// 用户管理 微店提现
{
path: '/wdWithdrawal',
name: 'wdWithdrawal',
component: resolve => require(['@/components/UserMan/tinyMerchant/wdWithdrawal'], resolve),
},
// 商品管理 素材管理
{
path: '/materialMan',
......@@ -449,7 +461,7 @@ export default new Router({
name: 'outboundManage',
component:resolve => require(['@/components/orderMan/outboundManage'], resolve),
},
// 订单管理 售后订单详情
{
path: '/salesOrderDetails',
......@@ -701,7 +713,7 @@ export default new Router({
name: 'mailRulesSet',
component: resolve => require(['@/components/setup/mailRulesSet'], resolve),
},
//设置 上传设置
{
path: '/uploadSettings',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment