Skip to content

E
ElectricitySheep
Commit 9ecc4e6f authored by 黄奎's avatar 黄奎
Browse files
Options

商品批量设置价格修改

parent 11d8074b
Show whitespace changes
Inline Side-by-side
Showing with 1582 additions and 1724 deletions
src/components/CommodityMan/goodsListEdit.vue
View file @ 9ecc4e6f
......@@ -399,13 +399,13 @@
:key="rIndex" multiple style="width:130px" size="small">
<el-option label="全部" :value="-1"></el-option>
<el-option v-for="(subItem,subIndex) in rItem.SpecificationValueList"
:key="subIndex" :label="subItem.Name" :value="subIndex+1"></el-option>
:key="subIndex" :label="subItem.Name" :value="subItem.Sort"></el-option>
</el-select>
</template>
</template>
<el-input style="width:280px;" size="small" v-model="valpl" placeholder="请输入内容"
<el-input style="width:300px;" size="small" v-model="valpl" placeholder="请输入内容"
class="input-with-select">
<el-select style="width:100px" v-model="ggpl" slot="prepend" placeholder="请选择">
<el-select style="width:120px" v-model="ggpl" slot="prepend" placeholder="请选择">
<el-option label="价格" :value="1"></el-option>
<el-option label="库存" :value="2"></el-option>
<el-option label="成本价" :value="5"></el-option>
......@@ -1625,7 +1625,6 @@
this.ggplList.forEach(subItem => {
var findRow = chooseSpecList[index];
if (subItem.SpecificationSort == findRow) {
console.log(findRow, "findRow")
if (this.ggpl == 1) {
item.SellingPrice = this.valpl;
}
......
src/components/CommodityMan/materialMan.vue
View file @ 9ecc4e6f
......@@ -314,7 +314,6 @@
canvas.height = 140;
canvas.getContext('2d').drawImage(video, 0, 0, video.clientWidth, video.clientHeight)
base64Str = canvas.toDataURL('image/jpeg');
console.log("base64Str", base64Str)
var arr = base64Str.split(','); // 分隔base64编码的头部信息
var mime = arr[0].match(/:(.*?);/)[1]; // 获取MIME类型
var bstr = atob(arr[1]); // Base64解码
......
src/components/UserMan/memberGroup.vue
View file @ 9ecc4e6f
......@@ -178,8 +178,6 @@
this.apipost("/api/User/GetMemberGroup", {
GroupId: item.GroupId
}, res => {
console.log(res);
});
},
//删除分组
......
src/components/coffeeManage/edit.vue
View file @ 9ecc4e6f
......@@ -33,7 +33,8 @@
<!-- <el-radio :label="3">教室类</el-radio> -->
</el-radio-group>
<div v-if="addMsg.GoodsEduType == 2">
<el-button type="primary" @click="isShowZC=true" style="margin:0 10px;" size="mini" :disabled="addMsg.Id > 0">选择资产
<el-button type="primary" @click="isShowZC=true" style="margin:0 10px;" size="mini"
:disabled="addMsg.Id > 0">选择资产
</el-button>
<span v-if="addMsg.MaterialId">资产编号：{{addMsg.MaterialId}}</span>
</div>
......@@ -2415,9 +2416,8 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.options = res.data.data;
console.log(2418,this.$route.query.GoodsId,this.options)
if(this.$route.query.GoodsId==0){
this.SupplierId=this.options[0].ID
if (this.$route.query.GoodsId == 0) {
this.SupplierId = this.options[0].ID
}
}
});
......@@ -2518,15 +2518,15 @@
this.addMsg.SellingPrice = val.SellPrice
this.addMsg.OriginalPrice = val.SellPrice
this.addMsg.CostPrice = val.Money
this.addMsg.Unit = val.Units||'件'
this.addMsg.Unit = val.Units || '件'
this.addMsg.InventoryNum = val.InventoryNum
this.defaultMsg=val.Name
this.defaultMsg = val.Name
this.addggxm2()
this.addGgz2(this.SpecificationList[0],0)
this.addGgz2(this.SpecificationList[0], 0)
this.ggzChange()
this.SpecificationPriceList[0].SellingPrice=val.SellPrice
this.SpecificationPriceList[0].InventoryNum=val.InventoryNum
this.SpecificationPriceList[0].CostMoney=val.Money
this.SpecificationPriceList[0].SellingPrice = val.SellPrice
this.SpecificationPriceList[0].InventoryNum = val.InventoryNum
this.SpecificationPriceList[0].CostMoney = val.Money
}
},
// 添加规格模板2
......@@ -2540,20 +2540,20 @@
Id: 0,
EnabledImage: 2
};
this.SpecificationList[0]=obj;
this.SpecificationList[0] = obj;
},
// 添加规格值2
addGgz2(item, index) {
let obj = {
Id: 0,
Image: "",
Name: "1"+this.addMsg.Unit,
Name: "1" + this.addMsg.Unit,
Sort: item.SpecificationValueList.length > 0 ?
item.SpecificationValueList[
item.SpecificationValueList.length - 1
].Sort + 1 : item.SpecificationValueList.length + 1
};
this.SpecificationList[index].SpecificationValueList[0]=obj;
this.SpecificationList[index].SpecificationValueList[0] = obj;
},
}
};
......
src/components/coffeeManage/index.vue
View file @ 9ecc4e6f
......@@ -470,7 +470,7 @@
EndTime: "",
OrderBy: 0,
Q_GoodsEduType: 1,
MaterialId:"",
MaterialId: "",
},
total: 0,
tableData: [],
......@@ -901,7 +901,6 @@
}
},
mounted() {
let that = this;
if (localStorage.getItem("iframeData")) {
that.getList();
......@@ -913,7 +912,6 @@
}
window.addEventListener("message", function (messageEvent) {
let data = messageEvent.data || '';
console.log("收到vue的数据：", data);
if (data.indexOf('token') > -1) {
window.localStorage.setItem("iframeData", data);
}
......
src/components/coffeeManage/orderList.vue
View file @ 9ecc4e6f
......@@ -1023,7 +1023,6 @@
}
window.addEventListener("message", function (messageEvent) {
let data = messageEvent.data || '';
console.log("收到的数据：", data);
if (data.indexOf('token') > -1) {
window.localStorage.setItem("iframeData", data);
}
......
src/components/orderMan/afterSalesOrder.vue
View file @ 9ecc4e6f
......@@ -2,38 +2,27 @@
<div class="orderList afterSalesOrder">
<div class="head-title">
售后列表
<el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出</el-button>
<el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出
</el-button>
</div>
<div class="content">
<div>
<span>添加时间：</span>
<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 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>
<span style="margin-left:15px">所属平台：</span>
<el-select class="w120" @change="msg.pageIndex=1,getList()" style="margin-right: 10px;" v-model="msg.OrderSource" size="small" placeholder="请选择">
<el-select class="w120" @change="msg.pageIndex=1,getList()" style="margin-right: 10px;"
v-model="msg.OrderSource" size="small" placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option>
<el-option
v-for="item in platList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
<el-option v-for="item in platList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<el-input @clear="msg.pageIndex=1,getList()" clearable style="margin-left:15px;width:300px" @keyup.enter.native="msg.pageIndex=1,getList()" class="input-with-select" placeholder="请输入内容" v-model="msgVal" size="small">
<el-input @clear="msg.pageIndex=1,getList()" clearable style="margin-left:15px;width:300px"
@keyup.enter.native="msg.pageIndex=1,getList()" class="input-with-select" placeholder="请输入内容" v-model="msgVal"
size="small">
<el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-option
v-for="item in option"
:key="item.Id"
:label="item.name"
:value="item.Id">
<el-option v-for="item in option" :key="item.Id" :label="item.name" :value="item.Id">
</el-option>
</el-select>
</el-input>
......@@ -88,7 +77,8 @@
<div class="app-order-body">
<div class="goods-item" style="width: 50%;">
<div class="goods">
<el-image :src="getIconLink(item.OrderDetailModel.CoverImagePath)" class="goods-image" :preview-src-list="[getIconLink(item.OrderDetailModel.CoverImagePath)]"></el-image>
<el-image :src="getIconLink(item.OrderDetailModel.CoverImagePath)" class="goods-image"
:preview-src-list="[getIconLink(item.OrderDetailModel.CoverImagePath)]"></el-image>
<div flex="dir:left">
<div class="goods-info">
<div class="goods-name">
......@@ -101,7 +91,9 @@
<div style="margin-bottom: 24px;">
<span style="margin-right: 10px;">
规格：
<el-tag :key="index2" v-for="(list,index2) in item.OrderDetailModel.SpecificationList" style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" size="mini">
<el-tag :key="index2" v-for="(list,index2) in item.OrderDetailModel.SpecificationList"
style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
size="mini">
{{list}}
</el-tag>
</span>
......@@ -126,10 +118,12 @@
<span v-if="item.Type==2">换货</span>
</div>
</div>
<div flex="main:center cross:center" class="app-box-info" style="width: 8%;border-right: 1px solid #EBEEF5;">
<div flex="main:center cross:center" class="app-box-info"
style="width: 8%;border-right: 1px solid #EBEEF5;">
<div>{{item.ReOrderStatusName}}</div>
</div>
<div flex="main:center cross:center" class="app-order-info" style="border-right:1px solid #EBEEF5; width: 8%;">
<div flex="main:center cross:center" class="app-order-info"
style="border-right:1px solid #EBEEF5; width: 8%;">
<div flex="dir:top">
<div>实付金额:￥{{item.Income}}</div>
<div v-if="item.Type==1">申请退款:￥{{item.Refund}}</div>
......@@ -145,26 +139,33 @@
</div>
<div flex="main:center cross:center" class="app-order-info" style="width: 18%;">
<el-tooltip class="item" effect="dark" content="同意" placement="top">
<img @click="agree(item,1)" v-if="item.ReOrderStatus==1" style="margin-right:5px" src="../../assets/img/userman/pass.png" alt="">
<img @click="agree(item,1)" v-if="item.ReOrderStatus==1" style="margin-right:5px"
src="../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top">
<img @click="setOrder(item,2)" v-if="item.ReOrderStatus==1" style="margin-right:5px" src="../../assets/img/userman/nopass.png" alt="">
<img @click="setOrder(item,2)" v-if="item.ReOrderStatus==1" style="margin-right:5px"
src="../../assets/img/userman/nopass.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="发货" placement="top">
<img v-if="item.Type==2 && item.ReOrderStatus==3" @click="fhOpenDig(item)" style="margin-right:5px" src="../../assets/img/userman/confirm.png" alt="">
<img v-if="item.Type==2 && item.ReOrderStatus==3" @click="fhOpenDig(item)" style="margin-right:5px"
src="../../assets/img/userman/confirm.png" alt="">
</el-tooltip>
<!-- 卖家收货 -->
<el-tooltip class="item" effect="dark" content="收货" placement="top">
<img v-if="item.Type==1 && item.ReOrderStatus==3" @click="shouHuo(item)" style="margin-right:5px" src="../../assets/img/userman/confirm.png" alt="">
<img v-if="item.Type==1 && item.ReOrderStatus==3" @click="shouHuo(item)" style="margin-right:5px"
src="../../assets/img/userman/confirm.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="打款" placement="top">
<img @click="dkOpenDig(item)" v-if="item.Type==1 && item.ReOrderStatus==4" style="margin-right:5px" src="../../assets/img/userman/pay.png" alt="">
<img @click="dkOpenDig(item)" v-if="item.Type==1 && item.ReOrderStatus==4" style="margin-right:5px"
src="../../assets/img/userman/pay.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="售后详情" placement="top">
<img @click="CommonJump('salesOrderDetails',{ReOrderId:item.ReOrderId})" style="margin-right:5px" src="../../assets/img/userman/refund-detail.png" alt="">
<img @click="CommonJump('salesOrderDetails',{ReOrderId:item.ReOrderId})" style="margin-right:5px"
src="../../assets/img/userman/refund-detail.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="订单详情" placement="top">
<img @click="CommonJump('orderDetails',{OrderId:item.OrderModel.OrderId})" style="margin-right:5px" src="../../assets/img/userman/detail.png" alt="">
<img @click="CommonJump('orderDetails',{OrderId:item.OrderModel.OrderId})" style="margin-right:5px"
src="../../assets/img/userman/detail.png" alt="">
</el-tooltip>
</div>
</div>
......@@ -175,7 +176,8 @@
电话：{{item.OrderModel.Mobile}} 地址：
{{item.OrderModel.DistrictAddress}}
{{item.OrderModel.ShoppingAddress}}</div>
<button @click="ExitshAdress(item.OrderModel)" type="button" class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button>
<button @click="ExitshAdress(item.OrderModel)" type="button"
class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button>
</div>
</div>
<div v-if="item.ReRemark && item.ReRemark!=''" class="seller-remark">商家备注：{{item.ReRemark}}</div>
......@@ -187,29 +189,24 @@
</div>
</el-card>
</div>
<el-pagination style="text-align:right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
:current-page.sync="msg.pageIndex"
layout="prev, pager, next"
:total="total">
<el-pagination style="text-align:right" background @current-change="handleCurrentChange"
:page-size="msg.pageSize" :current-page.sync="msg.pageIndex" layout="prev, pager, next" :total="total">
</el-pagination>
</div>
</div>
<!-- 选择导出信息 -->
<el-dialog
title="选择导出信息"
:visible.sync="dialogVisible"
width="960px">
<el-dialog title="选择导出信息" :visible.sync="dialogVisible" width="960px">
<el-form style="border: 1px solid #F0F2F7;" :model="addMsg" ref="addMsg" label-width="100px">
<div style="box-sizing: border-box;background-color: #F3F5F6;width: 100%;padding-left: 20px;height: 50px;line-height: 50px;">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
<div
style="box-sizing: border-box;background-color: #F3F5F6;width: 100%;padding-left: 20px;height: 50px;line-height: 50px;">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
</el-checkbox>
</div>
<div style="margin: 15px 0;"></div>
<div style="padding: 10px 25px 20px;">
<el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
<el-checkbox style="margin-bottom:10px;width:135px" v-for="city in cities" :label="city.Id" :key="city.Name">{{city.Name}}</el-checkbox>
<el-checkbox style="margin-bottom:10px;width:135px" v-for="city in cities" :label="city.Id"
:key="city.Name">{{city.Name}}</el-checkbox>
</el-checkbox-group>
</div>
......@@ -228,28 +225,18 @@
<el-input type="number" size="small" v-model="shMsg.Mobile"></el-input>
</el-form-item>
<el-form-item label="所在区域" prop="Province">
<el-select size="small" @change="shMsg.City='',getCity(shMsg.Province)" v-model="shMsg.Province" style="width:144px" filterable placeholder="请选择">
<el-option
v-for="item in provinceList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
<el-select size="small" @change="shMsg.City='',getCity(shMsg.Province)" v-model="shMsg.Province"
style="width:144px" filterable placeholder="请选择">
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
<el-select size="small" @change="shMsg.District='',getArea(shMsg.City)" v-model="shMsg.City" style="width:144px" filterable placeholder="请选择">
<el-option
v-for="item in cityList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
<el-select size="small" @change="shMsg.District='',getArea(shMsg.City)" v-model="shMsg.City"
style="width:144px" filterable placeholder="请选择">
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
<el-select size="small" v-model="shMsg.District" style="width:144px" filterable placeholder="请选择">
<el-option
v-for="item in areaList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
<el-option v-for="item in areaList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
......@@ -263,14 +250,12 @@
</span>
</el-dialog>
<!-- 打款 -->
<el-dialog
title="确认已收到货"
:visible.sync="dkDig"
width="600px">
<el-dialog title="确认已收到货" :visible.sync="dkDig" width="600px">
<div flex="main:center cross:center" style="text-align: center; font-size: 16px;">
<i class="el-icon-warning" style="color: rgb(230, 162, 60); margin-right: 10px; font-size: 24px;"></i>
<span class="span-label">确认收货后,退款金额</span>
<el-input class="w100" size="small" v-model="dkMsg.Refund" style="margin:0 6px" type="number" min="1" placeholder="请输入内容"></el-input>
<el-input class="w100" size="small" v-model="dkMsg.Refund" style="margin:0 6px" type="number" min="1"
placeholder="请输入内容"></el-input>
<span class="span-label">元将直接返还给用户！</span>
</div>
<div style="text-align:right;margin-top:20px">
......@@ -348,34 +333,19 @@
<!--选择的商品列表-->
<el-dialog title="收货地区选择" :visible.sync="regionshow" width="1024px">
<template>
<el-table
:data="regionlist"
border
style="width: 100%">
<el-table :data="regionlist" border style="width: 100%">
<el-table-column label="选择" width="55">
<template slot-scope="scope">
<el-radio v-model="SetOrderMsg.DeliveryId" :label="scope.row.ID"><i></i></el-radio>
</template>
</el-table-column>
<el-table-column
property="Name"
label="收件人姓名"
width="200">
<el-table-column property="Name" label="收件人姓名" width="200">
</el-table-column>
<el-table-column
property="Mobile"
label="联系方式"
width="200">
<el-table-column property="Mobile" label="联系方式" width="200">
</el-table-column>
<el-table-column
property="Address"
label="详细地址"
width="200"
>
<el-table-column property="Address" label="详细地址" width="200">
</el-table-column>
<el-table-column
property="Remarks"
label="备注">
<el-table-column property="Remarks" label="备注">
</el-table-column>
</el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChangere"
......@@ -393,93 +363,121 @@
</template>
<script>
export default {
export default {
name: "orderList",
data(){
return{
orderStatusList:[],
data() {
return {
orderStatusList: [],
checkAll: false,
checkedCities: [],
cities: [],
cityOptions: [],
isIndeterminate: true,
addMsg:{},
dialogVisible:false,
activeName:'first',
msgVal:'',
dateList:[],
msg:{
pageIndex:1,
pageSize:15,
OrderSource:0,
OrderType:0,
DeliveryMethod:0,
OrderId:0,
StartTime:'',
EndTime:'',
OrderNo:'',
UserName:'',
UserId:0,
GoodsName:'',
SelectStatus:0,
ReOrderNo:'',
Consignee:'',
Mobile:'',
addMsg: {},
dialogVisible: false,
activeName: 'first',
msgVal: '',
dateList: [],
msg: {
pageIndex: 1,
pageSize: 15,
OrderSource: 0,
OrderType: 0,
DeliveryMethod: 0,
OrderId: 0,
StartTime: '',
EndTime: '',
OrderNo: '',
UserName: '',
UserId: 0,
GoodsName: '',
SelectStatus: 0,
ReOrderNo: '',
Consignee: '',
Mobile: '',
},
platList:[],
option:[
{Id:1,name:'订单号'},
{Id:2,name:'原订单号'},
{Id:3,name:'用户名'},
{Id:4,name:'用户ID'},
{Id:5,name:'商品名称'},
{Id:6,name:'收件人'},
{Id:7,name:'收件人电话'}
],
msgId:1,
ExpressList:[],
provinceList:[],
cityList:[],
areaList:[],
tableData:[],
total:0,
deliveryList:[],
orderTypeList:[],
loading:false,
checkfhList:[],
moresendDig:false,
moresendtips:'',
hszDig:false,
hszMsg:{},
shDig:false,
shMsg:{
OrderId:0,
Consignee:'',
Mobile:'',
Province:'',
City:'',
District:'',
ShoppingAddress:'',
platList: [],
option: [{
Id: 1,
name: '订单号'
},
shMsgrule:{
Province: [
{ required: true, message: '请选择省', trigger: 'change' }
],
ShoppingAddress: [
{ required: true, message: '请输入详细地址', trigger: 'blur' }
],
Mobile: [
{ required: true, message: '请输入手机号', trigger: 'blur' }
],
Consignee: [
{ required: true, message: '请输入收件人', trigger: 'blur' }
{
Id: 2,
name: '原订单号'
},
{
Id: 3,
name: '用户名'
},
{
Id: 4,
name: '用户ID'
},
{
Id: 5,
name: '商品名称'
},
{
Id: 6,
name: '收件人'
},
{
Id: 7,
name: '收件人电话'
}
],
msgId: 1,
ExpressList: [],
provinceList: [],
cityList: [],
areaList: [],
tableData: [],
total: 0,
deliveryList: [],
orderTypeList: [],
loading: false,
checkfhList: [],
moresendDig: false,
moresendtips: '',
hszDig: false,
hszMsg: {},
shDig: false,
shMsg: {
OrderId: 0,
Consignee: '',
Mobile: '',
Province: '',
City: '',
District: '',
ShoppingAddress: '',
},
shMsgrule: {
Province: [{
required: true,
message: '请选择省',
trigger: 'change'
}],
ShoppingAddress: [{
required: true,
message: '请输入详细地址',
trigger: 'blur'
}],
Mobile: [{
required: true,
message: '请输入手机号',
trigger: 'blur'
}],
Consignee: [{
required: true,
message: '请输入收件人',
trigger: 'blur'
}],
},
dkMsg:{},
dkDig:false,
dkMsg: {},
dkDig: false,
fhrules: {
ExpressId: [{
required: true,
......@@ -502,24 +500,24 @@ export default {
},
fahuoList: [],
fhDig: false,
ExpressList:[],
SetOrderMsg:{
ReOrderId:0,
Type:0,
DeliveryId:'',
ExpressList: [],
SetOrderMsg: {
ReOrderId: 0,
Type: 0,
DeliveryId: '',
},
regionMsg:{
pageIndex:1,
pageSize:20,
Name:'',
regionMsg: {
pageIndex: 1,
pageSize: 20,
Name: '',
},
regionshow:false,
regionlist:[],
regiontotal:0,
IsHPSL:false,
regionshow: false,
regionlist: [],
regiontotal: 0,
IsHPSL: false,
}
},
created(){
created() {
this.getList();
this.getplat();
......@@ -530,17 +528,19 @@ export default {
this.getProvince();
this.getExpressInfo();
},
mounted(){},
methods:{
mounted() {},
methods: {
// 卖家收货
shouHuo(item){
let that=this;
shouHuo(item) {
let that = this;
that.$confirm("确认收货？", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/SetOrderReceivingForReturnsAndRefunds',{ReOrderId:item.ReOrderId},
this.apipost('/api/order/SetOrderReceivingForReturnsAndRefunds', {
ReOrderId: item.ReOrderId
},
res => {
if (res.data.resultCode === 1) {
this.getList();
......@@ -603,32 +603,31 @@ export default {
}
});
},
TableSelectChange(val){},
TableSelectChange(val) {},
// 发货
fhOpenDig(item){
this.fhMsg.AfterSaleOrderId=item.ReOrderId;
this.fahuoList=[];
item.OrderDetailModel.ReNumber=item.ReNumber;
fhOpenDig(item) {
this.fhMsg.AfterSaleOrderId = item.ReOrderId;
this.fahuoList = [];
item.OrderDetailModel.ReNumber = item.ReNumber;
this.fahuoList.push(item.OrderDetailModel);
this.fhDig=true;
this.fhDig = true;
},
//审核同意 收货地址选择
agree(item){
this.IsHPSL=false;
let that=this;
this.SetOrderMsg.ReOrderId=item.ReOrderId;
this.SetOrderMsg.Type=1;
agree(item) {
this.IsHPSL = false;
let that = this;
this.SetOrderMsg.ReOrderId = item.ReOrderId;
this.SetOrderMsg.Type = 1;
that.$confirm('同意,是否继续', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if(item.TenantId==29){
this.IsHPSL=true;
if (item.TenantId == 29) {
this.IsHPSL = true;
this.regionsubmitForm();
}
else{
this.regionshow=true;
} else {
this.regionshow = true;
this.getLogisticsDeliveryPage()
}
......@@ -639,7 +638,7 @@ export default {
},
//收货地址的列表
getLogisticsDeliveryPage(){
getLogisticsDeliveryPage() {
this.apipost("/api/MallBase/GetLogisticsDeliveryPage", this.regionMsg, res => {
if (res.data.resultCode == 1) {
this.regionlist = res.data.data.pageData;
......@@ -649,23 +648,19 @@ export default {
}
})
},
handleCurrentChangere(val){
handleCurrentChangere(val) {
this.regionMsg.pageIndex = val;
this.getLogisticsDeliveryPage();
},
regionsubmitForm(){
console.log("this.IsHPSL",this.IsHPSL);
if(this.SetOrderMsg.DeliveryId==''&&this.IsHPSL==false){
regionsubmitForm() {
if (this.SetOrderMsg.DeliveryId == '' && this.IsHPSL == false) {
this.Error('请选择收货地址');
return false
}
this.apipost('/api/order/SetOrderAfterSaleAudit',this.SetOrderMsg,
this.apipost('/api/order/SetOrderAfterSaleAudit', this.SetOrderMsg,
res => {
if (res.data.resultCode === 1) {
this.regionshow=false
this.regionshow = false
this.regionMsg.pageIndex = 1;
this.getList();
this.Success(res.data.message)
......@@ -678,21 +673,17 @@ export default {
},
// 售后订单审核
setOrder(item){
this.SetOrderMsg.ReOrderId=item.ReOrderId;
this.SetOrderMsg.Type=2;
this.SetOrderMsg.DeliveryId='';
let that=this;
// if(num==1){
// str="同意,是否继续";
// }
setOrder(item) {
this.SetOrderMsg.ReOrderId = item.ReOrderId;
this.SetOrderMsg.Type = 2;
this.SetOrderMsg.DeliveryId = '';
let that = this;
that.$confirm('拒绝,是否继续', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/SetOrderAfterSaleAudit',this.SetOrderMsg,
this.apipost('/api/order/SetOrderAfterSaleAudit', this.SetOrderMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
......@@ -708,18 +699,18 @@ export default {
});
},
SaleForRefunds(){
this.loading=true
this.apipost('/api/order/SetOrderAfterSaleForRefunds',this.dkMsg,
SaleForRefunds() {
this.loading = true
this.apipost('/api/order/SetOrderAfterSaleForRefunds', this.dkMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
this.dkDig=false;
this.loading=false
this.dkDig = false;
this.loading = false
} else {
this.Error(res.data.message);
this.loading=false
this.loading = false
}
},
......@@ -729,99 +720,99 @@ export default {
},
// 打款
dkOpenDig(item){
this.dkMsg={
Refund:item.Refund,
ReOrderId:item.ReOrderId
dkOpenDig(item) {
this.dkMsg = {
Refund: item.Refund,
ReOrderId: item.ReOrderId
};
this.dkDig=true;
this.dkDig = true;
},
// 修改收货地址
ExitshAdress(item){
this.shDig=true;
this.shMsg={
OrderId:item.OrderId,
Consignee:item.Consignee,
Mobile:item.Mobile,
Province:item.Province,
City:item.City,
District:item.District,
ShoppingAddress:item.ShoppingAddress,
ExitshAdress(item) {
this.shDig = true;
this.shMsg = {
OrderId: item.OrderId,
Consignee: item.Consignee,
Mobile: item.Mobile,
Province: item.Province,
City: item.City,
District: item.District,
ShoppingAddress: item.ShoppingAddress,
}
this.getCity(item.Province);
this.getArea(item.City);
},
ChangeId(val){
let msgVal=this.msgVal;
if(val==1){
this.msg.ReOrderNo=msgVal;
this.msg.OrderNo='';
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile='';
}
if(val==2){
this.msg.ReOrderNo='';
this.msg.OrderNo=msgVal;
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile='';
}
if(val==3){
this.msg.ReOrderNo='';
this.msg.OrderNo='';
this.msg.UserName=msgVal;
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile='';
}
if(val==4){
this.msg.ReOrderNo='';
this.msg.OrderNo='';
this.msg.UserName='';
this.msg.UserId=msgVal;
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile='';
}
if(val==5){
this.msg.ReOrderNo='';
this.msg.OrderNo='';
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName=msgVal;
this.msg.Consignee='';
this.msg.Mobile='';
}
if(val==6){
this.msg.ReOrderNo='';
this.msg.OrderNo='';
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee=msgVal;
this.msg.Mobile='';
}
if(val==7){
this.msg.ReOrderNo='';
this.msg.OrderNo='';
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile=msgVal;
ChangeId(val) {
let msgVal = this.msgVal;
if (val == 1) {
this.msg.ReOrderNo = msgVal;
this.msg.OrderNo = '';
this.msg.UserName = '';
this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = '';
this.msg.Mobile = '';
}
if (val == 2) {
this.msg.ReOrderNo = '';
this.msg.OrderNo = msgVal;
this.msg.UserName = '';
this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = '';
this.msg.Mobile = '';
}
if (val == 3) {
this.msg.ReOrderNo = '';
this.msg.OrderNo = '';
this.msg.UserName = msgVal;
this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = '';
this.msg.Mobile = '';
}
if (val == 4) {
this.msg.ReOrderNo = '';
this.msg.OrderNo = '';
this.msg.UserName = '';
this.msg.UserId = msgVal;
this.msg.GoodsName = '';
this.msg.Consignee = '';
this.msg.Mobile = '';
}
if (val == 5) {
this.msg.ReOrderNo = '';
this.msg.OrderNo = '';
this.msg.UserName = '';
this.msg.UserId = '';
this.msg.GoodsName = msgVal;
this.msg.Consignee = '';
this.msg.Mobile = '';
}
if (val == 6) {
this.msg.ReOrderNo = '';
this.msg.OrderNo = '';
this.msg.UserName = '';
this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = msgVal;
this.msg.Mobile = '';
}
if (val == 7) {
this.msg.ReOrderNo = '';
this.msg.OrderNo = '';
this.msg.UserName = '';
this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = '';
this.msg.Mobile = msgVal;
}
// this.getList();
},
Export(){
this.msg.ExcelEnumIds=this.checkedCities;
Export() {
this.msg.ExcelEnumIds = this.checkedCities;
let msg = JSON.parse(JSON.stringify(this.msg));
this.GetLocalFile(
"/api/order/GetGoodsOrderAfterListToExcel",
......@@ -829,12 +820,12 @@ export default {
"售后订单.xls"
);
},
getDown(){
this.cityOptions=[];
this.apipost("/api/order/GetOrderAfterSaleExportEnumList",{}, res => {
this.cities=res.data.data;
let data=res.data.data;
data.forEach(item=>{
getDown() {
this.cityOptions = [];
this.apipost("/api/order/GetOrderAfterSaleExportEnumList", {}, res => {
this.cities = res.data.data;
let data = res.data.data;
data.forEach(item => {
this.cityOptions.push(item.Id)
})
......@@ -849,39 +840,39 @@ export default {
this.checkAll = checkedCount === this.cities.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.cities.length;
},
handleClick(val){
let dataId=val.$attrs.dataId;
this.msg.SelectStatus=dataId;
this.msg.pageIndex=1
handleClick(val) {
let dataId = val.$attrs.dataId;
this.msg.SelectStatus = dataId;
this.msg.pageIndex = 1
this.getList();
},
getList(){
getList() {
this.ChangeId(this.msgId)
if(!this.msgVal || this.msgVal==''){
this.msg.ReOrderNo='';
this.msg.OrderNo='';
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile='';
}
if(this.dateList && this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}else{
this.msg.StartTime='';
this.msg.EndTime='';
}
this.loading=true;
if (!this.msgVal || this.msgVal == '') {
this.msg.ReOrderNo = '';
this.msg.OrderNo = '';
this.msg.UserName = '';
this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = '';
this.msg.Mobile = '';
}
if (this.dateList && this.dateList.length > 0) {
this.msg.StartTime = this.dateList[0];
this.msg.EndTime = this.dateList[1];
} else {
this.msg.StartTime = '';
this.msg.EndTime = '';
}
this.loading = true;
this.apipost("/api/order/GetGoodsOrderAfterPageList", this.msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.total=res.data.data.count;
let pageData=res.data.data.pageData;
this.tableData=pageData;
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
let pageData = res.data.data.pageData;
this.tableData = pageData;
}
})
......@@ -891,44 +882,50 @@ export default {
this.msg.pageIndex = val;
this.getList();
},
getOrderStatus(){
this.apipost("/api/order/GetOrderStatusEnumList",{}, res => {
this.orderStatusList=res.data.data;
getOrderStatus() {
this.apipost("/api/order/GetOrderStatusEnumList", {}, res => {
this.orderStatusList = res.data.data;
})
},
getDelivery(){
this.apipost("/api/order/GetOrderDeliveryMethodEnumList",{}, res => {
this.deliveryList=res.data.data;
getDelivery() {
this.apipost("/api/order/GetOrderDeliveryMethodEnumList", {}, res => {
this.deliveryList = res.data.data;
})
},
getOrderType(){
this.apipost("/api/order/GetAfterSaleSelectStatusEnumList",{}, res => {
this.orderTypeList=res.data.data;
getOrderType() {
this.apipost("/api/order/GetAfterSaleSelectStatusEnumList", {}, res => {
this.orderTypeList = res.data.data;
})
},
getplat(){
this.apipost("/api/user/GetMemberUserSourceEnumList",{}, res => {
this.platList=res.data.data;
getplat() {
this.apipost("/api/user/GetMemberUserSourceEnumList", {}, res => {
this.platList = res.data.data;
})
},
getArea(val){
this.apipost("/api/Destination/GetChildList",{Id:val}, res => {
this.areaList=res.data.data;
getArea(val) {
this.apipost("/api/Destination/GetChildList", {
Id: val
}, res => {
this.areaList = res.data.data;
})
},
getCity(val){
this.apipost("/api/Destination/GetChildList",{Id:val}, res => {
this.cityList=res.data.data;
if(this.cityList.length>0){
getCity(val) {
this.apipost("/api/Destination/GetChildList", {
Id: val
}, res => {
this.cityList = res.data.data;
if (this.cityList.length > 0) {
this.getArea(this.cityList[0].ID)
}
})
},
getProvince(){
this.apipost("/api/Destination/GetChildList",{Id:1}, res => {
this.provinceList=res.data.data;
if(this.provinceList.length>0){
getProvince() {
this.apipost("/api/Destination/GetChildList", {
Id: 1
}, res => {
this.provinceList = res.data.data;
if (this.provinceList.length > 0) {
this.getCity(this.provinceList[0].ID)
}
})
......@@ -945,90 +942,110 @@ export default {
},
},
};
};
</script>
<style>
.orderList .pendSelect .el-input {
.orderList .pendSelect .el-input {
width: 100px;
}
.hszDigClass .el-dialog__body{
}
.hszDigClass .el-dialog__body {
padding: 0 10px 20px 0;
}
.sendDigClass .el-dialog__body{
}
.sendDigClass .el-dialog__body {
padding: 0 10px 10px 0;
}
.app-order-list .card-footer .seller-remark {
}
.app-order-list .card-footer .seller-remark {
margin-top: 10px;
color: #E6A23C;
}
.app-send .el-table__header-wrapper th {
}
.app-send .el-table__header-wrapper th {
background-color: #f5f7fa;
}
.app-send .title-box .text {
}
.app-send .title-box .text {
background-color: #FEFAEF;
color: #E6A23C;
padding: 6px;
}
.app-send .title-box {
}
.app-send .title-box {
margin: 15px 0;
}
.app-order-list .app-order-item .el-button {
}
.app-order-list .app-order-item .el-button {
padding: 0;
}
.app-order-list .card-footer .address-box {
}
.app-order-list .card-footer .address-box {
margin-right: 10px;
}
.app-order-list .card-footer {
}
.app-order-list .card-footer {
background: #F3F5F6;
padding: 10px 20px;
}
.app-order-list .app-order-info > div {
}
.app-order-list .app-order-info>div {
width: 100%;
}
.app-order-icon {
}
.app-order-icon {
margin-right: 5%;
margin-bottom: 10px;
cursor: pointer;
}
.app-order-body {
}
.app-order-body {
display: flex;
flex-wrap: nowrap;
}
.app-order-list .app-order-info {
}
.app-order-list .app-order-info {
display: flex;
align-items: center;
width: 15%;
text-align: center;
border-right: 1px solid #EBEEF5;
justify-content: center;
}
.app-order-list .el-card__body {
}
.app-order-list .el-card__body {
padding: 0;
}
.app-order-list .express-price {
}
.app-order-list .express-price {
height: 30px;
line-height: 30px;
}
.app-order-list .goods-item {
}
.app-order-list .goods-item {
border-right: 1px solid #EBEEF5;
}
.app-order-list .app-order-info {
}
.app-order-list .app-order-info {
display: flex;
align-items: center;
width: 15%;
text-align: center;
border-right: 1px solid #EBEEF5;
}
.app-order-list .goods-item .goods .app-order-goods-price {
}
.app-order-list .goods-item .goods .app-order-goods-price {
height: 24px;
margin-top: 10px;
position: absolute;
bottom: 20px;
left: 125px;
}
.app-order-list .goods-item .goods-info .goods-name {
}
.app-order-list .goods-item .goods-info .goods-name {
margin-bottom: 5px;
word-break: break-all;
text-overflow: ellipsis;
......@@ -1036,92 +1053,110 @@ export default {
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.app-order-list .goods-item .goods-info {
}
.app-order-list .goods-item .goods-info {
width: 50%;
margin-top: 5px;
}
.app-order-list .goods-image {
}
.app-order-list .goods-image {
height: 90px;
width: 90px;
margin-right: 15px;
float: left;
}
.app-order-list .goods-item .goods {
}
.app-order-list .goods-item .goods {
position: relative;
padding: 20px;
min-height: 130px;
border-top: 1px solid #EBEEF5;
}
.app-order-list .goods-item .goods:first-of-type {
}
.app-order-list .goods-item .goods:first-of-type {
border-top: 0;
}
.orderList .app-order-list .app-order-item:hover .app-order-btnimg{
}
.orderList .app-order-list .app-order-item:hover .app-order-btnimg {
display: block;
}
.orderList .app-order-list .app-order-item:hover{
}
.orderList .app-order-list .app-order-item:hover {
border: 1px solid #3399FF;
}
.orderList .app-order-btnimg {
}
.orderList .app-order-btnimg {
position: absolute;
top: 20px;
right:25px;
right: 25px;
color: #7C868D;
font-size: 18px;
padding: 0;
display: none;
}
.orderList .app-order-offline {
}
.orderList .app-order-offline {
margin-left: 30px;
margin-top: -2px;
}
.orderList .app-order-user img {
}
.orderList .app-order-user img {
height: 20px;
width: 20px;
display: block;
float: left;
border-radius: 50%;
margin-right: 10px;
}
.orderList .app-order-list .app-order-time {
}
.orderList .app-order-list .app-order-time {
color: #909399;
}
.orderList .app-order-user {
}
.orderList .app-order-user {
margin-left: 30px;
}
.orderList .app-order-list .app-order-time {
}
.orderList .app-order-list .app-order-time {
color: #909399;
}
.orderList .app-order-list .app-order-item .el-card__header {
}
.orderList .app-order-list .app-order-item .el-card__header {
padding: 0;
}
.orderList .app-order-list .app-order-item {
}
.orderList .app-order-list .app-order-item {
margin-top: 20px;
min-width: 750px;
}
.orderList .app-order-list .app-order-head {
}
.orderList .app-order-list .app-order-head {
padding: 20px;
background-color: #F3F5F6;
color: #303133;
min-width: 750px;
display: flex;
position: relative;
}
.orderList .app-order-title div {
}
.orderList .app-order-title div {
text-align: center;
}
.orderList .app-order-title {
}
.orderList .app-order-title {
background-color: #F3F5F6;
height: 40px;
line-height: 40px;
display: flex;
min-width: 750px;
}
.orderList .content{
}
.orderList .content {
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
}
</style>
src/components/phoneManage/adminList.vue
View file @ 9ecc4e6f
......@@ -188,7 +188,6 @@ export default {
});
},
ChangeListName(val) {
console.log('tag', val)
this.usermsg.Name = val;
this.getUserList();
},
......
src/components/tradePavilion/billboardList.vue
View file @ 9ecc4e6f
......@@ -3,38 +3,18 @@
<div class="head-title">
榜单管理
<div style="float: right; margin-top: 5px">
<el-button
style="float: right; margin-top: -5px"
size="small"
type="primary"
@click="CommonJump('addbillboard')"
>新增
<el-button style="float: right; margin-top: -5px" size="small" type="primary"
@click="CommonJump('addbillboard')">新增
</el-button>
<el-button
style="float: right; margin-top: -5px; margin-right: 10px"
size="small"
type="primary"
:disabled="multipleSelection.length === 0"
@click="downloadMultipleExcel"
>批量下载榜单报名
<el-button style="float: right; margin-top: -5px; margin-right: 10px" size="small" type="primary"
:disabled="multipleSelection.length === 0" @click="downloadMultipleExcel">批量下载榜单报名
</el-button>
<el-button
style="float: right; margin-top: -5px; margin-right: 10px"
size="small"
type="primary"
:disabled="multipleSelection.length === 0"
@click="getDownloadMultiplefujianTag"
:loading="fujianLoading"
v-if="!showfujianbtn"
>{{ fujianText }}
<el-button style="float: right; margin-top: -5px; margin-right: 10px" size="small" type="primary"
:disabled="multipleSelection.length === 0" @click="getDownloadMultiplefujianTag" :loading="fujianLoading"
v-if="!showfujianbtn">{{ fujianText }}
</el-button>
<el-button
style="float: right; margin-top: -5px; margin-right: 10px"
size="small"
type="primary"
@click="downloadFujian"
v-if="showfujianbtn"
>下载附件
<el-button style="float: right; margin-top: -5px; margin-right: 10px" size="small" type="primary"
@click="downloadFujian" v-if="showfujianbtn">下载附件
</el-button>
</div>
</div>
......@@ -42,119 +22,60 @@
<div>
<span style="margin-left: 10px">主办方</span>
<div class="searchInput" style="width: 250px">
<el-input
@keyup.enter.native="(msg.pageIndex = 1), getList()"
@clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px"
placeholder="主办方"
v-model="msg.Sponsor"
size="small"
clearable
>
<el-input @keyup.enter.native="(msg.pageIndex = 1), getList()" @clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px" placeholder="主办方" v-model="msg.Sponsor"
size="small" clearable>
</el-input>
<span
@click="(msg.pageIndex = 1), getList()"
class="el-icon-search"
style="
<span @click="(msg.pageIndex = 1), getList()" class="el-icon-search" style="
color: #979dad;
font-size: 14px;
position: relative;
top: 1px;
"
></span>
"></span>
</div>
<span style="margin-left: 10px">榜单名称</span>
<div class="searchInput" style="width: 250px">
<el-input
@keyup.enter.native="(msg.pageIndex = 1), getList()"
@clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px"
placeholder="榜单名称"
v-model="msg.ListName"
size="small"
clearable
>
<el-input @keyup.enter.native="(msg.pageIndex = 1), getList()" @clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px" placeholder="榜单名称" v-model="msg.ListName"
size="small" clearable>
</el-input>
<span
@click="(msg.pageIndex = 1), getList()"
class="el-icon-search"
style="
<span @click="(msg.pageIndex = 1), getList()" class="el-icon-search" style="
color: #979dad;
font-size: 14px;
position: relative;
top: 1px;
"
></span>
"></span>
</div>
<span style="margin-left: 10px">榜单类型</span>
<el-select
size="small"
v-model="msg.ListType"
filterable
@change="(msg.pageIndex = 1), getList()"
placeholder="请选择"
>
<el-select size="small" v-model="msg.ListType" filterable @change="(msg.pageIndex = 1), getList()"
placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option
v-for="item in ListType"
:key="item.Id"
:label="item.Name"
:value="item.Id"
>
<el-option v-for="item in ListType" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<span style="margin-left: 10px">面向群体</span>
<el-select
size="small"
v-model="msg.ObjectTypeId"
filterable
@change="(msg.pageIndex = 1), getList()"
placeholder="请选择"
>
<el-select size="small" v-model="msg.ObjectTypeId" filterable @change="(msg.pageIndex = 1), getList()"
placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option
v-for="item in ListObjectType"
:key="item.Id"
:label="item.Name"
:value="item.Id"
>
<el-option v-for="item in ListObjectType" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<span style="margin-left: 10px">榜单状态</span>
<el-select
size="small"
v-model="msg.ListState"
filterable
@change="(msg.pageIndex = 1), getList()"
placeholder="请选择"
>
<el-select size="small" v-model="msg.ListState" filterable @change="(msg.pageIndex = 1), getList()"
placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option
v-for="item in ListState"
:key="item.Id"
:label="item.Name"
:value="item.Id"
>
<el-option v-for="item in ListState" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</div>
<el-table
:data="tableData"
v-loading="loading"
border
style="width: 100%; margin: 20px 0"
@selection-change="handleSelectionChange"
>
<el-table :data="tableData" v-loading="loading" border style="width: 100%; margin: 20px 0"
@selection-change="handleSelectionChange">
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="UserName" label="榜单信息" width="200">
<template slot-scope="scope">
<el-image
class="app-image"
:src="scope.row.CoverImage"
:preview-src-list="[scope.row.CoverImage]"
>
<el-image class="app-image" :src="scope.row.CoverImage" :preview-src-list="[scope.row.CoverImage]">
</el-image>
<div flex="dir:left cross:center">
{{ scope.row.ListName }}
......@@ -167,10 +88,8 @@
</el-table-column>
<el-table-column prop="ObjectTypeList" label="面向群体">
<template slot-scope="scope">
<span v-for="(x, y) in scope.row.ObjectTypeList"
>{{ x
}}{{ scope.row.ObjectTypeList.length - 1 == y ? "" : "、" }}</span
>
<span v-for="(x, y) in scope.row.ObjectTypeList">{{ x
}}{{ scope.row.ObjectTypeList.length - 1 == y ? "" : "、" }}</span>
</template>
</el-table-column>
<el-table-column prop="DeadlineDate" label="报名时间">
......@@ -182,9 +101,7 @@
<el-table-column prop="FinishDate" label="公示日期"> </el-table-column>
<el-table-column prop="EnableRank" label="是否启用排名">
<template slot-scope="scope">
<span v-if="scope.row.EnableRank == 1" style="color: green"
>启用</span
>
<span v-if="scope.row.EnableRank == 1" style="color: green">启用</span>
<span v-else style="color: #e95252">不启用</span>
</template>
</el-table-column>
......@@ -193,134 +110,53 @@
<el-table-column label="操作" width="260">
<template slot-scope="scope">
<div style="height: 32px; display: flex; align-items: center">
<el-tooltip
class="item"
effect="dark"
content="报名列表"
placement="top"
style="margin: 0 5px"
>
<img
src="../../assets/img/userman/baoming.png"
alt=""
class="imgstyle"
@click="getItem(scope.row)"
/>
<el-tooltip class="item" effect="dark" content="报名列表" placement="top" style="margin: 0 5px">
<img src="../../assets/img/userman/baoming.png" alt="" class="imgstyle" @click="getItem(scope.row)" />
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="编辑"
placement="top"
style="margin: 0 5px"
v-if="
<el-tooltip class="item" effect="dark" content="编辑" placement="top" style="margin: 0 5px" v-if="
scope.row.ListState == 5 ||
scope.row.ListState == 1 ||
scope.row.ListState === 4
"
>
<img
src="../../assets/img/setup/edit.png"
alt=""
class="imgstyle"
@click="EditgoUrl(scope.row)"
/>
">
<img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="EditgoUrl(scope.row)" />
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="删除"
placement="top"
style="margin: 0 5px"
v-if="scope.row.ListState === 5 || scope.row.ListState === 4"
>
<img
src="../../assets/img/setup/del.png"
alt=""
class="imgstyle"
@click="delete_b(scope.row)"
/>
<el-tooltip class="item" effect="dark" content="删除" placement="top" style="margin: 0 5px"
v-if="scope.row.ListState === 5 || scope.row.ListState === 4">
<img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(scope.row)" />
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="放榜"
placement="top"
style="margin: 0 5px"
v-if="scope.row.ListState === 2"
>
<img
src="../../assets/img/userman/bangdan1.png"
alt=""
class="imgstyle"
@click="fangbang(scope.row)"
/>
<el-tooltip class="item" effect="dark" content="放榜" placement="top" style="margin: 0 5px"
v-if="scope.row.ListState === 2">
<img src="../../assets/img/userman/bangdan1.png" alt="" class="imgstyle" @click="fangbang(scope.row)" />
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="放榜详情"
placement="top"
style="margin: 0 5px"
v-if="scope.row.ListState === 3"
>
<img
src="../../assets/img/userman/bangdan2.png"
alt=""
class="imgstyle"
@click="fangbangDetail(scope.row)"
/>
<el-tooltip class="item" effect="dark" content="放榜详情" placement="top" style="margin: 0 5px"
v-if="scope.row.ListState === 3">
<img src="../../assets/img/userman/bangdan2.png" alt="" class="imgstyle"
@click="fangbangDetail(scope.row)" />
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="下载榜单报名"
placement="top"
style="margin: 0 5px"
>
<img
src="../../assets/img/userman/status_1_active.png"
alt=""
class="imgstyle"
@click="downloadSingerExcel(scope.row)"
/>
<el-tooltip class="item" effect="dark" content="下载榜单报名" placement="top" style="margin: 0 5px">
<img src="../../assets/img/userman/status_1_active.png" alt="" class="imgstyle"
@click="downloadSingerExcel(scope.row)" />
</el-tooltip>
</div>
</template>
</el-table-column>
</el-table>
<el-pagination
style="text-align: right"
background
:current-page.sync="msg.pageIndex"
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
:page-sizes="[15, 30, 45, 60, 75, 90]"
:page-size="msg.pageSize"
layout="sizes,total,prev, pager, next"
:total="total"
>
<el-pagination style="text-align: right" background :current-page.sync="msg.pageIndex"
@current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[15, 30, 45, 60, 75, 90]"
:page-size="msg.pageSize" layout="sizes,total,prev, pager, next" :total="total">
</el-pagination>
</div>
<!-- 报名人数的展示 -->
<el-dialog title="报名信息" :visible.sync="dialogTableVisible">
<el-table :data="joinData">
<el-table-column
property="LinkMan"
label="联系人"
width="150"
></el-table-column>
<el-table-column
property="LinkTel"
label="联系电话"
width="200"
></el-table-column>
<el-table-column property="LinkMan" label="联系人" width="150"></el-table-column>
<el-table-column property="LinkTel" label="联系电话" width="200"></el-table-column>
</el-table>
</el-dialog>
</div>
</template>
<script>
export default {
export default {
data() {
return {
loading: false,
......@@ -403,14 +239,12 @@ export default {
handleSizeChange(val) {
this.msg.pageSize = val;
this.getList();
console.log(`每页 ${val} 条`);
},
delete_b(row) {
let that = this;
that.Confirm("是否删除?", function () {
that.apipost(
"/api/Trade/DelFistShopPrizeListInfo",
{
"/api/Trade/DelFistShopPrizeListInfo", {
ListId: row.Id,
},
(res) => {
......@@ -484,8 +318,7 @@ export default {
// 导出单个excel
downloadSingerExcel(item) {
this.GetLocalFile(
"/api/Trade/GetFirstShopListEnrollToExcel",
{
"/api/Trade/GetFirstShopListEnrollToExcel", {
ListId: item.Id,
},
"榜单报名列表.xls"
......@@ -498,8 +331,7 @@ export default {
downloadMultipleExcel() {
let ids = this.multipleSelection.map((e) => e.Id).toString();
this.GetLocalFile(
"/api/Trade/GetFirstShopMoreListEnrollToExcel",
{
"/api/Trade/GetFirstShopMoreListEnrollToExcel", {
ListIds: ids,
},
"批量下载榜单报名列表.xls"
......@@ -511,8 +343,7 @@ export default {
this.fujianLoading = true;
let ids = this.multipleSelection.map((e) => e.Id).toString();
this.apipost(
"/api/Trade/GetNewFirstShopEnrollZipExport",
{
"/api/Trade/GetNewFirstShopEnrollZipExport", {
ListIds: ids,
},
(res) => {
......@@ -523,7 +354,6 @@ export default {
clearInterval(this.timer);
this.timer = setInterval(() => {
setTimeout(() => {
console.log("轮询中");
that.downloadMultiplefujian(res.data.data);
}, 0);
}, 10000);
......@@ -538,8 +368,7 @@ export default {
// 获取附件url
downloadMultiplefujian(tag) {
this.apipost(
"/api/Trade/GetFirstShopEnrollResultUrl",
{
"/api/Trade/GetFirstShopEnrollResultUrl", {
UserFlag: tag,
},
(res) => {
......@@ -586,8 +415,7 @@ export default {
//删除附件
delDownloadMultiplefujian(url) {
this.apipost(
"/api/Trade/DelFirstShopEnrollZipExport",
{
"/api/Trade/DelFirstShopEnrollZipExport", {
Url: url,
},
(res) => {
......@@ -611,31 +439,32 @@ export default {
this.showfujianbtn = true;
}
},
};
};
</script>
<style>
.billboardList .content .searchInput {
.billboardList .content .searchInput {
border: 1px solid #dcdfe6;
border-radius: 4px;
}
}
.billboardList .app-image {
.billboardList .app-image {
background-position: center center;
width: 50px;
height: 50px;
border-radius: 0%;
float: left;
margin-right: 8px;
}
}
.billboardList .content .searchInput .el-input__inner {
.billboardList .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
}
.billboardList .content .searchInput {
.billboardList .content .searchInput {
line-height: normal;
display: inline-table;
width: 100%;
......@@ -643,21 +472,23 @@ export default {
border-spacing: 0;
width: 250px;
margin-right: 20px;
}
}
.billboardList .content {
.billboardList .content {
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
}
.el-icon-arrow-down {
.el-icon-arrow-down {
font-size: 12px;
}
.imgstyle {
}
.imgstyle {
width: 24px;
height: 24px;
object-fit: cover;
}
}
</style>
src/components/tradePavilion/listRegistration.vue
View file @ 9ecc4e6f
......@@ -203,7 +203,7 @@
</div>
</template>
<script>
export default {
export default {
data() {
return {
loading: false,
......@@ -300,13 +300,15 @@ export default {
.then(() => {
that.setFirstShop(row.Id, 1);
})
.catch(() => { });
.catch(() => {});
},
setFirstShop(id, type) {
let that = this;
that.apipost(
"/api/Trade/SetFirstShopEnrollState",
{ EnrollId: id, Type: type },
"/api/Trade/SetFirstShopEnrollState", {
EnrollId: id,
Type: type
},
(res) => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
......@@ -330,7 +332,7 @@ export default {
.then(() => {
that.setFirstShop(row.Id, 2);
})
.catch(() => { });
.catch(() => {});
},
delete_b(row) {
let that = this;
......@@ -343,14 +345,13 @@ export default {
.then(() => {
that.setFirstShop(row.Id, 3);
})
.catch(() => { });
.catch(() => {});
},
EditgoUrl() { },
EditgoUrl() {},
seeDetail(row) {
this.detailDialog = true;
let data = JSON.parse(row.Content);
this.seeData = data;
console.log(data);
},
getOptionValue(row) {
let value = row.OptionValue;
......@@ -386,39 +387,39 @@ export default {
) {
this.previewPDF(Url);
} else {
console.log(FilePath);
window.open(
"https://view.officeapps.live.com/op/view.aspx?src=" + FilePath
);
}
},
},
mounted() { },
};
mounted() {},
};
</script>
<style>
.listRegistration .content .searchInput {
.listRegistration .content .searchInput {
border: 1px solid #dcdfe6;
border-radius: 4px;
}
}
.listRegistration .app-image {
.listRegistration .app-image {
background-position: center center;
width: 50px;
height: 50px;
border-radius: 0%;
float: left;
margin-right: 8px;
}
}
.listRegistration .content .searchInput .el-input__inner {
.listRegistration .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
}
.listRegistration .content .searchInput {
.listRegistration .content .searchInput {
line-height: normal;
display: inline-table;
width: 100%;
......@@ -426,12 +427,13 @@ export default {
border-spacing: 0;
width: 250px;
margin-right: 20px;
}
}
.listRegistration .content {
.listRegistration .content {
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
}
</style>
src/components/tradePavilion/signList.vue
View file @ 9ecc4e6f
......@@ -438,11 +438,9 @@ export default {
// 详情
seeDetail(row, UserName, item) {
this.detailDialog = true;
// let data = JSON.parse(row.Content);
this.seeData = row;
this.UserName = UserName
this.information = item
console.log('llllllllllllllllllllll', row);
},
ChangeListName(val) {
this.usermsg.Name = val;
......
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