机构加盟流程变更：机构加盟入驻审核-管理平台审核通过后，管理平台直接进入运维平台搭建环节，运维平台分为加盟确认、环境配置、反馈三个环节，其中环境配置环节需要填写各类信息，其余两个环节都是状态变更，运维平台反馈后，代表加盟及平台搭建完毕

src/views/admin/orginfo/components/OrgInfoForm.vue

@@ -232,31 +232,6 @@
         </a-form>
       </template>
     </JFormContainer>
-    <JFormContainer :disabled="false">
-      <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
-          name="NuOrgInfoForm">
-          <a-row class="card-class">
-            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
-              <SectionDivider :title="'加盟合同'" />
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="加盟合同" v-bind="validateInfos.contract" id="OrgApplyInfoForm-contract">
-                <!-- <JUpload v-model:value="formData.contract" :maxCount="1"></JUpload> -->
-                <JUpload v-model:value="formData.contract" :maxCount="1" :buttonVisible="false" :disabled="true"
-                  fileType="pdf"></JUpload>
-              </a-form-item>
-            </a-col>
-            <!-- <a-col :span="12">
-              <a-form-item label="备注信息" v-bind="validateInfos.contractNote" id="OrgApplyInfoForm-contractNote"
-                name="contractNote">
-                {{formData.contractNote}}
-              </a-form-item>
-            </a-col> -->
-          </a-row>
-        </a-form>
-      </template>
-    </JFormContainer>
 
   </a-spin>
 </template>

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 });
-};
+};

src/views/admin/workorder/WorkOrderList.vue

@@ -65,7 +65,7 @@
     <!-- 表单区域 -->
     <WorkOrderModal ref="registerModal" @success="handleSuccess"></WorkOrderModal>
 
-    
+
     <GdglDataSourceModal ref="registerDrawer" @success="reload" />
   </div>
 </template>
@@ -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;

src/views/admin/workorder/components/DataSourceForm.vue

