Merge remote-tracking branch 'origin/master'

src/views/adweb/enquiry/AdwebEnquiry.api.ts

@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/adweb/adwebEnquiry/list',
+  save='/adweb/adwebEnquiry/add',
+  edit='/adweb/adwebEnquiry/edit',
+  deleteOne = '/adweb/adwebEnquiry/delete',
+  deleteBatch = '/adweb/adwebEnquiry/deleteBatch',
+  importExcel = '/adweb/adwebEnquiry/importExcel',
+  exportXls = '/adweb/adwebEnquiry/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+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(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}

src/views/adweb/enquiry/AdwebEnquiry.data.ts

@@ -0,0 +1,372 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '询盘来源IP',
+    align: "center",
+    dataIndex: 'fromIp'
+  },
+  {
+    title: '询盘发送者邮箱账号',
+    align: "center",
+    dataIndex: 'fromEmail'
+  },
+  {
+    title: '询盘模块：admp_web：admp网站询盘 ；email：邮件询盘  ；diy_element：自定义组件询盘',
+    align: "center",
+    dataIndex: 'modular'
+  },
+  {
+    title: '发送人姓名',
+    align: "center",
+    dataIndex: 'fromUser'
+  },
+  {
+    title: '0删除，1有效，默认值1   2：待解析  3:数据解析中 4.解析失败',
+    align: "center",
+    dataIndex: 'status'
+  },
+  {
+    title: '数据解析次数',
+    align: "center",
+    dataIndex: 'dealCount'
+  },
+  {
+    title: '系统有效性  0：无效       1；有效 后台字段',
+    align: "center",
+    dataIndex: 'sysEffective'
+  },
+  {
+    title: '用户有效性  0：无效       1：有效   2 : 待定 取自字典表',
+    align: "center",
+    dataIndex: 'userEffective'
+  },
+  {
+    title: '敏感信息',
+    align: "center",
+    dataIndex: 'sensitiveMessage'
+  },
+  {
+    title: '询盘阶段,由跟踪来决定（1：待沟通 ；2：沟通中；3：成单；4;放弃）',
+    align: "center",
+    dataIndex: 'phase'
+  },
+  {
+    title: '跟进跟进状态,由跟踪来决定（1：待跟进 ；2：跟进中；3：完成；4;停止）',
+    align: "center",
+    dataIndex: 'trackStatus'
+  },
+  {
+    title: '询盘所属用户主账号ID',
+    align: "center",
+    dataIndex: 'uid'
+  },
+  {
+    title: '询盘跟进人 id',
+    align: "center",
+    dataIndex: 'tracker'
+  },
+  {
+    title: '询盘创建时间',
+    align: "center",
+    dataIndex: 'recordCtime'
+  },
+  {
+    title: 'ADMP平台创建时间',
+    align: "center",
+    dataIndex: 'ctime'
+  },
+  {
+    title: '国家/地区（根据ip获取）',
+    align: "center",
+    dataIndex: 'country'
+  },
+  {
+    title: '通过ip解析获得国家码',
+    align: "center",
+    dataIndex: 'countryIsoCode'
+  },
+  {
+    title: '通过ip解析获得区域码',
+    align: "center",
+    dataIndex: 'areaIsoCode'
+  },
+  {
+    title: '询盘插件名称，名称小写，如：wpforms',
+    align: "center",
+    dataIndex: 'pluginName'
+  },
+  {
+    title: '站点code，关联站点表',
+    align: "center",
+    dataIndex: 'siteCode'
+  },
+  {
+    title: '站点token',
+    align: "center",
+    dataIndex: 'siteToken'
+  },
+  {
+    title: '询盘来自站点的域名',
+    align: "center",
+    dataIndex: 'siteHost'
+  },
+  {
+    title: '询盘原站点记录ID',
+    align: "center",
+    dataIndex: 'recordId'
+  },
+  {
+    title: '状态更新时间',
+    align: "center",
+    dataIndex: 'utime'
+  },
+  {
+    title: '回复时间',
+    align: "center",
+    dataIndex: 'replyTime'
+  },
+  {
+    title: '转发状态：0未转发，1已转发，默认值0',
+    align: "center",
+    dataIndex: 'forward'
+  },
+  {
+    title: '转发时间',
+    align: "center",
+    dataIndex: 'forwardTime'
+  },
+  {
+    title: '访客id',
+    align: "center",
+    dataIndex: 'visitId'
+  },
+  {
+    title: '来源于站点的id',
+    align: "center",
+    dataIndex: 'siteId'
+  },
+  {
+    title: '公司id',
+    align: "center",
+    dataIndex: 'companyId'
+  },
+  {
+    title: '联系人id，字符串组合',
+    align: "center",
+    dataIndex: 'contactIds'
+  },
+  {
+    title: '定时器任务修改查询唯一标识（10位随机数）',
+    align: "center",
+    dataIndex: 'jobId'
+  },
+  {
+    title: '回复状态',
+    align: "center",
+    dataIndex: 'replayStatus'
+  },
+  {
+    title: '外部编号',
+    align: "center",
+    dataIndex: 'noOut'
+  },
+  {
+    title: '处理后的询盘当地时间字段',
+    align: "center",
+    dataIndex: 'modifyRecordCtime'
+  },
+  {
+    title: 'transContent',
+    align: "center",
+    dataIndex: 'transContent'
+  },
+  {
+    title: '国家code',
+    align: "center",
+    dataIndex: 'countryCode'
+  },
+  {
+    title: '国家名',
+    align: "center",
+    dataIndex: 'countryName'
+  },
+  {
+    title: 'whatsApp',
+    align: "center",
+    dataIndex: 'whatsApp'
+  },
+  {
+    title: '0：不是；1：是',
+    align: "center",
+    dataIndex: 'wasteEnquiry'
+  },
+  {
+    title: '推送状态，0：待发送，1：成功，2不予发送',
+    align: "center",
+    dataIndex: 'pushStatus'
+  },
+  {
+    title: '推送错误次数',
+    align: "center",
+    dataIndex: 'pushErrorNum'
+  },
+  {
+    title: '姓名',
+    align: "center",
+    dataIndex: 'name'
+  },
+  {
+    title: '邮箱地址',
+    align: "center",
+    dataIndex: 'email'
+  },
+  {
+    title: '询盘信息',
+    align: "center",
+    dataIndex: 'message'
+  },
+  {
+    title: '公司名称',
+    align: "center",
+    dataIndex: 'company'
+  },
+  {
+    title: '来源页面',
+    align: "center",
+    dataIndex: 'fromPage'
+  },
+  {
+    title: 'form表单传入Ip',
+    align: "center",
+    dataIndex: 'customerIp'
+  },
+  {
+    title: '手机号',
+    align: "center",
+    dataIndex: 'phone'
+  },
+  {
+    title: 'whatsapp',
+    align: "center",
+    dataIndex: 'whatsapp'
+  },
+  {
+    title: '阅读状态，0是未阅读，1是已阅读',
+    align: "center",
+    dataIndex: 'readStatus'
+  },
+  {
+    title: '负责人的id',
+    align: "center",
+    dataIndex: 'principalUid'
+  },
+  {
+    title: '0代表系统根据规则分配，1代表主账户指定',
+    align: "center",
+    dataIndex: 'principalType'
+  },
+  {
+    title: 'form表单中的地址',
+    align: "center",
+    dataIndex: 'address'
+  },
+  {
+    title: '客户自定义字段',
+    align: "center",
+    dataIndex: 'specialField'
+  },
+  {
+    title: '向Wp发送请求时间',
+    align: "center",
+    dataIndex: 'requestTime'
+  },
+  {
+    title: 'Adweb实时获取WebHookS消息时间，定时器无该值',
+    align: "center",
+    dataIndex: 'acquireMessageTime'
+  },
+  {
+    title: '疑似垃圾询盘理由',
+    align: "center",
+    dataIndex: 'effectiveReason'
+  },
+  {
+    title: '垃圾询盘类型，关键词：keyword，邮箱：email，ip: ip，其他：other',
+    align: "center",
+    dataIndex: 'wasteEnquiryType'
+  },
+  {
+    title: '询盘关联产品',
+    align: "center",
+    dataIndex: 'cartItems'
+  },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  fromIp: {title: '询盘来源IP',order: 0,view: 'text', type: 'string',},
+  fromEmail: {title: '询盘发送者邮箱账号',order: 1,view: 'text', type: 'string',},
+  modular: {title: '询盘模块：admp_web：admp网站询盘 ；email：邮件询盘  ；diy_element：自定义组件询盘',order: 2,view: 'text', type: 'string',},
+  fromUser: {title: '发送人姓名',order: 3,view: 'text', type: 'string',},
+  status: {title: '0删除，1有效，默认值1   2：待解析  3:数据解析中 4.解析失败',order: 4,view: 'number', type: 'number',},
+  dealCount: {title: '数据解析次数',order: 5,view: 'number', type: 'number',},
+  sysEffective: {title: '系统有效性  0：无效       1；有效 后台字段',order: 6,view: 'number', type: 'number',},
+  userEffective: {title: '用户有效性  0：无效       1：有效   2 : 待定 取自字典表',order: 7,view: 'number', type: 'number',},
+  sensitiveMessage: {title: '敏感信息',order: 8,view: 'textarea', type: 'string',},
+  phase: {title: '询盘阶段,由跟踪来决定（1：待沟通 ；2：沟通中；3：成单；4;放弃）',order: 9,view: 'text', type: 'string',},
+  trackStatus: {title: '跟进跟进状态,由跟踪来决定（1：待跟进 ；2：跟进中；3：完成；4;停止）',order: 10,view: 'text', type: 'string',},
+  uid: {title: '询盘所属用户主账号ID',order: 11,view: 'text', type: 'string',},
+  tracker: {title: '询盘跟进人 id',order: 12,view: 'number', type: 'number',},
+  recordCtime: {title: '询盘创建时间',order: 13,view: 'datetime', type: 'string',},
+  ctime: {title: 'ADMP平台创建时间',order: 14,view: 'datetime', type: 'string',},
+  country: {title: '国家/地区（根据ip获取）',order: 15,view: 'text', type: 'string',},
+  countryIsoCode: {title: '通过ip解析获得国家码',order: 16,view: 'text', type: 'string',},
+  areaIsoCode: {title: '通过ip解析获得区域码',order: 17,view: 'text', type: 'string',},
+  pluginName: {title: '询盘插件名称，名称小写，如：wpforms',order: 18,view: 'text', type: 'string',},
+  siteCode: {title: '站点code，关联站点表',order: 19,view: 'text', type: 'string',},
+  siteToken: {title: '站点token',order: 20,view: 'text', type: 'string',},
+  siteHost: {title: '询盘来自站点的域名',order: 21,view: 'text', type: 'string',},
+  recordId: {title: '询盘原站点记录ID',order: 22,view: 'text', type: 'string',},
+  utime: {title: '状态更新时间',order: 23,view: 'datetime', type: 'string',},
+  replyTime: {title: '回复时间',order: 24,view: 'datetime', type: 'string',},
+  forward: {title: '转发状态：0未转发，1已转发，默认值0',order: 25,view: 'number', type: 'number',},
+  forwardTime: {title: '转发时间',order: 26,view: 'datetime', type: 'string',},
+  visitId: {title: '访客id',order: 27,view: 'text', type: 'string',},
+  siteId: {title: '来源于站点的id',order: 28,view: 'number', type: 'number',},
+  companyId: {title: '公司id',order: 29,view: 'number', type: 'number',},
+  contactIds: {title: '联系人id，字符串组合',order: 30,view: 'text', type: 'string',},
+  jobId: {title: '定时器任务修改查询唯一标识（10位随机数）',order: 31,view: 'text', type: 'string',},
+  replayStatus: {title: '回复状态',order: 32,view: 'text', type: 'string',},
+  noOut: {title: '外部编号',order: 33,view: 'text', type: 'string',},
+  modifyRecordCtime: {title: '处理后的询盘当地时间字段',order: 34,view: 'datetime', type: 'string',},
+  transContent: {title: 'transContent',order: 35,view: 'textarea', type: 'string',},
+  countryCode: {title: '国家code',order: 36,view: 'text', type: 'string',},
+  countryName: {title: '国家名',order: 37,view: 'text', type: 'string',},
+  whatsApp: {title: 'whatsApp',order: 38,view: 'text', type: 'string',},
+  wasteEnquiry: {title: '0：不是；1：是',order: 39,view: 'number', type: 'number',},
+  pushStatus: {title: '推送状态，0：待发送，1：成功，2不予发送',order: 40,view: 'number', type: 'number',},
+  pushErrorNum: {title: '推送错误次数',order: 41,view: 'number', type: 'number',},
+  name: {title: '姓名',order: 42,view: 'text', type: 'string',},
+  email: {title: '邮箱地址',order: 43,view: 'text', type: 'string',},
+  message: {title: '询盘信息',order: 44,view: 'textarea', type: 'string',},
+  company: {title: '公司名称',order: 45,view: 'text', type: 'string',},
+  fromPage: {title: '来源页面',order: 46,view: 'text', type: 'string',},
+  customerIp: {title: 'form表单传入Ip',order: 47,view: 'text', type: 'string',},
+  phone: {title: '手机号',order: 48,view: 'text', type: 'string',},
+  whatsapp: {title: 'whatsapp',order: 49,view: 'text', type: 'string',},
+  readStatus: {title: '阅读状态，0是未阅读，1是已阅读',order: 50,view: 'number', type: 'number',},
+  principalUid: {title: '负责人的id',order: 51,view: 'text', type: 'string',},
+  principalType: {title: '0代表系统根据规则分配，1代表主账户指定',order: 52,view: 'number', type: 'number',},
+  address: {title: 'form表单中的地址',order: 53,view: 'textarea', type: 'string',},
+  specialField: {title: '客户自定义字段',order: 54,view: 'textarea', type: 'string',},
+  requestTime: {title: '向Wp发送请求时间',order: 55,view: 'datetime', type: 'string',},
+  acquireMessageTime: {title: 'Adweb实时获取WebHookS消息时间，定时器无该值',order: 56,view: 'datetime', type: 'string',},
+  effectiveReason: {title: '疑似垃圾询盘理由',order: 57,view: 'text', type: 'string',},
+  wasteEnquiryType: {title: '垃圾询盘类型，关键词：keyword，邮箱：email，ip: ip，其他：other',order: 58,view: 'text', type: 'string',},
+  cartItems: {title: '询盘关联产品',order: 59,view: 'textarea', type: 'string',},
+};

