Home Explore Help
Register Sign In
ymy
/
oms
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

支付情况

ymy 1 year ago
parent
49ae8d9c68
commit
8514eed781
7 changed files with 245 additions and 17 deletions
Unified View Show Diff Stats
  1. 2 0
      package.json
  2. 1 1
      public/index.html
  3. 10 0
      src/api/orderPay.ts
  4. 1 1
      src/layout/components/Sidebar/Logo.vue
  5. 5 2
      src/views/audit/agencyGoods/index.vue
  6. 212 0
      src/views/oms/orderPay/index.vue
  7. 14 13
      src/views/oms/shop/index.vue

+ 2 - 0
package.json
View File 

@@ -10,6 +10,7 @@
 
   "dependencies": {
 
   "dependencies": {
 
     "@antv/data-set": "^0.11.8",
 
     "@antv/data-set": "^0.11.8",
 
     "@antv/g2": "^4.2.10",
 
     "@antv/g2": "^4.2.10",
 
+    "@riophae/vue-treeselect": "^0.4.0",
 
     "axios": "^1.3.5",
 
     "axios": "^1.3.5",
 
     "clipboard": "^2.0.11",
 
     "clipboard": "^2.0.11",
 
     "core-js": "^3.8.3",
 
     "core-js": "^3.8.3",
 
@@ -29,6 +30,7 @@
 
     "uuid": "^9.0.0",
 
     "uuid": "^9.0.0",
 
     "vue": "^2.6.14",
 
     "vue": "^2.6.14",
 
     "vue-class-component": "^7.2.3",
 
     "vue-class-component": "^7.2.3",
 
+    "vue-cropper": "^0.6.2",
 
     "vue-property-decorator": "^9.1.2",
 
     "vue-property-decorator": "^9.1.2",
 
     "vue-router": "^3.5.1",
 
     "vue-router": "^3.5.1",
 
     "vuex": "^3.6.2",
 
     "vuex": "^3.6.2",

+ 1 - 1
public/index.html
View File 

@@ -5,7 +5,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
-    <title><%= htmlWebpackPlugin.options.title %></title>
 
+    <title> OMS系统平台</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <noscript>
 
     <noscript>

+ 10 - 0
src/api/orderPay.ts
View File 

@@ -0,0 +1,10 @@
 
+import request from '@/benyun/utils/request'
 
+
 
+//异常查询
 
+export function query(params:any){
 
+	return request({
 
+		url: '/omsOrder/omsOrderPay/page',
 
+		method: 'GET',
 
+    params:params
 
+	})
 
+}

+ 1 - 1
src/layout/components/Sidebar/Logo.vue
View File 

@@ -35,7 +35,7 @@ export default {
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {
 
-      title: 'SaaS协同平台',
 
+      title: 'OMS系统平台',
 
       logo: logoImg
 
       logo: logoImg
 
     }
 
     }
 
   }
 
   }

+ 5 - 2
src/views/audit/agencyGoods/index.vue
View File 

