From cf1d79c51e305961b825fd24884616fd7ba7155f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com>
Date: Fri, 7 Jun 2024 11:10:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/typings/global.d.ts                       |  2 +-
 .../customer/components/AddCustom.vue         | 15 +++++++--
 .../equipment/components/AddEquipment.vue     | 31 ++++++++++++++-----
 .../equipment/components/BindingCustom.vue    |  9 +++++-
 4 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/typings/global.d.ts b/src/typings/global.d.ts
index 9c53ec1..a0fb126 100644
--- a/src/typings/global.d.ts
+++ b/src/typings/global.d.ts
@@ -94,7 +94,7 @@ declare global {
   }
   interface SelectForm extends PageQuery {
     selectName?: string;
-    selectValue?: string;
+    selectValue?: any;
   }
 }
 export {};
diff --git a/src/views/resources/customer/components/AddCustom.vue b/src/views/resources/customer/components/AddCustom.vue
index d13bcc9..144a237 100644
--- a/src/views/resources/customer/components/AddCustom.vue
+++ b/src/views/resources/customer/components/AddCustom.vue
@@ -346,8 +346,15 @@
             :data="tableData1"
             v-loading="tableLoading"
             highlight-current-row
-            @current-change="handleDevChange"
+            @row-click="handleDevChange"
           >
+            <el-table-column width="55">
+              <template #default="scope">
+                <el-radio :label="scope.row.devId" v-model="currentDevId">
+                  {{ "" }}
+                </el-radio>
+              </template>
+            </el-table-column>
             <el-table-column
               label="设备标识"
               align="center"
@@ -422,7 +429,11 @@ import { ElTable, FormInstance, FormRules } from "element-plus";
 import { getDomainOptions } from "@/api/domain";
 import { addCustom } from "@/api/customer";
 import { EquipmentTableVO } from "@/api/resources-equipment/types";
-import { bindingCustomAPI, getEquipmentPage, unbindingCustomAPI } from "@/api/resources-equipment";
+import {
+  bindingCustomAPI,
+  getEquipmentPage,
+  unbindingCustomAPI,
+} from "@/api/resources-equipment";
 
 const formData = ref<CustomForm>({});
 const active = ref<number>(1);
diff --git a/src/views/resources/equipment/components/AddEquipment.vue b/src/views/resources/equipment/components/AddEquipment.vue
index c769237..429205c 100644
--- a/src/views/resources/equipment/components/AddEquipment.vue
+++ b/src/views/resources/equipment/components/AddEquipment.vue
@@ -63,8 +63,18 @@
             v-loading="loading"
             highlight-current-row
             max-height="450"
-            @current-change="handleCurrentChange"
+            @row-click="handleCurrentChange"
           >
+            <el-table-column width="55">
+              <template #default="scope">
+                <el-radio
+                  :label="scope.row.devTypeId"
+                  v-model="addForm.devTypeId"
+                >
+                  {{ "" }}
+                </el-radio>
+              </template>
+            </el-table-column>
             <el-table-column label="设备类型" prop="devType" align="center">
               <template #default="scope">
                 <el-button
@@ -338,8 +348,18 @@
             max-height="300"
             v-loading="loading"
             highlight-current-row
-            @current-change="handleCustomerChange"
+            @row-click="handleCustomerChange"
           >
+            <el-table-column width="55">
+              <template #default="scope">
+                <el-radio
+                  :label="scope.row.customId"
+                  v-model="currentCustomerId"
+                >
+                  {{ "" }}
+                </el-radio>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="customType"
               label="客户类型"
@@ -397,9 +417,7 @@ import {
 } from "@/api/resources-equipment";
 import { customerPage } from "@/api/customer";
 import { CustomerVO } from "@/api/customer/types";
-import { add } from "lodash-es";
 
-const multiple = ref<Tr069DevTypeVO>({});
 const searchForm = ref<Tr069DevTypeQuery>({
   devTypeName: "",
   devHardVer: "",
@@ -454,7 +472,6 @@ const loadHardVerOption = async () => {
   });
 };
 const handleCurrentChange = (val: Tr069DevTypeVO) => {
-  multiple.value = val;
   addForm.value.devTypeId = val.devTypeId;
 };
 const loadTr069DevTypePage = () => {
@@ -483,7 +500,7 @@ async function loadDomainOptions() {
 }
 
 const next1 = () => {
-  if (multiple.value.devTypeId === undefined) {
+  if (addForm.value.devTypeId === undefined) {
     ElMessage({
       message: "请选择一个设备类型",
       type: "error",
@@ -583,7 +600,7 @@ const queryCustomer = () => {
       loading.value = false;
     });
 };
-const currentCustomerId = ref<number|undefined>(0);
+const currentCustomerId = ref<number | undefined>(0);
 const handleCustomerChange = (val: CustomerVO) => {
   currentCustomerId.value = val.customId;
 };
diff --git a/src/views/resources/equipment/components/BindingCustom.vue b/src/views/resources/equipment/components/BindingCustom.vue
index 56edf6d..013bef0 100644
--- a/src/views/resources/equipment/components/BindingCustom.vue
+++ b/src/views/resources/equipment/components/BindingCustom.vue
@@ -51,8 +51,15 @@
           v-loading="loading"
           max-height="350"
           highlight-current-row
-          @current-change="handleCustomerChange"
+          @row-click="handleCustomerChange"
         >
+          <el-table-column width="55">
+            <template #default="scope">
+              <el-radio :label="scope.row.customId" v-model="currentCustomerId">
+                {{ "" }}
+              </el-radio>
+            </template>
+          </el-table-column>
           <el-table-column prop="customType" label="客户类型" align="center" />
           <el-table-column
             prop="regionAreaName"