Skip to content

S
shop-new
提交 1b9e7ad2 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

云仓bug修复，我的资产-明细

上级 0c155fe8
隐藏空白字符变更
内嵌 并排
正在显示 包含 61 行增加 和 25 行删除
src/views/system/asset/balance/index.vue
浏览文件 @ 1b9e7ad2
......@@ -2,7 +2,41 @@
<div class="app-container">
<el-card class="box-card">
<div slot="header" class="clearfix">
<p style="font-size: 18px">结算流水</p>
<el-form class="form-params" :model="queryParams" label-width="auto" :inline="true" size="small">
<el-form-item label="商品ID" prop="goods_id">
<el-input
v-model="queryParams.goods_id"
placeholder="请输入商品id"
clearable
@keyup.enter.native="handleQuery"
/></el-form-item>
<el-form-item label="申请时间" prop="applyTime">
<el-date-picker
v-model="queryParams.applyTime"
type="daterange"
align="left"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="applyTimeChange"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item label="退换货类型" prop="refund_type">
<el-select v-model="queryParams.refund_type" placeholder="全部类型" clearable >
<el-option v-for="item in userNeedOptions" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</div>
<el-table v-loading="loading" :height="tableHeight" :data="assetList">
<el-table-column label="ID" align="center" prop="Id"/>
......@@ -43,7 +77,9 @@
queryParams: { // 查询参数
pageNum: 1,
pageSize: 10,
sellerId: 0
sellerId: 0,
order_sn: '',
searchTime: [],
},
form: {}, // 表单参数
rules: {} // 表单校验
......
src/views/system/asset/myAsset/index.vue
浏览文件 @ 1b9e7ad2
......@@ -17,7 +17,7 @@
<dt>当前余额（元）</dt>
<dd>￥{{ currentBalance }}</dd>
</dl>
<p class="in-details-balance">收支明细</p>
<p class="in-details-balance" @click="goToBalance">收支明细</p>
</div>
<div class="withdrawal-balance">
<dl class=" balance-dl dl-border">
......@@ -177,8 +177,12 @@
/** 取消 提交 添加银行卡信息*/
cancelSubmitBankcard() {
this.addBankcardInfoDialog = false;
},
/** 收支明细 跳转 */
goToBalance() {
this.$router.push({ path: "/system/asset/balance" });
}
}
} // methods end
}
</script>
......
src/views/system/order/index.vue
浏览文件 @ 1b9e7ad2
......@@ -32,7 +32,7 @@
<el-col :span="6">
<el-form-item label="商品名称：">
<el-input size="mini" v-model="form.GoodsName" placeholder="请输入商品名称"/>
<el-input size="mini" v-model="form.goods_name" placeholder="请输入商品名称"/>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -110,8 +110,6 @@
<el-table-column label="商品名称" align="center"></el-table-column>
<el-table-column label="规格/数量/金额" align="center" width="180" ></el-table-column>
<el-table-column label="下单/发货/完成时间" align="center" width="180" ></el-table-column>
<!-- <el-table-column label="发货时间" align="center" width="180" ></el-table-column>-->
<!-- <el-table-column label="完成时间" align="center" width="180" ></el-table-column>-->
<el-table-column label="收货人" align="center" width="180" ></el-table-column>
<el-table-column label="联系电话" align="center" width="180"></el-table-column>
<el-table-column label="操作" align="center" width="120"></el-table-column>
......@@ -131,11 +129,11 @@
:data="item.order_goods">
<el-table-column type="selection" width="55" align="center" v-if="activeName == 'fourth' "></el-table-column>
<el-table-column prop="goods_order_sn" label="订单号" width="220" align="center"></el-table-column>
<el-table-column prop="goods_option_title" label="商品名称" align="center">
<el-table-column prop="title" label="商品名称" align="center">
<template slot-scope="scope">
<div class="img-title-table">
<img style="width:60px;height:60px;" :src="scope.row.thumb"/>
<div class="ml10">{{ scope.row.goods_option_title }}</div>
<div class="ml10">{{ scope.row.title }}</div>
</div>
</template>
</el-table-column>
......@@ -153,18 +151,16 @@
{{ speTiemFormatter(scope.row.updated_time) }}
</template>
</el-table-column>
<!-- <el-table-column prop="send_time" label="发货时间" width="180" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ formatter(scope.row.send_time) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="updated_time" label="完成时间" width="180" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ formatter(scope.row.updated_time) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="phone" width="180" label="收货人" align="center"></el-table-column>
<el-table-column prop="real_name" label="联系电话" width="180" align="center"></el-table-column>
<el-table-column prop="phone" width="180" label="收货人" align="center">
<template slot-scope="scope">
{{ item.order.real_name }}
</template>
</el-table-column>
<el-table-column prop="mobile" label="联系电话" width="180" align="center">
<template slot-scope="scope">
{{ item.order.mobile }}
</template>
</el-table-column>
<el-table-column label="操作" width="120" align="center" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="handleInfo(scope.row)">详情</el-button>
......@@ -268,7 +264,7 @@
activeName: 'first',
form: {
order_sn: '',
GoodsName: '',
goods_name: '',
real_name: '',
Tel: '',
dateTime: [],
......@@ -374,7 +370,7 @@
resetBtn(iscall) {
this.form = {
order_sn: '',
GoodsName: '',
goods_name: '',
real_name: '',
Tel: '',
dateTime: [],
......@@ -446,8 +442,8 @@
if(this.form.order_sn != '') {
params['order_sn'] = this.form.order_sn
}
if(this.form.GoodsName != '') {
params['goods_name'] = this.form.GoodsName
if(this.form.goods_name != '') {
params['goods_name'] = this.form.goods_name
}
if(this.form.real_name != '') {
params['real_name'] = this.form.real_name
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论