Skip to content

R
rs-admin
提交 87b0d366 authored 作者: 翟畅's avatar 翟畅
浏览文件
操作

zc订单备注等新需求修改

上级 843b0ea5
显示空白字符变更
内嵌 并排
正在显示 包含 78 行增加 和 11 行删除
src/api/order/order.js
浏览文件 @ 87b0d366
......@@ -152,3 +152,11 @@ export function turnDownCheckAPI(data) { //退货--否定退货
data
})
}
export function changeNoteAPI(data) { //修改商家备注
return request({
url: `${requestPath.order}/order/update/note`,
method: 'post',
data
})
}
\ No newline at end of file
src/utils/static.js
浏览文件 @ 87b0d366
......@@ -104,8 +104,8 @@ export const orderSourceList = { //订单来源
}
export const invoiceList = { //开票
'0': '未开票',
'1': '已开票'
'0': '不开票',
'1': '开票'
}
export const statusTypeList = { //状态类型
......
src/views/order/order/index.vue
浏览文件 @ 87b0d366
......@@ -74,6 +74,7 @@
<span class="price">金额</span>
<span class="status">状态</span>
<span class="status">退货状态</span>
<span class="status">开票状态</span>
<span class="buy">下单时间</span>
<span class="set">操作</span>
</div>
......@@ -81,7 +82,8 @@
<div class="order_code">
<span class="type type_bz" v-if="item.orderTypeName">{{item.orderTypeName}}</span>
<span class="code">订单编号：{{item.code}}</span>
<!-- <span class="times">下单时间：{{item.createdTime}}</span> -->
<span class="times" v-if="item.remark" :title="item.remark">订单备注：{{item.remark}}</span>
<span class="times" v-if="item.note" :title="item.note">商家备注：{{item.note}}</span>
</div>
<div class="orderlist_con">
<div class="orderlist_left">
......@@ -124,12 +126,16 @@
<div class="orderlist_center">
<div class="orderstatus_text">{{(item.returnStatusArr && item.returnStatusArr.length > 0)?item.returnStatusArr.join(','):''}}</div>
</div>
<div class="orderlist_center">
<div class="orderstatus_text" :style="item.invoiceStatus==1&&{color:'#FF0000'}">{{item.invoiceStatus==1?"开票":"不开票"}}</div>
</div>
<div class="orderlist_buy">
<div class="order_buy">{{item.createdTime}}</div>
</div>
<div class="orderlist_right">
<div class="order_rightlist">
<!-- 0(待支付) 1（已支付）6（已完成）-1（已取消） -->
<el-button class="order_cancelbtn" @click="openNoteDialog(item)" size="mini" type="text">修改备注</el-button>
<router-link :to="{name:'order_processing',query:{id:item.id}}">
<el-button class="order_detailsbtn" size="mini" type="text">查看详情</el-button>
</router-link>
......@@ -158,11 +164,23 @@
</div>
</div>
</el-card>
<el-dialog
title="修改商家备注"
:visible.sync="showNoteDialog"
width="20%"
@closed="noteForm.orderId='';noteForm.note=''"
:before-close="handleClose">
<el-input v-model="noteForm.note" clearable type="textarea" maxlength="100" resize="none" rows="5"></el-input>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="noteForm.orderId='';noteForm.note='';showNoteDialog = false">取 消</el-button>
<el-button size="small" type="primary" @click="changeNote">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import { orderListAPI, orderCancleAPI } from '@/api/order/order'
import { orderListAPI, orderCancleAPI, changeNoteAPI, } from '@/api/order/order'
import { confirm } from '@/utils/function'
import { getSelectionIds } from '@/filters/getIds'
import { pcUrl, requestPath } from '@/utils/global'
......@@ -242,6 +260,11 @@ export default {
{name:'商品名称',id:1,key:"productName"},
{name:'手机号',id:2,key:"memberInformation"},
],
showNoteDialog: false,
noteForm: {
orderId: "",
note: "",
},
}
},
mounted() {
......@@ -344,6 +367,24 @@ export default {
})
});
},
openNoteDialog(item){
this.noteForm.orderId = item.id
this.noteForm.note = item.note
this.showNoteDialog = true
},
changeNote(){
if(!this.noteForm.note){
this.$message.warning("请输入商家备注")
return
}
changeNoteAPI(this.noteForm).then(res=>{
if(res.data.code==0){
this.$message.success("保存成功")
this.getList()
this.showNoteDialog = false
}
})
},
//导出订单
exportOrderMsg(code){
let {...params} = {code:code}
......@@ -529,6 +570,11 @@ export default {
}
.times{
margin:0 20px;
max-width: 20%;
float: right;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.orderlist_con{
......
src/views/order/order/order_processing.vue
浏览文件 @ 87b0d366
......@@ -39,7 +39,7 @@
</div>
<div class="newDetailCell">
<span>订单备注：</span>
<span></span>
<span>{{order.remark}}</span>
</div>
<div class="newDetailCell">
<span>下单价格：</span>
......@@ -63,7 +63,11 @@
<span>{{logisticsDetail.expressNo}}</span>
<!-- <el-input v-model="logisticsDetail.expressNo" placeholder="请输入快递单号" style="width:240px;"></el-input> -->
</div>
<div class="newDetailCell" style="width:50%;">
<div class="newDetailCell">
<span>商家备注：</span>
<span>{{order.note}}</span>
</div>
<div class="newDetailCell" style="width:100%">
<span>订单状态：</span>
<span v-if="order.status == 0 || order.status == 1 || order.status == 2">
<el-select v-model="order.status">
......@@ -823,12 +827,15 @@ export default {
flex-wrap: wrap;
.newDetailCell{
width: 33%;
height: 48px;
min-height: 48px;
display: inline-block;
line-height: 48px;
// line-height: 48px;
padding: 14px 0;
span{
font-size: 16px;
color: #4f5d73;
word-break: break-all;
line-height: 20px;
}
.statusBtn{
width: 90px;
......
src/views/resource_manage/paperbook_module/index.vue
浏览文件 @ 87b0d366
......@@ -57,6 +57,9 @@
<el-form-item label="ISBN：">
<el-input v-model="listQuery.isbn" clearable class="selWidth"/>
</el-form-item>
<el-form-item label="所属丛书：">
<el-input v-model="listQuery.seriesname" clearable class="selWidth"/>
</el-form-item>
<div class="search_btn_box">
<el-button type="primary" icon="ios-search" label="default" class="mr15" size="small" @click="getList(1)">搜索</el-button>
<el-button class="mr10" @click="resetFilder" size="small">重置</el-button>
......@@ -88,13 +91,14 @@
</el-table-column>
<el-table-column prop="author" label="作者" min-width="11%" align="center"/>
<el-table-column prop="isbn" label="ISBN" min-width="10%" align="center"/>
<el-table-column prop="realPrice" label="售价" min-width="8%" align="center" sortable="custom">
<el-table-column prop="seriesname" label="所属丛书" min-width="10%" align="center" show-overflow-tooltip/>
<el-table-column prop="realPrice" label="售价" min-width="6%" align="center" sortable="custom">
<template slot-scope="scope">
<span v-if="scope.row.realPrice && scope.row.realPrice != 0">{{ Number(scope.row.realPrice).toFixed(2) }}</span>
<!-- <span v-else>免费</span> -->
</template>
</el-table-column>
<el-table-column prop="sales" label="销量" min-width="8%" align="center" sortable="custom" />
<el-table-column prop="sales" label="销量" min-width="6%" align="center" sortable="custom" />
<el-table-column label="上架状态" align="center" min-width="8%" :filter-multiple="false" :filters="filterStatus" column-key="status">
<template slot-scope="scope">
<span v-if="scope.row.status == 1"><span class="up_status"></span>已上架</span>
......@@ -213,6 +217,7 @@ import axios from "axios";
beginTime: null,
endTime: null,
option: null,
seriesname: null,
status: ""
},
total: null,
......@@ -406,7 +411,7 @@ import axios from "axios";
this.listLoading = true;
this.listQuery.pageNum = num ? num : this.listQuery.pageNum
let obj = {}
obj = this.collapse ? this.listQuery : {params:this.listQuery.params,diyTypeCode:this.listQuery.diyTypeCode,pageNum:this.listQuery.pageNum,pageSize:this.listQuery.pageSize,status:this.listQuery.status,orderBy:this.listQuery.orderBy}
obj = this.collapse ? this.listQuery : {params:this.listQuery.params,diyTypeCode:this.listQuery.diyTypeCode,pageNum:this.listQuery.pageNum,pageSize:this.listQuery.pageSize,status:this.listQuery.status,orderBy:this.listQuery.orderBy,seriesname:this.listQuery.seriesname}
bookListAPI(obj).then(res => {
if (res.data.code === 0) {
this.dataList = res.data.data.list?res.data.data.list:[];
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论