Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-30 08ab4ebee26bb6c275b68c350bfa93ae770d6fee

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

@@ -72,7 +72,7 @@
      </el-form>

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

      <div class="gd-table-container" v-loading="loading">
@@ -98,8 +98,7 @@
               <el-table-column prop="taskDesc" show-overflow-tooltip label="巡查任务描述" />
               <el-table-column label="操作" class-name="operation-btns">
                  <template v-slot="{ row }">
                     <el-link @click="viewDiaLogView(row)">查看</el-link>
                     <!--                     <el-link @click="openForm('edit', row)">编辑</el-link>-->
                     <el-link  type="primary"  @click="viewDiaLogView(row)">查看</el-link>
                  </template>
               </el-table-column>
            </el-table>
@@ -140,7 +139,8 @@
import { airlineListApi } from '@/api/zkxt'

const store = useStore()
const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
const permission = computed(() => store.state.user.permission)

// 初始化查询参数
const initSearchParams = () => ({
   patrolTaskName: '', // 任务名称
@@ -170,7 +170,6 @@
})
const activeName = ref('all')
provide('dictObj', dictObj)
provide('requester', requester)

// 获取列表
async function getList() {
@@ -223,7 +222,7 @@
function viewDiaLogView(row) {
   viewDiaLogVisible.value = true
   nextTick(() => {
      let mode = ['1', '4'].includes(row.taskStatus) && requester.value ? 'edit' : 'view'
      let mode = ['1', '4'].includes(row.taskStatus) && permission.value.flyOrder_add ? 'edit' : 'view'
      viewDiaLogRef.value?.open({ mode, row })
   })
}