Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-02-02 f0ddb4e8e61a2dd1918d8d7d59c2cf28ac22eda1

Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

 applications/task-work-order/src/views/orderView/appConfiguration/materials/FormDiaLog.vue

New file
@@ -0,0 +1,303 @@
<template>
    <el-dialog
        class="gd-dialog"
        v-model="visible"
        :title="titleEnum[dialogMode]"
        @closed="visible = false"
        destroy-on-close
        :close-on-click-modal="false"
    >
        <el-row class="detail-row-view" v-if="dialogReadonly">
            <el-col :span="12">
                <div class="label">材料名称</div>
                <div class="val">{{ formData.materialName }}</div>
            </el-col>
            <el-col :span="12">
                <div class="label">材料说明</div>
                <div class="val">{{ formData.materialDesc }}</div>
            </el-col>
            <el-col :span="12">
                <div class="label">必要性</div>
                <div class="val">{{ getDictLabel(formData.necessity, dictObj.necessity) }}</div>
            </el-col>
            <el-col :span="12">
                <div class="label">是否适用全部情形</div>
                <div class="val">{{ getDictLabel(String(formData.isAllScenario), dictObj.isAllScenario) }}</div>
            </el-col>
            <el-col :span="12">
                <div class="label">所属区域</div>
                <div class="val">{{ formData.areaName }}</div>
            </el-col>
        </el-row>

        <el-form
            class="gd-dialog-form"
            v-else
            ref="formRef"
            :model="formData"
            :rules="rules"
            :disabled="dialogReadonly"
            label-width="140px"
        >
            <el-row>
                <el-col :span="12">
                    <el-form-item label="材料名称" prop="materialName">
                        <el-input class="gd-input" v-model="formData.materialName" placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="材料说明" prop="materialDesc">
                        <el-input class="gd-input" v-model="formData.materialDesc" placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="必要性" prop="necessity">
                        <el-select
                            class="gd-select"
                            popper-class="gd-select-popper"
                            v-model="formData.necessity"
                            placeholder="请选择"
                            clearable
                        >
                            <el-option
                                v-for="item in dictObj.necessity"
                                :key="item.dictKey"
                                :label="item.dictValue"
                                :value="item.dictKey"
                            />
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="是否适用全部情形" prop="isAllScenario">
                        <el-select
                            class="gd-select"
                            popper-class="gd-select-popper"
                            v-model="formData.isAllScenario"
                            placeholder="请选择"
                            clearable
                        >
                            <el-option
                                v-for="item in dictObj.isAllScenario"
                                :key="item.dictKey"
                                :label="item.dictValue"
                                :value="Number(item.dictKey)"
                            />
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="所属区域" prop="areaCode">
                        <el-tree-select
                            class="gd-select"
                            popper-class="gd-tree-select-popper"
                            v-model="formData.areaCode"
                            node-key="id"
                            :default-expanded-keys="expandedKeys"
                            :props="treeSelectProps"
                            placeholder="请选择"
                            clearable
                            filterable
                            :check-strictly="true"
                            lazy
                            :load="loadRegionNode"
                            :render-after-expand="false"
                        />
                    </el-form-item>
                </el-col>
            </el-row>
        </el-form>
        <template #footer v-if="!dialogReadonly">
            <el-button color="#F2F3F5" @click="visible = false">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
            <el-button class="save-btn" color="#4C34FF" :loading="submitting" :disabled="submitting" @click="handleSubmit">
                保存
            </el-button>
        </template>
    </el-dialog>
</template>

<script setup>
import { getDictLabel } from '@ztzf/utils'
import { computed, ref, inject } from 'vue'
import { ElMessage } from 'element-plus'
import { fieldRules } from '@ztzf/utils'
import { materialsSubmitApi, materialsDetailApi, regionLazyTreeApi } from './materialsApi'

// 初始化表单数据
const initForm = () => ({
    materialName: '',
    materialDesc: '',
    necessity: '',
    isAllScenario: '',
    areaCode: '',
    id: null,
})

const dictObj = inject('dictObj')

