Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-21 3204e97434926c3bd1b02ed2ead9392aecbd5ab0

Merge remote-tracking branch 'origin/master'

 applications/drone-command/src/styles/common/cockpit.scss

@@ -1503,7 +1503,7 @@


                    .detail-title {
                        line-height: 40px;
                        margin-bottom: 20px;
                        font-family: Source Han Sans CN, Source Han Sans CN;
                        font-weight: 500;
                        font-size: 16px;

 applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue

@@ -201,7 +201,7 @@
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
const readonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑场景', view: '查看场景', add: '新增场景' })
const titleEnum = ref({ edit: '编辑区域', view: '查看区域', add: '新增区域' })
const flyDateRange = ref([]) // 飞行时间
const deviceTableRef = ref(null)
const searchName = ref('')

 applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue

@@ -25,10 +25,6 @@
                    <div class="label">提交人联系方式</div>
                    <div class="val">{{ formData.submitterContact }}</div>
                </el-col>
                <!-- <el-col :span="12">
                    <div class="label">提交单位</div>
                    <div class="val">{{ formData.submitUnitName }}</div>
                </el-col> -->
                <el-col :span="12">
                    <div class="label">目录/申请资源名称</div>
                    <div class="val">{{ formData.catalogResourceName }}</div>
@@ -45,7 +41,43 @@
                    <div class="label">相关附件</div>
                    <div class="val">{{ formData.attachName || '暂无附件' }}</div>
                </el-col>
                <el-col :span="12" v-if="detailObjectionStatus === '2'">
                    <div class="label">其他异议详情</div>
                    <div class="val">{{ formData.otherObjectionDetail }}</div>
                </el-col>
                <el-col :span="12" v-if="detailObjectionStatus === '2'">
                    <div class="label">审核意见</div>
                    <div class="val">{{ formData.reviewOpinion  }}</div>
                </el-col>
            </el-row>
            <div v-if=" detailObjectionStatus === '1'">
                <div class="detail-title" :style="{ marginTop:pxToRem(20)}">异议反馈</div>
                <el-form ref="feedbackFormRef" class="gd-dialog-form" :model="feedbackFormData"
                                 :rules="feedbackRules" label-width="140px">
                    <el-row>
                        <el-col :span="12">
                            <el-form-item label="其他异议详情" prop="otherObjectionDetail">
                                <el-input
                                    class="gd-input"
                                    v-model="feedbackFormData.otherObjectionDetail"
                                    placeholder="请输入"
                                    clearable
                                />
                            </el-form-item>
                        </el-col>
                        <el-col :span="12">
                            <el-form-item label="审核意见" prop="reviewOpinion">
                                <el-input
                                    class="gd-input"
                                    v-model="feedbackFormData.reviewOpinion"
                                    placeholder="请输入"
                                    clearable
                                />
                            </el-form-item>
                        </el-col>
                    </el-row>
                </el-form>
            </div>
        </div>

        <el-form
@@ -55,7 +87,7 @@
            :model="formData"
            :rules="rules"
            :disabled="dialogReadonly"
            label-width="120px"
            label-width="180px"
        >
            <el-row>
                <el-col :span="12">
@@ -91,20 +123,6 @@
                        <el-input class="gd-input" v-model="formData.submitterContact" placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
<!--                <el-col :span="12">-->
<!--                    <el-form-item label="提交单位" prop="submitUnitId">-->
<!--                        <el-tree-select-->
<!--                            class="gd-select"-->
<!--                            popper-class="gd-tree-select-popper"-->
<!--                            v-model="formData.submitUnitId"-->
<!--                            node-key="id"-->
<!--                            :data="deptTree"-->
<!--                            :props="treeProps"-->
<!--                            check-strictly-->
<!--                            clearable-->
<!--                        />-->
<!--                    </el-form-item>-->
<!--                </el-col>-->
                <el-col :span="12">
                    <el-form-item label="目录/申请资源名称" prop="catalogResourceName">
                        <el-input class="gd-input" v-model="formData.catalogResourceName" placeholder="请输入" clearable />
@@ -156,19 +174,39 @@
                </el-col>
            </el-row>
        </el-form>
        <template #footer>
            <el-button
                class="save-btn"
                color="#4C34FF"
                v-if="!dialogReadonly"
                :loading="submitting"
                :disabled="submitting"
                @click="handleSubmit"
            >
                保存
            </el-button>
            <el-button color="#F2F3F5" @click="handleApply">申请</el-button>

        <template #footer>
            <template v-if="!dialogReadonly">
                <el-button
                    class="save-btn"
                    color="#4C34FF"
                    v-if="!dialogReadonly"
                    :loading="submitting"
                    :disabled="submitting"
                    @click="handleSubmit"
                >
                    保存
                </el-button>
                <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>
            </template>
            <template v-if="dialogReadonly && detailObjectionStatus === '1'">
                <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="visible = false">取消</el-button>

                <el-button
                    class="save-btn"
                    color="#4C34FF"

                    :loading="submitting"
                    :disabled="submitting"
                    @click="handleFeedbackSubmit"

                >
                    反馈
                </el-button>
            </template>
            <template v-if="detailDemandStatus === '2'">
                <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="visible = false">关闭</el-button>
            </template>
        </template>
    </el-dialog>
</template>
@@ -182,7 +220,7 @@
    gdDataObjectionSubmitApi,
} from '@/views/orderView/orderDataManage/dataObjection/dataObjectionApi'
import { putFileAttachApi } from '@/views/orderView/orderDataManage/supplyAdd/supplyAddApi'

