Merge remote-tracking branch 'origin/master'

张含笑

2026-01-23 cabb1279e9370edfebdef62f6eba272eeae8fe67

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

@@ -3,7 +3,7 @@
      <el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
         <el-form-item label="需求名称" prop="demandName">
            <el-input
               class="gd-input"
               class="gd-input gray"
               v-model="searchParams.demandName"
               placeholder="请输入"
               clearable
@@ -13,7 +13,7 @@

         <el-form-item label="需求状态" prop="demandStatus">
            <el-select
               class="gd-select"
               class="gd-select gray"
               popper-class="gd-select-popper"
               v-model="searchParams.demandStatus"
               placeholder="请选择"
@@ -43,10 +43,10 @@
         <div class="gd-table-content gd-table-content-bg">
            <el-table class="gd-table" :data="list">
               <el-table-column label="序号" width="60" align="center">
            <template #default="scope">
               {{ ((searchParams.current - 1) * searchParams.size + scope.$index + 1).toString().padStart(2, '0') }}
            </template>
         </el-table-column>
                  <template #default="scope">
                     {{ ((searchParams.current - 1) * searchParams.size + scope.$index + 1).toString().padStart(2, '0') }}
                  </template>
               </el-table-column>
               <el-table-column prop="demandName" show-overflow-tooltip label="需求名称" />
               <el-table-column prop="demandType" show-overflow-tooltip label="需求类型">
                  <template v-slot="{ row }">
@@ -78,11 +78,11 @@
               <el-table-column prop="demandInfo" show-overflow-tooltip label="需求信息项" />
               <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)" 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-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>
@@ -175,7 +175,7 @@
      // 为每条记录添加部门名称
      list.value = records.map(item => ({
         ...item,
         responsibleDeptName: item.responsibleDeptName || getDeptNameById(item.responsibleDeptId, deptTree.value)
         responsibleDeptName: item.responsibleDeptName || getDeptNameById(item.responsibleDeptId, deptTree.value),
      }))
      total.value = res?.data?.data?.total ?? 0
   } finally {
@@ -234,8 +234,6 @@
   ElMessage.success('删除成功')
   getList()
}



// 获取字典
function getDictList() {