Merge pull request #224 from John-Hong/John/KIP-11275

feat(KIP-11275): 临停微服务 | 车辆管理终端请求和展示调整

src/api/parking/index.js

@@ -242,4 +242,56 @@ curl --request DELETE \
  */
 export function deleteConfValueOfKey(key) {
   return window.requestms.delete(`conf-values/${key}`, {}, { loading: false });
+}
+
+
+/* 查询车牌
+
+curl --location 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service/vehicles?userId=2c9d85868652dee50186532bdbbb0001'
+*/
+export function getVehicles(userId) {
+  return window.requestms.get(`vehicles?userId=${userId}`, {}, { loading: false });
+  // return window.requestms.get(`https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service/vehicles?userId=${userId}`, {}, { loading: false });
+}
+
+/* 添加车牌
+
+curl --location 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service/vehicles?userId=2c9d85868652dee50186532bdbbb0001' \
+--header 'Content-Type: application/json' \
+--data '{
+    "userId": "2c9d85868652dee50186532bdbbb0001",
+    "vehicleNo": "车牌号",
+    "licensePlateType": "ORDINARY_CAR_NO"
+}'
+*/
+export function addVehicles(userId, params) {
+  return window.requestms.post(`vehicles?userId=${userId}`, params, { loading: false });
+  // return window.requestms.post(`https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service/vehicles?userId=${userId}`, params, { loading: false });
+}
+
+
+/* 修改车牌 
+
+curl --location --request PUT 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service/vehicles/4' \
+--header 'Content-Type: application/json' \
+--data '{
+    "id": 4,
+    "userId": "2c9d85868652dee50186532bdbbb0001",
+    "vehicleNo": "车牌号223332",
+    "licensePlateType": "ORDINARY_CAR_NO"
+}'
+*/
+export function editVehicles(vehicleId, params) {
+  return window.requestms.put(`vehicles/${vehicleId}`, params, { loading: false });
+  // return window.requestms.put(`https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service/vehicles/${vehicleId}`, params, { loading: false });
+}
+
+/* 删除车牌 
+
+curl --location --request DELETE 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service/vehicles/5' \
+--data ''
+*/
+export function delVehicle(vehicleId, params) {
+  return window.requestms.delete(`vehicles/${vehicleId}`, params, { loading: false });
+  // return window.requestms.delete(`https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service/vehicles/${vehicleId}`, params, { loading: false });
 }

src/pages/parkingFee/mixins/vehicleAddOrEdit.js

@@ -11,6 +11,7 @@ import {
   kipModifyMemberVehicles,
 } from '@/utils/api-kip.js';
 import { mapState } from 'vuex';
+import { addVehicles, editVehicles } from '@/api/parking/index'
 
 export default {
   components: {
@@ -51,7 +52,7 @@ export default {
       });
     }, 500)
     const params = this.$route.query;
-    // console.log(252, params);
+    console.log(55555, params);
     if (params.carType) {
       this.carInfo = {
         ...params,
@@ -72,6 +73,7 @@ export default {
     },
     ...mapState({
       custTypeId: (state) => state.custTypeId, // custTypeId: 0 默认版本，1 上海静安 2 上海浦东
+      kipUserId: (state) => state.kipUserId,
     }),
   },
   methods: {
@@ -159,7 +161,59 @@ export default {
     // 		return true;
     // 	}
     // },
+    async handleAddLicensePlateByTMP() {
+      const params = {
+        userId: this.kipUserId,
+        licensePlateType: this.licensePlateTypeArr[this.carType].value,
+        vehicleNo: this.vehicleNumber,
+      };
+      if(this.carInfo?.id) {
+        // 修改
+        const res = await editVehicles(this.carInfo?.id, {
+          id: this.carInfo?.id,
+          ...params
+        })
+        if(res.id) {
+          Toast({
+            message: '修改车牌成功',
+            position: 'top',
+            onClose: () => {
+              this.$router.replace({
+                path: `vehicleManagement`,
+              });
+            }
+          });
+        } else {
+          const message = res.langMessage || '修改车牌失败';
+          Toast({
+            message: message,
+          });
+        }
+        return
+      } 
+      // 添加
+      const res= await addVehicles( this.kipUserId, params )
+      if(res?.id) {
+        Toast({
+          message: '绑定车牌成功',
+          position: 'top',
+          onClose: () => {
+            this.$router.replace({
+              path: `vehicleManagement`,
+            });
+          }
+        });
+      } else {
+        const message = res.langMessage || '绑定车牌失败';
+        Toast({
+          message: message,
+          position: 'top',
+        });
+      }
+    },
     handleAddLicensePlateByKipMember() {
+      this.handleAddLicensePlateByTMP()
+      return
       // console.log('handleAddLicensePlateByKipMember执行');
       uni.showLoading({
         title: '加载中',

src/pages/parkingFee/mixins/vehicleManagement.js

@@ -17,6 +17,7 @@ import uni from '@/utils/uniHooks.js';
 // import { vehicles as vehiclesList } from './list';
 import { wxToLoginCallback } from '@/utils/index';
 import { Toast } from 'vant';
+import { getVehicles, delVehicle } from '@/api/parking/index'
 
 export default {
   components: {
@@ -32,6 +33,7 @@ export default {
       openid: (state) => state.openid,
       mallid: (state) => state.mallId,
       mobile: (state) => state.mobile,
+      kipUserId: (state) => state.kipUserId,
     }),
     isNoLogin() {
       return JSON.stringify(this.member) === '{}'
@@ -213,6 +215,29 @@ export default {
     activeCarnoFilter(str){
       return str.replace(/(.{2})/, '$1·')
     },
+    async delVehicleInTMP() {
+      const res = await delVehicle(this.activeId)
+      if (res.langMessage) {
+        const message = res.langMessage || '删除失败';
+        uni.showToast({
+          title: message,
+          duration: 2000,
+          icon: 'none',
+        });
+        return
+      }
+      Toast({
+        message: '删除成功',
+        type: 'success',
+        position: 'top',
+        duration: 5000,
+        className: 'top300',
+        icon: require('../static/images/success.svg')
+      });
+      setTimeout(() => {
+        this.getKipMemberVehicles();
+      }, 1000)
+    },
     // 删除
     toDelete(item) {
       this.activeId = item.id;
@@ -235,6 +260,8 @@ export default {
       // this.deleteDialogSwitch = true;
     },
     doDelete() {
+      this.delVehicleInTMP();
+      return
       uni.showLoading({
         title: '加载中',
       });
@@ -291,7 +318,13 @@ export default {
       this.getKipMemberVehicles();
     },
     // 获取会员绑定的车牌列表
+    async getVehiclesINTMP() {
+      const res = await getVehicles(this.kipUserId)
+      this.licensePlateList = this.setLicensePlateList(res.content);
+    },
     getKipMemberVehicles() {
+      this.getVehiclesINTMP();
+      return
       // console.log(453);
       uni.showLoading({
         title: '加载中',