From f80397b6c13e0f0a136d71f6aee15e8de80306ee Mon Sep 17 00:00:00 2001
From: zhaoxiaoqiang <287285524@qq.com>
Date: Thu, 07 Sep 2023 10:02:19 +0800
Subject: [PATCH] 推广位创建时间和管理员订单详情
---
src/views/qyp-project-order/admin.vue | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/views/qyp-project-order/admin.vue b/src/views/qyp-project-order/admin.vue
index 5fcea8f..a996242 100644
--- a/src/views/qyp-project-order/admin.vue
+++ b/src/views/qyp-project-order/admin.vue
@@ -100,7 +100,7 @@
</div>
<div class="table_box">
<div style="margin-left: 10px;text-align: right;">
- <el-button type="primary" size="small" @click="addProduct">导出excel</el-button>
+ <el-button type="primary" size="small" @click="addProduct" v-if='filterBtnById("430201")' >导出excel</el-button>
</div>
<Etable
hasIndex
@@ -113,7 +113,7 @@
@handleSelectionChange="handleSelectionChange"
:exportUrl="{
url: '/qyp/order/orderExport',
- powerId: '',
+ powerId: '430206',
name: '订单列表',
}"
></Etable>
@@ -129,12 +129,15 @@
<el-descriptions-item label="签约时间">{{ orderDetail.signTime }}</el-descriptions-item>
<el-descriptions-item label="解约时间">{{ orderDetail.terminateTime }}</el-descriptions-item>
<el-descriptions-item label="项目名称">{{ orderDetail.projName }}</el-descriptions-item>
+ <el-descriptions-item label="支付金额">￥{{ orderDetail.payAmt }}</el-descriptions-item>
+ <el-descriptions-item label="支付方式">{{ orderDetail.payType }}</el-descriptions-item>
+ <el-descriptions-item label="是否使用优惠券">{{ orderDetail.useCoup }}</el-descriptions-item>
</el-descriptions>
</el-dialog>
<el-dialog top="2vh" :title="subTitle" fullscreen :visible.sync="productShow" width="60%">
- <history v-if="isWhith==1"></history>
- <plan v-else-if="isWhith==2"></plan>
- <draw v-else-if="isWhith==3"></draw>
+ <history :orderId="orderId" v-if="isWhith==1"></history>
+ <plan :orderId="orderId" v-else-if="isWhith==2"></plan>
+ <draw :orderId="orderId" v-else-if="isWhith==3"></draw>
</el-dialog>
</div>
</template>
@@ -224,9 +227,9 @@
type:'text'
},
style: {
- // display: this.filterBtnById(150101)
- // ? "inline-block"
- // : "none",
+ display: this.filterBtnById(430202)
+ ? "inline-block"
+ : "none",
},
on: {
click: () => {
@@ -245,18 +248,16 @@
type:'text'
},
style: {
- // display: this.filterBtnById(150101)
- // ? "inline-block"
- // : "none",
+ display: this.filterBtnById(430203)
+ ? "inline-block"
+ : "none",
},
on: {
click: () => {
-
+ let {orderId} = scope.row;
+ this.orderId = orderId;
this.isWhith = 1;
this.productShow = true;
- // this.title = '订单详情';
- // let {orderId} = scope.row;
- // this.getProductDetail(orderId);
},
},
},
@@ -269,17 +270,16 @@
type:'text'
},
style: {
- // display: this.filterBtnById(150101)
- // ? "inline-block"
- // : "none",
+ display: this.filterBtnById(430204)
+ ? "inline-block"
+ : "none",
},
on: {
click: () => {
+ let {orderId} = scope.row;
+ this.orderId = orderId;
this.isWhith = 2;
this.productShow = true;
- // this.title = '订单详情';
- // let {orderId} = scope.row;
- // this.getProductDetail(orderId);
},
},
},
@@ -292,17 +292,16 @@
type:'text'
},
style: {
- // display: this.filterBtnById(150101)
- // ? "inline-block"
- // : "none",
+ display: this.filterBtnById(430205)
+ ? "inline-block"
+ : "none",
},
on: {
click: () => {
+ let {orderId} = scope.row;
+ this.orderId = orderId;
this.isWhith = 3;
this.productShow = true;
- // this.title = '订单详情';
- // let {orderId} = scope.row;
- // this.getProductDetail(orderId);
},
},
},
@@ -319,7 +318,8 @@
title:"新增项目",
orderDetail:{},
exportExcelList:[],
- isWhith:''
+ isWhith:'',
+ orderId:''
}
},
computed:{
@@ -377,7 +377,7 @@
}
let objForm = JSON.parse(JSON.stringify(this.formInline));
for (let key in objForm) {
- if (objForm[key] === "all") {
+ if (objForm[key] === "all"||objForm[key] === ""||objForm[key] === null) {
delete objForm[key];
}
}
--
Gitblit v1.8.0