浏览代码

接口联调及菜单整理

duwendi 1 年之前
父节点
当前提交
36aba927f3

+ 48 - 0
src/api/audit.js

@@ -133,4 +133,52 @@ export default {
133
   cftcTjxxListByPage(params) {
133
   cftcTjxxListByPage(params) {
134
     return axios.get('/opt/parking/card/stat/page', {params})
134
     return axios.get('/opt/parking/card/stat/page', {params})
135
   },
135
   },
136
+  // 应用配置_列表
137
+  yypzListByPage(params) {
138
+    return axios.get('/opt/pay/configuration/page', {params})
139
+  },
140
+  // 应用配置_添加
141
+  addYypz(params) {
142
+    return axios.post('/opt/pay/configuration/add', params)
143
+  },
144
+  // 应用配置_删除
145
+  deleteYypz(params) {
146
+    return axios.post('/opt/pay/configuration/delete', params)
147
+  },
148
+  // 应用配置_修改
149
+  editYypz(params) {
150
+    return axios.post('/opt/pay/configuration/edit', params)
151
+  },
152
+  // 支付商户_列表
153
+  zfshListByPage(params) {
154
+    return axios.get('/opt/payment/merchant/luohe/paymentmerchant/page', {params})
155
+  },
156
+  // 支付商户_添加
157
+  addZfsh(params) {
158
+    return axios.post('/opt/payment/merchant/luohe/paymentmerchant/add', params)
159
+  },
160
+  // 支付商户_修改
161
+  editZfsh(params) {
162
+    return axios.post('/opt/payment/merchant/luohe/paymentmerchant/edit', params)
163
+  },
164
+  // 支付商户_删除
165
+  deleteZfsh(params) {
166
+    return axios.post('/opt/payment/merchant/luohe/paymentmerchant/delete', params)
167
+  },
168
+  // 平台商户配置_列表
169
+  ptshpzListByPage(params) {
170
+    return axios.get('/opt/platform/merchant/page', {params})
171
+  },
172
+  // 平台商户配置_添加
173
+  addPtshpz(params) {
174
+    return axios.post('/opt/platform/merchant/add', params)
175
+  },
176
+  // 平台商户配置_修改
177
+  editPtshpz(params) {
178
+    return axios.post('/opt/platform/merchant/edit', params)
179
+  },
180
+  // 平台商户配置_删除
181
+  deletePtshpz(params) {
182
+    return axios.post('/opt/platform/merchant/delete', params)
183
+  },
136
 }
184
 }

+ 81 - 33
src/pages/index/components/pay_configuration.vue

@@ -8,17 +8,23 @@
8
           <el-row>
8
           <el-row>
9
             <el-col :span="6">
9
             <el-col :span="6">
10
               <el-form-item label="商户ID:">
10
               <el-form-item label="商户ID:">
11
-                <el-input v-model="parkName" placeholder="请输入"></el-input>
11
+                <el-input v-model="formInline.merchantId" placeholder="请输入"></el-input>
12
               </el-form-item>
12
               </el-form-item>
13
             </el-col>
13
             </el-col>
14
             <el-col :span="6">
14
             <el-col :span="6">
15
               <el-form-item label="商户名称:">
15
               <el-form-item label="商户名称:">
16
-                <el-input v-model="berthCode" placeholder="请输入"></el-input>
16
+                <el-input v-model="formInline.merchantName" placeholder="请输入"></el-input>
17
               </el-form-item>
17
               </el-form-item>
18
             </el-col>
18
             </el-col>
19
             <el-col :span="6">
19
             <el-col :span="6">
20
-              <el-form-item label="停车场名称:">
21
-                <el-input v-model="berthCode" placeholder="请输入"></el-input>
20
+              <el-form-item label="停车场: ">
21
+                <el-select clearable v-model="formInline.parkLotId" placeholder="请选择">
22
+                  <el-option
23
+                    v-for="(item,index) in carParkingNameOptions"
24
+                    :key="index"
25
+                    :label="item.parkName"
26
+                    :value="item.id" />
27
+                </el-select>
22
               </el-form-item>
28
               </el-form-item>
23
             </el-col>
29
             </el-col>
24
             <el-col :span="4">
30
             <el-col :span="4">
@@ -40,7 +46,7 @@
40
             width="200">
46
             width="200">
41
             <template slot-scope="scope" style="display: inline-block">
47
             <template slot-scope="scope" style="display: inline-block">
42
               <el-button type="primary" @click="handleEdit(scope.row)" slot="reference">修改</el-button>
