Merge branch 'temp' of https://gitea.peidikeji.cn/zhouhui/lcny-vue3-antd-admin into temp

src/api/sys/user.ts

@@ -679,6 +679,20 @@ export function editCropYields(id: string, data, mode: ErrorMessageMode = 'modal
   )
 }
 
+/**
+ * @description:查看农作物产量详情
+ */
+export function getCropYieldsInfo(id: string, mode: ErrorMessageMode = 'modal') {
+  return defHttp.get(
+    {
+      url: `/api/crop-yields/${id}`,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  )
+}
+
 /**
  * @description:设备列表
  */

src/utils/index.ts

@@ -178,3 +178,21 @@ export function getMonth() {
     MonthEndDate: dayjs(yesterdayEnd).format('YYYY-MM-DD'),
   }
 }
+
+/**
+ * 是否json字符串
+ */
+export function jsonString(value) {
+  if (typeof value === 'string') {
+    try {
+      const obj = JSON.parse(value)
+      if (typeof obj === 'object' && obj) {
+        return true
+      }
+      return false
+    } catch (e) {
+      return false
+    }
+  }
+  return false
+}

src/views/base/crop-yields/town-yields/TownDrawer.vue

@@ -10,27 +10,67 @@
     <BasicForm @register="registerForm">
       <template #crop="{ model, field }">
         <TreeSelect
+          treeDefaultExpandAll
+          :disabled="isUpdate"
           v-model:value="model[field]"
           :tree-data="treeData"
+          @select="select"
           placeholder="请选择"
           :fieldNames="{ children: 'children', label: 'name', value: 'id' }"
         ></TreeSelect>
       </template>
+      <!-- 产量 -->
+      <template #yield="{ model, field }">
+        <Input v-model:value="model[field]" :suffix="company" placeholder="请输入"></Input>
+      </template>
+      <!-- 扩展 -->
+      <template #extends="{ model, field }">
+        <Space
+          v-for="(sight, index) in model[field]"
+          :key="index"
+          style="width: 100%"
+          align="baseline"
+        >
+          <FormItem
+            class="w-full"
+            :label="sight.name"
+            :name="['extends', index, 'value']"
+            :rules="{
+              required: true,
+              message: '请输入',
+              trigger: 'change',
+            }"
+            :label-col="{ span: 6 }"
+          >
+            <Input
+              v-model:value="sight.value"
+              placeholder="请输入"
+              :suffix="sight.unit"
+              class="w-full"
+              type="number"
+            ></Input>
+          </FormItem>
+        </Space>
+      </template>
     </BasicForm>
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
-  import { getTreeData } from '/@/utils/index'
+  import { getTreeData, jsonString } from '/@/utils/index'
   import dayjs from 'dayjs'
   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 { addCropYields, editCropYields, getcrops } from '/@/api/sys/user'
+  import { addCropYields, editCropYields, getcrops, getCropYieldsInfo } from '/@/api/sys/user'
-  import { TreeSelect } from 'ant-design-vue'
+  import { TreeSelect, Input, Space, FormItem } from 'ant-design-vue'
+
   const emits = defineEmits(['success', 'register'])
   const isUpdate = ref(false)
   const treeData = ref([])
+  const cropslist = ref<any>([])
+  //单位
+  const company = ref('')
   const getTitle = computed(() => (!isUpdate.value ? '新增产量' : '编辑产量'))
   const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
     labelWidth: 120,
@@ -40,13 +80,18 @@
   })
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     resetFields()
+    company.value = ''
     setDrawerProps({ confirmLoading: false })
     if (unref(treeData).length === 0) {
       const res = await getcrops({ type: 'all', crop_type: 2 })
+      cropslist.value = res.data
       treeData.value = getTreeData(res.data, 0, 'parent_id', 'id', 'children', 'key')
     }
     isUpdate.value = data?.isUpdate
     if (unref(isUpdate)) {
+      company.value = cropslist?.value?.find((e) => e.id === data.crop_id)?.unit ?? ''
+      const my_extends = cropslist?.value?.find((e) => e.id === data.crop_id)?.extends ?? null
+      const res = await getCropYieldsInfo(data.id)
       await setFieldsValue({
         id: data.id,
         quarter: data.quarter.toString(),
@@ -56,13 +101,32 @@
         output: data.output,
         crop_id: data.crop_id,
         cultivated: data.cultivated,
+        extends: formatDataByObject(my_extends, res.extends),
+      })
+    } else {
+      setFieldsValue({
+        extends: [],
       })
     }
   })
 