src/views/adweb/enquiry/AdwebEnquiryList.vue

@@ -0,0 +1,251 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="siteCode">
+              <template #label><span title="站点code，关联站点表">站点co</span></template>
+              <a-input placeholder="请输入站点code，关联站点表" v-model:value="queryParam.siteCode" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button>批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <AdwebEnquiryModal ref="registerModal" @success="handleSuccess"></AdwebEnquiryModal>
+  </div>
+</template>
+
+<script lang="ts" name="adweb-adwebEnquiry" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns, superQuerySchema } from './AdwebEnquiry.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './AdwebEnquiry.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import AdwebEnquiryModal from './components/AdwebEnquiryModal.vue'
+  import { useUserStore } from '/@/store/modules/user';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const userStore = useUserStore();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '询盘信息存储表单',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        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({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    searchQuery();
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+  
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+   
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+   
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+   
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+   
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        }
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+  
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>

src/views/adweb/enquiry/components/AdwebEnquiryForm.vue

@@ -0,0 +1,130 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-row>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../AdwebEnquiry.api';
+  import { Form } from 'ant-design-vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => ({})},
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+  });
+  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({
+  });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    padding: 14px;
+  }
+</style>

src/views/adweb/enquiry/components/AdwebEnquiryModal.vue

@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <AdwebEnquiryForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></AdwebEnquiryForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import AdwebEnquiryForm from './AdwebEnquiryForm.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>