48
               <el-button type="primary" @click="handleEdit(scope.row)" slot="reference">修改</el-button>
43
-              <el-popconfirm title="确定删除吗?" @confirm="deleteRow2(scope.row)">
49
+              <el-popconfirm title="确定删除吗?" @confirm="deleteRow(scope.row)">
44
                 <el-button type="danger" slot="reference">删除</el-button>
50
                 <el-button type="danger" slot="reference">删除</el-button>
45
               </el-popconfirm>
51
               </el-popconfirm>
46
             </template>
52
             </template>
@@ -61,15 +67,21 @@
61
       width="45%"
67
       width="45%"
62
       custom-class="audit-dialog">
68
       custom-class="audit-dialog">
63
       <div class="form-div">
69
       <div class="form-div">
64
-        <el-form label-position="left" label-width="100px" :model="formInline">
70
+        <el-form label-position="left" label-width="100px" :model="formLabelAlign">
65
           <el-form-item label="商户ID:">
71
           <el-form-item label="商户ID:">
66
-            <el-input v-model="formInline.parkName" placeholder="请输入"></el-input>
72
+            <el-input v-model="formLabelAlign.merchantId" placeholder="请输入"></el-input>
67
           </el-form-item>
73
           </el-form-item>
68
           <el-form-item label="商户名称:">
74
           <el-form-item label="商户名称:">
69
-            <el-input v-model="formInline.berthCode" placeholder="请输入"></el-input>
75
+            <el-input v-model="formLabelAlign.merchantName" placeholder="请输入"></el-input>
70
           </el-form-item>
76
           </el-form-item>
71
-          <el-form-item label="停车场名称:">
72
-            <el-input v-model="formInline.berthIsorno" placeholder="请输入"></el-input>
77
+          <el-form-item label="停车场:">
78
+            <el-select clearable v-model="formLabelAlign.parkLotId" placeholder="请选择">
79
+              <el-option
80
+                v-for="(item,index) in carParkingNameOptions"
81
+                :key="index"
82
+                :label="item.parkName"
83
+                :value="item.id" />
84
+            </el-select>
73
           </el-form-item>
85
           </el-form-item>
74
         </el-form>
86
         </el-form>
75
       </div>
87
       </div>
@@ -83,6 +95,7 @@
83
 </template>
95
 </template>
84
 <script>
96
 <script>
85
 import api from "@/api/audit";
97
 import api from "@/api/audit";
98
+import api_z from "@/api/article_z.js";
86
 
99
 
87
 
100
 