import { pxToRem } from '@/utils/rem'
// 初始化表单数据
const initForm = () => ({
    title: '',
@@ -198,18 +236,28 @@
            attachId: '',
            attachName: '',
        }
    ]
    ],
    objectionStatus: '',

})

// 初始化异议反馈表单数据
const initFeedbackForm = () => ({
    otherObjectionDetail: '',
    reviewOpinion: '',
    objectionStatus: '2'
})

// 注入部门树和字典
const deptTree = inject('deptTree')
const treeProps = inject('treeProps')
const dictObj = inject('dictObj')

const detailObjectionStatus = inject('detailObjectionStatus')
const emit = defineEmits(['success'])
const formRef = ref(null) // 表单实例
const feedbackFormRef = ref(null) // 反馈表单实例
const formData = ref(initForm()) // 表单数据
const feedbackFormData = ref(initFeedbackForm()) // 异议反馈表单数据
const visible = defineModel() // 弹框显隐
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
@@ -227,6 +275,12 @@
    catalogResourceName: fieldRules(true),
    objectionDesc: fieldRules(true),
    objectionBasis: fieldRules(true),
}

// 异议反馈表单校验规则
const feedbackRules = {
    otherObjectionDetail: fieldRules(true),
    reviewOpinion: fieldRules(true),
}

// 自定义上传请求
@@ -294,8 +348,8 @@
    ElMessage.error(error?.message || '文件上传失败，请重试')
}

// 提交新增/编辑
async function handleSubmit() {
// 提交数据的通用函数
async function submitForm(objectionStatus) {
    const isValid = await formRef.value?.validate().catch(() => false)
    if (!isValid) return
    submitting.value = true
@@ -310,15 +364,12 @@
            objectionDesc: formData.value.objectionDesc,
            objectionBasis: formData.value.objectionBasis,
            areaCode: formData.value.areaCode || '',
            handleUnit: formData.value.handleUnit || '',
            objectionStatus: formData.value.objectionStatus || '',
            otherObjectionDetail: formData.value.otherObjectionDetail || '',
            reviewOpinion: formData.value.reviewOpinion || '',
            // 构建附件列表
            attachmentList: uploadedFiles.value.map(file => ({
                attachId: file.attachId,
                attachName: file.originalName,
            }))
            })),
            objectionStatus: objectionStatus
        }
        await gdDataObjectionSubmitApi(submitData)
        ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
