From bed415a1e505b35e2e416e1696fdfae04b43626a Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Wed, 6 Dec 2023 11:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/api/land.ts                 |  2 +-
 admin/src/views/land/edit.vue         | 55 +++++++++++----------------
 admin/src/views/product/edit.vue      | 11 ++++--
 app/adminapi/logic/land/LandLogic.php | 10 +++--
 app/adminapi/logic/user/UserLogic.php |  2 +-
 5 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/admin/src/api/land.ts b/admin/src/api/land.ts
index 4b362fe9..40dddd1e 100644
--- a/admin/src/api/land.ts
+++ b/admin/src/api/land.ts
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 // 用户列表
 export function getUserList(params: any) {
-    return request.get({ url: '/user.user/lists', params }, { ignoreCancelToken: true })
+    return request.get({ url: '/user.user/datas', params }, { ignoreCancelToken: true })
 }
 
 // 产品列表列表
diff --git a/admin/src/views/land/edit.vue b/admin/src/views/land/edit.vue
index f8416602..1f202448 100644
--- a/admin/src/views/land/edit.vue
+++ b/admin/src/views/land/edit.vue
@@ -9,22 +9,21 @@
             @close="handleClose"
         >
 <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-                <el-form-item v-if="formData.root == 1" label="用户ID" prop="user_id">
+    <el-form-item v-if="formData.root == 1" label="所属用户" prop="user_id">
     <el-select
         v-model="formData.user_id"
-        filterable
         remote
-        reserve-keyword
+        filterable
         placeholder="请输入用户信息"
         :remote-method="queryUser"
         :loading="loading"
       >
-        <el-option
-          v-for="item in userOptions"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
+      <el-option
+        v-for="(item, index) in optionsData.user"
+        :key="index"
+        :label="item.userinfo"
+        :value="item.id"
+    />
       </el-select>
 </el-form-item>
                 <el-form-item label="土地名称" prop="title">
@@ -90,6 +89,7 @@
 </template>
 
 <script lang="ts" setup name="landEdit">
+import { useDictOptions } from '@/hooks/useDictOptions'
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiLandAdd, apiLandEdit, apiLandDetail, getUserList, getUserInfo } from '@/api/land'
@@ -182,31 +182,23 @@ const getDetail = async (row: Record<string, any>) => {
     setFormData(data)
 }
 
-interface ListItem {
-    value: string
-    label: string
-}
-const userOptions = ref<ListItem[]>([])
+const { optionsData } = useDictOptions<{
+    user: any[]
+}>({
+    user: {
+        api: getUserList
+    }
+})
+
 const loading = ref(false)
 
 const queryUser = async (query: string) => {
-    if (query) {
-        loading.value = true
-        const userList = await getUserList({
-            keyword: query
-        })
-        loading.value = false
-        if (userList.count > 0) {
-            userOptions.value = userList.lists.map((user: any) => {
-                return { value: `${user.id}`, label: `ID: ${user.id} / 账户: ${user.account}` }
-            })
-        } else {
-            userOptions.value = []
-        }
-        loading.value = false
-    } else {
-        userOptions.value = []
-    }
+    loading.value = true
+    const userList = await getUserList({
+        keyword: query ?? ''
+    })
+    optionsData.user = userList
+    loading.value = false
 }
 
 // 提交按钮
@@ -240,7 +232,6 @@ const handleClose = () => {
 }
 
 
-
 defineExpose({
     open,
     setFormData,
diff --git a/admin/src/views/product/edit.vue b/admin/src/views/product/edit.vue
index f4554c43..e62bd921 100644
--- a/admin/src/views/product/edit.vue
+++ b/admin/src/views/product/edit.vue
@@ -23,7 +23,7 @@
         filterable
         placeholder="请输入用户信息"
         :remote-method="queryUser"
-        @change="selectedUser"
+        @blur="selectedUser"
         :loading="loading"
       >
       <el-option
@@ -42,6 +42,7 @@
                     filterable
                     placeholder="请输入土地信息"
                     :remote-method="queryLand"
+                    @focus="selectedLand"
                     :loading="loading"
                 >
                 <el-option
@@ -117,7 +118,6 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
     //@ts-ignore
     formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss') 
 }
@@ -153,7 +153,8 @@ const queryUser = async (query: string) => {
 }
 
 const selectedUser = (value: any) => {
-    queryLand(value)
+    optionsData.land = []
+    formData.land_id = ''
 }
 
 const queryLand = async (user_id: string) => {
@@ -166,6 +167,10 @@ const queryLand = async (user_id: string) => {
     loading.value = false
 }
 
+const selectedLand = () => {
+    queryLand(formData.user_id)
+}
+
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
diff --git a/app/adminapi/logic/land/LandLogic.php b/app/adminapi/logic/land/LandLogic.php
index d3f45534..294ab064 100644
--- a/app/adminapi/logic/land/LandLogic.php
+++ b/app/adminapi/logic/land/LandLogic.php
@@ -38,9 +38,10 @@ class LandLogic extends BaseLogic
      */
     public static function add(array $params): bool
     {
+        $root = (request()->adminInfo)['root'];
         $userId = (request()->adminInfo)['user_id'];
-        if (!empty($params['user_id'])) {
-            $userId = $params['user_id'];
+        if ($root && !empty($params['user_id'])) {
+            $userId = $params['user_id']; 
         }
         Db::startTrans();
         try {
@@ -86,9 +87,10 @@ class LandLogic extends BaseLogic
      */
     public static function edit(array $params): bool
     {
+        $root = (request()->adminInfo)['root'];
         $userId = (request()->adminInfo)['user_id'];
-        if (!empty($params['user_id'])) {
-            $userId = $params['user_id'];
+        if ($root && !empty($params['user_id'])) {
+            $userId = $params['user_id']; 
         }
         Db::startTrans();
         try {
diff --git a/app/adminapi/logic/user/UserLogic.php b/app/adminapi/logic/user/UserLogic.php
index 74226867..c0496866 100644
--- a/app/adminapi/logic/user/UserLogic.php
+++ b/app/adminapi/logic/user/UserLogic.php
@@ -73,7 +73,7 @@ class UserLogic extends BaseLogic
             ->order('id desc')
             ->select()->toArray();
         foreach ($lists as &$item) {
-            $item['userinfo'] = $item['id'] . ' / ' . $item['nickname'] . ' / ' . $item['account'];
+            $item['userinfo'] = $item['id'] . ' / ' . $item['account'];
         }
         return $lists;
     }