88
 export default {
101
 export default {
@@ -91,31 +104,28 @@ export default {
91
   },
104
   },
92
   data() {
105
   data() {
93
     return {
106
     return {
107
+      carParkingNameOptions: [],
94
       formInline: {
108
       formInline: {
95
-        parkName: '',
96
-        berthCode: '',
97
-        berthIsorno:''
109
+        merchantId: '',
110
+        merchantName: '',
111
+        parkLotId:''
98
       },
112
       },
99
       columns: [
113
       columns: [
100
         {
114
         {
101
           label: '商户ID',
115
           label: '商户ID',
102
-          key: 'parkName'
116
+          key: 'merchantId'
103
         },
117
         },
104
         {
118
         {
105
           label: '商户名称',
119
           label: '商户名称',
106
-          key: 'berthCode'
120
+          key: 'merchantName'
107
         },
121
         },
108
         {
122
         {
109
           label: '停车场',
123
           label: '停车场',
110
-          key: 'berthIsorno'
111
-        },
112
-        {
113
-          label: '创建人',
114
-          key: 'isTidalPark'
124
+          key: 'parkName'
115
         },
125
         },
116
         {
126
         {
117
           label: '创建日期',
127
           label: '创建日期',
118
-          key: 'hasChargingPile'
128
+          key: 'createTime'
119
         },
129
         },
120
       ],
130
       ],
121
       tableData:[],
131
       tableData:[],
@@ -125,9 +135,9 @@ export default {
125
       title:'',
135
       title:'',
126
       dialogVisible: false,
136
       dialogVisible: false,
127
       formLabelAlign: {
137
       formLabelAlign: {
128
-        parkName: '',
129
-        berthCode: '',
130
-        berthIsorno:'',
138
+        merchantId: '',
139
+        merchantName: '',
140
+        parkLotId: '',
131
       },
141
       },
132
       total: 0,
142
       total: 0,
133
       pageSize: 5,
143
       pageSize: 5,
@@ -135,10 +145,17 @@ export default {
135
     }
145
     }
136
   },
146
   },
137
   mounted() {
147
   mounted() {
148
+    this.getCarParkingName()
138
     this.getTableData()
149
     this.getTableData()
139
   },
150
   },
140
   watch: {},
151
   watch: {},
141
   methods: {
152
   methods: {
153
+    //车场
154
+    getCarParkingName() {
155
+      api_z.querySelectParkListByPage().then(res => {
156
+        this.carParkingNameOptions=res.data
157
+      })
158
+    },
142
     onSubmit() {
159
     onSubmit() {
143
       this.pageNum = 1
160
       this.pageNum = 1
144
       this.getTableData()
161
       this.getTableData()
@@ -147,25 +164,56 @@ export default {
147
       this.getTableData()
164
       this.getTableData()
148
     },
165
     },
149
     handleAdd() {
166
     handleAdd() {
150
-      this.title = '添加配置'
151
-      this.formLabelAlign.parkName = ''
152
-      this.formLabelAlign.berthCode = ''
153
-      this.formLabelAlign.berthIsorno = ''
167
+      this.title = '添加'
168
+      this.formLabelAlign = {}
154
       this.dialogVisible = true
169
       this.dialogVisible = true
155
     },
170
     },
156
     handleEdit(row) {
171
     handleEdit(row) {
157
-      this.title = '修改车场'
158
-      this.formInline = {...row}
172
+      this.title = '修改'
173
+      this.formLabelAlign = {...row}
159
       this.dialogVisible = true
174
       this.dialogVisible = true
160
     },
175
     },
161
     getTableData() {
176
     getTableData() {
162
       const {pageNum, pageSize} = this
177
       const {pageNum, pageSize} = this
163
-      api.berthListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
164
-        this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
178
+      api.yypzListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
179
+        this.tableData = (res.data.records || [])
165
         this.total = res.data.total
180
         this.total = res.data.total
166
       })
181
       })
167
     },
182
     },
168
-  }
183
+    deleteRow(record) {
184
+      api.deleteYypz([{id: record.id}]).then(res => {
185
+        if (res.code === 200) {
186
+          this.$message({type: 'success', message: '删除成功!'})
187
+          this.getTableData()
188
+        }
189
+      })
190
+    },
191
+    handleConfirm() {
192
+      if (this.title === '修改') {
193
+        api.editYypz({...this.formLabelAlign}).then(res => {
194
+          if (res.code === 200) {
195
+            this.dialogVisible = false
196
+            this.$message({
197
+              message: '修改成功!',
198
+              type: 'success'
199
+            })
200
+            this.getTableData()
201
+          }
202
+        })
203
+      } else {
204
+        api.addYypz({...this.formLabelAlign}).then(res => {
205
+          if (res.code === 200) {
206
+            this.dialogVisible = false
207
+            this.$message({
208
+              message: '添加成功!',
209
+              type: 'success'
210
+            })
211
+            this.getTableData()
212
+          }
213
+        })
214
+      }
215
+    },
216
+  },
169
 }
217
 }
170
 </script>
218
 </script>
171
 <style lang="scss" scoped>
219
 <style lang="scss" scoped>

+ 52 - 63
src/pages/index/components/payment_merchant.vue

@@ -2,23 +2,23 @@
2
   <div class="body-wrapper">
2
   <div class="body-wrapper">
3
     <div style="display: flex; justify-content: space-between;">
3
     <div style="display: flex; justify-content: space-between;">
4
       <div style="width: 100%">
4
       <div style="width: 100%">
5
-        <h4>应用配置</h4>
5
+        <h4>支付商户配置</h4>
6
         <br>
6
         <br>
7
         <el-form class="form-wrapper" :inline="true" :model="formInline" style="margin-bottom: 20px;">
7
         <el-form class="form-wrapper" :inline="true" :model="formInline" style="margin-bottom: 20px;">
8
           <el-row>
8
           <el-row>
9
             <el-col :span="6">
9
             <el-col :span="6">
10
               <el-form-item label="商户ID:">
10
               <el-form-item label="商户ID:">
11
-                <el-input v-model="parkName" placeholder="请输入"></el-input>
11
+                <el-input v-model="formInline.merchantId" placeholder="请输入"></el-input>
12
               </el-form-item>
12
               </el-form-item>
13
             </el-col>
13
             </el-col>
14
             <el-col :span="6">
14
             <el-col :span="6">
15
               <el-form-item label="商户名称:">
15
               <el-form-item label="商户名称:">
