Commit 9bb67c72 authored by zhengke's avatar zhengke

修改

parent d6612ef4
...@@ -32,15 +32,17 @@ ...@@ -32,15 +32,17 @@
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange" <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="下单结束日期"> range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="下单开始日期" end-placeholder="下单结束日期">
</el-date-picker> </el-date-picker>
<el-button type="primary" size="mini" @click="getList()" style="margin-left:10px;position:relative;top:-1px;">查询</el-button>
</div> </div>
<el-table :data="tableData" ref="multipleTable" v-loading="loading" border style="width: 100%" <el-table :data="tableData" ref="multipleTable" v-loading="loading" border style="width: 100%">
@select="selectSingle" @select-all="selectAll"> <!-- <el-table-column type="selection" width="55">
</el-table-column> -->
<el-table-column width="55"> <el-table-column width="55">
<template slot="header" slot-scope="scope"> <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>
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column prop="OrderNo" label="订单号/订单Id" width="200"> <el-table-column prop="OrderNo" label="订单号/订单Id" width="200">
...@@ -111,10 +113,10 @@ ...@@ -111,10 +113,10 @@
<el-dialog title="修改" :visible.sync="updateDialog" width="400px"> <el-dialog title="修改" :visible.sync="updateDialog" width="400px">
<el-form label-width="50px"> <el-form label-width="50px">
<el-form-item label="数量" v-if="updateMsg.Type==1||updateMsg.Type==2"> <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>
<el-form-item label="金额" v-if="updateMsg.Type==1||updateMsg.Type==3"> <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-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -155,7 +157,6 @@ ...@@ -155,7 +157,6 @@
ERPEmpId: 0, ERPEmpId: 0,
updateDialog: false, updateDialog: false,
isCheckAll: false, //全选
//修改信息 //修改信息
updateMsg: { updateMsg: {
Ids: '', Ids: '',
...@@ -167,7 +168,11 @@ ...@@ -167,7 +168,11 @@
isSingleCheck: false, //有过单选 isSingleCheck: false, //有过单选
firstPeoNum: -1, firstPeoNum: -1,
AccountList: [], //账户下拉 AccountList: [], //账户下拉
checkedDan: [] //选中数 checkedDan: [], //选中数
isCheckAll: false, //全选
findRow:{},
} }
}, },
created() { created() {
...@@ -197,14 +202,12 @@ ...@@ -197,14 +202,12 @@
this.loading = true; this.loading = true;
this.apipost("/api/order/GetLiveGoodsOrderPageList", this.msg, res => { this.apipost("/api/order/GetLiveGoodsOrderPageList", this.msg, res => {
this.loading = false; this.loading = false;
console.log(res, 'res');
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
var myData = res.data.data.pageData; var myData = res.data.data.pageData;
var tempArray=[];
myData.forEach(x => { myData.forEach(x => {
x.isChecked = false; x.isChecked = false;
x.isCanCheck=false;
}) })
this.tableData = JSON.parse(JSON.stringify(myData)); this.tableData = JSON.parse(JSON.stringify(myData));
} else { } else {
...@@ -232,6 +235,7 @@ ...@@ -232,6 +235,7 @@
this.getList(); this.getList();
this.Success(res.data.message); this.Success(res.data.message);
this.ComCheckedArr = []; this.ComCheckedArr = [];
this.findRow={};
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -252,74 +256,64 @@ ...@@ -252,74 +256,64 @@
} }
} }
}, },
//单选 //自定义单选
selectSingle(selection, row) { getSingleCheck(tableData,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');
this.ComCheckedArr=[]; this.ComCheckedArr=[];
//单选 this.findRow = tableData.find(eItem => eItem.isChecked == true);
if (row) { if(this.findRow){
var findRow = tabledata.find(eItem => eItem.isChecked == true); tableData.forEach(x=>{
console.log("findRow", findRow); if(x.LivePeopleNum!=this.findRow.LivePeopleNum){
if (findRow) { x.isCanCheck=true;
tabledata.forEach(x => {
if (x.isChecked) {
if (x.LivePeopleNum != findRow.LivePeopleNum) {
this.Info("11111")
x.isChecked = false;
}
this.ComCheckedArr.push(x);
} }
}) if(x.isChecked){
}
} else {
var findRow = tabledata[0];
if (findRow) {
tabledata.forEach(x => {
if (x.LivePeopleNum == findRow.LivePeopleNum) {
x.isChecked = this.isCheckAll;
this.ComCheckedArr.push(x); this.ComCheckedArr.push(x);
} }
}) })
} }else{
tableData.forEach(x=>{
x.isCanCheck=false;
})
this.isCheckAll=false;
this.findRow={};
} }
console.log(this.ComCheckedArr,'ComCheckedArr');
}, },
//多选 //自定义多选
selectAll(selection) { getCheckAll(tableData){
//有过单选 this.ComCheckedArr=[];
this.$refs.multipleTable.clearSelection(); if(this.isCheckAll){
// this.$refs.multipleTable.toggleRowSelection(false); //有过单选
this.ComCheckedArr = []; if(JSON.stringify(this.findRow) != "{}"){
if (this.isSingleCheck) { this.findRow = tableData.find(eItem => eItem.isChecked == true);
selection.forEach(x => { tableData.forEach(x=>{
if (x.LivePeopleNum == this.firstPeoNum) { if(x.LivePeopleNum==this.findRow.LivePeopleNum){
this.$refs.multipleTable.toggleRowSelection(x, true); x.isChecked=true;
this.ComCheckedArr.push(x); this.ComCheckedArr.push(x);
} }else{
}); x.isCanCheck=true;
} else { }
var firstPeoNum = selection[0].LivePeopleNum })
selection.forEach(x => { }else{
if (x.LivePeopleNum == firstPeoNum) { if(tableData.length>0){
this.$refs.multipleTable.toggleRowSelection(x, true); var firstData = tableData[0];
this.ComCheckedArr.push(x); 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() { batchUpMoney() {
if (this.ComCheckedArr == 0) { if (this.ComCheckedArr == 0) {
...@@ -359,7 +353,8 @@ ...@@ -359,7 +353,8 @@
} }
var _index = this.finMsg.AccountIds.indexOf(0); var _index = this.finMsg.AccountIds.indexOf(0);
if (_index > -1) { if (_index > -1) {
this.Error('请选择第' + _index + '个账户'); this.Error('请选择第' + (_index+1) + '个账户');
return;
} }
if (this.ComCheckedArr.length > 0) { if (this.ComCheckedArr.length > 0) {
this.ComCheckedArr.forEach(x => { this.ComCheckedArr.forEach(x => {
...@@ -384,7 +379,6 @@ ...@@ -384,7 +379,6 @@
this.apipost("/api/Supplier/GetClientBankAccountList", {}, res => { this.apipost("/api/Supplier/GetClientBankAccountList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.AccountList = res.data.data; this.AccountList = res.data.data;
console.log(this.AccountList, 'AccountList');
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -404,36 +398,4 @@ ...@@ -404,36 +398,4 @@
box-sizing: border-box; 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> </style>
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