From bac9657fdef49221a80ace96d3522d0a66e758a0 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 26 Jan 2026 15:58:48 +0800
Subject: [PATCH] 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 | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
index d08bf95..78266a5 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -221,7 +221,7 @@
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
const dialogReadonly = computed(() => dialogMode.value === 'view')
-const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
+const titleEnum = ref({ edit: '新增', view: '查看', add: '新增' })
// 工单相关
const workOrderList = ref([]) // 工单列表
@@ -270,7 +270,7 @@
// 获取工单列表
async function getWorkOrderList() {
- const res = await gdWorkOrderPageApi({ size: 999, workOrderStatus: '20' })
+ const res = await gdWorkOrderPageApi({ size: 999, workOrderStatus: dialogMode.value ==='add' ? '20' : '' })
workOrderList.value = res?.data?.data?.records ?? []
}
@@ -294,7 +294,7 @@
// 获取设备列表
async function getDeviceList() {
const res = await gdManageDeviceListApi({
- deviceIds: selectedWorkOrder.value.recommendDeviceIds,
+ deviceIds: selectedWorkOrder.value?.recommendDeviceIds,
})
deviceList.value = res?.data?.data ?? []
}
@@ -302,6 +302,7 @@
watch(
() => selectedWorkOrderId.value,
() => {
+ handleWorkOrderChange(selectedWorkOrderId.value)
getDeviceList()
}
)
@@ -364,9 +365,9 @@
// 打开弹框
async function open({ mode = 'add', row } = {}) {
- console.log(row, 'rowrow')
dialogMode.value = mode
- if (mode === 'add') {
+ await getWorkOrderList()
+ if (dialogMode.value === 'add') {
selectedWorkOrderId.value = null
selectedWorkOrder.value = null
taskList.value = [initTaskRow()]
@@ -385,7 +386,7 @@
}
onMounted(() => {
- getWorkOrderList()
+
})
defineExpose({ open })
--
Gitblit v1.9.3