Skip to content

C
CRM
Commit 26436a8f authored by 罗超's avatar 罗超
Browse files
Options

修复日期问题

parent 29f6b55c
Show whitespace changes
Inline Side-by-side
Showing with 761 additions and 669 deletions
src/components/customerManage/customerOrder.vue
View file @ 26436a8f
<style>
@import '../../assets/css/customerManage.css';
*{
font-family: 'perfectFont';
}
.query-box .el-row .el-col{
@import "../../assets/css/customerManage.css";
* {
font-family: "perfectFont";
}
.query-box .el-row .el-col {
display: flex;
align-items: center;
margin-bottom: 15px;
}
.query-box .el-row .el-col span{
}
.query-box .el-row .el-col span {
flex-shrink: 0;
}
.statistics{
}
.statistics {
background: #fff;
display: flex;
justify-content: space-between;
}
.statistics-box{
}
.statistics-box {
flex: 1;
padding: 7px 16px;
background-color: #DDDEE0;
background-color: #dddee0;
display: flex;
flex-wrap: wrap;
border-radius: 5px;
margin-right: 10px;
}
.statistics-box:last-child{
}
.statistics-box:last-child {
margin-right: 0;
}
.statistics-box span:first-child{
}
.statistics-box span:first-child {
font-weight: bold;
margin-right: 5px;
flex-shrink: 0;
}
.red{
color: #F72E52;
}
.blue{
color: #3A7CF7;
}
.status-box{
}
.red {
color: #f72e52;
}
.blue {
color: #3a7cf7;
}
.status-box {
display: flex;
flex-direction: row;
justify-content: flex-end;
}
.status-text{
}
.status-text {
display: flex;
flex-direction: row;
align-items: center;
margin-left: 15px;
font-size: 13px;
}
.tis-k{
}
.tis-k {
width: 10px;
height: 10px;
margin-right: 10px;
}
}
</style>
<template>
<div class="customerManage">
......@@ -162,6 +162,7 @@
size="mini"
style="width: 100%;"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
placeholder="开始日期">
</el-date-picker>
......@@ -174,6 +175,7 @@
size="mini"
style="width: 100%;"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
placeholder="结束日期">
</el-date-picker>
......@@ -238,91 +240,96 @@
</div>
</template>
<script>
import orderList from "./orderList";
export default {
import orderList from "./orderList";
export default {
components: {
orderList
orderList,
},
data() {
return {
VisaList:[
VisaList: [
{ Name: "不限", Id: "0" },
{ Name: "未出签", Id: "1" },
{ Name: "已出签", Id: "2" },
],
MultipleChoiceList: [ //多选项目
MultipleChoiceList: [
//多选项目
{
Name: '机票',
Id: '1',
show: false
}, {
Name: '签证',
Id: '2',
show: false
}, {
Name: '地接',
Id: '3',
show: false
}, {
Name: '套餐',
Id: '4',
show: false
}, {
Name: '其他',
Id: '5',
show: false
}
Name: "机票",
Id: "1",
show: false,
},
{
Name: "签证",
Id: "2",
show: false,
},
{
Name: "地接",
Id: "3",
show: false,
},
{
Name: "套餐",
Id: "4",
show: false,
},
{
Name: "其他",
Id: "5",
show: false,
},
],
superManage:"订单统计",
StatModel:{},// 合计
loading:false,
total:0,
dataList:[],
timeList:[],//时间
superManage: "订单统计",
StatModel: {}, // 合计
loading: false,
total: 0,
dataList: [],
timeList: [], //时间
msg: {
pageIndex: 1,
pageSize: 15,
OrderId:"",//订单id
GuestName:"",//客人姓名
GuestId:"",//客人id
StartCityName:"",//出发城市
EndCityName:"",//到达城市
EnterID:"",//业务员id
CreateBy:"",//引流员id
TicketStatus:"0",//出票状态
VisaStatus:"0",//出签状态
OrderStatus:"0",//订单状态
Q_IsCollect:"0",//收款状态
StartTime:"",//订单开始时间
EndTime:"",//订单结束时间
OrderType:"",//订单类型
OrderId: "", //订单id
GuestName: "", //客人姓名
GuestId: "", //客人id
StartCityName: "", //出发城市
EndCityName: "", //到达城市
EnterID: "", //业务员id
CreateBy: "", //引流员id
TicketStatus: "0", //出票状态
VisaStatus: "0", //出签状态
OrderStatus: "0", //订单状态
Q_IsCollect: "0", //收款状态
StartTime: "", //订单开始时间
EndTime: "", //订单结束时间
OrderType: "", //订单类型
},
ticketingStatusList:[],// 出票状态
OrderStatusList:[],
QIsCollectList:[
{Name:'不限',Id:'0'},
{Name:'已收齐',Id:'1'},
{Name:'未收齐',Id:'2'}
ticketingStatusList: [], // 出票状态
OrderStatusList: [],
QIsCollectList: [
{ Name: "不限", Id: "0" },
{ Name: "已收齐", Id: "1" },
{ Name: "未收齐", Id: "2" },
],
EmployeeList:[]
}
EmployeeList: [],
};
},
mounted() {
// erp自动登陆传过来的参数
if(this.$route.query.erpOrderObj){
let data = JSON.parse(this.$route.query.erpOrderObj)
this.msg.OrderId = data.OrderId
if (this.$route.query.erpOrderObj) {
let data = JSON.parse(this.$route.query.erpOrderObj);
this.msg.OrderId = data.OrderId;
}
//接收订单统计传过来的参数
if(this.$route.query.OrderId){
this.msg.OrderId = this.$route.query.OrderId
if (this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId;
}
this.Employee() //业务员
this.GetTicketStatusEnumList() //出票枚举
this.GetOrderStatusEnumList() //订单状态枚举
let $this = this
this.Employee(); //业务员
this.GetTicketStatusEnumList(); //出票枚举
this.GetOrderStatusEnumList(); //订单状态枚举
let $this = this;
this.MsgBus.$on("closeGetList", function() {
$this.getList()
$this.getList();
});
$this.MsgBus.$on("closeBillMaking", function() {
for (let i = 0; i < $this.dataList.length; i++) {
......@@ -332,7 +339,7 @@
$this.dataList[i].cost = false;
}
});
this.getList()
this.getList();
},
methods: {
// 获取业务员
......@@ -359,27 +366,28 @@
},
//点击下载
downLoadExcel() {
if(!this.msg.StartTime||!this.msg.EndTime){
let tips = '请选择开始时间、结束时间！'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
}).catch(() => { });
return
if (!this.msg.StartTime || !this.msg.EndTime) {
let tips = "请选择开始时间、结束时间！";
this.$confirm(tips, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {})
.catch(() => {});
return;
}
this.GetLocalFile(
"/api/Order/GetGuestOrderStatisticsToExcel",
this.msg,'订单表.xls'
this.msg,
"订单表.xls"
);
},
// 清空下拉
emptyMore(){
this.dataList.forEach(item=>{
return item.More = ''
})
emptyMore() {
this.dataList.forEach((item) => {
return (item.More = "");
});
},
// 获取订单状态枚举
GetOrderStatusEnumList() {
......@@ -397,25 +405,21 @@
});
},
// 获取出票状态枚举
GetTicketStatusEnumList(){
this.apipost(
"/api/Order/GetTicketStatusEnumList",
{},
(res) => {
GetTicketStatusEnumList() {
this.apipost("/api/Order/GetTicketStatusEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.ticketingStatusList = res.data.data;
let data = {
Name:'全部',
Id:'0'
}
this.ticketingStatusList.unshift(data)
Name: "全部",
Id: "0",
};
this.ticketingStatusList.unshift(data);
} else {
this.$message.error(res.data.message);
}
}
);
});
},
getList(){
getList() {
this.loading = true;
this.apipost(
"/api/Order/GetGuestOrderStatisticsPageList",
......@@ -424,18 +428,23 @@
if (res.data.resultCode == 1) {
let data = res.data.data.Data.pageData;
let addList = function(arr) {
arr.forEach(item => {
item.More = ''
item.actuallyReceived = false
item.cost = false
item.selectedType = ''
item.checkList = []
item.MultipleChoiceList = []
arr.forEach((item) => {
item.More = "";
item.actuallyReceived = false;
item.cost = false;
item.selectedType = "";
item.checkList = [];
item.MultipleChoiceList = [];
item.MoreList = [
{
Name: "取消订单",
Id: "1",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false,
show:
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6
? true
: false,
},
{
Name: "订单转交",
......@@ -445,69 +454,105 @@
{
Name: "修改订单金额",
Id: "3",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&(item.TicketStatus==1||item.VisaStatus==1)?true:false,
show:
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
(item.TicketStatus == 1 || item.VisaStatus == 1)
? true
: false,
},
{
Name: "修改出票状态",
Id: "4",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.TicketStatus<3?true:false,
show:
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
item.TicketStatus < 3
? true
: false,
},
{
Name: "修改出签状态",
Id: "5",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.VisaStatus==1?true:false,
show:
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
item.VisaStatus == 1
? true
: false,
},
{
Name: '订单收损',
Id: '8',
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
Name: "订单收损",
Id: "8",
show:
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6
? true
: false,
},
{
Name: '收损完结',
Id: '9',
show: (item.OrderStatus==3||item.OrderStatus==4)&&item.DueinMoney==0&&item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
Name: "收损完结",
Id: "9",
show:
(item.OrderStatus == 3 || item.OrderStatus == 4) &&
item.DueinMoney == 0 &&
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6
? true
: false,
},
{
Name: '订单完结',
Id: '6',
show: item.OrderStatus==1&&item.DueinMoney==0?true:false
Name: "订单完结",
Id: "6",
show:
item.OrderStatus == 1 && item.DueinMoney == 0
? true
: false,
},
{
Name: "操作日志",
Id: "7",
show: true,
}
]
},
];
});
};
addList(data);
data.forEach(item=>{
if(item.OrderType){
let list = item.OrderType&&item.OrderType.split(',')
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(JSON.parse(JSON.stringify(this.MultipleChoiceList[i])))
data.forEach((item) => {
if (item.OrderType) {
let list = item.OrderType && item.OrderType.split(",");
for (let j = 0; j < list.length; j++) {
for (let i = 0; i < this.MultipleChoiceList.length; i++) {
if (list[j] == this.MultipleChoiceList[i].Id) {
item.MultipleChoiceList.push(
JSON.parse(JSON.stringify(this.MultipleChoiceList[i]))
);
}
}
}
}
if(item.LossList.length>0){
for(let i=0;i<item.LossList.length;i++){
for(let j=0;j<item.MultipleChoiceList.length;j++){
if(item.LossList[i].OrderType==item.MultipleChoiceList[j].Id){
item.MultipleChoiceList[j].show = true
if (item.LossList.length > 0) {
for (let i = 0; i < item.LossList.length; i++) {
for (let j = 0; j < item.MultipleChoiceList.length; j++) {
if (
item.LossList[i].OrderType ==
item.MultipleChoiceList[j].Id
) {
item.MultipleChoiceList[j].show = true;
}
}
}
}
})
});
this.dataList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count;
this.StatModel = res.data.data.StatModel
this.loading = false
this.StatModel = res.data.data.StatModel;
this.loading = false;
} else {
this.$message.error(res.data.message);
}
......@@ -515,13 +560,13 @@
);
},
handleSizeChange(val) {
this.msg.pageSize = val
this.msg.pageSize = val;
this.getList();
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
}
}
},
};
</script>
src/components/customerManage/myCustomerOrder.vue
View file @ 26436a8f
<style>
@import '../../assets/css/customerManage.css';
*{
font-family: 'perfectFont';
}
.query-box .el-row .el-col{
@import "../../assets/css/customerManage.css";
* {
font-family: "perfectFont";
}
.query-box .el-row .el-col {
display: flex;
align-items: center;
margin-bottom: 15px;
}
.query-box .el-row .el-col span{
}
.query-box .el-row .el-col span {
flex-shrink: 0;
}
.statistics{
}
.statistics {
background: #fff;
display: flex;
justify-content: space-between;
}
.statistics-box{
}
.statistics-box {
flex: 1;
padding: 7px 16px;
background-color: #DDDEE0;
background-color: #dddee0;
display: flex;
flex-wrap: wrap;
border-radius: 5px;
margin-right: 10px;
}
.statistics-box:last-child{
}
.statistics-box:last-child {
margin-right: 0;
}
.statistics-box span:first-child{
}
.statistics-box span:first-child {
font-weight: bold;
margin-right: 5px;
flex-shrink: 0;
}
.red{
color: #F72E52;
}
.blue{
color: #3A7CF7;
}
.status-box{
}
.red {
color: #f72e52;
}
.blue {
color: #3a7cf7;
}
.status-box {
display: flex;
flex-direction: row;
justify-content: flex-end;
}
.status-text{
}
.status-text {
display: flex;
flex-direction: row;
align-items: center;
margin-left: 15px;
font-size: 13px;
}
.tis-k{
}
.tis-k {
width: 10px;
height: 10px;
margin-right: 10px;
}
}
</style>
<template>
<div class="customerManage">
......@@ -129,6 +129,7 @@
style="width: 100%;"
format="yyyy-MM-dd"
type="date"
value-format="yyyy-MM-dd"
placeholder="开始日期">
</el-date-picker>
</el-col>
......@@ -141,6 +142,7 @@
style="width: 100%;"
format="yyyy-MM-dd"
type="date"
value-format="yyyy-MM-dd"
placeholder="结束日期">
</el-date-picker>
</el-col>
......@@ -204,88 +206,93 @@
</div>
</template>
<script>
import orderList from "./orderList";
export default {
import orderList from "./orderList";
export default {
components: {
orderList
orderList,
},
data() {
return {
VisaList:[
VisaList: [
{ Name: "不限", Id: "0" },
{ Name: "未出签", Id: "1" },
{ Name: "已出签", Id: "2" },
],
MultipleChoiceList: [ //多选项目
MultipleChoiceList: [
//多选项目
{
Name: '机票',
Id: '1',
show: false
}, {
Name: '签证',
Id: '2',
show: false
}, {
Name: '地接',
Id: '3',
show: false
}, {
Name: '套餐',
Id: '4',
show: false
}, {
Name: '其他',
Id: '5',
show: false
}
Name: "机票",
Id: "1",
show: false,
},
{
Name: "签证",
Id: "2",
show: false,
},
{
Name: "地接",
Id: "3",
show: false,
},
{
Name: "套餐",
Id: "4",
show: false,
},
{
Name: "其他",
Id: "5",
show: false,
},
],
StatModel:{},// 合计
loading:false,
total:0,
dataList:[],
timeList:[],//时间
StatModel: {}, // 合计
loading: false,
total: 0,
dataList: [],
timeList: [], //时间
msg: {
pageIndex: 1,
pageSize: 15,
OrderId:"",//订单id
GuestName:"",//客人姓名
GuestId:"",//客人id
StartCityName:"",//出发城市
EndCityName:"",//到达城市
EnterID:"",//业务员id
TicketStatus:"0",//出票状态
VisaStatus:"0",//出签状态
OrderStatus:"0",//订单状态
Q_IsCollect:"0",//收款状态
StartTime:"2022-04-28",
EndTime:"",
IsMyOrder:"1",//我的订单
OrderId: "", //订单id
GuestName: "", //客人姓名
GuestId: "", //客人id
StartCityName: "", //出发城市
EndCityName: "", //到达城市
EnterID: "", //业务员id
TicketStatus: "0", //出票状态
VisaStatus: "0", //出签状态
OrderStatus: "0", //订单状态
Q_IsCollect: "0", //收款状态
StartTime: "2022-04-28",
EndTime: "",
IsMyOrder: "1", //我的订单
},
ticketingStatusList:[],// 出票状态
OrderStatusList:[],
QIsCollectList:[
{Name:'不限',Id:'0'},
{Name:'已收齐',Id:'1'},
{Name:'未收齐',Id:'2'}
ticketingStatusList: [], // 出票状态
OrderStatusList: [],
QIsCollectList: [
{ Name: "不限", Id: "0" },
{ Name: "已收齐", Id: "1" },
{ Name: "未收齐", Id: "2" },
],
EmployeeList:[],// 业务员数据
userInfo:{}
}
EmployeeList: [], // 业务员数据
userInfo: {},
};
},
mounted() {
this.userInfo = this.getLocalStorage()
this.msg.EnterID = this.userInfo.EmployeeId
this.userInfo = this.getLocalStorage();
this.msg.EnterID = this.userInfo.EmployeeId;
// erp自动登陆传过来的参数
if(this.$route.query.erpOrderObj){
let data = JSON.parse(this.$route.query.erpOrderObj)
this.msg.OrderId = data.OrderId
}
this.Employee() //业务员
this.GetTicketStatusEnumList() //出票枚举
this.GetOrderStatusEnumList() //订单状态枚举
let $this = this
if (this.$route.query.erpOrderObj) {
let data = JSON.parse(this.$route.query.erpOrderObj);
this.msg.OrderId = data.OrderId;
}
this.Employee(); //业务员
this.GetTicketStatusEnumList(); //出票枚举
this.GetOrderStatusEnumList(); //订单状态枚举
let $this = this;
this.MsgBus.$on("closeGetList", function() {
$this.getList()
$this.getList();
});
$this.MsgBus.$on("closeBillMaking", function() {
for (let i = 0; i < $this.dataList.length; i++) {
......@@ -295,7 +302,7 @@
$this.dataList[i].cost = false;
}
});
this.getList()
this.getList();
},
methods: {
// 获取业务员
......@@ -322,27 +329,28 @@
},
//点击下载
downLoadExcel() {
if(!this.msg.StartTime||!this.msg.EndTime){
let tips = '请选择开始时间、结束时间！'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
}).catch(() => { });
return
if (!this.msg.StartTime || !this.msg.EndTime) {
let tips = "请选择开始时间、结束时间！";
this.$confirm(tips, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {})
.catch(() => {});
return;
}
this.GetLocalFile(
"/api/Order/GetGuestOrderStatisticsToExcel",
this.msg,'订单表.xls'
this.msg,
"订单表.xls"
);
},
// 清空下拉
emptyMore(){
this.dataList.forEach(item=>{
return item.More = ''
})
emptyMore() {
this.dataList.forEach((item) => {
return (item.More = "");
});
},
// 获取订单状态枚举
GetOrderStatusEnumList() {
......@@ -360,25 +368,21 @@
});
},
// 获取出票状态枚举
GetTicketStatusEnumList(){
this.apipost(
"/api/Order/GetTicketStatusEnumList",
{},
(res) => {
GetTicketStatusEnumList() {
this.apipost("/api/Order/GetTicketStatusEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.ticketingStatusList = res.data.data;
let data = {
Name:'全部',
Id:'0'
}
this.ticketingStatusList.unshift(data)
Name: "全部",
Id: "0",
};
this.ticketingStatusList.unshift(data);
} else {
this.$message.error(res.data.message);
}
}
);
});
},
getList(){
getList() {
this.loading = true;
this.apipost(
"/api/Order/GetGuestOrderStatisticsPageList",
......@@ -387,18 +391,23 @@
if (res.data.resultCode == 1) {
let data = res.data.data.Data.pageData;
let addList = function(arr) {
arr.forEach(item => {
item.More = ''
item.actuallyReceived = false
item.cost = false
item.selectedType = ''
item.checkList = []
item.MultipleChoiceList = []
arr.forEach((item) => {
item.More = "";
item.actuallyReceived = false;
item.cost = false;
item.selectedType = "";
item.checkList = [];
item.MultipleChoiceList = [];
item.MoreList = [
{
Name: "取消订单",
Id: "1",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false,
show:
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6
? true
: false,
},
{
Name: "订单转交",
......@@ -408,67 +417,105 @@
{
Name: "修改订单金额",
Id: "3",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&(item.TicketStatus==1||item.VisaStatus==1)?true:false,
show:
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
(item.TicketStatus == 1 || item.VisaStatus == 1)
? true
: false,
},
{
Name: "修改出票状态",
Id: "4",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.TicketStatus<3?true:false,
show:
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
item.TicketStatus < 3
? true
: false,
},
{
Name: "修改出签状态",
Id: "5",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.VisaStatus==1?true:false,
show:
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
item.VisaStatus == 1
? true
: false,
},
{
Name: '订单收损',
Id: '8',
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
Name: "订单收损",
Id: "8",
show:
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6
? true
: false,
},
{
Name: '收损完结',
Id: '9',
show: (item.OrderStatus==3||item.OrderStatus==4)&&item.DueinMoney==0&&item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
Name: "收损完结",
Id: "9",
show:
(item.OrderStatus == 3 || item.OrderStatus == 4) &&
item.DueinMoney == 0 &&
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6
? true
: false,
},
{
Name: '订单完结',
Id: '6',
show: item.OrderStatus==1&&item.DueinMoney==0?true:false
Name: "订单完结",
Id: "6",
show:
item.OrderStatus == 1 && item.DueinMoney == 0
? true
: false,
},
{
Name: "操作日志",
Id: "7",
show: true,
}
]
},
];
});
};
addList(data);
data.forEach(item=>{
if(item.OrderType){
let list = item.OrderType&&item.OrderType.split(',')
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(JSON.parse(JSON.stringify(this.MultipleChoiceList[i])))
data.forEach((item) => {
if (item.OrderType) {
let list = item.OrderType && item.OrderType.split(",");
for (let j = 0; j < list.length; j++) {
for (let i = 0; i < this.MultipleChoiceList.length; i++) {
if (list[j] == this.MultipleChoiceList[i].Id) {
item.MultipleChoiceList.push(
JSON.parse(JSON.stringify(this.MultipleChoiceList[i]))
);
}
}
}
}
if(item.LossList.length>0){
for(let i=0;i<item.LossList.length;i++){
for(let j=0;j<item.MultipleChoiceList.length;j++){
if(item.LossList[i].OrderType==item.MultipleChoiceList[j].Id){
item.MultipleChoiceList[j].show = true
if (item.LossList.length > 0) {
for (let i = 0; i < item.LossList.length; i++) {
for (let j = 0; j < item.MultipleChoiceList.length; j++) {
if (
item.LossList[i].OrderType ==
item.MultipleChoiceList[j].Id
) {
item.MultipleChoiceList[j].show = true;
}
}
}
}
})
});
this.dataList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count;
this.StatModel = res.data.data.StatModel
this.loading = false
this.StatModel = res.data.data.StatModel;
this.loading = false;
} else {
this.$message.error(res.data.message);
}
......@@ -476,13 +523,13 @@
);
},
handleSizeChange(val) {
this.msg.pageSize = val
this.msg.pageSize = val;
this.getList();
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
}
}
},
};
</script>
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