From 1bd7d5288355a527cb1905a73011ae47eaaac500 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Mon, 9 Mar 2026 14:57:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E5=8F=98=E6=9B=B4=EF=BC=9A=E6=9C=BA=E6=9E=84=E5=8A=A0?=
=?UTF-8?q?=E7=9B=9F=E5=85=A5=E9=A9=BB=E5=AE=A1=E6=A0=B8-=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?=
=?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=AE=A1=E7=90=86=E5=B9=B3=E5=8F=B0=E7=9B=B4?=
=?UTF-8?q?=E6=8E=A5=E8=BF=9B=E5=85=A5=E8=BF=90=E7=BB=B4=E5=B9=B3=E5=8F=B0?=
=?UTF-8?q?=E6=90=AD=E5=BB=BA=E7=8E=AF=E8=8A=82=EF=BC=8C=E8=BF=90=E7=BB=B4?=
=?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=88=86=E4=B8=BA=E5=8A=A0=E7=9B=9F=E7=A1=AE?=
=?UTF-8?q?=E8=AE=A4=E3=80=81=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E3=80=81?=
=?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=B8=89=E4=B8=AA=E7=8E=AF=E8=8A=82=EF=BC=8C?=
=?UTF-8?q?=E5=85=B6=E4=B8=AD=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E7=8E=AF?=
=?UTF-8?q?=E8=8A=82=E9=9C=80=E8=A6=81=E5=A1=AB=E5=86=99=E5=90=84=E7=B1=BB?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=85=B6=E4=BD=99=E4=B8=A4=E4=B8=AA?=
=?UTF-8?q?=E7=8E=AF=E8=8A=82=E9=83=BD=E6=98=AF=E7=8A=B6=E6=80=81=E5=8F=98?=
=?UTF-8?q?=E6=9B=B4=EF=BC=8C=E8=BF=90=E7=BB=B4=E5=B9=B3=E5=8F=B0=E5=8F=8D?=
=?UTF-8?q?=E9=A6=88=E5=90=8E=EF=BC=8C=E4=BB=A3=E8=A1=A8=E5=8A=A0=E7=9B=9F?=
=?UTF-8?q?=E5=8F=8A=E5=B9=B3=E5=8F=B0=E6=90=AD=E5=BB=BA=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/orginfo/components/OrgInfoForm.vue | 25 --
src/views/admin/workorder/WorkOrder.api.ts | 71 ++--
src/views/admin/workorder/WorkOrderList.vue | 63 +++-
.../workorder/components/DataSourceForm.vue | 305 +++++++++++++-----
.../workorder/components/DataSourceModal.vue | 4 +-
5 files changed, 319 insertions(+), 149 deletions(-)
diff --git a/src/views/admin/orginfo/components/OrgInfoForm.vue b/src/views/admin/orginfo/components/OrgInfoForm.vue
index 77b0cea..f015e6c 100644
--- a/src/views/admin/orginfo/components/OrgInfoForm.vue
+++ b/src/views/admin/orginfo/components/OrgInfoForm.vue
@@ -232,31 +232,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/admin/workorder/WorkOrder.api.ts b/src/views/admin/workorder/WorkOrder.api.ts
index 68e3a93..6e90b6a 100644
--- a/src/views/admin/workorder/WorkOrder.api.ts
+++ b/src/views/admin/workorder/WorkOrder.api.ts
@@ -1,21 +1,24 @@
import { defHttp } from '/@/utils/http/axios';
-import { useMessage } from "/@/hooks/web/useMessage";
+import { useMessage } from '/@/hooks/web/useMessage';
const { createConfirm } = useMessage();
enum Api {
list = '/workorder/workOrder/list',
- save='/workorder/workOrder/add',
- saveSjygl='/sys/dataSource/add',
- editDepart='/sys/sysDepart/edit',
- edit='/workorder/workOrder/edit',
- editUrl='/workorder/workOrder/editUrl',
- updateMqById='/workorder/workOrder/updateMqById',
+ save = '/workorder/workOrder/add',
+ saveSjygl = '/sys/dataSource/add',
+ editDepart = '/sys/sysDepart/edit',
+ edit = '/workorder/workOrder/edit',
+ editUrl = '/workorder/workOrder/editUrl',
+ updateMqById = '/workorder/workOrder/updateMqById',
+ joinConfirm = '/workorder/workOrder/joinConfirm',
+ handFk = '/workorder/workOrder/handFk',
deleteOne = '/workorder/workOrder/delete',
deleteBatch = '/workorder/workOrder/deleteBatch',
importExcel = '/workorder/workOrder/importExcel',
exportXls = '/workorder/workOrder/exportXls',
testConnection = '/online/cgreport/api/testConnection',
+ saveHjpz = '/workorder/workOrder/saveHjpz',
}
/**
@@ -40,11 +43,11 @@ export const list = (params) => defHttp.get({ url: Api.list, params });
* @param params
* @param handleSuccess
*/
-export const deleteOne = (params,handleSuccess) => {
- return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+export const deleteOne = (params, handleSuccess) => {
+ return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
handleSuccess();
});
-}
+};
/**
* 批量删除
@@ -59,12 +62,12 @@ export const batchDelete = (params, handleSuccess) => {
okText: '确认',
cancelText: '取消',
onOk: () => {
- return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+ return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
handleSuccess();
});
- }
+ },
});
-}
+};
/**
* 保存或者更新
@@ -74,14 +77,13 @@ export const batchDelete = (params, handleSuccess) => {
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
-}
+};
export const editUrl = (params, isUpdate) => {
return defHttp.post({ url: Api.editUrl, params }, { isTransformResponse: false });
-}
+};
export const editDepart = (params, isUpdate) => {
return defHttp.post({ url: Api.editDepart, params }, { isTransformResponse: false });
-}
-
+};
/**
* 接收
@@ -89,20 +91,43 @@ export const editDepart = (params, isUpdate) => {
*/
export const edit = (params) => {
return defHttp.post({ url: Api.edit, params }, { isTransformResponse: false });
-}
+};
export const updateMqById = (params) => {
return defHttp.post({ url: Api.updateMqById, params }, { isTransformResponse: false });
-}
+};
+
+/**
+ * 加盟确认
+ * @param params
+ * @returns
+ */
+export const joinConfirm = (params) => {
+ return defHttp.post({ url: Api.joinConfirm, params }, { isTransformResponse: false });
+};
+
+/**
+ * 反馈
+ */
+export const handFk = (params) => {
+ return defHttp.post({ url: Api.handFk, params }, { isTransformResponse: false });
+};
+
/**
* 保存数据源信息
* @param params
*/
export const saveSjygl = (params) => {
return defHttp.post({ url: Api.saveSjygl, params }, { isTransformResponse: false });
-}
-
-
+};
+/**
+ * 保存 环境配置
+ * @param params
+ * @returns
+ */
+export const saveHjpz = (params) => {
+ return defHttp.post({ url: Api.saveHjpz, params }, { isTransformResponse: false });
+};
/**
* 测试连接
@@ -110,4 +135,4 @@ export const saveSjygl = (params) => {
*/
export const testConnection = (params) => {
return defHttp.post({ url: Api.testConnection, params });
-};
\ No newline at end of file
+};
diff --git a/src/views/admin/workorder/WorkOrderList.vue b/src/views/admin/workorder/WorkOrderList.vue
index 35e7d76..47c6313 100644
--- a/src/views/admin/workorder/WorkOrderList.vue
+++ b/src/views/admin/workorder/WorkOrderList.vue
@@ -65,7 +65,7 @@
-
+
@@ -75,7 +75,7 @@ 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, edit } from './WorkOrder.api';
+import { list, edit, joinConfirm, handFk } from './WorkOrder.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import WorkOrderModal from './components/WorkOrderModal.vue'
import { useUserStore } from '/@/store/modules/user';
@@ -83,7 +83,7 @@ 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';
import GdglDataSourceModal from './components/DataSourceModal.vue';
-import {useDrawer} from "@/components/Drawer";
+import { useDrawer } from "@/components/Drawer";
@@ -138,7 +138,7 @@ function handleSuperQuery(params) {
/**
* 数据源管理
*/
-function handleSjygl(record){
+function handleSjygl(record) {
console.log("🚀 ~ handleSjygl ~ record:", record)
registerDrawer.value.add(record);
registerDrawer.value.disableSubmit = false;
@@ -181,25 +181,64 @@ function getTableAction(record) {
onClick: handleOrgDetail.bind(null, record)
},
{
- label: '数据源管理',
- onClick: handleSjygl.bind(null, record),
- ifShow: record.status == '0'
+ label: '加盟确认',
+ ifShow: record.status == '0',
+ popConfirm: {
+ title: '是否进行加盟确认操作',
+ confirm: joinConfirmFunc.bind(null, record),
+ },
},
{
- label: '访问配置',
- onClick: handleFwpz.bind(null, record),
+ label: '环境配置',
+ onClick: handleSjygl.bind(null, record),
ifShow: record.status == '1'
},
{
label: '反馈',
- onClick: handleQueren.bind(null, record),
- ifShow: record.status == '2'
+ ifShow: record.status == '2',
+ popConfirm: {
+ title: '是否确认反馈',
+ confirm: handFkFunc.bind(null, record),
+ },
},
+ // {
+ // label: '访问配置',
+ // onClick: handleFwpz.bind(null, record),
+ // ifShow: record.status == '0'
+ // },
+ // {
+ // label: '反馈',
+ // onClick: handleQueren.bind(null, record),
+ // ifShow: record.status == '0'
+ // },
];
}
/**
- * 接收
+ * 加盟确认
+ * @param record
+ */
+function joinConfirmFunc(record) {
+ joinConfirm(record).then(res => {
+ createMessage.success('操作成功');
+ reload()
+ })
+}
+
+/**
+ * 反馈
+ * 修改工单状态、发短信、通知管理平台修改搭建状态
+ * @param record
+ */
+function handFkFunc(record) {
+ handFk(record).then(res => {
+ createMessage.success('操作成功');
+ reload()
+ })
+}
+
+/**
+ * 反馈
*/
function handleQueren(record) {
record.accountNo = record.orgTel;
diff --git a/src/views/admin/workorder/components/DataSourceForm.vue b/src/views/admin/workorder/components/DataSourceForm.vue
index 7511d43..1b7cf21 100644
--- a/src/views/admin/workorder/components/DataSourceForm.vue
+++ b/src/views/admin/workorder/components/DataSourceForm.vue
@@ -1,64 +1,174 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+