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