Merge remote-tracking branch 'origin/master'

罗广辉

8 hours ago 5f694550ed7bf0f6147c66feaa4406034ae62e54

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

@@ -6,28 +6,87 @@
      </el-tabs>
      <el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
         <el-form-item label="工单名称" prop="workOrderName">
            <el-input class="gd-input gray" v-model="searchParams.workOrderName" placeholder="请输入" clearable
               @clear="handleSearch" />
            <el-input
               class="gd-input gray"
               v-model="searchParams.workOrderName"
               placeholder="请输入"
               clearable
               @clear="handleSearch"
            />
         </el-form-item>

         <el-form-item label="工单编号" prop="workOrderCode">
            <el-input
               class="gd-input gray"
               v-model="searchParams.workOrderCode"
               placeholder="请输入"
               clearable
               @clear="handleSearch"
            />
         </el-form-item>

         <el-form-item label="工单类型" prop="workOrderType">
            <el-cascader class="gd-select gray" popper-class="gd-select-popper" v-model="searchParams.workOrderType"
               :options="workOrderTypeXT" :props="taskTypeFilterCascaderProps" placeholder="请选择" clearable
               @change="handleSearch" />
            <el-cascader
               class="gd-cascader gray"
               popper-class="gd-cascader-popper"
               v-model="searchParams.workOrderType"
               :options="workOrderTypeXT"
               :props="taskTypeCascaderProps"
               placeholder="请选择"
               clearable
               @change="handleSearch"
            />
         </el-form-item>

         <el-form-item label="工单状态" prop="workOrderStatus">
            <el-select class="gd-select gray" popper-class="gd-select-popper" v-model="searchParams.workOrderStatus"
               placeholder="请选择" clearable @change="handleSearch">
               <el-option v-for="item in dictObj.workOrderStatus" :key="item.dictKey"
                  :label="item.dictValue.split('_')[1]" :value="item.dictKey" />
            <el-select
               class="gd-select gray"
               popper-class="gd-select-popper"
               v-model="searchParams.workOrderStatus"
               placeholder="请选择"
               clearable
               @change="handleSearch"
            >
               <el-option
                  v-for="item in dictObj.workOrderStatus"
                  :key="item.dictKey"
                  :label="item.dictValue.split('_')[1]"
                  :value="item.dictKey"
               />
            </el-select>
         </el-form-item>

         <el-form-item label="执行时间" prop="executeTime">
            <el-date-picker class="gd-date-picker gray" popper-class="gd-date-picker-popper" v-model="dateRange"
               type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
               value-format="YYYY-MM-DD HH:mm:ss" @change="handleSearch" />
            <el-date-picker
               class="gd-date-picker gray"
               popper-class="gd-date-picker-popper"
               v-model="dateRange"
               type="daterange"
               range-separator="-"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               value-format="YYYY-MM-DD HH:mm:ss"
               @change="handleSearch"
            />
         </el-form-item>

         <el-form-item label="需求方名称" prop="createUserName">
            <el-input
               class="gd-input gray"
               v-model="searchParams.createUserName"
               placeholder="请输入"
               clearable
               @clear="handleSearch"
            />
         </el-form-item>
         <el-form-item label="服务方名称" prop="serviceParty">
            <el-input
               class="gd-input gray"
               v-model="searchParams.serviceParty"
               placeholder="请输入"
               clearable
               @clear="handleSearch"
            />
         </el-form-item>

         <el-form-item class="gd-search-actions">
@@ -38,18 +97,17 @@

      <div class="gd-table-container" v-loading="loading">
         <div class="gd-table-toolbar">
            <el-button v-if="permission.order_release" :icon="Plus" color="#4C34FF" type="primary"
               @click="openForm('add')">
            <el-button v-if="permission.order_release" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">
               新增工单
            </el-button>
         </div>

         <div class="gd-table-content gd-table-content-bg">
            <el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
            <el-table class="gd-table" :data="list" @selection-change="handleSelectionChange" @sort-change="handleSortChange">
               <el-table-column type="index" width="64" label="序号" />
               <el-table-column prop="workOrderName" show-overflow-tooltip label="工单名称" />
               <el-table-column prop="workOrderCode" show-overflow-tooltip label="工单编号" />
               <el-table-column prop="workOrderType" show-overflow-tooltip label="工单类型">
               <el-table-column prop="workOrderType" show-overflow-tooltip label="工单类型" sortable="custom">
                  <template v-slot="{ row }">
                     {{ getTaskTypeLabel(row.workOrderType, workOrderTypeXT) }}
                  </template>
@@ -75,7 +133,7 @@
               <el-table-column prop="createUserName" show-overflow-tooltip label="需求方名称" />
               <el-table-column prop="serviceParty" show-overflow-tooltip label="服务方名称" />
               <el-table-column prop="createTime" show-overflow-tooltip label="工单创建时间" />
               <el-table-column label="操作" class-name="operation-btns">
               <el-table-column label="操作" class-name="operation-btns" fixed="right">
                  <template v-slot="{ row }">
                     <el-link type="primary" @click="openFormChange(row)">查看</el-link>
                     <el-link type="primary" @click="routeManagement(row)">航线管理</el-link>