16
-                <el-input v-model="berthCode" placeholder="请输入"></el-input>
16
+                <el-input v-model="formInline.merchantName" placeholder="请输入"></el-input>
17
               </el-form-item>
17
               </el-form-item>
18
             </el-col>
18
             </el-col>
19
             <el-col :span="6">
19
             <el-col :span="6">
20
-              <el-form-item label="停车场名称:">
21
-                <el-input v-model="berthCode" placeholder="请输入"></el-input>
20
+              <el-form-item label="支付渠道:">
21
+                <el-input v-model="formInline.paymentChannels" placeholder="请输入"></el-input>
22
               </el-form-item>
22
               </el-form-item>
23
             </el-col>
23
             </el-col>
24
             <el-col :span="4">
24
             <el-col :span="4">
@@ -61,24 +61,15 @@
61
       width="45%"
61
       width="45%"
62
       custom-class="audit-dialog">
62
       custom-class="audit-dialog">
63
       <div class="form-div">
63
       <div class="form-div">
64
-        <el-form label-position="left" label-width="100px" :model="formInline">
64
+        <el-form label-position="left" label-width="100px" :model="formLabelAlign">
65
           <el-form-item label="商户ID:">
65
           <el-form-item label="商户ID:">
66
-            <el-input v-model="formInline.parkName" placeholder="请输入"></el-input>
66
+            <el-input v-model="formLabelAlign.merchantId" placeholder="请输入"></el-input>
67
           </el-form-item>
67
           </el-form-item>
68
           <el-form-item label="商户名称:">
68
           <el-form-item label="商户名称:">
69
-            <el-input v-model="formInline.berthCode" placeholder="请输入"></el-input>
69
+            <el-input v-model="formLabelAlign.merchantName" placeholder="请输入"></el-input>
70
           </el-form-item>
70
           </el-form-item>
71
           <el-form-item label="支付渠道:">
71
           <el-form-item label="支付渠道:">
72
-            <el-input v-model="formInline.berthIsorno" placeholder="请输入"></el-input>
73
-          </el-form-item>
74
-          <el-form-item label="APP ID">
75
-            <el-input v-model="formInline.app_id" placeholder="请输入"></el-input>
76
-          </el-form-item>
77
-          <el-form-item label="App Secret">
78
-            <el-input v-model="formInline.app_secret" placeholder="请输入"></el-input>
79
-          </el-form-item>
80
-          <el-form-item label="API KEY">
81
-            <el-input v-model="formInline.api_key" placeholder="请输入"></el-input>
72
+            <el-input v-model="formLabelAlign.paymentChannels" placeholder="请输入"></el-input>
82
           </el-form-item>
73
           </el-form-item>
83
         </el-form>
74
         </el-form>
84
       </div>
75
       </div>