+  const select = (e: number, node: any) => {
+    console.log(e)
+    company.value = node.unit
+    setFieldsValue({
+      extends: jsonString(node.extends) ? JSON.parse(node.extends) : node.extends,
+    })
+  }
+
   const handleSubmit = async () => {
     try {
       const values = await validate()
+      if (values.extends) {
+        values.extends = values.extends.reduce(
+          (obj, item) => ((obj[item.name] = item.value), obj),
+          {},
+        )
+      }
       values.time_year = dayjs(values.time_year.toString()).format('YYYY')
       values.type = 2
       setDrawerProps({ confirmLoading: true })
@@ -79,9 +143,41 @@
       setDrawerProps({ confirmLoading: false })
     }
   }
+
+  const formatDataByObject = (e, v) => {
+    let arr: any = []
+    const arr1 = jsonString(e) ? JSON.parse(e) : e
+    if (!!arr1) {
+      if (!!v) {
+        arr1.forEach((e) => {
+          Object.keys(v).forEach((eve) => {
+            if (e.name === eve) {
+              arr.push({
+                name: e.name,
+                value: v[eve],
+                unit: e.unit,
+              })
+            }
+          })
+        })
+      } else {
+        arr = arr1.map((s) => {
+          return {
+            name: s.name,
+            value: '',
+            unit: s.unit,
+          }
+        })
+      }
+    }
+    return arr
+  }
 </script>
 <style lang="less" scoped>
   :deep(.ant-picker) {
     width: 100%;
   }
+  :deep(.ant-space-item) {
+    width: 100%;
+  }
 </style>

src/views/base/crop-yields/town-yields/town.data.ts

@@ -94,6 +94,27 @@ export const accountFormSchema: FormSchema[] = [
       return !!values.id
     },
   },
+  {
+    label: '农作物',
+    field: 'crop_id',
+    slot: 'crop',
+    component: 'TreeSelect',
+    required: true,
+  },
+  {
+    field: 'base_id',
+    label: '区域',
+    component: 'ApiSelect',
+    required: true,
+    componentProps: {
+      api: async () => {
+        const res = await getTownAgriculturalBasic({ type: 2, page: 1, per_page: 99999 })
+        return res.data
+      },
+      labelField: 'name',
+      valueField: 'id',
+    },
+  },
   {
     field: 'time_year',
     label: '年份',
@@ -119,57 +140,42 @@ export const accountFormSchema: FormSchema[] = [
     },
   },
 
-  {
-    field: 'base_id',
-    label: '区域',
-    component: 'ApiSelect',
-    required: true,
-    componentProps: {
-      api: async () => {
-        const res = await getTownAgriculturalBasic({ type: 2, page: 1, per_page: 99999 })
-        return res.data
-      },
-      labelField: 'name',
-      valueField: 'id',
-    },
-  },
   {
     field: 'yield',
     label: '产量',
     required: true,
-    component: 'InputNumber',
+    component: 'Input',
+    slot: 'yield',
   },
   {
     field: 'output',
     label: '产值',
     required: true,
-    component: 'InputNumber',
+    component: 'Input',
-  },
+    componentProps: {
-  // {
+      suffix: '元',
-  //   field: 'crop_id',
+      type: 'number',
-  //   label: '农作物',
+    },
-  //   component: 'TreeSelect',
-  //   required: true,
-  //   componentProps: {
-  //     api: async () => {
-  //       const res = await getcrops({ type: 'all', crop_type: 2 })
-  //       return res.filter((e) => e.is_end == 1)
-  //     },
-  //     labelField: 'name',
-  //     valueField: 'id',
-  //   },
-  // },
-  {
-    label: '农作物',
-    field: 'crop_id',
-    slot: 'crop',
-    component: 'TreeSelect',
-    required: true,
   },
+
   {
     field: 'cultivated',
     label: '耕种面积',
     required: true,
-    component: 'InputNumber',
+    component: 'Input',
+    componentProps: {
+      suffix: '亩',
+      type: 'number',
+    },
+  },
+  {
+    field: 'extends',
+    label: '',
+    required: false,
+    component: 'Input',
+    slot: 'extends',
+    ifShow: ({ values }) => {
+      return values?.extends?.length > 0
+    },
   },
 ]