const emit = defineEmits(['success'])
const formRef = ref(null) // 表单实例
const formData = ref(initForm()) // 表单数据
const visible = defineModel() // 弹框显隐
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
const dialogReadonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
const expandedKeys = ref([]) // 树形选择器展开的节点
const regionNodeCache = ref(new Map()) // 缓存区域节点及其父节点关系

// 树形选择器配置
const treeSelectProps = ref({
    value: 'id',
    label: 'name',
    children: 'children',
    // 判断叶子节点
    isLeaf: (data, node) => {
        return node.level >= 2
    },
})

// 表单校验规则
const rules = {
    materialName: fieldRules(true),
    materialDesc: fieldRules(true),
    necessity: fieldRules(true),
    isAllScenario: fieldRules(true),
    areaCode: fieldRules(true),
}

// 提交新增/编辑
async function handleSubmit() {
    const isValid = await formRef.value?.validate().catch(() => false)
    if (!isValid) return
    submitting.value = true
    try {
        await materialsSubmitApi(formData.value)
        ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
        visible.value = false
        emit('success')
    } finally {
        submitting.value = false
    }
}

// 加载详情
async function loadDetail() {
    if (!formData.value.id) return
    const res = await materialsDetailApi({ id: formData.value.id })
    const data = res?.data?.data ?? {}
    // 将 areaCode 转换为字符串类型
    if (data.areaCode !== undefined) {
        data.areaCode = String(data.areaCode)
    }
    formData.value = data

    // 如果是编辑模式，获取区域节点的路径以展开树形选择器
    if (dialogMode.value === 'edit' && data.areaCode) {
        await loadRegionPath(data.areaCode)
    }
}

// 加载区域节点路径
async function loadRegionPath(areaCode) {
    try {
        const path = []
        const queue = [{ code: '360800000000', currentPath: ['360800000000'] }]
        let found = false

        // 广度优先搜索，逐层加载节点直到找到目标节点
        while (queue.length > 0 && !found) {
            const { code, currentPath } = queue.shift()

            // 获取当前节点的子节点
            const res = await regionLazyTreeApi({ parentCode: code })
            const nodes = res?.data?.data || []

            for (const node of nodes) {
                const nodeId = node.id || node.value

                // 缓存节点及其父节点关系
                regionNodeCache.value.set(nodeId, {
                    id: nodeId,
                    name: node.name || node.title || node.label,
                    parentId: code,
                    hasChildren: node.hasChildren || false,
                })

                // 检查是否找到目标节点
                if (nodeId === areaCode) {
                    path.push(...currentPath, nodeId)
                    found = true
                    break
                }

                // 如果有子节点，加入队列继续搜索
                if (node.hasChildren) {
                    queue.push({
                        code: nodeId,
                        currentPath: [...currentPath, nodeId],
                    })
                }
            }
        }

        if (path.length > 0) {
            expandedKeys.value = path
        }
    } catch (error) {
        console.error('加载区域路径失败:', error)
    }
}

// 打开弹框
async function open({ mode = 'add', row } = {}) {
    dialogMode.value = mode
    formData.value = dialogMode.value === 'add' ? initForm() : row
    if (dialogMode.value !== 'add') {
        await loadDetail()
    }
}

// 懒加载获取区域节点数据
async function loadRegionNode(node, resolve) {
    try {
        // 限制只加载两级，当前节点 level >= 1 时不加载子节点
        if (node.level >= 2) {
            resolve([])
            return
        }
        // 初始化加载时传递 code 参数，加载子节点时传递 parentCode 参数
        const params = node.data?.id ? { parentCode: node.data.id } : { code: '360800000000' }
        const parentCode = node.data?.id || '360800000000'
        const res = await regionLazyTreeApi(params)
        const nodes = res?.data?.data || []

        // 处理返回的节点数据
        const processedNodes = nodes.map(item => {
            const nodeId = item.id || item.value
            // 缓存节点及其父节点关系
            regionNodeCache.value.set(nodeId, {
                id: nodeId,
                name: item.name || item.title || item.label,
                parentId: parentCode,
                hasChildren: item.hasChildren || false,
            })

            return {
                id: nodeId,
                name: item.name || item.title || item.label,
                hasChildren: item.hasChildren || false,
            }
        })

        resolve(processedNodes)
    } catch (error) {
        console.error('获取区域数据失败:', error)
        resolve([])
    }
}

