From 57b7e93baf35afbb9e1c569477052daa01de4699 Mon Sep 17 00:00:00 2001
From: zhaoxiaoqiang <287285524@qq.com>
Date: Wed, 06 Sep 2023 17:56:20 +0800
Subject: [PATCH] 编辑器,项目新增,管理员订单管理

---
 src/views/qyp-project-order/admin.vue |   55 ++++++++++++++++++++++++++-----------------------------
 1 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/views/qyp-project-order/admin.vue b/src/views/qyp-project-order/admin.vue
index 5fcea8f..41bbcaf 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>
@@ -132,9 +132,9 @@
         </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 +224,9 @@
                         type:'text'
                       },
                       style: {
-                        // display: this.filterBtnById(150101)
-                        //   ? "inline-block"
-                        //   : "none",
+                        display: this.filterBtnById(430202)
+                          ? "inline-block"
+                          : "none",
                       },
                       on: {
                         click: () => {
@@ -245,18 +245,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 +267,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 +289,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 +315,8 @@
           title:"新增项目",
           orderDetail:{},
           exportExcelList:[],
-          isWhith:''
+          isWhith:'',
+          orderId:''
       }
     },
     computed:{
@@ -377,7 +374,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