@@ -101,45 +92,26 @@ export default {
101
   data() {
92
   data() {
102
     return {
93
     return {
103
       formInline: {
94
       formInline: {
104
-        parkName: '',
105
-        berthCode: '',
106
-        berthIsorno:'',
107
-        app_id:'',
108
-        app_secret:'',
109
-        api_key:''
95
+        merchantId: '',
96
+        merchantName: '',
97
+        paymentChannels: '',
110
       },
98
       },
111
       columns: [
99
       columns: [
112
         {
100
         {
113
           label: '商户ID',
101
           label: '商户ID',
114
-          key: 'parkName'
102
+          key: 'merchantId'
115
         },
103
         },
116
         {
104
         {
117
           label: '商户名称',
105
           label: '商户名称',
118
-          key: 'berthCode'
119
-        },
120
-        {
121
-          label: '停车场',
122
-          key: 'berthIsorno'
123
-        },
124
-        {
125
-          label: 'APP ID',
126
-          key: 'app_id'
127
-        },
128
-        {
129
-          label: 'APP Secret',
130
-          key: 'app_secret'
106
+          key: 'merchantName'
131
         },
107
         },
132
         {
108
         {
133
-          label: 'API Key',
134
-          key: 'api_key'
109
+          label: '支付渠道',
110
+          key: 'paymentChannels'
135
         },
111
         },
136
         {
112
         {
137
-          label: '创建人',
138
-          key: 'isTidalPark'
139
-        },
140
-        {
141
-          label: '创建日期',
142
-          key: 'hasChargingPile'
113
+          label: '创建时间',
114
+          key: 'createTime'
143
         },
115
         },
144
       ],
116
       ],
145
       tableData:[],
117
       tableData:[],
@@ -149,12 +121,9 @@ export default {
149
       title:'',
121
       title:'',
150
       dialogVisible: false,
122
       dialogVisible: false,
151
       formLabelAlign: {
123
       formLabelAlign: {
152
-        parkName: '',
153
-        berthCode: '',
154
-        berthIsorno:'',
155
-        app_id:'',
156
-        app_secret:'',
157
-        api_key:''
124
+        merchantId: '',
125
+        merchantName: '',
126
+        paymentChannels: '',
158
       },
127
       },
159
       total: 0,
128
       total: 0,
160
       pageSize: 5,
129
       pageSize: 5,
@@ -174,27 +143,47 @@ export default {
174
       this.getTableData()
143
       this.getTableData()
175
     },
144
     },
176
     handleAdd() {
145
     handleAdd() {
177
-      this.title = '添加配置'
178
-      this.formInline.parkName = ''
179
-      this.formInline.berthCode = ''
180
-      this.formInline.berthIsorno = ''
181
-      this.formInline.app_id=''
182
-      this.formInline.app_secret=''
183
-      this.formInline.api_key=''
146
+      this.title = '添加'
147
+      this.formLabelAlign = {}
184
       this.dialogVisible = true
148
       this.dialogVisible = true
185
     },
149
     },
186
     handleEdit(row) {
150
     handleEdit(row) {
187
-      this.title = '修改车场'
188
-      this.formInline = {...row}
151
+      this.title = '修改'
152
+      this.formLabelAlign = {...row}
189
       this.dialogVisible = true
153
       this.dialogVisible = true
190
     },
154
     },
191
     getTableData() {
155
     getTableData() {
192
       const {pageNum, pageSize} = this
156
       const {pageNum, pageSize} = this
193
-      api.berthListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
194
-        this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
157
+      api.zfshListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
158
+        this.tableData = (res.data.records || [])
195
         this.total = res.data.total
159
         this.total = res.data.total
196
       })
160
       })
197
     },
161
     },
162
+    handleConfirm() {
163
+      if (this.title === '修改') {
164
+        api.editZfsh({...this.formLabelAlign}).then(res => {
165
+          if (res.code === 200) {
166
+            this.dialogVisible = false
167
+            this.$message({
168
+              message: '修改成功!',
169
+              type: 'success'
170
+            })
171
+            this.getTableData()
172
+          }
173
+        })
174
+      } else {
175
+        api.addZfsh({...this.formLabelAlign}).then(res => {
176
+          if (res.code === 200) {
177
+            this.dialogVisible = false
178
+            this.$message({
179
+              message: '添加成功!',
180
+              type: 'success'
181
+            })
182
+            this.getTableData()
183
+          }
184
+        })
185
+      }
186
+    },
198
   }
187
   }
199
 }
188
 }
200
 </script>
189
 </script>

+ 3 - 3
src/pages/index/components/performance_assess.vue

