|
@@ -86,7 +86,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="is_reservation" label="是否预定" width="80">
|
|
|
<template slot-scope="scope">
|
|
|
- {{ scope.row.is_reservation === "true" ? "是" : "否" }}
|
|
|
+ {{ scope.row.is_reservation_order === "true" ? "是" : "否" }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -217,11 +217,92 @@
|
|
|
<span style="margin-right: 5px">可退金额:</span>
|
|
|
<el-input v-model="ktje"></el-input>
|
|
|
<p>可退商品信息</p>
|
|
|
- <el-table>
|
|
|
- <el-table-column type="index" label="#" width="54"> </el-table-column>
|
|
|
- <el-table-column label="商品名称"></el-table-column>
|
|
|
- <el-table-column label="价格"></el-table-column>
|
|
|
- </el-table>
|
|
|
+ <div class="item-info">
|
|
|
+ <label>物品类型:</label><span>{{ ktjeInfo.goods_type_name }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="item-info">
|
|
|
+ <label>物品学段:</label
|
|
|
+ ><span>{{ ktjeInfo.goods_study_phase_name }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="item-info">
|
|
|
+ <label>订单金额:</label
|
|
|
+ ><span>¥{{ ktjeInfo.order_amount | cutMoneyFiter }}</span>
|
|
|
+ </div>
|
|
|
+ <!-- 物品实体 -->
|
|
|
+ <template v-if="ktjeInfo.order_sale_model === 0">
|
|
|
+ <div class="item-info" v-if="ktjeInfo.is_reservation_order === 'true'">
|
|
|
+ <label>订阅期数:</label
|
|
|
+ ><span>{{
|
|
|
+ ktjeInfo.period_count === -1 ? "年刊" : ktjeInfo.period_count
|
|
|
+ }}</span>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="item-info"
|
|
|
+ v-if="
|
|
|
+ ktjeInfo.is_reservation_order === 'true' &&
|
|
|
+ ktjeInfo.period_count !== -1
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <label>订阅列表:</label
|
|
|
+ ><span>{{ ktjeInfo.issue_no_list_reservation.join("、") }}</span>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="item-info"
|
|
|
+ v-if="
|
|
|
+ ktjeInfo.is_reservation_order === 'true' &&
|
|
|
+ ktjeInfo.period_count !== -1
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <label>已上架:</label
|
|
|
+ ><span>{{ ktjeInfo.issue_no_list_my_goods.join("、") }}</span>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="item-info"
|
|
|
+ v-if="
|
|
|
+ ktjeInfo.is_reservation_order === 'true' &&
|
|
|
+ ktjeInfo.period_count === -1
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <label>开始日期:</label
|
|
|
+ ><span>{{ ktjeInfo.valid_period_begin_date }}</span>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="item-info"
|
|
|
+ v-if="
|
|
|
+ ktjeInfo.is_reservation_order === 'true' &&
|
|
|
+ ktjeInfo.period_count === -1
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <label>截止日期:</label
|
|
|
+ ><span>{{ ktjeInfo.valid_period_end_date }}</span>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="item-info"
|
|
|
+ v-if="
|
|
|
+ ktjeInfo.is_reservation_order === 'true' &&
|
|
|
+ ktjeInfo.period_count === -1
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <label>当前日期:</label><span>{{ ktjeInfo.cur_date }}</span>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ <!-- 使用期限 -->
|
|
|
+ <template v-if="ktjeInfo.order_sale_model === 1">
|
|
|
+ <div class="item-info">
|
|
|
+ <label>订单日期:</label><span>{{ ktjeInfo.order_date }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="item-info">
|
|
|
+ <label>有效期天数:</label
|
|
|
+ ><span>{{ ktjeInfo.valid_period_day_count }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="item-info">
|
|
|
+ <label>截止日期:</label
|
|
|
+ ><span>{{ ktjeInfo.valid_period_end_date }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="item-info">
|
|
|
+ <label>当前日期:</label><span>{{ ktjeInfo.cur_date }}</span>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button size="small" @click="dialogVisible = false">取 消</el-button>
|
|
|
<el-button size="small" type="primary" @click="sureRefund"
|
|
@@ -386,11 +467,11 @@ export default {
|
|
|
color: "#165DFF",
|
|
|
bg: "#E8F7FF",
|
|
|
},
|
|
|
- // '2':{
|
|
|
- // text:'画刊',
|
|
|
- // color:'#F53F3F',
|
|
|
- // bg:'#FFECE8'
|
|
|
- // },
|
|
|
+ 4: {
|
|
|
+ text: "画刊",
|
|
|
+ color: "#F53F3F",
|
|
|
+ bg: "#FFECE8",
|
|
|
+ },
|
|
|
3: {
|
|
|
text: "精读",
|
|
|
color: "#0FC6C2",
|
|
@@ -477,6 +558,7 @@ export default {
|
|
|
dialogVisible: false,
|
|
|
ktje: 0,
|
|
|
refundId: "",
|
|
|
+ ktjeInfo: null,
|
|
|
};
|
|
|
},
|
|
|
//计算属性 类似于data概念
|
|
@@ -516,10 +598,10 @@ export default {
|
|
|
// 升序不传值
|
|
|
order_column_list = [this.dataSort.prop];
|
|
|
} else {
|
|
|
- order_column_list = ["create_time:desc"];
|
|
|
+ order_column_list = ["submit_time:desc"];
|
|
|
}
|
|
|
} else {
|
|
|
- order_column_list = ["create_time:desc"];
|
|
|
+ order_column_list = ["submit_time:desc"];
|
|
|
}
|
|
|
|
|
|
let data = {
|
|
@@ -567,13 +649,14 @@ export default {
|
|
|
// 退款
|
|
|
handleRefund(row, index) {
|
|
|
let Mnames =
|
|
|
- "/ShopServer/Manager/FinanceManager/ComputeOrderRefundApplyKTJE";
|
|
|
+ "/ShopServer/Manager/FinanceManager/GetOrderRefundApplyKTJEInfo";
|
|
|
let datas = {
|
|
|
id: row.id,
|
|
|
};
|
|
|
getLogin(Mnames, datas).then((res) => {
|
|
|
if (res.status === 1) {
|
|
|
- this.ktje = res.ktje;
|
|
|
+ this.ktje = res.ktje_info.ktje;
|
|
|
+ this.ktjeInfo = res.ktje_info;
|
|
|
this.refundId = row.id;
|
|
|
this.dialogVisible = true;
|
|
|
}
|
|
@@ -822,4 +905,14 @@ export default {
|
|
|
margin-left: 8px;
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
+.item-info {
|
|
|
+ display: flex;
|
|
|
+ width: 100%;
|
|
|
+ margin: 5px 0;
|
|
|
+ label {
|
|
|
+ width: 90px;
|
|
|
+ text-align: right;
|
|
|
+ flex-shrink: 0;
|
|
|
+ }
|
|
|
+}
|
|
|
</style>
|