Skip to content

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

update

parent d4f5dadc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1881 additions and 30 deletions
src/components/orderMan/afterSalesOrder.vue
View file @ deaa98ed
This diff is collapsed.
src/components/orderMan/evaluationMan.vue 0 → 100644
View file @ deaa98ed
This diff is collapsed.
src/components/orderMan/evaluationTemplate.vue 0 → 100644
View file @ deaa98ed
<template>
<div class="evalTemplate">
<div class="head-title">
<span @click="CommonJump('evaluationMan')" class="blue point">评价管理</span> / 回复模板
<el-button @click="addTemplate" style="float:right" size="small" type="primary">添加模板</el-button>
</div>
<div class="content">
<div style="margin-bottom:20px">
<span>模板类型</span>
<el-select class="w100" @change="getList" v-model="msg.CommentGrade" size="small" placeholder="请选择">
<el-option label="全部回复" :value="0"></el-option>
<el-option
v-for="item in templateList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
<el-input style="margin-left:15px;width:350px" class="input-item" placeholder="请输入内容" v-model="msgVal" size="small">
<el-select class="w100" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-option
v-for="item in option"
:key="item.Id"
:label="item.name"
:value="item.Id">
</el-option>
</el-select>
<el-button @click="getList" slot="append" icon="el-icon-search"></el-button>
</el-input>
</div>
<el-table
:data="tableData"
v-loading="loading" border
style="width: 100%">
<el-table-column
prop="Id"
label="ID"
width="80">
</el-table-column>
<el-table-column
prop="Name"
label="模板名称"
width="180">
</el-table-column>
<el-table-column
prop="Content"
label="模板内容">
</el-table-column>
<el-table-column
prop="CommentGradeName"
width="120"
label="模板类型">
</el-table-column>
<el-table-column
width="220"
prop="address"
label="操作">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="EditTemplate(scope.row)" style="margin-right:10px" src="../../assets/img/userman/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(scope.row)" src="../../assets/img/userman/del.png" alt="">
</el-tooltip>
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
layout="prev, pager, next" :total="total">
</el-pagination>
</div>
<!-- 添加模板 -->
<el-dialog title="添加模板" :visible.sync="addDig" width="600px">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="80px">
<el-form-item label="模板名称" prop="Name">
<el-input size="small" v-model="addMsg.Name"></el-input>
</el-form-item>
<el-form-item label="模板内容" prop="Content">
<el-input size="small" v-model="addMsg.Content" type="textarea" row="2"></el-input>
</el-form-item>
<el-form-item label="操作" prop="CommentGrade">
<el-radio v-model="addMsg.CommentGrade" :label="item.Id" v-for="(item,index) in templateList" :key="index">{{item.Name}}</el-radio>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="addDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="czsubmitForm('addMsg')">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
name: "evalTemplate",
data(){
return{
addDig:false,
loading:false,
tableData:[],
msgVal:'',
msgId:'',
option:[
{Id:1,name:'模板名称'},
{Id:2,name:'ID'}
],
msg:{
pageIndex:1,
pageSize:15,
Id:0,
Name:'',
CommentGrade:0,
},
templateList:[],
total:0,
addMsg:{
Id:0,
Name:'',
Content:'',
CommentGrade:0,
},
rules:{
Name: [
{ required: true, message: '请输入模板名称', trigger: 'blur' }
],
Content: [
{ required: true, message: '请输入模板内容', trigger: 'blur' }
],
CommentGrade: [
{ required: true, message: '请选择类型', trigger: 'change' }
],
},
}
},
created(){
this.getTemplate();
this.getList();
},
mounted(){},
methods:{
Delete(row){
let that=this;
that.$confirm("确认删除模板？", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/DelGoodsCommentTemplateInfo',{TemplateId:row.Id},
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
},
EditTemplate(row){
this.addMsg={
Id:row.Id,
Name:row.Name,
Content:row.Content,
CommentGrade:row.CommentGrade,
}
this.addDig=true;
},
addTemplate(){
this.addMsg={
Id:0,
Name:'',
Content:'',
CommentGrade:1,
}
this.addDig=true;
},
czsubmitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
let cmd = "/api/order/SetGoodsCommentTemplateInfo";
this.apipost(cmd, this.addMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
this.addDig = false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
ChangeId(val){
let msgVal=this.msgVal;
if(this.msgId==1){
this.msg.Name=msgVal;
this.msg.Id=0;
}
if(this.msgId==2){
this.msg.Name='';
this.msg.Id=msgVal;
}
this.getList();
},
getList(){
if(this.msgId==1){
this.msg.Name=this.msgVal;
this.msg.Id=0;
}
if(this.msgId==2){
this.msg.Name='';
this.msg.Id=this.msgVal;
}
if(!this.msgVal || this.msgVal==''){
this.msg.Name='';
this.msg.Id=0;
}
this.loading = true;
this.apipost("/api/order/GetGoodsCommentTemplatePageList", 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;
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getTemplate(){
this.apipost("/api/order/GetGoodsCommentTypeEnumList",{}, res => {
this.templateList=res.data.data;
})
},
},
};
</script>
<style>
.evalTemplate .input-item .el-input__inner:hover {
border: 1px solid #dcdfe6;
border-right: 0;
outline: 0;
}
.evalTemplate .input-item .el-input__inner {
border-right: 0;
}
.evalTemplate .el-input-group__append {
background-color: #fff;
border-left: 0;
width: 10%;
padding: 0;
}
.evalTemplate .content{
background: #fff;
margin-top:10px;
padding: 20px;
box-sizing: border-box;
}
</style>
src/components/orderMan/orderDetails.vue
View file @ deaa98ed
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<div flex="dir:left cross:center" class="item-box"> <div flex="dir:left cross:center" class="item-box">
<span class="label">收货地址:</span> <span class="label">收货地址:</span>
<div class="express-address">{{dataInfo.OrderInfo.DistrictAddress}} <div class="express-address">{{dataInfo.OrderInfo.DistrictAddress}}
{{dataInfo.OrderInfo.ShippingAddress}} {{dataInfo.OrderInfo.ShoppingAddress}}
<button v-if="activeStep==2 || activeStep==3" @click="ExitshAdress(dataInfo.OrderInfo)" type="button" <button v-if="activeStep==2 || activeStep==3" @click="ExitshAdress(dataInfo.OrderInfo)" type="button"
class="el-button el-button--text el-button--small is-circle"> class="el-button el-button--text el-button--small is-circle">
<i class="el-icon-edit"></i> <i class="el-icon-edit"></i>
...@@ -210,10 +210,9 @@ ...@@ -210,10 +210,9 @@
</el-table-column> </el-table-column>
<el-table-column prop="name" label="规格" width="200"> <el-table-column prop="name" label="规格" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="el-tag el-tag--mini el-tag--light" <el-tag :key="index2" v-for="(list,index2) in scope.row.SpecificationList" style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" size="mini">
style="margin-right: 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 95%;"> {{list}}
{{scope.row.Specification}} </el-tag>
</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -275,8 +274,8 @@ ...@@ -275,8 +274,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="详细地址" prop="ShippingAddress"> <el-form-item label="详细地址" prop="ShoppingAddress">
<el-input size="small" v-model="shMsg.ShippingAddress"></el-input> <el-input size="small" v-model="shMsg.ShoppingAddress"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -380,7 +379,7 @@ ...@@ -380,7 +379,7 @@
Province: '', Province: '',
City: '', City: '',
District: '', District: '',
ShippingAddress: '', ShoppingAddress: '',
}, },
shMsgrule: { shMsgrule: {
Province: [{ Province: [{
...@@ -388,7 +387,7 @@ ...@@ -388,7 +387,7 @@
message: '请选择省', message: '请选择省',
trigger: 'change' trigger: 'change'
}], }],
ShippingAddress: [{ ShoppingAddress: [{
required: true, required: true,
message: '请输入详细地址', message: '请输入详细地址',
trigger: 'blur' trigger: 'blur'
...@@ -651,7 +650,7 @@ ...@@ -651,7 +650,7 @@
Province: item.Province, Province: item.Province,
City: item.City, City: item.City,
District: item.District, District: item.District,
ShippingAddress: item.ShippingAddress, ShoppingAddress: item.ShoppingAddress,
} }
this.getCity(item.Province); this.getCity(item.Province);
this.getArea(item.City); this.getArea(item.City);
......
src/components/orderMan/orderList.vue
View file @ deaa98ed
...@@ -116,9 +116,11 @@ ...@@ -116,9 +116,11 @@
<span style="margin-right: 10px;"> <span style="margin-right: 10px;">
规格： 规格：
<el-tag <el-tag
:key="index2"
v-for="(msg,index2) in list.SpecificationList"
style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
size="mini"> size="mini">
{{list.Specification}} {{msg}}
</el-tag> </el-tag>
</span> </span>
</div> </div>
...@@ -214,8 +216,9 @@ ...@@ -214,8 +216,9 @@
<div class="card-footer"> <div class="card-footer">
<div> <div>
<div flex="dir:left"> <div flex="dir:left">
<div class="address-box">收货人: {{item.Consignee}} 电话：{{item.Mobile}} 地址：{{item.DistrictAddress}} <div class="address-box">收货人: {{item.Consignee}} 电话：{{item.Mobile}}
{{item.ShippingAddress}}</div> 地址：{{item.DistrictAddress}}
{{item.ShoppingAddress}}</div>
<button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button" <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> class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button>
</div> </div>
...@@ -344,8 +347,8 @@ ...@@ -344,8 +347,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="详细地址" prop="ShippingAddress"> <el-form-item label="详细地址" prop="ShoppingAddress">
<el-input size="small" v-model="shMsg.ShippingAddress"></el-input> <el-input size="small" v-model="shMsg.ShoppingAddress"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -438,7 +441,7 @@ ...@@ -438,7 +441,7 @@
Province: '', Province: '',
City: '', City: '',
District: '', District: '',
ShippingAddress: '', ShoppingAddress: '',
}, },
shMsgrule: { shMsgrule: {
Province: [{ Province: [{
...@@ -446,7 +449,7 @@ ...@@ -446,7 +449,7 @@
message: '请选择省', message: '请选择省',
trigger: 'change' trigger: 'change'
}], }],
ShippingAddress: [{ ShoppingAddress: [{
required: true, required: true,
message: '请输入详细地址', message: '请输入详细地址',
trigger: 'blur' trigger: 'blur'
...@@ -803,7 +806,7 @@ ...@@ -803,7 +806,7 @@
Province: item.Province, Province: item.Province,
City: item.City, City: item.City,
District: item.District, District: item.District,
ShippingAddress: item.ShippingAddress, ShoppingAddress: item.ShoppingAddress,
} }
this.getCity(item.Province); this.getCity(item.Province);
this.getArea(item.City); this.getArea(item.City);
......
src/components/orderMan/salesOrderDetails.vue 0 → 100644
View file @ deaa98ed
This diff is collapsed.
src/router/index.js
View file @ deaa98ed
...@@ -259,6 +259,24 @@ export default new Router({ ...@@ -259,6 +259,24 @@ export default new Router({
name: 'afterSalesOrder', name: 'afterSalesOrder',
component: resolve => require(['@/components/orderMan/afterSalesOrder'], resolve), component: resolve => require(['@/components/orderMan/afterSalesOrder'], resolve),
}, },
// 订单管理 售后订单详情
        {
          path: '/salesOrderDetails',
          name: 'salesOrderDetails',
          component: resolve => require(['@/components/orderMan/salesOrderDetails'], resolve),
        },
        // 订单管理 评价模板
        {
          path: '/evaluationTemplate',
          name: 'evaluationTemplate',
          component: resolve => require(['@/components/orderMan/evaluationTemplate'], resolve),
        },
        // 订单管理 评价管理
        {
          path: '/evaluationMan',
          name: 'evaluationMan',
          component: resolve => require(['@/components/orderMan/evaluationMan'], resolve),
        },
//设置 基础设置 //设置 基础设置
......
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