Skip to content

E
ElectricitySheep
Commit 6ad24911 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent e840fc26
Show whitespace changes
Inline Side-by-side
Showing with 1010 additions and 273 deletions
src/components/CommodityMan/materialMan.vue
View file @ 6ad24911
......@@ -103,6 +103,7 @@
<div class="material-item material-upload">
<div class="app-upload" flex="main:center cross:center" style="width: 140px; height: 140px;">
<el-upload class="avatar-uploader" action=""
:before-upload="beforeAvatarUpload"
accept="video/mp4,video/ogg,video/webm"
:show-file-list="false" :http-request="UploadImage">
<i class="el-icon-upload"></i>
......@@ -112,7 +113,7 @@
<el-tooltip v-for="(item,index) in PageList" :key="index" class="item" effect="dark" :content="item.Name" placement="top-start">
<div @click="PageSelect(item,index)" :class="item.Selected ? 'selected' :''" class="el-tooltip item material-item ">
<img :src="'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com'+item.Path+'?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast'" class="material-img" style="width: 140px; height: 140px;">
<div class="material-video-info"><i class="el-icon-video-play"></i> <span>{{item.VideoTime}}</span></div>
<div class="material-video-info"><i class="el-icon-video-play"></i> <span>{{Time(item.VideoTime)}}</span></div>
<div flex="dir:left" style="margin-top: 5px;">
<div class="material-name">{{item.Name}}</div>
<div style="margin: 0px 5px;">|</div>
......@@ -144,7 +145,10 @@
</div>
</div>
<input type="text" ref="dur" name='0'/>
<video style="display:none;" controls="controls" id="aa" oncanplaythrough="myFunction(this)">
</video>
</div>
<!-- 新增分组 -->
<el-dialog title="分组管理" :visible.sync="addGroupMsgDig" width="400px">
......@@ -266,6 +270,34 @@ export default {
},
methods:{
Time(value){
var theTime = parseInt(value);// 秒
    var middle= 0;// 分
    var hour= 0;// 小时
    if(theTime > 60) {
        middle= parseInt(theTime/60);
        theTime = parseInt(theTime%60);
        if(middle> 60) {
            hour= parseInt(middle/60);
            middle= parseInt(middle%60);
        }
    }
    var result = ""+parseInt(theTime);
if(theTime<10){
result="0"+parseInt(theTime);
}
    if(middle > 0) {
        result = ""+parseInt(middle)+":"+result;
    }
else{
result = "00:"+result;
}
    if(hour> 0) {
        result = ""+parseInt(hour)+"小时"+result;
    }
    return result;
},
SelectPageId(item){
this.PageList.forEach(item=>{
if(item.Selected){
......@@ -418,13 +450,25 @@ export default {
}
});
},
beforeAvatarUpload(file) {
this.getTimes(file); //
},
getTimes(file) { //获取时长
var content = file;
var url = URL.createObjectURL(content);
//经测试，发现audio也可获取视频的时长
var audioElement = new Audio(url);
audioElement.addEventListener("loadedmetadata", (_event) => {
this.audioDuration = parseInt(audioElement.duration);
this.addpageMsg.VideoTime=this.audioDuration;
});
},
UploadImage(file) {
this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => {
if (res.resultCode == 1) {
if(this.addpageMsg.Type==2){
this.addpageMsg.Image = res.FileUrl;
}
console.log(" this.addpageMsg.Image", this.addpageMsg.Image)
this.addpageMsg.Path = res.FileUrl;
this.addpageMsg.Name = res.FileName;
this.addPageList();
......
src/components/UserMan/MembersBuy.vue
View file @ 6ad24911
......@@ -9,7 +9,7 @@
<div>
<el-date-picker
size="small"
v-model="value"
v-model="dateList"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
......@@ -18,11 +18,12 @@
<div style="margin-left:20px" class="searchInput">
<el-input style="display:inline-block;width:225px;height:30px"
placeholder="请输入内容"
v-model="value"
v-model="msg.UserName"
size="small"
@clear="getList"
clearable>
</el-input>
<span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
<span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
</div>
<el-table v-loading="loading"
......@@ -30,45 +31,34 @@
border
style="width: 100%;margin:20px 0">
<el-table-column
prop="ID"
prop="OrderId"
width="80"
label="ID">
</el-table-column>
<el-table-column
prop="address"
prop="OrderNo"
width="280"
label="订单号">
<template slot-scope="scope">
<div class="app-image" style="background-image: url('https://wx.qlogo.cn/mmopen/vi_32/HO8Q9ibH7UtSFzHs67f0MH6VWjftiboELYLBya5OxpZkHDlicLMq39gxRHS4NhOG1AUepQ13JdUyrT7eM52u6hAsg/132');
background-size: cover; background-position: center center; width: 50px; height: 50px; border-radius: 0%; float: left; margin-right: 8px;"></div>
<div flex="dir:left cross:center">易飞易&港中旅小李15351281772</div>
<img style="width:24px;height:24px" src="../../assets/img/userman/wx.png" alt="" class="platform-img">
<button type="button" class="el-button el-button--success" style="float: right; padding: 5px !important;">
<span>显示OpenId</span>
</button>
<div>ow_7I5dE_g9Fe1BuBPKdk8RNtEj0</div>
</template>
</el-table-column>
<el-table-column
prop="name"
prop="UserName"
label="昵称">
</el-table-column>
<el-table-column
prop="name"
prop="Income"
label="支付金额">
</el-table-column>
<el-table-column
prop="name"
label="购买情况">
<template slot-scope="scope">
<span class="blue">0</span>
<p>支付方式：{{scope.row.PaymentWayName}}</p>
<p>订单状态：{{scope.row.OrderStatusName}}</p>
</template>
</el-table-column>
<el-table-column
prop="name"
prop="PaymentTime"
label="支付时间">
<template slot-scope="scope">
<span class="blue">0</span>
</template>
</el-table-column>
</el-table>
......@@ -92,13 +82,13 @@
<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" v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox>
<el-checkbox style="margin-bottom:10px" v-for="city in cities" :label="city.Id" :key="city.Id">{{city.Name}}</el-checkbox>
</el-checkbox-group>
</div>
</el-form>
<div style="text-align:right;margin-top:20px">
<el-button size="small" type="primary" @click="dialogVisible = false">导出</el-button>
<el-button size="small" type="primary" @click="Export">导出</el-button>
</div>
</el-dialog>
</div>
......@@ -109,30 +99,55 @@
return {
loading:false,
checkAll: false,
checkedCities: ['上海', '北京'],
cities: ['上海', '北京', '广州', '深圳'],
cityOptions: ['上海', '北京', '广州', '深圳'],
checkedCities: [],
cities: [],
cityOptions: [],
isIndeterminate: true,
addMsg:{},
dialogVisible:false,
value:'',
options:[],
tableData:[
{ID:'111'}
],
tableData:[],
msg:{
pageIndex:1,
pageSize:15,
OrderId:0,
OrderNo:'',
UserName:'',
StartTime:'',
EndTime:'',
},
total:0,
dateList:[],
};
},
created() {
this.getDown();
this.getList();
},
methods: {
Export(){
this.msg.ExcelEnumIds=this.checkedCities;
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
"/api/order/GetMembersToBuyToExcel",
msg,
"会员购买列表.xls"
);
},
getDown(){
this.cityOptions=[];
this.apipost("/api/order/GetMembersToBuyExportEnumList",{}, res => {
this.cities=res.data.data;
let data=res.data.data;
data.forEach(item=>{
this.cityOptions.push(item.Id)
})
})
},
handleCheckAllChange(val) {
this.checkedCities = val ? this.cityOptions : [];
this.isIndeterminate = false;
......@@ -148,6 +163,24 @@
},
getList(){
this.loading=true;
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/GetMembersToBuyPageList", 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;
}
})
},
},
......
src/components/orderMan/orderDetails.vue
View file @ 6ad24911
......@@ -8,26 +8,48 @@
<el-card class="app-order-status" shadow="never">
<el-steps :active="activeStep" align-center>
<el-step title="已下单" icon="el-icon-edit" :description="dataInfo.CreateDate">
<i :class="activeStep==1?'step01Active':'step01'" slot="icon"></i>
<i :class="activeStep>0?'step01Active':'step01'" slot="icon"></i>
</el-step>
<template>
<el-step v-if="dataInfo.PaymentTime==''" title="未付款" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==2?'step02Active':'step02'" slot="icon"></i>
<el-step v-if="dataInfo.PaymentTime=='' && !exitState" title="未付款" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep>1?'step02Active':'step02'" slot="icon"></i>
</el-step>
<el-step v-else title="已付款" icon="el-icon-edit" :description="dataInfo.PaymentTime">
<i :class="activeStep==2?'step02Active':'step02'" slot="icon"></i>
<i :class="activeStep>1?'step02Active':'step02'" slot="icon"></i>
</el-step>
</template>
<el-step title="未发货" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==3?'step03Active':'step03'" slot="icon"></i>
<template v-if="exitState">
<el-step title="已取消" icon="el-icon-edit" :description="dataInfo.CancelTime">
<i class="stepExit" slot="icon"></i>
</el-step>
</template>
<template v-else>
<template>
<el-step v-if="activeStep>2" title="已发货" icon="el-icon-edit" :description="dataInfo.DeliveryTime">
<i :class="activeStep>2?'step03Active':'step03'" slot="icon"></i>
</el-step>
<el-step v-else title="未发货" icon="el-icon-edit" description="">
<i :class="activeStep>2?'step03Active':'step03'" slot="icon"></i>
</el-step>
<el-step v-if="activeStep!=2 && activeStep!=3" title="已收货" icon="el-icon-edit" description="2020-05-13 16:36:11">
</template>
<template>
<el-step v-if="activeStep==3" title="未收货" icon="el-icon-edit">
<i :class="activeStep==4?'step04Active':'step04'" slot="icon"></i>
</el-step>
<el-step title="未结束" icon="el-icon-edit" description="2020-05-13 16:36:11">
<el-step v-else-if="activeStep>3" title="已收货" icon="el-icon-edit" :description="dataInfo.ReceivingTime">
<i :class="activeStep>3?'step04Active':'step04'" slot="icon"></i>
</el-step>
</template>
<template>
<el-step v-if="activeStep>4" title="已结束" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep>4?'step05Active':'step05'" slot="icon"></i>
</el-step>
<el-step v-else title="未结束" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==5?'step05Active':'step05'" slot="icon"></i>
</el-step>
</template>
</template>
</el-steps>
</el-card>
<el-row :gutter="16">
......@@ -65,8 +87,8 @@
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">收货地址:</span>
<div class="express-address">{{dataInfo.OrderInfo.ShippingAddress}}
<button type="button" class="el-button el-button--text el-button--small is-circle">
<div class="express-address">{{dataInfo.OrderInfo.DistrictAddress}} {{dataInfo.OrderInfo.ShippingAddress}}
<button v-if="activeStep==2 || activeStep==3" @click="ExitshAdress(dataInfo.OrderInfo)" type="button" class="el-button el-button--text el-button--small is-circle">
<i class="el-icon-edit"></i>
</button>
</div>
......@@ -83,7 +105,7 @@
</div>
<div flex="dir:left" style="margin-top:10px">
<span class="label">商家留言:</span>
<span></span>
<span>{{OrderInfo.OrderExpressList[0].Remark}}</span>
</div>
</div>
<div v-if="OrderInfo.OrderExpressList.length>1" v-for="(item,index) in OrderInfo.OrderExpressList" :key="index" flex="dir:top" class="item-box">
......@@ -127,8 +149,9 @@
<h3>表单信息</h3>
<div flex="dir:left cross:center" class="item-box" style="flex-shrink: 0;">
<span class="label">商家备注:</span>
<div>库存-1
<i class="el-icon-edit" style="color: rgb(64, 158, 255); cursor: pointer; margin-left: 10px;"></i>
<div>
{{dataInfo.Remark}}
<i v-if="activeStep==2 || activeStep==3" @click="OrderExit" class="el-icon-edit" style="color: rgb(64, 158, 255); cursor: pointer; margin-left: 10px;"></i>
</div>
</div>
</div>
......@@ -223,37 +246,350 @@
</el-form>
</el-card>
<div flex="dir:right" class="action-box">
<el-button style="margin-left: 10px;" size="small" type="primary">打印发货单</el-button>
<el-button v-if="(activeStep==2 || activeStep==3) && !exitState" style="margin-left: 10px;" size="small" type="primary">打印发货单</el-button>
<el-button style="margin-left: 10px;" size="small" type="primary">打印小票</el-button>
<el-button style="margin-left: 10px;" size="small" type="primary">发货</el-button>
<el-button @click="qrEnd(dataInfo)" v-if="activeStep==4 && !exitState" style="margin-left: 10px;" size="small" type="primary">确认完成</el-button>
<el-button @click="ConfirmSh(dataInfo)" v-if="activeStep==3 && !exitState" style="margin-left: 10px;" size="small" type="primary">确认收货</el-button>
<el-button @click="fhBtn(dataInfo)" v-if="activeStep==2 && !exitState" style="margin-left: 10px;" size="small" type="primary">发货</el-button>
</div>
</div>
<!-- 修改收货地址 -->
<el-dialog title="修改收货地址" :visible.sync="shDig" width="600px">
<el-form :model="shMsg" :rules="shMsgrule" ref="shMsg" label-width="80px">
<el-form-item label="收件人" prop="Consignee">
<el-input size="small" v-model="shMsg.Consignee"></el-input>
</el-form-item>
<el-form-item label="电话" prop="Mobile">
<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-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-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>
</el-select>
</el-form-item>
<el-form-item label="详细地址" prop="ShippingAddress">
<el-input size="small" v-model="shMsg.ShippingAddress"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="shDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="shsubmitForm('shMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 订单取消 -->
<el-dialog title="修改" :visible.sync="exitDig" width="600px">
<el-form :model="exitMsg" ref="exitMsg" label-width="0">
<p style="padding:10px 0" v-if="exitMsg.Type==1">修改备注：</p>
<el-form-item>
<el-input type="textarea" row="2" size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="exitDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="submitForm('exitMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 发货 -->
<el-dialog custom-class="app-send" title="发货" :visible.sync="fhDig" width="35%">
<div class="title-box">
<span class="text">选择发货商品</span>
<span>(默认全选)</span>
</div>
<el-table
ref="fahuoTable"
:data="fahuoList"
@selection-change="TableSelectChange"
style="width: 100%">
<el-table-column
:selectable="selectable"
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="id"
label="图片"
width="60">
<template slot-scope="scope">
<img style="width:30px;height:30px" :src="domainManager().ImageUrl+scope.row.CoverImagePath" alt="">
</template>
</el-table-column>
<el-table-column
prop="GoodsName"
label="名称"
width="314">
<template slot-scope="scope">
<el-tag v-if="scope.row.IsBindExpress==1" style="margin-left:5px" size="small" type="success">已发货</el-tag>
<span>{{scope.row.GoodsName}}</span>
</template>
</el-table-column>
<el-table-column
prop="Number"
label="数量"
width="80">
</el-table-column>
<el-table-column
prop="Specification"
label="规格">
</el-table-column>
</el-table>
<div class="title-box"><span class="text">物流信息</span></div>
<el-form :model="fhMsg" ref="exitMsg" :rules="fhrules" label-width="130px">
<el-form-item label="物流快递">
<el-radio v-model="fhMsg.Type" :label="1">快递</el-radio>
<el-radio v-model="fhMsg.Type" :label="2">其他方式</el-radio>
</el-form-item>
<template v-if="fhMsg.Type==1">
<el-form-item label="快递公司" prop="ExpressId">
<el-select class="w200" size="small" v-model="fhMsg.ExpressId" filterable placeholder="请选择">
<el-option
v-for="item in ExpressList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="收件人邮编">
<el-input type="number" min="1" size="small" v-model="fhMsg.PostCode"></el-input>
</el-form-item>
<el-form-item label="快递单号" prop="ExpressNumber">
<el-input size="small" v-model="fhMsg.ExpressNumber">
<!-- <el-button slot="append"> 获取面单</el-button> -->
</el-input>
</el-form-item>
<el-form-item label="商家留言">
<el-input type="textarea" row="2" size="small" v-model="fhMsg.Remark"></el-input>
</el-form-item>
</template>
<template v-if="fhMsg.Type==2">
<el-form-item label="物流内容">
<el-input type="textarea" row="2" size="small" v-model="fhMsg.Remark"></el-input>
</el-form-item>
</template>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="fhDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="FhsubmitForm('fhMsg')">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
activeStep:1,
activeStep:0,
tableData:[
{Id:1}
],
OrderId:0,
dataInfo:{},
OrderInfo:{},
shDig:false,
shMsg:{
OrderId:0,
Consignee:'',
Mobile:'',
Province:'',
City:'',
District:'',
ShippingAddress:'',
},
shMsgrule:{
Province: [
{ required: true, message: '请选择省', trigger: 'change' }
],
ShippingAddress: [
{ required: true, message: '请输入详细地址', trigger: 'blur' }
],
Mobile: [
{ required: true, message: '请输入手机号', trigger: 'blur' }
],
Consignee: [
{ required: true, message: '请输入收件人', trigger: 'blur' }
],
},
provinceList:[],
cityList:[],
areaList:[],
exitMsg:{
OrderId:0,
Type:1,
Remark:'',
},
exitDig:false,
fhrules:{
ExpressId: [
{ required: true, message: '请选择快递公司', trigger: 'change' }
],
ExpressNumber: [
{ required: true, message: '请输入快递单号', trigger: 'blur' }
],
},
fhMsg:{
Id:0,
OrderId:'',
Type:1,
ExpressId:'',
PostCode:'',
ExpressNumber:'',
Remark:'',
OrderDetailIdList:[],
},
fahuoList:[],
fhDig:false,
checkfhList:[],
ExpressList:[],
exitState:false,
};
},
created() {
if(this.$route.query.OrderId){
this.OrderId=this.$route.query.OrderId;
this.getData()
this.getProvince();
this.getExpressInfo();
}
},
methods: {
// 确认完成
qrEnd(item,num){
let msg={
OrderId:item.OrderId,
Type:num
};
let that=this;
that.$confirm('是否完成该订单?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/SetOrderOperation',msg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
},
// 确认收货
ConfirmSh(item){
let msg={
OrderId:item.OrderId,
Type:5
};
let that=this;
that.$confirm('是否确认收货?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/SetOrderOperation',msg,
res => {
if (res.data.resultCode === 1) {
this.getData();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
},
FhsubmitForm(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
this.fhMsg.OrderDetailIdList=[];
if(this.checkfhList.length==0){
this.Error("至少选择一项！");
return;
}
this.checkfhList.forEach(item=>{
this.fhMsg.OrderDetailIdList.push(item.Id);
})
if(this.fhMsg.Type==2){
this.fhMsg.ExpressId="";
this.fhMsg.PostCode="";
this.fhMsg.ExpressNumber="";
}
this.apipost('/api/order/SetOrderSendGoods',this.fhMsg,
res => {
if (res.data.resultCode === 1) {
this.getData();
this.fhDig=false;
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
TableSelectChange(val){
this.checkfhList=val;
},
selectable (row, index) {
return row.IsBindExpress === 2
},
// 发货
fhBtn(item){
this.fhDig=true;
this.fhMsg={
Id:0,
OrderId:item.OrderId,
Type:1,
ExpressId:'',
PostCode:'',
ExpressNumber:'',
Remark:'',
OrderDetailIdList:[],
}
this.fahuoList=item.DetailList;
console.log("this.fahuoList",this.fahuoList)
},
getData(){
this.apipost("/api/order/GetGoodsOrderInfo",{OrderId:this.OrderId}, res => {
this.dataInfo=res.data.data;
......@@ -261,12 +597,28 @@
let data=res.data.data;
// 未付款
if(data.PaymentTime==''&& data.DeliveryTime==''){
this.activeStep=1;
}
// 已付款 未发货
else if(data.PaymentTime!='' && data.DeliveryTime=='' && data.ReceivingTime==''){
this.activeStep=2;
}
// 已付款 待发货
if(data.PaymentTime!='' && data.DeliveryTime=='' && data.ReceivingTime==''){
// 已发货 未收货
else if(data.PaymentTime!='' && data.DeliveryTime!='' && data.ReceivingTime==''){
this.activeStep=3;
}
// 已收货 未结束
else if(data.PaymentTime!='' && data.DeliveryTime!='' && data.ReceivingTime!='' && data.FinishTime==''){
this.activeStep=4;
}
// 已结束
else if(data.FinishTime!=''){
this.activeStep=5;
}
if(data.OrderStatus==7){
this.exitState=true;
this.activeStep=5;
}
if(data.OrderInfo){
this.OrderInfo=data.OrderInfo;
}
......@@ -275,6 +627,104 @@
})
},
// 快递公司
getExpressInfo(){
this.apipost("/api/MallBase/GetExpressInfo",{} , res => {
if (res.data.resultCode == 1) {
this.ExpressList = res.data.data;
} else {
this.Info(res.data.message);
}
})
},
// 修改备注
OrderExit(){
this.exitMsg={
OrderId:this.dataInfo.OrderId,
Type:1,
Remark:this.dataInfo.Remark,
}
this.exitDig=true;
},
// 订单操作
submitForm(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('/api/order/SetOrderOperation',this.exitMsg,
res => {
if (res.data.resultCode === 1) {
this.getData();
this.Success(res.data.message)
this.exitDig=false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
// 修改收货地址
ExitshAdress(item){
this.shDig=true;
this.shMsg={
OrderId:this.dataInfo.OrderId,
Consignee:item.Consignee,
Mobile:item.Mobile,
Province:item.Province,
City:item.City,
District:item.District,
ShippingAddress:item.ShippingAddress,
}
this.getCity(item.Province);
this.getArea(item.City);
},
shsubmitForm(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('/api/order/SetOrderShopingAddress',this.shMsg,
res => {
if (res.data.resultCode === 1) {
this.getData();
this.Success(res.data.message)
this.shDig=false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
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){
this.getArea(this.cityList[0].ID)
}
})
},
getProvince(){
this.apipost("/api/Destination/GetChildList",{Id:2}, res => {
this.provinceList=res.data.data;
if(this.provinceList.length>0){
this.getCity(this.provinceList[0].ID)
}
})
},
},
mounted() {
......@@ -329,6 +779,11 @@
height: 300px;
overflow-y: scroll;
}
.app-order-detail .stepExit{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_6_active.png");
}
.app-order-detail .step05{
height: 30px;
width: 30px;
......@@ -350,6 +805,11 @@
width: 30px;
background-image: url("../../assets/img/userman/status_2.png");
}
.app-order-detail .step05Active{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_5_active.png");
}
.app-order-detail .step04Active{
height: 30px;
width: 30px;
......
src/components/orderMan/orderList.vue
View file @ 6ad24911
......@@ -2,7 +2,7 @@
<div class="orderList">
<div class="head-title">
订单列表
<el-button 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>
<el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">清空回收站</el-button>
</div>
<div class="content">
......@@ -48,8 +48,8 @@
:value="item.Id">
</el-option>
</el-select>
<el-input style="margin-left:15px;width:350px" placeholder="请输入内容" v-model="msgVal" size="small">
<el-select @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-input @clear="getList" clearable style="margin-left:15px;width:300px" 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"
......@@ -74,7 +74,7 @@
<el-card v-for="(item,index) in tableData" :key="index" class="app-order-item" shadow="never">
<div slot="header" class="clearfix">
<div flex="cross:center" class="app-order-head">
<div class="app-order-time">{{item.PaymentTime}}</div>
<div class="app-order-time">{{item.CreateDate}}</div>
<div class="app-order-user">
<span class="app-order-time">订单号：</span>{{item.OrderNo}}
</div>
......@@ -87,14 +87,16 @@
<span class="el-tag el-tag--small el-tag--light">{{item.DeliveryMethodName}}</span>
</div>
<el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
<el-tag v-else style="margin-left:5px" size="small" type="warning">已付款</el-tag>
<el-tag v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''" style="margin-left:5px" size="small" type="warning">已付款</el-tag>
<el-tag v-if="item.DeliveryTime=='' && item.ReceivingTime==''" style="margin-left:5px" size="small" type="success">未发货</el-tag>
<el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small" type="success">待发货</el-tag>
<el-tag v-if="item.ReceivingTime!=''" style="margin-left:5px" size="small" type="success">已收货</el-tag>
<el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small" type="success">已发货</el-tag>
<el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small" type="success">未收货</el-tag>
<el-tag v-if="item.ReceivingTime!=''" style="margin-left:5px" size="small" type="success">已完成</el-tag>
<el-tag v-if="item.ReceivingTime!='' && item.FinishTime==''" style="margin-left:5px" size="small" type="success">已收货</el-tag>
<el-tag v-if="item.FinishTime!=''" style="margin-left:5px" size="small" type="success">已完成</el-tag>
<el-tag v-if="item.OrderStatus==7" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
......@@ -126,9 +128,9 @@
<div style="margin-bottom: 24px;">
<span style="margin-right: 10px;">
规格：
<span class="el-tag el-tag--mini el-tag--light" style="margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;">
<el-tag style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" size="mini">
{{list.Specification}}
</span>
</el-tag>
</span>
</div>
<div class="app-order-goods-price">
......@@ -138,8 +140,7 @@
<div flex="dir:left box:mean" style="width: 250px;">
<div flex="cross:center main:center">
<span>小计：￥{{list.Final_Price}}
<!-- v-if="item.PaymentTime==''" -->
<img @click="OrderExit(item,2,1)" src="../../assets/img/userman/edit1.png" alt="">
<img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)" src="../../assets/img/userman/edit1.png" alt="">
</span>
</div>
<div flex="cross:center main:center">数量：x {{list.Number}}</div>
......@@ -162,8 +163,7 @@
</div>
<div class="express-price"><span>
<span style="color: rgb(144, 147, 153);">(含运费￥{{item.FreightMoney}})
<!-- v-if="item.PaymentTime==''" -->
<img @click="OrderExit(item,2,2)" src="../../assets/img/userman/edit1.png" alt="">
<img v-if="item.PaymentTime==''" @click="EditPrice(item,2)" src="../../assets/img/userman/edit1.png" alt="">
</span>
</span></div>
<div><el-tag effect="dark" type="warning" size="mini">{{item.PaymentWayName}}</el-tag></div>
......@@ -181,8 +181,8 @@
<img @click="ConfirmSh(item)" v-if="item.OrderStatus==3" class="app-order-icon" src="../../assets/img/userman/confirm.png" alt="">
</el-tooltip>
<!-- 已收货 -->
<el-tooltip class="item" effect="dark" content="结束订单" placement="top">
<img v-if="item.OrderStatus==4" class="app-order-icon" src="../../assets/img/userman/sale.png" alt="">
<el-tooltip class="item" effect="dark" content="确认完成" placement="top">
<img @click="qrEnd(item,6)" v-if="item.OrderStatus==4" class="app-order-icon" src="../../assets/img/userman/sale.png" alt="">
</el-tooltip>
</template>
......@@ -217,7 +217,7 @@
<div class="card-footer">
<div>
<div flex="dir:left">
<div class="address-box">收货人: {{item.Consignee}} 电话：{{item.Mobile}} 地址：{{item.ShippingAddress}}</div>
<div class="address-box">收货人: {{item.Consignee}} 电话：{{item.Mobile}} 地址：{{item.DistrictAddress}} {{item.ShippingAddress}}</div>
<button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button" class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button>
</div>
</div>
......@@ -343,7 +343,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="fhDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="FhsubmitForm('exitMsg')">确 定</el-button>
<el-button size="small" type="primary" @click="FhsubmitForm('fhMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 修改收货地址 -->
......@@ -435,6 +435,22 @@
<el-button size="small" type="primary" @click="hszOk">确定</el-button>
</div>
</el-dialog>
<!-- 订单取消 -->
<el-dialog title="修改价格" :visible.sync="priceDig" width="600px">
<el-form :model="priceMsg" ref="priceMsg" label-width="80px">
<el-form-item label="商品总价">
<el-input size="small" v-model="priceMsg.Income"></el-input>
</el-form-item>
<el-form-item v-if="priceType==2" label="运费">
<el-input size="small" v-model="priceMsg.FreightMoney"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="priceDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="priceForm('priceMsg')">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
......@@ -443,6 +459,12 @@ export default {
name: "orderList",
data(){
return{
priceType:1,
priceMsg:{
Income:'',
FreightMoney:'',
},
priceDig:false,
hstips:'是否放入回收站(可在回收站中恢复)?',
orderStatusList:[],
checkAll: false,
......@@ -536,8 +558,7 @@ export default {
{Id:5,name:'商品名称'},
{Id:6,name:'收货人'},
{Id:7,name:'收货人电话'},
{Id:8,name:'门店名称'},
{Id:9,name:'商品货号'},
{Id:8,name:'商品货号'},
],
msgId:1,
ExpressList:[],
......@@ -568,6 +589,135 @@ export default {
},
mounted(){},
methods:{
// 订单操作
priceForm(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
let cmd='';
if(this.priceType==1){
cmd='/api/order/SetOrderDetialMoneyInfo';
}else{
cmd='/api/order/SetOrderMoneyOrFreightInfo';
}
this.apipost(cmd,this.priceMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
this.priceDig=false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
// 修改价格
EditPrice(item,num,list){
this.priceType=num;
if(num==1){
this.priceMsg={
OrderDetailId:list.Id,
Income:list.Final_Price,
}
}else{
this.priceMsg={
OrderId:item.OrderId,
Income:item.Income,
FreightMoney:item.FreightMoney
}
}
this.priceDig=true;
},
ChangeId(val){
let msgVal=this.msgVal;
if(val==1){
this.msg.OrderNo=msgVal;
this.msg.MerchantsNo='';
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile='';
this.msg.ProductCode='';
}
if(val==2){
this.msg.OrderNo='';
this.msg.MerchantsNo=msgVal;
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile='';
this.msg.ProductCode='';
}
if(val==3){
this.msg.OrderNo='';
this.msg.MerchantsNo='';
this.msg.UserName=msgVal;
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile='';
this.msg.ProductCode='';
}
if(val==4){
this.msg.OrderNo='';
this.msg.MerchantsNo='';
this.msg.UserName='';
this.msg.UserId=msgVal;
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile='';
this.msg.ProductCode='';
}
if(val==5){
this.msg.OrderNo='';
this.msg.MerchantsNo='';
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName=msgVal;
this.msg.Consignee='';
this.msg.Mobile='';
this.msg.ProductCode='';
}
if(val==6){
this.msg.OrderNo='';
this.msg.MerchantsNo='';
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee=msgVal;
this.msg.Mobile='';
this.msg.ProductCode='';
}
if(val==7){
this.msg.OrderNo='';
this.msg.MerchantsNo='';
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile=msgVal;
this.msg.ProductCode='';
}
if(val==8){
this.msg.OrderNo='';
this.msg.MerchantsNo='';
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile='';
this.msg.ProductCode=msgVal;
}
this.getList();
},
hszOk(){
this.apipost('/api/order/SetOrderOperation',this.hszMsg,
res => {
......@@ -583,6 +733,34 @@ export default {
null
);
},
// 确认完成
qrEnd(item,num){
let msg={
OrderId:item.OrderId,
Type:num
};
let that=this;
that.$confirm('是否完成该订单?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/SetOrderOperation',msg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
},
// 放入回收站
fRhsz(item,num){
if(num==4){
......@@ -669,7 +847,6 @@ export default {
},
// 判断是否有多个物流
getOrderSend(item){
console.log("item",item)
this.apipost("/api/order/GetOrderSendGoodsExpressIdByOrderId",{OrderId:item.OrderId}, res => {
let Id=res.data.data;
if(res.data.resultCode==1){
......@@ -863,16 +1040,13 @@ export default {
},
// 强制取消
OrderExit(item,type,moneyType){
OrderExit(item,type){
this.exitMsg.OrderId=item.OrderId;
this.exitMsg.Type=type;
this.exitMsg.Remark=item.Remark;
if(type==3){
this.exitMsg.Remark='';
}
if(type==2){
this.exitMsg.moneyType=moneyType;
}
this.exitDig=true;
},
handleClick(val){
......@@ -887,10 +1061,18 @@ export default {
this.getList();
},
ChangeId(val){
console.log("ChangeId",val)
},
getList(){
if(!this.msgVal || this.msgVal==''){
this.msg.OrderNo='';
this.msg.MerchantsNo='';
this.msg.UserName='';
this.msg.UserId='';
this.msg.GoodsName='';
this.msg.Consignee='';
this.msg.Mobile='';
this.msg.ProductCode='';
}
if(this.dateList && this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
......@@ -971,6 +1153,9 @@ export default {
</script>
<style>
.orderList .pendSelect .el-input {
width: 100px;
}
.hszDigClass .el-dialog__body{
padding: 0 10px 20px 0;
}
......@@ -1142,4 +1327,5 @@ export default {
padding: 20px;
box-sizing: border-box;
}
</style>
src/router/index.js
View file @ 6ad24911
......@@ -168,6 +168,12 @@ export default new Router({
name: 'disWithdrawal',
component: resolve => require(['@/components/UserMan/disWithdrawal'], resolve),
},
// 用户管理 分销订单
{
path: '/distributionOrder',
name: 'distributionOrder',
component: resolve => require(['@/components/UserMan/distributionOrder'], resolve),
},
// 商品管理 素材管理
{
path: '/materialMan',
......@@ -228,18 +234,26 @@ export default new Router({
name: 'goodsListEdit',
component: resolve => require(['@/components/CommodityMan/goodsListEdit'], resolve),
},
// 商品管理 商品列表新增
// 订单管理 商品列表新增
{
path: '/orderList',
name: 'orderList',
component: resolve => require(['@/components/orderMan/orderList'], resolve),
},
// 商品管理 商品详情
// 订单管理 商品详情
{
path: '/orderDetails',
name: 'orderDetails',
component: resolve => require(['@/components/orderMan/orderDetails'], resolve),
},
// 订单管理 售后订单
{
path: '/afterSalesOrder',
name: 'afterSalesOrder',
component: resolve => require(['@/components/orderMan/afterSalesOrder'], resolve),
},
//设置 基础设置
{
path: '/basicSetUp',
......
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