@@ -1,64 +1,174 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <JFormContainer :disabled="disabled">
-      <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
-          name="WorkOrderForm">
-          <a-row class="card-class">
-            <a-col :span="24">
-              <a-form-item label="数据源名称" v-bind="validateInfos.name" id="WorkOrderForm-name" name="name">
-                <a-input v-model:value="formData.name" placeholder="请输入数据源名称" disabled ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="数据源编码" v-bind="validateInfos.code" id="WorkOrderForm-code" name="code">
-                <a-input v-model:value="formData.code" placeholder="请输入数据源编码" disabled ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="数据库类型" v-bind="validateInfos.dbType" id="WorkOrderForm-dbType" name="dbType">
-                <JDictSelectTag placeholder="请输入数据库类型" v-model:value="formData.dbType" dictCode="database_type" @change="onChangeDbType"></JDictSelectTag>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="驱动类" v-bind="validateInfos.dbDriver" id="WorkOrderForm-dbDriver" name="dbDriver">
-                <a-input v-model:value="formData.dbDriver" placeholder="请输入驱动类"  ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="数据源地址" v-bind="validateInfos.dbUrl" id="WorkOrderForm-dbUrl" name="dbUrl">
-                <a-textarea :rows="3" v-model:value="formData.dbUrl" placeholder="请输入数据源地址"  ></a-textarea>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="数据库用户名" v-bind="validateInfos.dbUsername" id="WorkOrderForm-dbUsername" name="dbUsername">
-                <a-input v-model:value="formData.dbUsername" placeholder="请输入数据库用户名"  ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="数据库密码" v-bind="validateInfos.dbPassword" id="WorkOrderForm-dbPassword" name="dbPassword">
-                <a-input-search v-model:value="formData.dbPassword" placeholder="请输入数据库密码" enter-button="测试" @search="handleTest"/>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="备注" v-bind="validateInfos.remark" id="WorkOrderForm-remark" name="remark">
-                <a-textarea v-model:value="formData.remark" placeholder="请输入备注"  ></a-textarea>
-              </a-form-item>
-            </a-col>
-             
-          </a-row>
-        </a-form>
-      </template>
-    </JFormContainer>
+    <a-row>
+      <a-col :span="12">
+        <JFormContainer :disabled="true">
+          <template #detail>
+            <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+              name="WorkOrderForm">
+              <a-row class="card-class">
+                <a-col :span="24">
+                  <div style="margin: 20px;">
+                    <SectionDivider :title="'机构信息'" />
+                  </div>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="机构名称" v-bind="validateInfos.name" id="WorkOrderForm-name" name="name">
+                    <a-input v-model:value="formData.name" disabled allow-clear></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="机构编码" v-bind="validateInfos.code" id="WorkOrderForm-code" name="code">
+                    <a-input v-model:value="formData.code" disabled allow-clear></a-input>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-form>
+          </template>
+        </JFormContainer>
+        <JFormContainer :disabled="disabled" style="margin-top: -55px;">
+          <template #detail>
+            <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+              name="WorkOrderForm">
+              <a-row class="card-class">
+                <a-col :span="24">
+                  <a-form-item label="域名" v-bind="validateInfos.url" id="WorkOrderForm-url" name="url">
+                    <a-input v-model:value="formData.url" placeholder="请输入域名" :maxlength="100" />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="前台路径" v-bind="validateInfos.frontPath" id="WorkOrderForm-frontPath"
+                    name="frontPath">
+                    <a-input v-model:value="formData.frontPath" placeholder="请输入前台路径" :maxlength="100" />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="后台路径" v-bind="validateInfos.contextPath" id="WorkOrderForm-contextPath"
+                    name="contextPath">
+                    <a-input v-model:value="formData.contextPath" placeholder="请输入后台路径" :maxlength="100" />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="媒体资源地址" v-bind="validateInfos.mediaUrl" id="WorkOrderForm-mediaUrl"
+                    name="mediaUrl">
+                    <a-input v-model:value="formData.mediaUrl" placeholder="请输入媒体资源地址" :maxlength="100" />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-form>
+          </template>
+        </JFormContainer>
+        <JFormContainer :disabled="true" style="margin-top: -55px;">
+          <template #detail>
+            <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+              name="WorkOrderForm">
+              <a-row class="card-class">
+                <a-col :span="24">
+                  <div style="margin: 20px;">
+                    <SectionDivider :title="'反馈信息'" />
+                  </div>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="访问地址" v-bind="validateInfos.netUrl" id="WorkOrderForm-netUrl" name="netUrl">
+                    <a-input v-model:value="formData.netUrl" placeholder="请输入域名及前台路径" :maxlength="100" disabled />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="账号" v-bind="validateInfos.accountNo" id="WorkOrderForm-accountNo"
+                    name="accountNo">
+                    <a-input v-model:value="formData.accountNo" placeholder="请输入账号" :maxlength="100" disabled />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="密码" v-bind="validateInfos.passwordText" id="WorkOrderForm-passwordText"
+                    name="passwordText">
+                    <a-input v-model:value="formData.passwordText" placeholder="请输入密码" :maxlength="100" disabled />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-form>
+          </template>
+        </JFormContainer>
+      </a-col>
+      <a-col :span="12">
+        <JFormContainer :disabled="true">
+          <template #detail>
+            <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+              name="WorkOrderForm">
+              <a-row class="card-class">
+                <a-col :span="24">
+                  <div style="margin: 20px;">
+                    <SectionDivider :title="'数据源信息'" />
+                  </div>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="数据源名称" v-bind="validateInfos.name" id="WorkOrderForm-name" name="name">
+                    <a-input v-model:value="formData.name" placeholder="请输入数据源名称" disabled></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="数据源编码" v-bind="validateInfos.code" id="WorkOrderForm-code" name="code">
+                    <a-input v-model:value="formData.code" placeholder="请输入数据源编码" disabled></a-input>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-form>
+          </template>
+        </JFormContainer>
+        <JFormContainer :disabled="disabled" style="margin-top: -55px;">
+          <template #detail>
+            <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+              name="WorkOrderForm">
+              <a-row class="card-class">
+                <a-col :span="24">
+                  <a-form-item label="数据库类型" v-bind="validateInfos.dbType" id="WorkOrderForm-dbType" name="dbType">
+                    <JDictSelectTag placeholder="请输入数据库类型" v-model:value="formData.dbType" dictCode="database_type"
+                      @change="onChangeDbType"></JDictSelectTag>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="驱动类" v-bind="validateInfos.dbDriver" id="WorkOrderForm-dbDriver" name="dbDriver">
+                    <a-input v-model:value="formData.dbDriver" placeholder="请输入驱动类"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="数据源地址" v-bind="validateInfos.dbUrl" id="WorkOrderForm-dbUrl" name="dbUrl">
+                    <a-textarea :rows="3" v-model:value="formData.dbUrl" placeholder="请输入数据源地址"></a-textarea>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="数据库用户名" v-bind="validateInfos.dbUsername" id="WorkOrderForm-dbUsername"
+                    name="dbUsername">
+                    <a-input v-model:value="formData.dbUsername" placeholder="请输入数据库用户名"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                  <a-form-item label="数据库密码" v-bind="validateInfos.dbPassword" id="WorkOrderForm-dbPassword"
+                    name="dbPassword">
+                    <a-input-search v-model:value="formData.dbPassword" placeholder="请输入数据库密码" enter-button="测试"
+                      @search="handleTest" />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="24" style="margin-bottom: 15px;">
+                  <a-form-item label="备注" v-bind="validateInfos.remark" id="WorkOrderForm-remark" name="remark">
+                    <a-textarea :rows="4" v-model:value="formData.remark" placeholder="请输入备注"></a-textarea>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-form>
+          </template>
+        </JFormContainer>
+      </a-col>
+    </a-row>
   </a-spin>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted, watch } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { getValueType } from '/@/utils';