defineExpose({ open })
</script>

<style scoped lang="scss"></style>

 applications/task-work-order/src/views/orderView/appConfiguration/materials/index.vue

@@ -1,20 +1,230 @@
<template>
 <div>
    材料配置
 </div>
    <basic-container>
        <el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
            <el-form-item label="材料名称" prop="materialName">
                <el-input
                    class="gd-input gray"
                    v-model="searchParams.materialName"
                    placeholder="请输入"
                    clearable
                    @clear="handleSearch"
                />
            </el-form-item>

            <el-form-item label="所属区划" prop="areaCode">
                <el-tree-select
                    class="gd-select gray"
                    popper-class="gd-tree-select-popper"
                    v-model="searchParams.areaCode"
                    node-key="id"
                    :props="treeSelectProps"
                    placeholder="请选择"
                    clearable
                    filterable
                    @change="handleSearch"
                    :check-strictly="true"
                    lazy
                    :load="loadRegionNode"
                    :render-after-expand="false"
                />
            </el-form-item>

            <el-form-item class="gd-search-actions">
                <el-button :icon="RefreshRight" @click="resetForm"></el-button>
                <el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
            </el-form-item>
        </el-form>

        <div class="gd-table-toolbar">
            <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增材料</el-button>
        </div>

        <div class="gd-table-container" v-loading="loading">
            <div class="gd-table-content gd-table-content-bg">
                <el-table class="gd-table" :data="list">
                    <el-table-column label="序号" width="80">
                        <template v-slot="{ $index }">
                            {{ $index + 1 }}
                        </template>
                    </el-table-column>
                    <el-table-column prop="materialName" show-overflow-tooltip label="材料名称" />
                    <el-table-column prop="materialDesc" show-overflow-tooltip label="材料说明" />
                    <el-table-column prop="necessity" show-overflow-tooltip label="必要性">
                        <template v-slot="{ row }">
                            {{ getDictLabel(row.necessity, dictObj.necessity) }}
                        </template>
                    </el-table-column>
                    <el-table-column prop="isAllScenario" show-overflow-tooltip label="是否适用全部情形">
                        <template v-slot="{ row }">
                            {{ getDictLabel(String(row.isAllScenario), dictObj.isAllScenario) }}
                        </template>
                    </el-table-column>
                    <el-table-column prop="areaName" show-overflow-tooltip label="所属区域" />
                    <el-table-column label="操作" class-name="operation-btns" width="200">
                        <template v-slot="{ row }">
                            <el-link type="primary" @click="openForm('view', row)">查看</el-link>
                            <el-link type="primary" @click="openForm('edit', row)">编辑</el-link>
                            <el-link type="primary" @click="handleDelete(row)">删除</el-link>
                        </template>
                    </el-table-column>
                </el-table>
            </div>

            <div class="gd-pagination-parent">
                <el-pagination
                    popper-class="gd-select-popper"
                    v-model:current-page="searchParams.current"
                    v-model:page-size="searchParams.size"
                    layout="total, prev, pager, next, sizes"
                    :total="total"
                    @change="getList"
                />
            </div>
        </div>

        <FormDiaLog ref="dialogRef" @success="getList" v-if="dialogVisible" v-model="dialogVisible" />
    </basic-container>
</template>

<script setup >
/**
 * @description index
 * @date 2026-02-02 (周一) 09:26:21
 */
