diff --git a/src/api/integrated/maintenanceOrder.ts b/src/api/integrated/maintenanceOrder.ts index 64ea7d3..2de43c5 100644 --- a/src/api/integrated/maintenanceOrder.ts +++ b/src/api/integrated/maintenanceOrder.ts @@ -46,3 +46,11 @@ export function getScreenMaintenanceOrderList() { }) } +export function handleObj(obj?: Object) { + return request({ + url: '/integrated/maintenanceOrder/handle', + method: 'post', + data: obj + }) +} + diff --git a/src/views/integrated/maintenanceOrder/handleDialog.vue b/src/views/integrated/maintenanceOrder/handleDialog.vue new file mode 100644 index 0000000..674f8d5 --- /dev/null +++ b/src/views/integrated/maintenanceOrder/handleDialog.vue @@ -0,0 +1,92 @@ + + + + + + diff --git a/src/views/integrated/maintenanceOrder/index.vue b/src/views/integrated/maintenanceOrder/index.vue index ec41c37..8b4b8c6 100644 --- a/src/views/integrated/maintenanceOrder/index.vue +++ b/src/views/integrated/maintenanceOrder/index.vue @@ -89,7 +89,7 @@ >删除 - 标记为已处理 + 开始处理 @@ -99,6 +99,9 @@ + + + @@ -110,11 +113,13 @@ import { useDict } from "/@/hooks/dict" // 引入组件 const FormDialog = defineAsyncComponent(() => import("./form.vue")) +const HandleDialog = defineAsyncComponent(() => import("./handleDialog.vue")) // 定义查询字典 const { maintenance_urgency, maintenance_status } = useDict("maintenance_urgency", "maintenance_status") // 定义变量内容 const formDialogRef = ref() +const handleDialogRef = ref() // 搜索变量 const queryRef = ref() const showSearch = ref(true) @@ -167,19 +172,8 @@ const handleDelete = async (ids: string[]) => { } } -// 添加已处理操作 -const handleProcessed = async (row: any) => { - try { - await useMessageBox().confirm("确定将该工单标记为已处理吗？") - } catch { - return - } - try { - await putObj({ ...row, status: 1 }) - useMessage().success("已处理") - getDataList() - } catch (err: any) { - useMessage().error(err.msg) - } +// 开始处理操作 +const handleProcessed = (row: any) => { + handleDialogRef.value.openDialog(row.id) } diff --git a/src/views/integrated/notice/form.vue b/src/views/integrated/notice/form.vue index 01982e5..61e0799 100644 --- a/src/views/integrated/notice/form.vue +++ b/src/views/integrated/notice/form.vue @@ -81,7 +81,7 @@ const loading = ref(false) const {push_status, is_top} = useDict('push_status', 'is_top') // 提交表单数据 -const form = reactive({ +const defaultForm = { id: '', description: '', status: '', @@ -92,7 +92,8 @@ const form = reactive({ isTop: '', viewCount: '', expireTime: '', -}); +} +const form = reactive({ ...defaultForm }) // 定义校验规则 const dataRules = ref({ @@ -115,7 +116,7 @@ const disabledTime = () => { // 打开弹窗 const openDialog = (id: string) => { visible.value = true - form.id = '' + Object.assign(form, defaultForm) // 重置表单数据 nextTick(() => { diff --git a/src/views/supermarket/mallProduct/form.vue b/src/views/supermarket/mallProduct/form.vue index d92eae7..fe41dc4 100644 --- a/src/views/supermarket/mallProduct/form.vue +++ b/src/views/supermarket/mallProduct/form.vue @@ -30,18 +30,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -72,7 +72,7 @@ - + @@ -134,7 +134,7 @@
- +