-import { saveSjygl,saveOrUpdate,testConnection } from '../WorkOrder.api';
+import { saveSjygl, saveOrUpdate, testConnection, saveHjpz } from '../WorkOrder.api';
 import { Form } from 'ant-design-vue';
 import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
@@ -74,29 +184,46 @@ const useForm = Form.useForm;
 const emit = defineEmits(['register', 'ok']);
 const formData = reactive<Record<string, any>>({
   id: '',
+  orgId: '',
   code: '',
   name: '',
   remark: '',
-  dbType: '',
-  dbDriver: '',
+  dbType: '4',
+  dbDriver: 'com.mysql.cj.jdbc.Driver',
   dbUrl: '',
   dbUsername: '',
   dbPassword: '',
-
+  mediaUrl: '',
+  frontPath: '',
+  contextPath: '',
+  url: '',
+  netUrl: '',
+  accountNo: '',
+  passwordText: '',
 });
+watch(formData, (new_, old_) => {
+  formData.netUrl = new_.url + new_.frontPath
+}, { deep: true })
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
 const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
 const confirmLoading = ref<boolean>(false);
 //表单验证
 const validatorRules = reactive({
-  code: [{ required: true, message: '请输入数据源编码!'},],
-  name: [{ required: true, message: '请输入数据源名称!'},],
-  dbType: [{ required: true, message: '请输入数据库类型'},],
-  dbDriver: [{ required: true, message: '请输入驱动类!'},],
-  dbUrl: [{ required: true, message: '请输入数据源地址!'},],
-  dbUsername: [{ required: true, message: '请输入数据库用户名!'},],
-  dbPassword: [{ required: true, message: '请输入数据库密码!'},],
+  // code: [{ required: true, message: '请输入数据源编码!' },],
+  // name: [{ required: true, message: '请输入数据源名称!' },],
+  dbType: [{ required: true, message: '请输入数据库类型' },],
+  dbDriver: [{ required: true, message: '请输入驱动类!' },],
+  dbUrl: [{ required: true, message: '请输入数据源地址!' },],
+  dbUsername: [{ required: true, message: '请输入数据库用户名!' },],
+  dbPassword: [{ required: true, message: '请输入数据库密码!' },],
+  mediaUrl: [{ required: true, message: '请输入媒体资源地址!' },],
+  frontPath: [{ required: true, message: '请输入前台路径!' },],
+  contextPath: [{ required: true, message: '请输入后台路径!' },],
+  url: [{ required: true, message: '请输入域名' },],
+  netUrl: [{ required: true, message: '请输入访问地址' },],
+  accountNo: [{ required: true, message: '请输入账号' },],
+  passwordText: [{ required: true, message: '请输入密码' },],
 });
 const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 