@@ -85,9 +143,14 @@
         </div>

         <div class="gd-pagination-parent">
            <el-pagination popper-class="gd-select-popper" v-model:current-page="searchParams.current"
               v-model:page-size="searchParams.size" layout="total, prev, pager, next, sizes" :total="total"
               @change="getList" />
            <el-pagination
               popper-class="gd-select-popper"
               v-model:current-page="searchParams.current"
               v-model:page-size="searchParams.size"
               layout="total, prev, pager, next, sizes"
               :total="total"
               @change="getList"
            />
         </div>
      </div>

@@ -109,7 +172,11 @@
import testDock from '@/assets/docx/testDocx.docx'
import testPdf from '@/assets/pdf/testPdf.pdf'
import { useStore } from 'vuex'
import { getTaskTypeLabel, normalizeTaskTypeOptions, taskTypeFilterCascaderProps } from '../taskTypeOptions'
import {
   getTaskTypeLabel,
   normalizeTaskTypeOptions,
   taskTypeCascaderProps,
} from '../taskTypeOptions'

const store = useStore()
const activeName = ref('all')
@@ -119,10 +186,14 @@
// 初始化查询参数
const initSearchParams = () => ({
   workOrderName: '', // 工单名称
   workOrderCode: '', // 工单编号
   workOrderType: '', // 工单类型
   workOrderStatus: '', // 工单状态
   executeStartTime: '', // 执行开始时间
   executeEndTime: '', // 执行结束时间
   createUserName: '', // 需求方名称
   serviceParty: '', // 服务方名称
   typePinyinFirst: '', // 工单类型拼音首字母（大写）
   current: 1, // 当前页
   size: 10, // 每页大小
})
@@ -148,7 +219,7 @@
provide('workOrderTypeXT', workOrderTypeXT)

// 获取列表
async function getList () {
async function getList() {
   const range = dateRangeFormat(dateRange.value)
   loading.value = true
   try {
@@ -157,6 +228,8 @@
         startTime: range[0],
         endTime: range[1],
         createUser: activeName.value === 'my' ? store.state.user.userInfo.user_id : '',
         workOrderType: searchParams?.value?.workOrderType?.join?.(','),
         typePinyinFirst: typePinyinFirst.value,
      })
      list.value = res?.data?.data?.records ?? []
      total.value = res?.data?.data?.total ?? 0
@@ -166,27 +239,27 @@
}

// 查询
function handleSearch () {
function handleSearch() {
   searchParams.value.current = 1
   getList()
}

// 重置查询
function resetForm () {
function resetForm() {
   queryParamsRef.value?.resetFields()
   dateRange.value = []
   searchParams.value.current = 1
   getList()
}

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

// 新增/编辑/查看 弹框
function openForm (mode, row) {
function openForm(mode, row) {
   dialogVisible.value = true
   nextTick(() => {
      dialogRef.value?.open({ mode, row })
@@ -196,7 +269,7 @@
// 21响应中_申请取消、22响应中_申请修改、23响应中_已取消、
// 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、
// 50验收通过_待结算、60结算完成_已结算
function openFormChange (row) {
function openFormChange(row) {
   dialogVisible.value = true
   nextTick(() => {
      const mode = ['11'].includes(row.workOrderStatus) && permission.value.order_release ? 'edit' : 'view'
@@ -223,7 +296,7 @@
}

// 删除
async function handleDelete (row) {
async function handleDelete(row) {
   const tips = row ? '该条' : '选中的项'
   await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', {
      type: 'warning',
@@ -239,12 +312,12 @@
}

// 勾选值设置
function handleSelectionChange (rows) {
function handleSelectionChange(rows) {
   selectedIds.value = rows.map(item => item.id)
}

// 获取字典
function getDictList () {
function getDictList() {
   getDictionaryByCode('deviceLoadDemand,workOrderType,workOrderStatus,taskStatus').then(res => {
      dictObj.value = res.data.data
   })
@@ -254,7 +327,7 @@
}

// 获取两个tab的总条数
async function getTabTotals () {
async function getTabTotals() {
   // 获取全部tab的总数
   const allRes = await gdWorkOrderPageApi({
      current: 1,
@@ -272,10 +345,47 @@
   myTotal.value = myRes?.data?.data?.total ?? 0
}

// 工单类型排序方向：asc（升序）/ desc（降序）/ ''（不排序）
const typePinyinFirst = ref('')

// 点击工单类型排序三角：上三角传 asc，下三角传 desc
function handleSortChange({ prop, order }) {
   if (prop !== 'workOrderType') return
   typePinyinFirst.value = order === 'ascending' ? 'asc' : order === 'descending' ? 'desc' : ''
   searchParams.value.current = 1
   getList()
}

onMounted(() => {
   getTabTotals()
   getList()
   getDictList()
})
</script>
<style scoped lang="scss"></style>
<style scoped lang="scss">
.gd-search-form {
   // 搜索项较多，用栅格分两排整齐排列（4 列 × 2 行）
   display: grid;
   grid-template-columns: repeat(5, max-content);
   gap: 16px 40px;
   align-items: center;

   // 清除公共样式里的行内间距，交给 grid 的 gap 统一控制
   :deep(.el-form-item) {
      margin: 0 !important;
   }

   // 固定 label 宽度，让每一列的输入框起点对齐
   :deep(.el-form-item__label) {
      width: 84px;
      margin-right: 12px;
      flex-shrink: 0;
   }

   // 操作按钮紧跟最后一个搜索项
   :deep(.gd-search-actions) {
      justify-self: start;
      margin-left: 30px !important;
   }
}
</style>