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,47 +1,45 @@
<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">
                <el-table :data="list">
                    <el-table-column label="线索缩略图" width="120">
                        <template v-slot="{ row }">
                            <el-image
                                v-if="row.resultUrl"
                                :src="row.resultUrl"
                                :preview-src-list="[row.resultUrl]"
                                fit="cover"
                                style="width: 80px; height: 60px"
                                preview-teleported
                            />
                            <span v-else>-</span>
                        </template>
                    </el-table-column>
                    <el-table-column prop="resultCode" show-overflow-tooltip label="线索编号" />
                    <el-table-column prop="shootTime" show-overflow-tooltip label="拍摄时间" />
                    <el-table-column label="线索位置" show-overflow-tooltip>
                        <template v-slot="{ row }">
                            {{ formatLocation(row) }}
                        </template>
                    </el-table-column>
                    <el-table-column prop="distributeStatus" show-overflow-tooltip label="线索状态">
                        <template v-slot="{ row }">
                            {{ getDistributeStatusLabel(row.distributeStatus) }}
                        </template>
                    </el-table-column>
                    <el-table-column prop="distributeDeptName" show-overflow-tooltip label="分发部门" />
                    <el-table-column prop="distributeUserName" show-overflow-tooltip label="分发人员" />
                    <el-table-column label="操作" class-name="operation-btns" width="140">
                        <template v-slot="{ row }">
                            <el-link  type="primary"
                                @click="openDistributeDialog(row)"
                                :disabled="row.distributeStatus === 1 || currentRow.taskStatus !== '50'"
                            >
                                转为事件并分发
                            </el-link>
                        </template>
                    </el-table-column>
                </el-table>
            </div>
        <div v-loading="loading">
            <el-table :data="list">
                <el-table-column label="线索缩略图" width="120">
                    <template v-slot="{ row }">
                        <el-image
                            v-if="row.resultUrl"
                            :src="row.resultUrl"
                            :preview-src-list="[row.resultUrl]"
                            fit="cover"
                            style="width: 80px; height: 60px"
                            preview-teleported
                        />
                        <span v-else>-</span>
                    </template>
                </el-table-column>
                <el-table-column prop="resultCode" show-overflow-tooltip label="线索编号" />
                <el-table-column prop="shootTime" show-overflow-tooltip label="拍摄时间" />
                <el-table-column label="线索位置" show-overflow-tooltip>
                    <template v-slot="{ row }">
                        {{ formatLocation(row) }}
                    </template>
                </el-table-column>
                <el-table-column prop="distributeStatus" show-overflow-tooltip label="线索状态">
                    <template v-slot="{ row }">
                        {{ getDistributeStatusLabel(row.distributeStatus) }}
                    </template>
                </el-table-column>
                <el-table-column prop="distributeDeptName" show-overflow-tooltip label="分发部门" />
                <el-table-column prop="distributeUserName" show-overflow-tooltip label="分发人员" />
                <el-table-column label="操作" class-name="operation-btns" width="140">
                    <template v-slot="{ row }">
                        <el-link  type="primary"
                                            @click="openDistributeDialog(row)"
                                            :disabled="row.distributeStatus === 1 || currentRow.taskStatus !== '8'"
                        >
                            转为事件并分发
                        </el-link>
                    </template>
                </el-table-column>
            </el-table>
        </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>