Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-20 bcbcc546577c7c6643e7f0d4ac366f8a013bd306

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

@@ -75,10 +75,11 @@
               <el-table-column prop="demandInfo" show-overflow-tooltip label="需求信息项" />
               <el-table-column label="操作" class-name="operation-btns">
                  <template v-slot="{ row }">
                     <el-link @click="openForm('view', row)">查看</el-link>
                     <el-link @click="openForm('edit', row)" v-if="row.demandStatus !== '1'">编辑</el-link>
                     <el-link @click="handleDelete(row)" v-if="row.demandStatus !== '1'">删除</el-link>
                  </template>
               <el-link @click="openForm('view', row)">查看</el-link>
               <!-- 只对非审批状态显示编辑和删除按钮 -->
               <el-link @click="openForm('edit', row)" v-if="!['1', '2', '3'].includes(row.demandStatus)">编辑</el-link>
               <el-link @click="handleDelete(row)" v-if="!['1', '2', '3'].includes(row.demandStatus)">删除</el-link>
            </template>
               </el-table-column>
            </el-table>
         </div>
@@ -96,7 +97,7 @@
      </div>

      <FormDiaLog ref="dialogRef" @success="getList" v-if="dialogVisible" v-model="dialogVisible" />
      <ApplyViewDialog ref="applyDialogRef" v-if="applyDialogVisible" v-model="applyDialogVisible" />
      <ApplyViewDialog ref="applyDialogRef" @success="getList" v-if="applyDialogVisible" v-model="applyDialogVisible" />
   </basic-container>
</template>
<script setup>
@@ -192,8 +193,9 @@

// 新增/编辑/查看 弹框
function openForm(mode, row) {
   if (mode === 'view' && row?.demandStatus === '1') {
      // 如果是查看申请中的记录，使用申请详情弹框
   // 对于所有审批相关状态（申请中、审核通过、审核拒绝）都使用申请详情弹框
   if (mode === 'view' && ['1', '2', '3'].includes(row?.demandStatus)) {
      // 使用申请详情弹框
      openApplyViewDialog(row)
   } else {
      // 其他情况使用原有弹框