From a857a5abd3525287221f813cea77bb78cd6c7e01 Mon Sep 17 00:00:00 2001
From: zhaoxiaoqiang <287285524@qq.com>
Date: Thu, 07 Sep 2023 15:32:52 +0800
Subject: [PATCH] 新增推广位项目选择

---
 src/views/qyp-project-order/admin.vue |   72 +++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/views/qyp-project-order/admin.vue b/src/views/qyp-project-order/admin.vue
index 7320164..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>
@@ -143,14 +146,15 @@
   import history from './history.vue';
   import plan from './plan.vue';
   import draw from './draw.vue';
-  import {orderInit,orderDtl} from "@/api/credit";
+  import {orderInit,orderDtl,orderExport} from "@/api/order";
   import uploadImg from "@/components/upload.vue";
+  import downloadUrl from "@/utils/excelDownLoadConfig";
   export default {
     name: "order",
     components: { Etable,uploadImg,history,plan,draw },
     data() {
       return {
-          formInline: {status:"all"},
+          formInline: {promId:"all",orderStatus:"all",agencyName:'all'},
           searchData: {},
           columns: [
             {
@@ -223,9 +227,9 @@
                         type:'text'
                       },
                       style: {
-                        // display: this.filterBtnById(150101)
-                        //   ? "inline-block"
-                        //   : "none",
+                        display: this.filterBtnById(430202)
+                          ? "inline-block"
+                          : "none",
                       },
                       on: {
                         click: () => {
@@ -244,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);
                         },
                       },
                     },
@@ -268,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);
                         },
                       },
                     },
@@ -291,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);
                         },
                       },
                     },
@@ -318,7 +318,8 @@
           title:"新增项目",
           orderDetail:{},
           exportExcelList:[],
-          isWhith:''
+          isWhith:'',
+          orderId:''
       }
     },
     computed:{
@@ -356,8 +357,11 @@
     methods: {
       addProduct(){
         if(!this.exportExcelList.length){
-            return this.$message.error("请选择订单后导出");
+          return this.$message.error("请选择订单后导出");
         }
+        orderExport({orderIdList:this.exportExcelList.join(',')}).then((res) => {
+          downloadUrl.configDate2(res, '管理员订单列表');
+        });
       },
       keyupEvent(e) {
         //只能输入整数
@@ -373,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];
           }
         }
@@ -387,7 +391,9 @@
       getDataList(e) {
       },
       handleSelectionChange(list){
-        this.exportExcelList = list;
+        this.exportExcelList = list.map(d=>{
+          return d.orderId
+        });
       },
       getProductDetail(orderId){
         orderDtl({orderId:orderId}).then(({body})=>{

--
Gitblit v1.8.0