@@ -328,9 +379,38 @@
        submitting.value = false
    }
}

// 提交新增/编辑（保存）
async function handleSubmit() {
    await submitForm('0')
}

// 申请提交
async function handleApply() {
    await submitForm('1')
}

// 处理异议反馈提交
async function handleFeedbackSubmit() {
    // 验证反馈表单
    const isValid = await feedbackFormRef.value?.validate().catch(() => false)
    if (!isValid) return
    submitting.value = true
    try {
        // 构建反馈提交数据
        const submitData = {
            id: formData.value.id,
            otherObjectionDetail: feedbackFormData.value.otherObjectionDetail || '',
            reviewOpinion: feedbackFormData.value.reviewOpinion || '',
            objectionStatus: '2'
        }
        await gdDataObjectionSubmitApi(submitData)
        ElMessage.success('反馈提交成功')
        visible.value = false
        emit('success')
    } finally {
        submitting.value = false
    }
}
// 加载详情
async function loadDetail() {
@@ -345,7 +425,10 @@
    // 重置文件列表
    fileList.value = []
    uploadedFiles.value = []
    // 重置表单数据
    formData.value = dialogMode.value === 'add' ? initForm() : row
    // 重置反馈表单数据
    feedbackFormData.value = initFeedbackForm()
    if (dialogMode.value !== 'add') {
        await loadDetail()
    }
@@ -357,22 +440,11 @@
<style scoped lang="scss">
.detail-container {
    padding: 20px;
    .label {
        font-weight: 500;
        color: #333333;
        margin-bottom: 8px;
    }
    .val {
        padding: 8px;
        background-color: #f5f7fa;
        border-radius: 4px;
        min-height: 32px;
        word-break: break-all;
        margin-bottom: 16px;
    }
}

.upload-container {
    width: 100%;
}
.label {
    width: 120px !important;
}
</style>

 applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/index.vue

@@ -66,8 +66,8 @@
                    <el-table-column label="操作" class-name="operation-btns" width="140">
                        <template v-slot="{ row }">
                            <el-link @click="openForm('view', row)">查看</el-link>
                            <el-link @click="openForm('edit', row)">编辑</el-link>
                            <el-link @click="handleDelete(row)">删除</el-link>
                            <el-link @click="openForm('edit', row)" v-if="!['1', '2'].includes(row.objectionStatus)">编辑</el-link>
                            <el-link @click="handleDelete(row)" v-if="!['1', '2'].includes(row.objectionStatus)">删除</el-link>
                        </template>
                    </el-table-column>
                </el-table>
@@ -122,6 +122,8 @@
    label: 'name',
    children: 'children',
}
const detailObjectionStatus = ref('')
provide('detailObjectionStatus', detailObjectionStatus)
provide('deptTree', deptTree)
provide('treeProps', treeProps)
provide('dictObj', dictObj)
@@ -153,6 +155,7 @@

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

 applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue

@@ -45,7 +45,7 @@
    steps.push({
      status: '0',
      title: '需求申请',
      person: sortedRecords.find(r => r.auditStatus === '0')?.createUser || '',
      person: sortedRecords.find(r => r.auditStatus === '0')?.userName || '',
      time: sortedRecords.find(r => r.auditStatus === '0')?.createTime || ''
    })
    
@@ -55,7 +55,7 @@
      steps.push({
        status: '1',
        title: '审核通过',
        person: approvedRecord.createUser || '',
        person: approvedRecord.userName || '',
        time: approvedRecord.createTime || ''
      })
    }
@@ -66,7 +66,7 @@
      steps.push({
        status: '2',
        title: '拒绝申请',
        person: rejectedRecord.createUser || '',
        person: rejectedRecord.userName || '',
        time: rejectedRecord.createTime || ''
      })
      // 查找拒绝原因