From 34bb3886a8be67028acd9d80270d61b271b1793a Mon Sep 17 00:00:00 2001
From: "30830569@qq.com" <>
Date: Tue, 22 Nov 2022 10:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E4=BD=9C=E7=89=A9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/crops/base-crops/BaseDrawer.vue      | 53 ++++++++++++++++---
 src/views/base/crops/base-crops/base.data.ts  | 17 +++---
 .../base/crops/town-crops/TownDrawer.vue      | 52 +++++++++++++++---
 src/views/base/crops/town-crops/town.data.ts  | 17 +++---
 4 files changed, 109 insertions(+), 30 deletions(-)

diff --git a/src/views/base/crops/base-crops/BaseDrawer.vue b/src/views/base/crops/base-crops/BaseDrawer.vue
index f8ee9eaa..037e876f 100644
--- a/src/views/base/crops/base-crops/BaseDrawer.vue
+++ b/src/views/base/crops/base-crops/BaseDrawer.vue
@@ -8,10 +8,22 @@
     @ok="handleSubmit"
   >
     <BasicForm @register="registerForm">
+      <!--  -->
+      <template #category_id="{ model, field }">
+        <Select
+          v-model:value="model[field]"
+          :options="industryData"
+          placeholder="请选择"
+          @select="select"
+          :fieldNames="{ label: 'name', value: 'id' }"
+        ></Select>
+      </template>
+      <!--  -->
       <template #parent="{ model, field }">
         <TreeSelect
           v-model:value="model[field]"
           :tree-data="treeData"
+          treeDefaultExpandAll
           placeholder="请选择"
           allowClear
           :fieldNames="{ children: 'children', label: 'name', value: 'id' }"
@@ -68,17 +80,24 @@
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
-  import { getTreeData } from '/@/utils/index'
+  import { getTreeData, jsonString } from '/@/utils/index'
   import { ref, computed, unref } from 'vue'
   import { BasicForm, useForm } from '/@/components/Form/index'
   import { accountFormSchema } from './base.data'
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'
-  import { TreeSelect, Space, FormItem, Input, Button } from 'ant-design-vue'
-  import { addcrops, editcrops, getcrops, agriculturalBasicInfo } from '/@/api/sys/user'
+  import { TreeSelect, Space, FormItem, Input, Button, Select } from 'ant-design-vue'
+  import {
+    addcrops,
+    editcrops,
+    getcrops,
+    agriculturalBasicInfo,
+    getCropCate,
+  } from '/@/api/sys/user'
   import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons-vue'
   const emits = defineEmits(['success', 'register'])
   const isUpdate = ref(false)
   const treeData = ref([])
+  const industryData = ref<any>([])
   const getTitle = computed(() => (!isUpdate.value ? '新增农作物' : '编辑农作物'))
   const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
     labelWidth: 100,
@@ -89,17 +108,22 @@
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     resetFields()
     setDrawerProps({ confirmLoading: false })
-    if (unref(treeData).length === 0) {
-      const res = await getcrops({ type: 'all', crop_type: 1 })
-      treeData.value = getTreeData(res.data, 0, 'parent_id', 'id', 'children', 'key', 0)
+    if (unref(industryData).length === 0) {
+      // 获取产业数据
+      getIndustry()
+      //获取上级数据
+      getTree()
     }
     isUpdate.value = data?.isUpdate
     if (unref(isUpdate)) {
       const res = await agriculturalBasicInfo(data.id)
+      //获取上级数据
+      await getTree(res?.category?.id ?? null)
+      const arr1 = jsonString(res.extends) ? JSON.parse(res.extends) : res.extends
       await setFieldsValue({
         ...res,
         is_end: res.is_end === 1 ? true : false,
-        extends: res.extends.length ? res.extends : [{ name: '', unit: '' }],
+        extends: arr1.length ? arr1 : [{ name: '', unit: '' }],
         category_id: res?.category?.id,
         parent_id: res.parent_id > 0 ? res.parent_id : undefined,
       })
@@ -109,6 +133,21 @@
       })
     }
   })
