From fa2745ae9546b03a72f04556ac14451733c6b5e7 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Tue, 9 Jul 2024 12:41:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=B6=E7=BC=96=E5=8F=B7=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/controller/RecycleDeviceController.java  | 15 +++++++++++++++
 jnpf-java-boot/jnpf-web/src/api/device.js         |  7 +++++++
 .../jnpf-web/src/views/recyclecleanorder/form.vue | 15 ++++++++++-----
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java
index ad0d543..99d78aa 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java
@@ -341,6 +341,21 @@ public class RecycleDeviceController {
         List<CompanyEntity> list = companyService.list(lambda);
         return ActionResult.success(list);
     }
+    //获取桶列表
+    @PostMapping("/getBucketList")
+    @Operation(summary = "获取桶清单下拉框")
+    public ActionResult getBucketList() {
+        UserInfo userInfo = userProvider.get();
+        Boolean isAdministrator = userInfo.getIsAdministrator();
+        String organizeId = userInfo.getOrganizeId();
+        QueryWrapper<RecycleBucketEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<RecycleBucketEntity> lambda = wrapper.lambda();
+        if (!isAdministrator) {
+            lambda.eq(RecycleBucketEntity::getCompanyId, organizeId);
+        }
+        List<RecycleBucketEntity> list = recycleBucketService.list(lambda);
+        return ActionResult.success(list);
+    }
 
     //获取设备信息
     @PostMapping("/getControlAuth")
diff --git a/jnpf-java-boot/jnpf-web/src/api/device.js b/jnpf-java-boot/jnpf-web/src/api/device.js
index 65a9ecd..364d92c 100644
--- a/jnpf-java-boot/jnpf-web/src/api/device.js
+++ b/jnpf-java-boot/jnpf-web/src/api/device.js
@@ -231,6 +231,13 @@ export function getDeviceListOption() {
     method: "POST"
   });
 }
+// 获取桶设备列表
+export function getBucketList() {
+  return request({
+    url: `/api/scm/RecycleDevice/getBucketList`,
+    method: "POST"
+  });
+}
 // 获取设备信息
 export function getDeviceListInfo(query) {
   // let query = {
diff --git a/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/form.vue
index c01bacd..2d72dbc 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/form.vue
@@ -395,6 +395,7 @@ import {
   getLaterTime
 } from "@/components/Generator/utils/index.js";
 import { thousandsFormat } from "@/components/Generator/utils/index";
+import { getBucketList } from "@/api/device";
 export default {
   components: {},
   props: [],
@@ -661,8 +662,8 @@ export default {
       doorNumProps: { label: "fullName", value: "id" },
       bucketCodeOptions: [],
       bucketCodeProps: {
-        label: "show_name",
-        value: "bucket_code",
+        label: "showName",
+        value: "bucketCode",
         children: "children"
       }
     };
@@ -786,11 +787,15 @@ export default {
       let template = {
         paramList: templateJsonList
       };
-      getDataInterfaceRes("565524506681020549", template).then(res => {
-        let data = res.data;
-        this.bucketCodeOptions = data;
+      getBucketList().then(res => {
+        this.bucketCodeOptions = res.data;
         this.changeDataFormData(1, "bucketCode", "bucketCode", index, []);
       });
+      // getDataInterfaceRes("565524506681020549", template).then(res => {
+      //   let data = res.data;
+      //   this.bucketCodeOptions = data;
+      //   this.changeDataFormData(1, "bucketCode", "bucketCode", index, []);
+      // });
     },
     getproductCodeOptions() {
       const index = this.childIndex;