@@ -115,7 +115,7 @@ export default {
115
       columns1: [
115
       columns1: [
116
         {
116
         {
117
           label: '收费员',
117
           label: '收费员',
118
-          key: 'inspectionManName'
118
+          key: 'tollmanName'
119
         },
119
         },
120
         {
120
         {
121
           label: '收费员收入',
121
           label: '收费员收入',
@@ -176,11 +176,11 @@ export default {
176
       columns3: [
176
       columns3: [
177
         {
177
         {
178
           label: '收费员',
178
           label: '收费员',
179
-          key: 'inspectionManName'
179
+          key: 'tollManName'
180
         },
180
         },
181
         {
181
         {
182
           label: '稽查员',
182
           label: '稽查员',
183
-          key: 'tollManName'
183
+          key: 'inspectionManName'
184
         },
184
         },
185
         {
185
         {
186
           label: '被稽查次数',
186
           label: '被稽查次数',

+ 55 - 42
src/pages/index/components/platform_merchant.vue

@@ -2,23 +2,18 @@
2
   <div class="body-wrapper">
2
   <div class="body-wrapper">
3
     <div style="display: flex; justify-content: space-between;">
3
     <div style="display: flex; justify-content: space-between;">
4
       <div style="width: 100%">
4
       <div style="width: 100%">
5
-        <h4>应用配置</h4>
5
+        <h4>平台商户配置</h4>
6
         <br>
6
         <br>
7
         <el-form class="form-wrapper" :inline="true" :model="formInline" style="margin-bottom: 20px;">
7
         <el-form class="form-wrapper" :inline="true" :model="formInline" style="margin-bottom: 20px;">
8
           <el-row>
8
           <el-row>
9
             <el-col :span="6">
9
             <el-col :span="6">
10
               <el-form-item label="平台商户名称:">
10
               <el-form-item label="平台商户名称:">
11
-                <el-input v-model="parkName" placeholder="请输入"></el-input>
11
+                <el-input v-model="formInline.merchantName" placeholder="请输入"></el-input>
12
               </el-form-item>
12
               </el-form-item>
13
             </el-col>
13
             </el-col>
14
             <el-col :span="6">
14
             <el-col :span="6">
15
               <el-form-item label="支付商户名称:">
15
               <el-form-item label="支付商户名称:">
16
-                <el-input v-model="berthCode" placeholder="请输入"></el-input>
17
-              </el-form-item>
18
-            </el-col>
19
-            <el-col :span="6">
20
-              <el-form-item label="停车场名称:">
21
-                <el-input v-model="berthCode" placeholder="请输入"></el-input>
16
+                <el-input v-model="formInline.aymentMerchantName" placeholder="请输入"></el-input>
22
               </el-form-item>
17
               </el-form-item>
23
             </el-col>
18
             </el-col>
24
             <el-col :span="4">
19
             <el-col :span="4">
@@ -40,7 +35,7 @@
40
             width="200">
35
             width="200">
41
             <template slot-scope="scope" style="display: inline-block">
36
             <template slot-scope="scope" style="display: inline-block">
42
               <el-button type="primary" @click="handleEdit(scope.row)" slot="reference">修改</el-button>
37
               <el-button type="primary" @click="handleEdit(scope.row)" slot="reference">修改</el-button>
43
-              <el-popconfirm title="确定删除吗?" @confirm="deleteRow2(scope.row)">
38
+              <el-popconfirm title="确定删除吗?" @confirm="deleteRow(scope.row)">
44
                 <el-button type="danger" slot="reference">删除</el-button>
39
                 <el-button type="danger" slot="reference">删除</el-button>
45
               </el-popconfirm>
40
               </el-popconfirm>
46
             </template>
41
             </template>
@@ -61,18 +56,18 @@
61
       width="45%"
56
       width="45%"
62
       custom-class="audit-dialog">
57
       custom-class="audit-dialog">
63
       <div class="form-div">
58
       <div class="form-div">
64
-        <el-form label-position="left" label-width="100px" :model="formInline">
59
+        <el-form label-position="left" label-width="100px" :model="formLabelAlign">
65
           <el-form-item label="平台商户ID:">
60
           <el-form-item label="平台商户ID:">
66
-            <el-input v-model="formInline.parkName" placeholder="请输入"></el-input>
61
+            <el-input v-model="formLabelAlign.parkName" placeholder="请输入"></el-input>
67
           </el-form-item>
62
           </el-form-item>
68
           <el-form-item label="平台商户名称:">
63
           <el-form-item label="平台商户名称:">
69
-            <el-input v-model="formInline.berthCode" placeholder="请输入"></el-input>
64
+            <el-input v-model="formLabelAlign.berthCode" placeholder="请输入"></el-input>
70
           </el-form-item>
65
           </el-form-item>
71
           <el-form-item label="支付商户ID:">
66
           <el-form-item label="支付商户ID:">
72
-            <el-input v-model="formInline.berthIsorno" placeholder="请输入"></el-input>
67
+            <el-input v-model="formLabelAlign.berthIsorno" placeholder="请输入"></el-input>
73
           </el-form-item>
68
           </el-form-item>
74
           <el-form-item label="支付商户名称">
69
           <el-form-item label="支付商户名称">
75
-            <el-input v-model="formInline.app_id" placeholder="请输入"></el-input>
70
+            <el-input v-model="formLabelAlign.app_id" placeholder="请输入"></el-input>
76
           </el-form-item>
71
           </el-form-item>
77
         </el-form>
72
         </el-form>
78
       </div>
73
       </div>
@@ -95,37 +90,29 @@ export default {
95
   data() {
90
   data() {
96
     return {
91
     return {
97
       formInline: {
92
       formInline: {
98
-        parkName: '',
99
-        berthCode: '',
100
-        berthIsorno:'',
101
-        app_id:'',
102
-        app_secret:'',
103
-        api_key:''
93
+        merchantName: '',
94
+        paymentMerchantName: '',
104
       },
95
       },
105
       columns: [
96
       columns: [
106
         {
97
         {
107
           label: '平台商户ID',
98
           label: '平台商户ID',
108
-          key: 'parkName'
99
+          key: 'merchantId'
109
         },
100
         },
110
         {
101
         {
111
           label: '平台商户名称',
102
           label: '平台商户名称',
112
-          key: 'berthCode'
103
+          key: 'merchantName'
113
         },
104
         },
114
         {
105
         {
115
           label: '支付商户ID',
106
           label: '支付商户ID',
116
-          key: 'app_id'
107
+          key: 'paymentMerchantId'
117
         },
108
         },
118
         {
109
         {
119
           label: '支付商户名称',
110
           label: '支付商户名称',
120
-          key: 'app_secret'
121
-        },
122
-        {
123
-          label: '创建人',
124
-          key: 'isTidalPark'
111
+          key: 'paymentMerchantName'
125
         },
112
         },
126
         {
113
         {
127
-          label: '创建日期',
128
-          key: 'hasChargingPile'
114
+          label: '创建时间',
115
+          key: 'createTime'
129
         },
116
         },
130
       ],
117
       ],
131
       tableData:[],
118
       tableData:[],
@@ -135,12 +122,10 @@ export default {
135
       title:'',
122
       title:'',
136
       dialogVisible: false,
123
       dialogVisible: false,
137
       formLabelAlign: {
124
       formLabelAlign: {
138
-        parkName: '',
139
-        berthCode: '',
140
-        berthIsorno:'',
141
-        app_id:'',
142
-        app_secret:'',
143
-        api_key:''
125
+        merchantId: '',
126
+        merchantName: '',
127
+        paymentMerchantName:'',
128
+        paymentMerchantId:'',
144
       },
129
       },
145
       total: 0,
130
       total: 0,
146
       pageSize: 5,
131
       pageSize: 5,
@@ -162,11 +147,6 @@ export default {
162
     handleAdd() {
147
     handleAdd() {
163
       this.title = '添加配置'
148
       this.title = '添加配置'
164
       this.formInline.parkName = ''
149
       this.formInline.parkName = ''
165
-      this.formInline.berthCode = ''
166
-      this.formInline.berthIsorno = ''
167
-      this.formInline.app_id=''
168
-      this.formInline.app_secret=''
169
-      this.formInline.api_key=''
170
       this.dialogVisible = true
150
       this.dialogVisible = true
171
     },
151
     },
172
     handleEdit(row) {
152
     handleEdit(row) {
@@ -176,11 +156,44 @@ export default {
176
     },
156
     },
177
     getTableData() {
157
     getTableData() {
178
       const {pageNum, pageSize} = this
158
       const {pageNum, pageSize} = this
179
-      api.berthListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
159
+      api.ptshpzListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
180
         this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
160
         this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
181
         this.total = res.data.total
161
         this.total = res.data.total
182
       })
162
       })
183
     },
163
     },
164
+    deleteRow(record) {
165
+      api.deletePtshpz([{id: record.id}]).then(res => {
166
+        if (res.code === 200) {
167
+          this.$message({type: 'success', message: '删除成功!'})
168
+          this.getTableData()
169
+        }
170
+      })
171
+    },
172
+    handleConfirm() {
173
+      if (this.title === '修改') {
174
+        api.editPtshpz({...this.formLabelAlign}).then(res => {
175
+          if (res.code === 200) {
176
+            this.dialogVisible = false
177
+            this.$message({
178
+              message: '修改成功!',
179
+              type: 'success'
180
+            })
181
+            this.getTableData()
182
+          }
183
+        })
184
+      } else {
185
+        api.addPtshpz({...this.formLabelAlign}).then(res => {
186
+          if (res.code === 200) {
187
+            this.dialogVisible = false
188
+            this.$message({
189
+              message: '添加成功!',
190
+              type: 'success'
191
+            })
192
+            this.getTableData()
193
+          }
194
+        })
195
+      }
196
+    },
184
   }
197
   }
185
 }
198
 }
186
 </script>
199
 </script>

+ 15 - 12
src/pages/index/layouts/indexLayout.vue

@@ -36,17 +36,8 @@ export default {
36
       isCollapse: false,//默认为不折叠菜单
36
       isCollapse: false,//默认为不折叠菜单
37
       foldphoto: "el-icon-s-unfold",//菜单展开图标
37
       foldphoto: "el-icon-s-unfold",//菜单展开图标
38
       menu: [
38
       menu: [
39
-        {name: 'demo1', url: '/demo1'},
40
-        {name: 'demo2', url: '/demo2'},
41
         {name: '概览系统', url: '/parking_index'},
39
         {name: '概览系统', url: '/parking_index'},
42
-        {name: '订单修改查询', url: '/product_order_search'},
43
-        {name: '停车订单查询', url: '/parking_order'},
44
-        {name: '商品订单查询', url: '/product_order'},
45
         {name: '泊位列表', url: '/berth_list'},
40
         {name: '泊位列表', url: '/berth_list'},
46
-        {name: '停车卡', url: '/parking_card'},
47
-        {name: '错峰停车', url: '/parking_unpeak'},
48
-        {name: '预约停车', url: '/appointment_rules'},
49
-        {name: '车场纠错', url: '/parking_correction'},
50
         {name: '稽查管理', url: '/inspection_management'},
41
         {name: '稽查管理', url: '/inspection_management'},
51
         {name: '绩效考核', url: '/performance_assess'},
42
         {name: '绩效考核', url: '/performance_assess'},
52
         {name: '停车场管理', url: '/pakking_lot'},
43
         {name: '停车场管理', url: '/pakking_lot'},
@@ -55,14 +46,26 @@ export default {
55
         {name: '异常管理', url: '/exception_handing'},
46
         {name: '异常管理', url: '/exception_handing'},
56
         {name: '基础配置', url: '/basic_configuration'},
47
         {name: '基础配置', url: '/basic_configuration'},
57
         {name: '岗亭操作', url: '/parking_outside_operation'},
48
         {name: '岗亭操作', url: '/parking_outside_operation'},
49
+        {name: '订单修改查询', url: '/product_order_search'},
50
+        {name: '停车订单查询', url: '/parking_order'},
51
+        {name: '商品订单查询', url: '/product_order'},
52
+        {name: '应用配置', url: '/pay_configuration'},
53
+        {name: '支付商户配置', url: '/payment_merchant'},
54
+        {name: '平台商户配置', url: '/platform_merchant'},
55
+        {name: '领导数字驾驶舱系统', url: '/lead_system'},
56
+        {name: '消息管理', url: '/message_management'},
57
+        {name: '业务配置', url: '/service_configuration'},
58
         {name: '欠费用户', url: '/defaulting_subscrlber'},
58
         {name: '欠费用户', url: '/defaulting_subscrlber'},
59
         {name: '任务追缴', url: '/task_recovery'},
59
         {name: '任务追缴', url: '/task_recovery'},
60
         {name: '任务审核', url: '/task_audit'},
60
         {name: '任务审核', url: '/task_audit'},
61
         {name: '任务报表', url: '/task_report'},
61
         {name: '任务报表', url: '/task_report'},
62
         {name: '电话管理', url: '/telephone_management'},
62
         {name: '电话管理', url: '/telephone_management'},
63
-        {name: '领导数字驾驶舱系统', url: '/lead_system'},
64
-        {name: '消息管理', url: '/message_management'},
65
-        {name: '业务配置', url: '/service_configuration'},
63
+        {name: '停车卡', url: '/parking_card'},
64
+        {name: '错峰停车', url: '/parking_unpeak'},
65
+        {name: '预约停车', url: '/appointment_rules'},
66
+        {name: '车场纠错', url: '/parking_correction'},
67
+        {name: 'demo1', url: '/demo1'},
68
+        {name: 'demo2', url: '/demo2'},
66
       ]
69
       ]
67
     }
70
     }
68
   },
71
   },

+ 16 - 0
src/router/index.js

@@ -152,6 +152,22 @@ export default new Router({
152
           path: "/service_configuration",
152
           path: "/service_configuration",
153
           component: () => import("../pages/index/components/service_configuration.vue")
153
           component: () => import("../pages/index/components/service_configuration.vue")
154
         },
154
         },
155
+        {
156
+          name: "pay_configuration",
157
+          path: "/pay_configuration",
158
+          component: () => import("../pages/index/components/pay_configuration.vue")
159
+        },
160
+        {
161
+          name: "payment_merchant",
162
+          path: "/payment_merchant",
163
+          component: () => import("../pages/index/components/payment_merchant.vue")
164
+        },
165
+        {
166
+          name: "platform_merchant",
167
+          path: "/platform_merchant",
168
+          component: () => import("../pages/index/components/platform_merchant.vue")
169
+        },
170
+
155
       ]
171
       ]
156
     }
172
     }
157
   ]
173
   ]

+ 1 - 1
static/mung-local-config.js

@@ -1,7 +1,7 @@
1
 window.mungConfig = {
1
 window.mungConfig = {
2
   dev: {
2
   dev: {
3
     //BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"
3
     //BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"
4
-    BASE_API: 'http://192.168.0.81:16399/luohe2_ee/api'
4
+    BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api'
5
   },
5
   },
6
   build: {
6
   build: {
7
     BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"
7
     BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"