@@ -60,6 +60,9 @@
 
 			}
 
 			}
 
 		}
 
 		}
 
 		config : any = {
 
 		config : any = {
 
+			attr:{
 
+				calculateH:true
 
+			},
 
 			search: {
 
 			search: {
 
 				attr: {
 
 				attr: {
 
 					size: 'mini',
 
 					size: 'mini',
 
@@ -384,7 +387,7 @@
 
 		box-sizing: border-box;
 
 		box-sizing: border-box;
 
 		display: flex;
 
 		display: flex;
 
 		padding: 16px;
 
 		padding: 16px;
 
-
 
+		height: 100%;
 
 		.search-btn {
 
 		.search-btn {
 
 			width: 100%;
 
 			width: 100%;
 
 			display: flex;
 
 			display: flex;
 
@@ -454,7 +457,7 @@
 
 			box-sizing: border-box;
 
 			box-sizing: border-box;
 
 			margin-left: 16px;
 
 			margin-left: 16px;
 
 			position: relative;
 
 			position: relative;
 
-			height: 600px;
 
+			height: 100%;
 
 			// overflow-y: auto;
 
 			// overflow-y: auto;
 
 			.bill-box {
 
 			.bill-box {
 
 				width: 100%;
 
 				width: 100%;

+ 212 - 0
src/views/oms/orderPay/index.vue
View File 

@@ -0,0 +1,212 @@
 
+<template>
 
+  <div class="order-pay">
 
+    <module-view :propConfig="config" ref="view" v-loading="load" @pagination="pagination" @onRefresh="getList" @resert="queryList" @search="queryList" />
 
+  </div>
 
+</template>
 
+
 
+<script lang="ts">
 
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 
+import {query} from '@/api/orderPay'
 
+@Component({components:{}})
 
+export default class OrderPay extends Vue {
 
+  config:any={
 
+    attr:{
 
+      calculateH:true
 
+    },
 
+    search:{
 
+      attr:{
 
+        size:'small'
 
+      },
 
+      columns:[
 
+        [{
 
+          label:'内部订单号',
 
+          prop:'orderId',
 
+          component:'by-input'
 
+        },{
 
+          label:'买家ID',
 
+          prop:'buyerId',
 
+          component:'by-input'
 
+        },{
 
+          label:'买家支付帐号',
 
+          prop:'buyerAccount',
 
+          component:'by-input'
 
+        },{
 
+          label:'审核状态',
 
+          prop:'status',
 
+          component:'by-select',
 
+          compConfig:{
 
+            attr:{
 
+              clearable:true,
 
+              data:[{
 
+                label:'待审核',
 
+                value:'WaitConfirm'
 
+              },{
 
+                label:'已审核',
 
+                value:'Confirmed'
 
+              },{
 
+                label:'已失效',
 
+                value:'Invalid'
 
+              }]
 
+            }
 
+          }
 
+        }],
 
+        [{
 
+          label:'支付渠道',
 
+          prop:'payment',
 
+          component:'by-input'
 
+        },{
 
+          label:'卖家ID',
 
+          prop:'sellerId',
 
+          component:'by-input'
 
+        },{
 
+          label:'卖家收款账号',
 
+          prop:'sellerAccount',
 
+          component:'by-input'
 
+        },{
 
+          label:'支付时间',
 
+          prop:'payDate',
 
+          component:'by-date-picker',
 
+          compConfig:{
 
+            attr:{
 
+              editable:false,
 
+              type:'datetimerange',
 
+              format:'yyyy-MM-dd HH:mm:ss'
 
+            }
 
+          }
 
+        }]
 
+      ]
 
+    },
 
+    tool:{
 
+      tools:{
 
+        search:true,
 
+        refresh:true
 
+      }
 
+    },
 
+    table:{
 
+      attr:{
 
+        size:'mini',
 
+        seq:true,
 
+        align:'center',
 
+      },
 
+      columns:[{
 
+        title:'内部订单号',
 
+        field:'orderId',
 
+        width:120
 
+      },{
 
+        title:'订单来源',
 
+        field:'sourceFrom',
 
+        width:120
 
+      },{
 
+        title:'外部支付单号',
 
+        field:'outerPayId',
 
+        width:120
 
+      },{
 
+        title:'是否支付',
 
+        field:'isOrderPay',
 
+        width:120
 
+      },{
 
+        title:'支付渠道',
 
+        field:'payment',
 
+        width:120
 
+      },{
 
+        title:'买家ID',
 
+        field:'buyerId',
 
+        width:120
 
+      },{
 
+        title:'买家支付帐号',
 
+        field:'buyerAccount',
 
+        width:120
 
+      },{
 
+        title:'卖家ID',
 
+        field:'sellerId',
 
+        width:120
 
+      },{
 
+        title:'卖家收款账号',
 
+        field:'sellerAccount',
 
+        width:120
 
+      },{
 
+        title:'支付金额',
 
+        field:'amount',
 
+        width:120
 
+      },{
 
+        title:'支付时间',
 
+        field:'payDate',
 
+        width:120
 
+      },{
 
+        title:'审核状态',
 
+        field:'status',
 
+        width:120
 
+      },{
 
+        title:'审核时间',
 
+        field:'confirmDate',
 
+        width:120
 
+      },{
 
+        title:'店铺名称',
 
+        field:'shopName',
 
+        width:120
 
+      }]
 
+    }
 
+  }
 
+  load=false
 
+  isSearch=false
 
+  timeNum = 0;
 
+  mounted(){
 
+    this.$nextTick(()=>{
 
+      this.getList()
 
+    })
 
+  }
 
+  //分页
 
+  pagination(){
 
+    if(this.isSearch){
 
+      this.queryList();
 
+    }else{
 
+      this.getList()
 
+    }
 
+  }
 
+  //列表请求（只有分页，不包含搜素条件）
 
+  getList(){
 
+    if(!this.$refs.view){
 
+      if(this.timeNum > 5){
 
+        return
 
+      }
 
+      setTimeout(()=>{
 
+        this.getList()
 
+      },500) 
+      this.timeNum ++;
 
+      return
 
+    }
 
+    this.isSearch = false;
 
+    let data = (this.$refs.view as any).getPage();
 
+    this.requestList(data);
 
+  }
 
+  //列表请求（包含分页和搜素条件）
 
+  queryList(){
 
+    this.isSearch = true;
 
+    let data = (this.$refs.view as any).getQuery();
 
+    this.requestList(data);
 
+  }
 
+  requestList(data:any){
 
+    this.load = true;
 
+    query(data).then((res:any) => {
 
+      this.load = false;
 
+      (this.$refs.view as any).setTableValue(res.data.records);
 
+      let page = {
 
+        pageNo: res.data.current, //当前页
 
+        pageSize: res.data.size, //每页条数
 
+        total: res.data.total //总条数
 
+      };
 
+      (this.$refs.view as any).setPage(page)
 
+
 
+    }).catch(()=>{
 
+      this.load = false;
 
+    })
 
+  }
 
+}
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+.order-pay{
 
+  height: 100%;
 
+  width: 100%;
 
+}
 
+</style>

+ 14 - 13
src/views/oms/shop/index.vue
View File 

@@ -306,19 +306,20 @@ export default class Shop extends Vue {
 
       //   title:'创建时间',
 
       //   title:'创建时间',
 
       //   field:'createTime',
 
       //   field:'createTime',
 
       //   width:150
 
       //   width:150
 
-      // },{
 
-      //   title:'操作',
 
-      //   action:true,
 
-      //   width:100,
 
-      //   plugins:[{
 
-      //     name:'删除',
 
-      //     event:{
 
-      //       click:(item:any) => {
 
-      //         this.del(item);
 
-      //       }
 
-      //     }
 
-      //   }]
 
-      // }
 
+      // },
 
+      {
 
+        title:'操作',
 
+        action:true,
 
+        width:100,
 
+        plugins:[{
 
+          name:'删除',
 
+          event:{
 
+            click:(item:any) => {
 
+              this.del(item);
 
+            }
 
+          }
 
+        }]
 
+      }
 
     ]
 
     ]
 
     },
 
     },
 
     modal:{
 
     modal:{