Merge remote-tracking branch 'origin/master'

chenyao

2026-01-23 233ca8def6816070c75fe5cee109c27f59879072

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

@@ -53,21 +53,21 @@
                     {{ getDictLabel(row.objectionStatus, dictObj.objectionStatus) }}
                  </template>
               </el-table-column>
               <el-table-column prop="catalogResourceName" show-overflow-tooltip label="目录/申请资源名称" />
               <el-table-column prop="catalogResourceName" width="170" show-overflow-tooltip label="目录/申请资源名称" />
               <el-table-column prop="otherObjectionDetail" show-overflow-tooltip label="其他异议详情" />
               <el-table-column prop="submitter" show-overflow-tooltip label="问题提交人" />
               <el-table-column prop="submitterContact" show-overflow-tooltip label="提交人联系方式" />
               <el-table-column prop="submitterContact" show-overflow-tooltip width="145" label="提交人联系方式" />
               <el-table-column prop="submitUnitName" show-overflow-tooltip label="提交单位" />
               <el-table-column prop="handleUnit" show-overflow-tooltip label="处理单位" />
               <el-table-column prop="objectionDesc" show-overflow-tooltip label="异议描述" />
               <el-table-column prop="objectionBasis" show-overflow-tooltip label="异议依据" />
               <el-table-column prop="attachName" show-overflow-tooltip label="附件名称" />
               <el-table-column prop="reviewOpinion" show-overflow-tooltip label="审核意见" />
               <el-table-column label="操作" class-name="operation-btns" width="140">
               <el-table-column label="操作" class-name="operation-btns" width="180">
                  <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 })