Merge remote-tracking branch 'origin/master'

chenyao

2026-01-22 6ed0045e0f379dbd7fdd065a65f8898c482a7cab

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

@@ -1,6 +1,6 @@
<template>
   <basic-container>
      <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
      <el-tabs class="gd-tabs" v-model="activeName" @tab-click="tabsClick">
         <el-tab-pane label="全部 " name="all"></el-tab-pane>
         <el-tab-pane label="我的任务工单" name="my"></el-tab-pane>
      </el-tabs>
@@ -73,10 +73,10 @@

      <div class="gd-table-toolbar">
<!--         <el-button color="#F2F3F5" @click="requester = !requester">我是{{ requester ? '需求方' : '服务方' }}</el-button>-->
         <el-button color="#F2F3F5" @click="previewVisible = true">预览</el-button>
<!--         <el-button color="#F2F3F5" @click="previewVisible = true">预览</el-button>-->

         <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增</el-button>
         <el-button :icon="Delete" color="#4C34FF" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
         <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')" v-if="requester">新增</el-button>
         <el-button :icon="Delete" color="#4C34FF" :disabled="!selectedIds.length" @click="handleDelete()" v-if="requester">删除</el-button>
      </div>

      <div class="gd-table-container" v-loading="loading">
@@ -108,13 +108,13 @@
                  </template>
               </el-table-column>
               <el-table-column prop="serviceParty" show-overflow-tooltip label="服务方名称" />
               <el-table-column prop="createDeptName" show-overflow-tooltip label="需求方名称" />
               <el-table-column prop="createUserName" show-overflow-tooltip label="需求方名称" />
               <el-table-column prop="createTime" show-overflow-tooltip label="工单创建时间" />
               <el-table-column label="操作" class-name="operation-btns">
                  <template v-slot="{ row }">
                     <el-link @click="openFormChange(row)">查看</el-link>
                     <!--<el-link @click="openForm('edit', row)">编辑</el-link>-->
                     <el-link @click="handleDelete(row)">删除</el-link>
                     <el-link @click="handleDelete(row)" v-if="requester">删除</el-link>
                  </template>
               </el-table-column>
            </el-table>
@@ -193,7 +193,7 @@
         ...searchParams.value,
         startTime: range[0],
         endTime: range[1],
         createUser: activeName.value === 'user' ? store.state.user.userInfo.user_id : '',
         createUser: activeName.value === 'my' ? store.state.user.userInfo.user_id : '',
      })
      list.value = res?.data?.data?.records ?? []
      total.value = res?.data?.data?.total ?? 0
@@ -216,7 +216,9 @@
   getList()
}

function handleClick(tab,event) {
function tabsClick(tab, event) {
   activeName.value = tab.props.name
   resetForm()
   handleSearch()
}