Merge remote-tracking branch 'origin/master'

罗广辉

2026-03-04 587d17e44d96b37640f14fb80370064b9a66ae59

Merge remote-tracking branch 'origin/master'

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

@@ -97,7 +97,8 @@
        </el-form>
        <template #footer>
            <template v-if="!dialogReadonly">
                <el-button color="#F2F3F5" @click="visible = false">取消</el-button>
                <el-button color="#F2F3F5" :loading="submitting"
                    :disabled="submitting" @click="preservation">保存</el-button>
                <el-button
                    class=""
                    color="#4C34FF"
@@ -165,14 +166,29 @@
    resourceCode: fieldRules(true,50),
    caseDesc: fieldRules(true,200),
}

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

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

@@ -63,7 +63,7 @@
                    <el-table-column label="操作" class-name="operation-btns" width="150">
                        <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="openForm('edit', row)" v-if="!['0','1', '2'].includes(row.innovationStatus) && row.isTheSameDepartment">编辑</el-link>
                            <el-link  type="primary"  @click="handleDelete(row)" v-if="!['1', '2'].includes(row.innovationStatus) && row.isTheSameDepartment">删除</el-link>
                        </template>
                    </el-table-column>