defineOptions({
 name: 'index'
<script setup>
import { Search, RefreshRight, Plus } from '@element-plus/icons-vue'
import { onMounted, ref, provide, nextTick } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import FormDiaLog from './FormDiaLog.vue'
import { materialsPageApi, materialsRemoveApi, regionLazyTreeApi } from './materialsApi'
import { getDictLabel } from '@ztzf/utils'

// 初始化查询参数
const initSearchParams = () => ({
    materialName: '', // 材料名称
    areaCode: '', // 所属区划
    current: 1, // 当前页
    size: 10, // 每页大小
})
const searchParams = ref(initSearchParams()) // 查询参数
const total = ref(0) // 总条数
const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例
const dialogVisible = ref(false)
const dictObj = ref({
    necessity: [],
    isAllScenario: [],
}) // 字典对象

// 树形选择器配置
const treeSelectProps = {
    value: 'id',
    label: 'name',
    children: 'children',
    // 判断叶子节点
    isLeaf: (data, node) => {
        return data.leaf === true
    },
}

provide('dictObj', dictObj)

// 获取字典列表
function getDictList() {
    // 必要性字典：必填/可选/容缺
    dictObj.value.necessity = [
        { dictKey: '必填', dictValue: '必填' },
        { dictKey: '可选', dictValue: '可选' },
        { dictKey: '容缺', dictValue: '容缺' },
    ]
    // 是否适用全部情形字典
    dictObj.value.isAllScenario = [
        { dictKey: '1', dictValue: '是' },
        { dictKey: '0', dictValue: '否' },
    ]
}

// 懒加载获取区域节点数据
async function loadRegionNode(node, resolve) {
    try {
        // 限制只加载两级，当前节点 level >= 1 时不加载子节点
        if (node.level >= 2) {
            resolve([])
            return
        }

        // 初始化加载时传递 code 参数，加载子节点时传递 parentCode 参数
        const params = node.data?.id ? { parentCode: node.data.id } : { code: '360800000000' }
        const res = await regionLazyTreeApi(params)
        const nodes = res?.data?.data || []

        // 处理返回的节点数据
        const processedNodes = nodes.map(item => {
            // 判断是否为叶子节点：如果是第二级（node.level === 1）则为叶子节点
            const isLeaf = node.level === 1

            return {
                id: item.id || item.value,
                name: item.name || item.title || item.label,
                hasChildren: item.hasChildren || false,
                leaf: isLeaf,
            }
        })

        resolve(processedNodes)
    } catch (error) {
        console.error('获取区域数据失败:', error)
        resolve([])
    }
}

// 获取列表
async function getList() {
    loading.value = true
    try {
        const res = await materialsPageApi(searchParams.value)
        list.value = res?.data?.data?.records ?? []
        total.value = res?.data?.data?.total ?? 0
    } finally {
        loading.value = false
    }
}

// 查询
function handleSearch() {
    searchParams.value.current = 1
    getList()
}

// 重置查询
function resetForm() {
    queryParamsRef.value?.resetFields()
    searchParams.value.current = 1
    getList()
}

// 新增/编辑/查看 弹框
function openForm(mode, row) {
    dialogVisible.value = true
    nextTick(() => {
        dialogRef.value?.open({ mode, row })
    })
}

// 删除
async function handleDelete(row) {
    await ElMessageBox.confirm('确认删除该条记录吗？', '提示', {
        type: 'warning',
        customClass: 'gd-confirm-custom',
        confirmButtonClass: 'gd-confirm-button',
        cancelButtonClass: 'gd-confirm-cancel-button',
    })
    await materialsRemoveApi({ ids: row.id })
    ElMessage.success('删除成功')
    getList()
}

onMounted(() => {
    getDictList()
    getList()
})
</script>

<style scoped >
</style>
<style scoped lang="scss"></style>

 applications/task-work-order/src/views/orderView/appConfiguration/materials/materialsApi.js

New file
@@ -0,0 +1,46 @@
import request from '@/axios'

// 分页查询材料列表
export const materialsPageApi = params => {
    return request({
        url: `/drone-gd/implement/gdMaterial/page`,
        method: 'get',
        params: { ...params },
    })
}

// 获取材料详情
export const materialsDetailApi = params => {
    return request({
        url: `/drone-gd/implement/gdMaterial/detail`,
        method: 'get',
        params,
    })
}

// 新增或编辑材料
export const materialsSubmitApi = data => {
    return request({
        url: `/drone-gd/implement/gdMaterial/submit`,
        method: 'post',
        data,
    })
}

// 删除材料
export const materialsRemoveApi = params => {
    return request({
        url: `/drone-gd/implement/gdMaterial/remove`,
        method: 'post',
        params,
    })
}

// 懒加载区域树
export const regionLazyTreeApi = params => {
    return request({
        url: `/blade-system/region/lazy-tree`,
        method: 'get',
        params,
    })
}