From 595a03d0ccb522464f97bbb766c019e02b965e09 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 15 Sep 2023 10:46:45 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E4=BF=AE=E6=94=B9/=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=89=B4=E6=9D=83=E5=8D=A1=E6=96=B0=E5=A2=9E=E8=BF=90?=
 =?UTF-8?q?=E8=90=A5=E5=95=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/PileAuthCardController.java          |  2 ++
 jsowell-ui/src/views/pile/card/index.vue      | 35 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileAuthCardController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileAuthCardController.java
index 1555b156b..676a7078a 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileAuthCardController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileAuthCardController.java
@@ -3,6 +3,7 @@ package com.jsowell.web.controller.pile;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSON;
 import com.jsowell.pile.dto.PileAuthCardDTO;
 import com.jsowell.pile.vo.web.PileAuthCardVO;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -86,6 +87,7 @@ public class PileAuthCardController extends BaseController {
     @Log(title = "充电站鉴权卡", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PileAuthCardDTO dto) {
+        logger.info("新增充电站鉴权卡 params:{}", JSON.toJSONString(dto));
         return toAjax(pileAuthCardService.addAuthCard(dto));
     }
 
diff --git a/jsowell-ui/src/views/pile/card/index.vue b/jsowell-ui/src/views/pile/card/index.vue
index 72238d781..5d4a7b31d 100644
--- a/jsowell-ui/src/views/pile/card/index.vue
+++ b/jsowell-ui/src/views/pile/card/index.vue
@@ -131,7 +131,20 @@
 
     <!-- 添加或修改充电站鉴权卡对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="一级运营商" prop="merchantId">
+          <el-select
+            v-model="form.merchantId"
+            clearable placeholder="请选择一级运营商"
+          >
+            <el-option
+              v-for="item in firstLevelMerchantList"
+              :key="item.merchantName"
+              :label="item.merchantName"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="逻辑卡号" prop="logicCard">
           <el-input v-model="form.logicCard" :disabled = "isDisabled" placeholder="请输入逻辑卡号" />
         </el-form-item>
@@ -172,6 +185,7 @@
 
 <script>
 import {listCard, getCard, delCard, addCard, updateCard, deactivateCard} from "@/api/pile/card";
+import {queryFirstLevelMerchant} from "@/api/pile/merchant";
 
 export default {
   name: "card",
@@ -198,11 +212,13 @@ export default {
       open: false,
       // 卡号是否可填写
       isDisabled: false,
+      firstLevelMerchantList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         logicCard: null,
+        merchantId: null,
         physicsCard: null,
         memberId: null,
         phoneNumber: null
@@ -211,6 +227,13 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        merchantId:[
+          {
+            required: true,
+            message: "请选择一级运营商",
+            trigger: "blur"
+          }
+        ],
         phoneNumber: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@@ -231,6 +254,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getFirstLevelMerchantList();
   },
   methods: {
     /** 查询充电站鉴权卡列表 */
@@ -242,6 +266,13 @@ export default {
         this.loading = false;
       });
     },
+    // 获取一级运营商列表
+    getFirstLevelMerchantList() {
+      queryFirstLevelMerchant().then(response =>{
+        console.log("getFirstLevelMerchantList", response)
+        this.firstLevelMerchantList = response.rows;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -254,6 +285,7 @@ export default {
         logicCard: null,
         physicsCard: null,
         memberId: null,
+        merchantId: null,
         phoneNumber: null,
         createTime: null,
         createBy: null,
@@ -300,6 +332,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
+        console.log("submitForm", this.form);
         if (valid) {
           if (this.form.id != null) {
             updateCard(this.form).then(response => {