zhangdan 4 years ago
parent
commit
08e181ed42
3 changed files with 75 additions and 78 deletions
  1. 13 35
      src/config/router.config.js
  2. 44 36
      src/views/Order/OrderCenter.vue
  3. 18 7
      src/views/Order/OrderDetailModal.vue

+ 13 - 35
src/config/router.config.js

@@ -85,13 +85,15 @@ export const asyncRouterMap = [
     },
     },
     {
     {
       path: '/Order',
       path: '/Order',
-      redirect: '/Order/OrderCenter',
+      redirect: '/Order/OrderCenter',
+      name: 'Order',
       component: PageView,
       component: PageView,
       meta: {
       meta: {
         title: '订单中心',
         title: '订单中心',
         icon: 'snippets'
         icon: 'snippets'
         // permission: 'M_setting_0'
         // permission: 'M_setting_0'
       },
       },
+      // hideChildrenInMenu: true,
       children: [
       children: [
         {
         {
           path: '/Order/OrderCenter',
           path: '/Order/OrderCenter',
@@ -102,41 +104,17 @@ export const asyncRouterMap = [
             icon: 'snippets'
             icon: 'snippets'
           // permission: 'M_sys_dataDictionary'
           // permission: 'M_sys_dataDictionary'
           }
           }
-          // hideChildrenInMenu: true,
-          // children: [
-          //   {
-          //     path: '/Order/OrderCenter',
-          //     name: 'OrderCenter',
-          //     component: () => import('@/views/Order/OrderCenter.vue'),
-          //     meta: {
-          //       title: '订单中心',
-          //       icon: 'snippets'
-          //     // permission: 'M_sys_dataDictionary'
-          //     }
-          //   },
-          //   {
-          //     path: '/Order/OrderDetail',
-          //     name: 'OrderDetail',
-          //     component: () => import('@/views/Order/OrderDetail.vue'),
-          //     meta: {
-          //       title: '订单详情',
-          //       icon: 'snippets'
-          //     // permission: 'M_sys_dataDictionary'
-          //     }
-          //   }
-          // ]
-        },
-        {
-          path: '/Order/OrderDetail',
-          name: 'OrderDetail',
-          component: () => import('@/views/Order/OrderDetail.vue'),
-          meta: {
-            title: '订单详情',
-            icon: 'snippets'
-          // permission: 'M_sys_dataDictionary'
-          }
         }
         }
-
+        // {
+        //   path: '/Order/OrderDetail/:id',
+        //   name: 'OrderDetail',
+        //   component: () => import('@/views/Order/OrderDetail.vue'),
+        //   meta: {
+        //     title: '订单详情',
+        //     icon: 'snippets'
+        //     // permission: 'M_sys_dataDictionary'
+        //   }
+        // }
       ]
       ]
     },
     },
     {
     {

+ 44 - 36
src/views/Order/OrderCenter.vue

@@ -65,10 +65,15 @@
       </span>
       </span>
       <!-- 操作 -->
       <!-- 操作 -->
       <span slot="action" slot-scope="text, record">
       <span slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="seeDetail(record)">查看</a-button>
-        <a-button type="danger" @click="refund(record)">退款</a-button>
+        <a-button type="primary" @click="openDetailsModal=true">查看</a-button>
+        <!-- 本期暂不做 -->
+        <!-- <a-button type="danger" @click="refund(record)">退款</a-button> -->
       </span>
       </span>
     </s-table>
     </s-table>
+    <!-- 查看详情弹窗 -->
+    <order-detail-modal 
+      :openModal="openDetailsModal"
+      @close="openDetailsModal=false"/> 
   </a-card>
   </a-card>
 </template>
 </template>
 
 
@@ -76,11 +81,14 @@
   import { STable, VSelect } from '@/components'
   import { STable, VSelect } from '@/components'
   import getDate from '../../libs/getDate.js'
   import getDate from '../../libs/getDate.js'
   import { orderCenterList, itemList, storeList } from '../../api/order.js'
   import { orderCenterList, itemList, storeList } from '../../api/order.js'
+  import OrderDetailModal from './OrderDetailModal.vue'
   import moment from 'moment'
   import moment from 'moment'
   export default {
   export default {
+    name:'OrderCenter',
     components: {
     components: {
       STable,
       STable,
-      VSelect
+      VSelect,
+      OrderDetailModal
     },
     },
     data() {
     data() {
       return {
       return {
@@ -101,6 +109,7 @@
         incomeHJ:'2000',
         incomeHJ:'2000',
         itemOptionData:[],    // 服务项目数据
         itemOptionData:[],    // 服务项目数据
         storeOptionData:[],   // 网点名称数据
         storeOptionData:[],   // 网点名称数据
+        openDetailsModal:false,   // 查看详情弹窗 默认关闭
         time: [
         time: [
           moment(getDate.getToday().starttime, this.dateFormat),
           moment(getDate.getToday().starttime, this.dateFormat),
 					moment(getDate.getToday().endtime, this.dateFormat)
 					moment(getDate.getToday().endtime, this.dateFormat)
@@ -231,30 +240,30 @@
       // 合计
       // 合计
       getTotal(){},
       getTotal(){},
       // 查看详情--跳转到对应的详情页
       // 查看详情--跳转到对应的详情页
-      seeDetail(record) {
-        this.$router.push({name: 'OrderDetail',query: {id: record.id}
-        })
-      },
-      // 退款
-      refund(row) {
-        const _this = this
-        this.$confirm({
-          title: '警告',
-          content: '确认退款后 款项将通过原渠道退回 且不可撤回,确认退款?',
-          okText: '确定',
-          cancelText: '取消',
-          // onOk() {
-          // 	deleteItem({
-          // 		id: row.id
-          // 	}).then(res => {
-          // 		if (res.status == 200) {
-          // 			_this.$message.success('退款成功')
-          // 			_this.$refs.table.refresh()
-          // 		}
-          // 	})
-          // }
-        })
-      },
+      // seeDetail(record) {
+      //   this.$router.push({name: 'OrderDetail',query: {id: record.id}
+      //   })
+      // },
+      // 退款---暂不做
+      // refund(row) {
+      //   const _this = this
+      //   this.$confirm({
+      //     title: '警告',
+      //     content: '确认退款后 款项将通过原渠道退回 且不可撤回,确认退款?',
+      //     okText: '确定',
+      //     cancelText: '取消',
+      //     // onOk() {
+      //     // 	deleteItem({
+      //     // 		id: row.id
+      //     // 	}).then(res => {
+      //     // 		if (res.status == 200) {
+      //     // 			_this.$message.success('退款成功')
+      //     // 			_this.$refs.table.refresh()
+      //     // 		}
+      //     // 	})
+      //     // }
+      //   })
+      // },
       // 重置
       // 重置
       resetForm() {
       resetForm() {
         this.searchForm.beginDate = getDate.getToday().starttime
         this.searchForm.beginDate = getDate.getToday().starttime
@@ -283,17 +292,15 @@
   }
   }
 </script>
 </script>
 <style lang="less">
 <style lang="less">
-  .orderCenter-searchForm,
-  .addButton {
-    margin-bottom: 0;
-  }
-
-  .orderCenter-searchForm .ant-form-inline .ant-form-item {
-    margin-bottom: 15px;
+  .orderCenter-searchForm{
+    // 搜索框的下间距
+    .ant-form-item{
+      margin-bottom: 10px;
+    }
   }
   }
-
+  // 合计
   .total {
   .total {
-    margin-bottom: 24px;
+    margin:15px 0 25px;
     width:100%;
     width:100%;
     background-color: #e6f7ff;
     background-color: #e6f7ff;
     border: 1px solid #91d5ff;
     border: 1px solid #91d5ff;
@@ -304,4 +311,5 @@
       margin-right: 10px;
       margin-right: 10px;
     }
     }
   }
   }
+  
 </style>
 </style>

+ 18 - 7
src/views/Order/OrderDetail.vue → src/views/Order/OrderDetailModal.vue

@@ -1,5 +1,6 @@
 <template>
 <template>
-  <a-card :bordered="false">
+  <!-- <a-card :bordered="false"> -->
+  <a-modal title="查看详情" :footer="null" :width="1000" :destroyOnClose="true" @cancel="isShow=false" v-model="isShow">
     <v-select ref="orderStatus" code="ORDER_STATUS" placeholder="请选择" allowClear v-show="false"></v-select>
     <v-select ref="orderStatus" code="ORDER_STATUS" placeholder="请选择" allowClear v-show="false"></v-select>
     <div class="orderDetail-content">
     <div class="orderDetail-content">
       <a-form>
       <a-form>
@@ -84,13 +85,15 @@
         <a-row style="text-align: center;margin-top: 100px;">
         <a-row style="text-align: center;margin-top: 100px;">
           <a-col>
           <a-col>
             <a-form-item>
             <a-form-item>
-              <a-button type="default" @click="goBack()">返回列表</a-button>
+              <a-button type="default" @click="isShow=false" >返回列表</a-button>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
       </a-form>
       </a-form>
     </div>
     </div>
-  </a-card>
+  </a-modal>
+    
+  <!-- </a-card> -->
 </template>
 </template>
 
 
 <script>
 <script>
@@ -98,9 +101,17 @@
   import { orderDetail } from '../../api/order.js'
   import { orderDetail } from '../../api/order.js'
   export default {
   export default {
     components: { Upload, VSelect },
     components: { Upload, VSelect },
+    name:'OrderDetailModal',
+    props: {
+      openModal: {  //  弹框是否展示
+        type: Boolean,
+        default: false
+      }
+    },
     data() {
     data() {
       return {
       return {
-        orderDetailData:[]
+        orderDetailData:[],
+        isShow:this.openModal
       }
       }
     },
     },
     methods: {
     methods: {
@@ -110,9 +121,9 @@
       // },
       // },
       // 返回列表
       // 返回列表
       goBack() {
       goBack() {
-        this.$router.push({
-          name: 'OrderCenter'
-        })
+        // this.$router.push({
+        //   name: 'OrderCenter'
+        // })
       },
       },
     },
     },
     beforeRouteEnter (to, from, next) {
     beforeRouteEnter (to, from, next) {