Merge remote-tracking branch 'origin/master'

张含笑

2026-01-26 c386716f860cae84ab4bcb885a7c7c7ee1245f45

Merge remote-tracking branch 'origin/master'

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

@@ -1,7 +1,6 @@
<template>
    <el-dialog class="gd-dialog" v-model="visible" title="查看" @closed="visible = false" width="1000px" destroy-on-close>
        <div class="gd-table-container" v-loading="loading" style="height: 600px">
            <div class="gd-table-content gd-table-content-bg">
        <div v-loading="loading">
                <el-table :data="list">
                    <el-table-column label="线索缩略图" width="120">
                        <template v-slot="{ row }">
@@ -34,14 +33,13 @@
                        <template v-slot="{ row }">
                            <el-link  type="primary"
                                @click="openDistributeDialog(row)"
                                :disabled="row.distributeStatus === 1 || currentRow.taskStatus !== '50'"
                                            :disabled="row.distributeStatus === 1 || currentRow.taskStatus !== '8'"
                            >
                                转为事件并分发
                            </el-link>
                        </template>
                    </el-table-column>
                </el-table>
            </div>
        </div>

        <template #footer>

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

@@ -159,7 +159,12 @@
    const range = dateRangeFormat(dateRange.value)
    loading.value = true
    try {
        const res = await gdPatrolTaskPageApi({ ...searchParams.value, startTime: range[0], endTime: range[1] })
        const res = await gdPatrolTaskPageApi({
            ...searchParams.value,
            startTime: range[0],
            endTime: range[1],
            taskStatus: 8
        })
        list.value = res?.data?.data?.records ?? []
        total.value = res?.data?.data?.total ?? 0
    } finally {

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

@@ -20,8 +20,8 @@
                <el-table-column label="操作" width="180" align="center" class-name="operation-btns">
                    <template #default="scope">
            <!-- <el-button icon="el-icon-view" type="text" @click="handleDetail(scope.row)">查看</el-button> -->
                            <el-link @click="handleEdit(scope.row)">编辑</el-link>
                            <el-link @click="handleDelete(scope.row)">删除</el-link>
                            <el-link type="primary" @click="handleEdit(scope.row)">编辑</el-link>
                            <el-link  type="primary" @click="handleDelete(scope.row)">删除</el-link>
                    </template>
                </el-table-column>
            </el-table>