+
+  // 获取产业数据
+  const getIndustry = async () => {
+    const res = await getCropCate()
+    industryData.value = res
+  }
+  const select = (e) => {
+    setFieldsValue({ parent_id: undefined })
+    getTree(e)
+  }
+  // 获取上级数据
+  const getTree = async (category = null) => {
+    const res = await getcrops({ type: 'all', crop_type: 1, category })
+    treeData.value = getTreeData(res.data, 0, 'parent_id', 'id', 'children', 'key', 0)
+  }
   const handleSubmit = async () => {
     try {
       const values = await validate()
diff --git a/src/views/base/crops/base-crops/base.data.ts b/src/views/base/crops/base-crops/base.data.ts
index 39ed9275..d0907ec1 100644
--- a/src/views/base/crops/base-crops/base.data.ts
+++ b/src/views/base/crops/base-crops/base.data.ts
@@ -52,14 +52,15 @@ export const accountFormSchema: FormSchema[] = [
     label: '产业',
     required: true,
     component: 'ApiSelect',
-    componentProps: {
-      api: async () => {
-        const res = await getCropCate()
-        return res
-      },
-      labelField: 'name',
-      valueField: 'id',
-    },
+    slot: 'category_id',
+    // componentProps: {
+    //   api: async () => {
+    //     const res = await getCropCate()
+    //     return res
+    //   },
+    //   labelField: 'name',
+    //   valueField: 'id',
+    // },
   },
   {
     field: 'name',
diff --git a/src/views/base/crops/town-crops/TownDrawer.vue b/src/views/base/crops/town-crops/TownDrawer.vue
index 91f0f3c2..8785b89c 100644
--- a/src/views/base/crops/town-crops/TownDrawer.vue
+++ b/src/views/base/crops/town-crops/TownDrawer.vue
@@ -8,11 +8,23 @@
     @ok="handleSubmit"
   >
     <BasicForm @register="registerForm">
+      <!--  -->
+      <template #category_id="{ model, field }">
+        <Select
+          v-model:value="model[field]"
+          :options="industryData"
+          placeholder="请选择"
+          @select="select"
+          :fieldNames="{ label: 'name', value: 'id' }"
+        ></Select>
+      </template>
+      <!--  -->
       <template #parent="{ model, field }">
         <TreeSelect
           v-model:value="model[field]"
           :tree-data="treeData"
           placeholder="请选择"
+          treeDefaultExpandAll
           :fieldNames="{ children: 'children', label: 'name', value: 'id' }"
         ></TreeSelect>
       </template>
@@ -67,17 +79,24 @@
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
-  import { getTreeData } from '/@/utils/index'
+  import { getTreeData, jsonString } from '/@/utils/index'
   import { ref, computed, unref } from 'vue'
   import { BasicForm, useForm } from '/@/components/Form/index'
   import { accountFormSchema } from './town.data'
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'
-  import { TreeSelect, Space, FormItem, Input, Button } from 'ant-design-vue'
-  import { addcrops, editcrops, getcrops, agriculturalBasicInfo } from '/@/api/sys/user'
+  import { TreeSelect, Space, FormItem, Input, Button, Select } from 'ant-design-vue'
+  import {
+    addcrops,
+    editcrops,
+    getcrops,
+    agriculturalBasicInfo,
+    getCropCate,
+  } from '/@/api/sys/user'
   import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons-vue'
   const emits = defineEmits(['success', 'register'])
   const isUpdate = ref(false)
   const treeData = ref([])
+  const industryData = ref<any>([])
   const getTitle = computed(() => (!isUpdate.value ? '新增农作物' : '编辑农作物'))
   const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
     labelWidth: 100,
@@ -88,17 +107,22 @@
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     resetFields()
     setDrawerProps({ confirmLoading: false })
-    if (unref(treeData).length === 0) {
-      const res = await getcrops({ type: 'all', crop_type: 2 })
-      treeData.value = getTreeData(res.data, 0, 'parent_id', 'id', 'children', 'key', 0)
+    if (unref(industryData).length === 0) {
+      // 获取产业数据
+      getIndustry()
+      //获取上级数据
+      getTree()
     }
     isUpdate.value = data?.isUpdate
     if (unref(isUpdate)) {
       const res = await agriculturalBasicInfo(data.id)
+      //获取上级数据
+      await getTree(res?.category?.id ?? null)
+      const arr1 = jsonString(res.extends) ? JSON.parse(res.extends) : res.extends
       await setFieldsValue({
         ...res,
         is_end: res.is_end === 1 ? true : false,
-        extends: res.extends.length ? res.extends : [{ name: '', unit: '' }],
+        extends: arr1.length ? arr1 : [{ name: '', unit: '' }],
         category_id: res?.category?.id,
         parent_id: res.parent_id > 0 ? res.parent_id : undefined,
       })
@@ -108,6 +132,20 @@
       })
     }
   })
+  // 获取产业数据
+  const getIndustry = async () => {
+    const res = await getCropCate()
+    industryData.value = res
+  }
+  const select = (e) => {
+    setFieldsValue({ parent_id: undefined })
+    getTree(e)
+  }
+  // 获取上级数据
+  const getTree = async (category = null) => {
+    const res = await getcrops({ type: 'all', crop_type: 2, category })
+    treeData.value = getTreeData(res.data, 0, 'parent_id', 'id', 'children', 'key', 0)
+  }
   const handleSubmit = async () => {
     try {
       const values = await validate()
diff --git a/src/views/base/crops/town-crops/town.data.ts b/src/views/base/crops/town-crops/town.data.ts
index 39ed9275..d0907ec1 100644
--- a/src/views/base/crops/town-crops/town.data.ts
+++ b/src/views/base/crops/town-crops/town.data.ts
@@ -52,14 +52,15 @@ export const accountFormSchema: FormSchema[] = [
     label: '产业',
     required: true,
     component: 'ApiSelect',
-    componentProps: {
-      api: async () => {
-        const res = await getCropCate()
-        return res
-      },
-      labelField: 'name',
-      valueField: 'id',
-    },
+    slot: 'category_id',
+    // componentProps: {
+    //   api: async () => {
+    //     const res = await getCropCate()
+    //     return res
+    //   },
+    //   labelField: 'name',
+    //   valueField: 'id',
+    // },
   },
   {
     field: 'name',