From 61cbf02877feefc275f0ff602afe2a9b122d8d65 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Mon, 2 Sep 2024 09:09:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E7=8E=B0=E5=B1=95=E7=A4=BA=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=202.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                            |  4 +-
 src/api/system/hardwareVersion.js          |  9 +++
 src/views/system/device/index.vue          | 14 ++---
 src/views/system/hardwareVersion/index.vue | 19 +++++-
 src/views/system/recharge/index.vue        |  2 +-
 src/views/system/withdrawAudit/index.vue   | 69 ++++++++++++----------
 6 files changed, 74 insertions(+), 43 deletions(-)

diff --git a/.env.production b/.env.production
index bbd9562..1fe549c 100644
--- a/.env.production
+++ b/.env.production
@@ -5,8 +5,8 @@ VUE_APP_TITLE = 共享电动车管理系统
 ENV = 'production'
 
 # 共享电动车管理系统/生产环境
-# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
-VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api'
+VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
+# VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api'
 
 # 小程序外链跳转设备
 VUE_APP_WX_DEVICE_URL = 'weixin://dl/business/?appid=wx4d178f8c80348214&env_version=release'
diff --git a/src/api/system/hardwareVersion.js b/src/api/system/hardwareVersion.js
index 1741ae0..35cac74 100644
--- a/src/api/system/hardwareVersion.js
+++ b/src/api/system/hardwareVersion.js
@@ -9,6 +9,15 @@ export function listHardwareVersion(query) {
   })
 }
 
