From 6c34662e5a39f50f3cfbbf6cf3600fb479e52fd9 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 11 Jul 2025 08:37:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=B3=E5=8F=B0=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/orginfo/components/OrgInfoForm.vue | 192 +++++++-------- src/views/admin/workorder/WorkOrder.api.ts | 9 + src/views/admin/workorder/WorkOrder.data.ts | 15 +- src/views/admin/workorder/WorkOrderList.vue | 87 ++----- .../workorder/components/WorkOrderFankui.vue | 221 ++++++++++++++++++ .../workorder/components/WorkOrderForm.vue | 56 +++-- .../workorder/components/WorkOrderModal.vue | 42 ++++ 7 files changed, 439 insertions(+), 183 deletions(-) create mode 100644 src/views/admin/workorder/components/WorkOrderFankui.vue diff --git a/src/views/admin/orginfo/components/OrgInfoForm.vue b/src/views/admin/orginfo/components/OrgInfoForm.vue index 2f7c7b9..1034e82 100644 --- a/src/views/admin/orginfo/components/OrgInfoForm.vue +++ b/src/views/admin/orginfo/components/OrgInfoForm.vue @@ -8,10 +8,56 @@ + + + {{formData.departName}} + + + + + {{formData.orgCode}} + + + + + {{formData.orgLeader}} + + + + + {{formData.orgLeaderPhone}} + + + + + {{formData.orgPropertyType}} + + + + + {{formData.orgBuildingArea}} ㎡ + + + + + + {{formData.orgAddress}} + + + - + @@ -21,72 +67,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + {{formData.name}} + + + + + {{formData.sex}} + + + + + {{formData.idCard}} + + + + + {{formData.birthDate?formData.birthDate.substring(0,10):""}} - + {{formData.startTime?formData.startTime.substring(0,10):""}} - + {{formData.endTime?formData.endTime.substring(0,10):""}} - - + + + {{formData.national}} + + + + + {{formData.idCardAddress}} + + + + + {{formData.issuingAuthority}} + + + + @@ -97,73 +137,36 @@ - + {{formData.comName}} - + {{formData.comRegisterAddress}} - + {{formData.comCreditCode}} - + {{formData.comLegalPerson}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -176,13 +179,12 @@ - + diff --git a/src/views/admin/workorder/WorkOrder.api.ts b/src/views/admin/workorder/WorkOrder.api.ts index 317a6d4..54b257c 100644 --- a/src/views/admin/workorder/WorkOrder.api.ts +++ b/src/views/admin/workorder/WorkOrder.api.ts @@ -70,3 +70,12 @@ export const saveOrUpdate = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({ url: url, params }, { isTransformResponse: false }); } + + +/** + * 接收 + * @param params + */ +export const edit = (params) => { + return defHttp.post({ url: Api.edit, params }, { isTransformResponse: false }); +} \ No newline at end of file diff --git a/src/views/admin/workorder/WorkOrder.data.ts b/src/views/admin/workorder/WorkOrder.data.ts index 1dfeddc..bed72ae 100644 --- a/src/views/admin/workorder/WorkOrder.data.ts +++ b/src/views/admin/workorder/WorkOrder.data.ts @@ -16,12 +16,22 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'platType_dictText' }, + { + title: '工单类型', + align: "center", + dataIndex: 'workType_dictText' + }, { title: '标题', align: "center", dataIndex: 'title', width:260 }, + { + title: '工单状态', + align: "center", + dataIndex: 'status_dictText' + }, { title: '提交人', align: "center", @@ -42,11 +52,6 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'replyTime' }, - { - title: '工单状态', - align: "center", - dataIndex: 'status_dictText' - }, ]; // 高级查询数据 diff --git a/src/views/admin/workorder/WorkOrderList.vue b/src/views/admin/workorder/WorkOrderList.vue index 7c414bf..fab7716 100644 --- a/src/views/admin/workorder/WorkOrderList.vue +++ b/src/views/admin/workorder/WorkOrderList.vue @@ -11,12 +11,6 @@ - - - - - - @@ -26,14 +20,22 @@ - + + + + + + + - + @@ -52,29 +54,10 @@ @@ -89,17 +72,20 @@ import { ref, reactive } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage'; import { columns, superQuerySchema } from './WorkOrder.data'; -import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './WorkOrder.api'; +import { list, edit } from './WorkOrder.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import WorkOrderModal from './components/WorkOrderModal.vue' import { useUserStore } from '/@/store/modules/user'; import JInput from "/@/components/Form/src/jeecg/components/JInput.vue"; +import { useMessage } from '/@/hooks/web/useMessage'; +import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; const formRef = ref(); const queryParam = reactive({}); const toggleSearchStatus = ref(false); const registerModal = ref(); const userStore = useUserStore(); +const { createMessage } = useMessage(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { @@ -116,15 +102,6 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ return Object.assign(params, queryParam); }, }, - exportConfig: { - name: "工单表", - url: getExportUrl, - params: queryParam, - }, - importConfig: { - url: getImportUrl, - success: handleSuccess - }, }); const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext; const labelCol = reactive({ @@ -183,20 +160,6 @@ function handleOrgDetail(record: Recordable) { registerModal.value.orgDetail(record.orgCode); } -/** - * 删除事件 - */ -async function handleDelete(record) { - await deleteOne({ id: record.id }, handleSuccess); -} - -/** - * 批量删除事件 - */ -async function batchHandleDelete() { - await batchDelete({ ids: selectedRowKeys.value }, handleSuccess); -} - /** * 成功回调 */ @@ -217,26 +180,22 @@ function getTableAction(record) { label: '机构详情', onClick: handleOrgDetail.bind(null, record) }, - { - label: '接收', - onClick: handleOrgDetail.bind(null, record) - }, { label: '反馈', - onClick: handleOrgDetail.bind(null, record) + onClick: handleQueren.bind(null, record), + ifShow: record.status == '0' }, ]; } /** - * 下拉操作栏 + * 接收 */ -function getDropDownAction(record) { - return [ - - ] +function handleQueren(record) { + console.log("🚀 ~ handleQueren ~ record:", record) + registerModal.value.disableSubmit = false; + registerModal.value.orgFankui(record); } - /** * 查询 */ diff --git a/src/views/admin/workorder/components/WorkOrderFankui.vue b/src/views/admin/workorder/components/WorkOrderFankui.vue new file mode 100644 index 0000000..70663d8 --- /dev/null +++ b/src/views/admin/workorder/components/WorkOrderFankui.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/src/views/admin/workorder/components/WorkOrderForm.vue b/src/views/admin/workorder/components/WorkOrderForm.vue index e6c5c43..d734173 100644 --- a/src/views/admin/workorder/components/WorkOrderForm.vue +++ b/src/views/admin/workorder/components/WorkOrderForm.vue @@ -4,64 +4,76 @@ + + + +