Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-01-31 a3e0ec12eac870c47728add7fce2d1277da8d34b

Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

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

@@ -94,13 +94,13 @@
                                <span class="required-star">*</span>
                                巡查任务类型
                            </template>
                            <template v-slot="{ row }">
                            <template v-slot="{ row, $index }">
                                <el-select
                                    class="gd-select"
                                    popper-class="gd-select-popper"
                                    v-model="row.patrolTaskType"
                                    placeholder="请选择"
                                    disabled
                                    @change="handlePatrolTaskTypeChange($index, $event)"
                                >
                                    <el-option
                                        v-for="item in dictObj.workOrderType"
@@ -324,6 +324,14 @@
    workOrderList.value = res?.data?.data?.records ?? []
}

// 处理巡查任务类型变化
async function handlePatrolTaskTypeChange(index, skilledTaskType) {
    // 清空该行已选择的飞手
    taskList.value[index].recommendFlyerName = ''
    // 获取对应的飞手列表
    await getFlyerList(index, skilledTaskType)
}

// 获取飞手列表
async function getFlyerList(index, skilledTaskType) {
    const res = await gdFlyerPageApi({

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

@@ -57,6 +57,7 @@
                    </el-row>
                    <div class="detail-title" :style="{ marginTop: pxToRem(20) }">已选设备</div>
                    <el-table class="setHeight gd-dialog-table" ref="deviceTableRef" :data="deviceList" row-key="id">
                        <el-table-column type="index" label="序号" />
                        <el-table-column prop="nickname" label="设备名称" />
                        <el-table-column prop="deviceName" label="设备型号" />
                        <el-table-column prop="devicePayload" label="设备负载" />
@@ -179,12 +180,17 @@
                />
            </div>
            <div class="rightBox" v-if="!dialogReadonly">
                <div class="detail-title"><span class="required-star" v-if="!dialogReadonly">*</span>推荐设备</div>
                <div class="detail-title">
                    <span class="required-star" v-if="!dialogReadonly">*</span>
                    推荐设备
                </div>
                <el-table
                    class="separateTable"
                    :empty-text="(formData.deviceLoadDemand && pointList.length) ? '暂无数据' : '请先选择设备需求并在地图上绘制工单范围'"
                    :empty-text="
                        formData.deviceLoadDemand && pointList.length ? '暂无数据' : '请先选择设备需求并在地图上绘制工单范围'
                    "
                    ref="deviceTableRef"
                    :data="(formData.deviceLoadDemand && pointList.length) ? deviceList : []"
                    :data="formData.deviceLoadDemand && pointList.length ? deviceList : []"
                    row-key="id"
                    @selection-change="handleDeviceSelectionChange"
                >
@@ -197,11 +203,7 @@
        </div>

        <template #footer>
            <el-button
                v-if="['11', '21', '23','31', '60'].includes(gdStatus)"
                @click="viewDescription"
                color="#F2F3F5"
            >
            <el-button v-if="['11', '21', '23', '31', '60'].includes(gdStatus)" @click="viewDescription" color="#F2F3F5">
                {{ gdStatusObj[gdStatus]?.reason }}
            </el-button>

@@ -216,7 +218,7 @@
                <el-button
                    color="#4C34FF"
                    @click="requestModification"
                    v-if="['20'].includes(gdStatus) && permission.order_applyNegotiation"
                    v-if="['20'].includes(gdStatus) && permission.order_applyEdit"
                >
                    申请修改
                </el-button>
@@ -330,15 +332,15 @@
const hasPatrolTaskList = computed(() => ['30', '40', '50', '60'].includes(String(formData.value.workOrderStatus)))

const gdStatusObj = {
    '10': { reason: '拒单原因', operationType: '2' },
    '10': { reason: '拒单原因', operationType: '2', title: '拒绝接单' },
    '11': { reason: '拒单原因' },
    '20': { reason: '取消原因', operationType: '3' },
    '21': { reason: '取消原因'},
    '20': { reason: '取消原因', operationType: '3',title:'申请取消' },
    '21': { reason: '取消原因' },
    '23': { reason: '取消原因' },
    '30': { reason: '协商修改原因', operationType: '9' },
    '31': { reason: '协商修改原因' },
    '30': { reason: '修改原因', operationType: '9',title:'协商修改' },
    '31': { reason: '修改原因' },
    '40': { reason: '' },
    '50': { reason: '情况说明', operationType: '11' },
    '50': { reason: '情况说明', operationType: '11',title:'结算' },
    '60': { reason: '情况说明' },
}

@@ -392,6 +394,7 @@
            row: formData.value,
            type: gdStatusObj[gdStatus.value].operationType,
            formLabel: gdStatusObj[gdStatus.value].reason,
            title: gdStatusObj[gdStatus.value]?.title || '新增'
        })
    })
}
@@ -641,14 +644,14 @@
</script>

<style lang="scss" scoped>
.separateTable{
.separateTable {
    height: 0;
    flex: 1;
    :deep(){
        .el-scrollbar__view{
    :deep() {
        .el-scrollbar__view {
            height: 100%;
        }
        .el-table__empty-text{
        .el-table__empty-text {
            line-height: normal;
        }
    }

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

@@ -2,7 +2,7 @@
    <el-dialog
        class="gd-dialog"
        v-model="visible"
        :title="titleEnum[dialogMode]"
        :title="dialogTitle"
        @closed="visible = false"
        destroy-on-close
        :close-on-click-modal="false"
@@ -98,12 +98,14 @@
}

let formLabelStr = ref('原因')
let dialogTitle = ref('新增')


// 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改
async function open({ mode = 'add', row, formLabel, type } = {}) {
async function open({ mode = 'add', row, formLabel, type,title } = {}) {
    dialogMode.value = mode
    formLabelStr.value = formLabel
    dialogTitle.value =  title
    formData.value = {
        workOrderId: row.id,
        operationType: type,