@@ -187,12 +314,11 @@ function onChangeDbType(value) {
 
 
 async function handleTest() {
-  if(!formData.dbType || !formData.dbDriver || !formData.dbUrl || !formData.dbUsername || !formData.dbPassword){
+  if (!formData.dbType || !formData.dbDriver || !formData.dbUrl || !formData.dbUsername || !formData.dbPassword) {
     createMessage.warning('请填写完整数据源信息！');
     return;
   }
-  var params = {'dbType':formData.dbType, 'dbDriver':formData.dbDriver, 'dbUrl':formData.dbUrl,  'dbUsername':formData.dbUsername, 'dbPassword':formData.dbPassword}
-  console.log("🚀 ~ handleTest ~ params:", params)
+  var params = { 'dbType': formData.dbType, 'dbDriver': formData.dbDriver, 'dbUrl': formData.dbUrl, 'dbUsername': formData.dbUsername, 'dbPassword': formData.dbPassword }
   let loading = createMessage.loading('连接中....', 0);
   testConnection(params)
     .then((data) => {
@@ -208,8 +334,7 @@ async function handleTest() {
  * 新增
  */
 function add(record) {
-  console.log("🚀 ~ add ~ record:", record)
-  edit({name:record.orgName,code:record.orgCode,id:record.id});
+  edit({ accountNo: record.orgTel, passwordText: '123456', orgId: record.orgId, name: record.orgName, code: record.orgCode, id: record.id });
 }
 
 /**
@@ -263,29 +388,36 @@ async function submitForm() {
       }
     }
   }
-  var params2 = {code:formData.code,name:formData.name,'dbType':formData.dbType, 'dbDriver':formData.dbDriver, 'dbUrl':formData.dbUrl,  'dbUsername':formData.dbUsername, 'dbPassword':formData.dbPassword}
-  await saveSjygl(params2).then((res) => { 
-    console.log("🚀 ~ submitForm ~ res:", res)
+  var params2 = {
+    code: formData.code, name: formData.name, 'dbType': formData.dbType,
+    'dbDriver': formData.dbDriver, 'dbUrl': formData.dbUrl, 'dbUsername': formData.dbUsername, 'dbPassword': formData.dbPassword
+  }
+  //先存储数据库并刷新数据源，这一步返回成功后保存相关信息
+  await saveSjygl(params2).then(async (res) => {
     if (res.success) {
-      var params = {id:model.id,status:'1'}
-      saveOrUpdate(params, isUpdate.value).then((res) => {
-      if (res.success) {
-        createMessage.success(res.message);
-        emit('ok');
-      } else {
-        createMessage.warning(res.message);
-      }
-    })
-    .finally(() => {
-      confirmLoading.value = false;
-    });
+
+      //数据库更新后 处理数据存储问题
+      await saveHjpz(model).then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      }).catch(error => {
+        createMessage.warning('服务器无法访问');
+      }).finally(() => {
+        confirmLoading.value = false;
+      });
+
     } else {
+      confirmLoading.value = false;
       createMessage.warning(res.message);
     }
-  });
-  
 
-  // saveSjygl(model).then((res) => { });
+  }).catch(error => {
+    confirmLoading.value = false;
+  });
 }
 
 
@@ -302,7 +434,7 @@ defineExpose({
 }
 
 .card-class {
-  padding-top: 24px;
+  padding-top: 12px;
   padding-bottom: 24px;
   padding-left: 14px;
   padding-right: 14px;
@@ -311,6 +443,5 @@ defineExpose({
   border-radius: 10px;
   // box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
   margin-bottom: 14px;
-
 }
 </style>

src/views/admin/workorder/components/DataSourceModal.vue

@@ -15,7 +15,7 @@ import { ref, nextTick, defineExpose } from 'vue';
 import DataSourceForm from './DataSourceForm.vue'
 
 const title = ref<string>('');
-const width = ref<number>(600);
+const width = ref<number>(1200);
 const visible = ref<boolean>(false);
 const orgDetailVisible = ref<boolean>(false);
 const orgFankuiVisible = ref<boolean>(false);
@@ -27,7 +27,7 @@ const emit = defineEmits(['register', 'success']);
  * 新增
  */
 function add(record) {
-  title.value = '数据源管理';
+  title.value = '环境配置';
   visible.value = true;
   nextTick(() => {
     registerForm.value.add(record);