+// 查询硬件版本列表 排除父节点
+export function listHardwareVersionExcludeParent(query) {
+  return request({
+    url: '/system/hardwareVersion/list/exclude',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询硬件版本详细
 export function getHardwareVersion(id) {
   return request({
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index 48d3c03..2d3701d 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -809,7 +809,7 @@
               </el-date-picker>
             </el-row>
             <!-- <el-row style="margin-bottom: 0.5em">
-            
+
             </el-row> -->
             <location-map
               v-if="showPlaceSearchMap && tripRouteStr != ''"
@@ -904,8 +904,8 @@ import {
 import { listDept2 } from "@/api/system/dept";
 import {
   getHardwareVersion,
-  listHardwareVersion,
-} from "@/api/system/hardwareVersion";
+  listHardwareVersion, listHardwareVersionExcludeParent
+} from '@/api/system/hardwareVersion'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -1032,8 +1032,8 @@ export default {
     window.removeEventListener("scroll", this.handleScroll, true);
   },
   created() {
-    listHardwareVersion(this.queryParams).then((response) => {
-      this.hardwareVersionOptions = response.rows;
+    listHardwareVersionExcludeParent(this.queryParams).then((response) => {
+      this.hardwareVersionOptions = response.data;
       this.loading2 = false;
     });
     console.log("当前用户信息：", this.$store.state.user.name);
@@ -1483,13 +1483,13 @@ export default {
         endTime: this.formatDate(this.endTime),
       };
       this.showPlaceSearchMap=false
-     
+
       gettrajectory(data).then((response) => {
         this.tripRouteStr = response.data;
         // this.re
         this.showPlaceSearchMap=true
         setTimeout(() => {
-         
+
           this.$refs.map.trajectory();
         }, 600);
 
diff --git a/src/views/system/hardwareVersion/index.vue b/src/views/system/hardwareVersion/index.vue
index abd2286..77983f6 100644
--- a/src/views/system/hardwareVersion/index.vue
+++ b/src/views/system/hardwareVersion/index.vue
@@ -100,6 +100,14 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:hardwareVersion:edit']"
           >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            v-if="scope.row.parentId == 0"
+            @click="handleAddChild(scope.row)"
+            v-hasPermi="['system:hardwareVersion:edit']"
+          >新增</el-button>
           <el-button
             size="mini"
             type="text"
@@ -254,7 +262,16 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加硬件版本";
+      this.form.parentId = 0;
+      this.title = "添加批次版本";
+    },
+    /** 添加子版本 */
+    handleAddChild(row) {
+      this.reset();
+      this.open = true;
+      console.log("row：",row)
+      this.form.parentId = row.id;
+      this.title = "添加子版本";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/src/views/system/recharge/index.vue b/src/views/system/recharge/index.vue
index 13305d3..589a7bd 100644
--- a/src/views/system/recharge/index.vue
+++ b/src/views/system/recharge/index.vue
@@ -58,7 +58,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            v-if="scope.row.rechargeType == '2' && !scope.row.isRefunded"
+            v-if="scope.row.rechargeType == '2' && !scope.row.isRefunded && scope.row.depositDeduction == '0'"
             size="mini"
             type="text"
             icon="el-icon-edit"
diff --git a/src/views/system/withdrawAudit/index.vue b/src/views/system/withdrawAudit/index.vue
index b0943c0..248b3fe 100644
--- a/src/views/system/withdrawAudit/index.vue
+++ b/src/views/system/withdrawAudit/index.vue
@@ -170,28 +170,25 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="提现详细" :visible.sync="open3" width="700px" append-to-body>
+    <el-dialog title="提现详细" :visible.sync="open3" width="1000px" append-to-body>
       <el-form ref="form3" :model="form3"  label-width="100px" size="mini">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="申请人：">{{ form3.owner }}</el-form-item>
-            <el-form-item label="区域：">{{ form3.areaName }}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="提现金额："><span style="color: red;font-weight: 700">{{ form3.amount + form3.handlingCharge  }}</span> 元</el-form-item>
-            <el-form-item label="支付手续费："><span style="color: red;font-weight: 700">{{ form3.handlingCharge }}</span> 元</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="实际到账："><span style="color: red;font-weight: 700">{{ form3.amount }}</span> 元</el-form-item>
-            <el-form-item label="运营商结余："><span style="color: red;font-weight: 700">{{ form3.operatorBalance }}</span> 元</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="申请时间：">{{ form3.createTime }}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="状态：">
-              <dict-tag :options="dict.type.et_flow_status" :value="form3.status"/>
-            </el-form-item>
+            <el-col :span="12">
+              <el-form-item label="申请人：">{{ form3.owner }}</el-form-item>
+              <el-form-item label="区域：">{{ form3.areaName }}</el-form-item>
+              <el-form-item label="提现金额："><span style="font-weight: 700">{{ form3.amount + form3.handlingCharge  }}</span> 元</el-form-item>
+              <el-form-item label="支付手续费："><span style="font-weight: 700">{{ form3.handlingCharge }}</span> 元</el-form-item>
+              <el-form-item label="实际到账："><span style="color: red;font-weight: 700">{{ form3.amount }}</span> 元</el-form-item>
+              <el-form-item label="运营商结余："><span style="font-weight: 700">{{ form3.operatorBalance }}</span> 元</el-form-item>
+              <el-form-item label="申请时间：">{{ form3.createTime }}</el-form-item>
+              <el-form-item label="状态：">
+                <dict-tag :options="dict.type.et_flow_status" :value="form3.status"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <img :src="collectionCode" alt="收款码" style="max-width: 100%; height: auto;">
+            </el-col>
           </el-col>
           <el-col :span="24">
             <el-form-item label="驳回原因" prop="rejectReason">
@@ -213,7 +210,7 @@
 <script>
   import { listFlow, getFlow, delFlow, updateFlow, withdraw, rejectWithdraw } from '@/api/system/flow'
 import { optionselect as getAreaOptionselect } from '@/api/system/area'
-  import { getDeptByToken, listDept, listDept2 } from '@/api/system/dept'
+  import { getDept, getDeptByToken, listDept, listDept2 } from '@/api/system/dept'
 
 export default {
   name: "Flow",
@@ -308,6 +305,7 @@ export default {
       // 表单参数
       form: {},
       form3: {},
+      collectionCode:null,
       // 表单校验
       rules: {
         amount: [
@@ -352,9 +350,12 @@ export default {
     },
     /** 审核 */
     handleEdit(row) {
-      this.open3 = true;
-      this.form3 = row;
-      this.view = false;
+      getDept(row.ownerId).then(response => {
+        this.collectionCode = response.data.collectionCode;
+        this.open3 = true;
+        this.form3 = row;
+        this.view = false;
+      });
     },
     /** 通过 */
     pass(){
@@ -508,20 +509,24 @@ export default {
 };
 </script>
 <style lang="scss">
-.el-select {
-  .el-input__inner{
-    color: red;
-  }
+  .el-select {
+    .el-input__inner{
+      color: red;
+    }
 
-}
-.el-input{
-  .el-input__inner{
-    color: red;
   }
-}
+  .el-input{
+    .el-input__inner{
+      color: red;
+    }
+  }
   .amoun-tips{
     color: red;
     font-size: 12px;
     font-weight: 700;
   }
+
+.el-dialog__body {
+  padding: 0px 20px !important;
+}
 </style>