公共邮箱黑名单

package.json

@@ -46,6 +46,7 @@
     "jquery": "^3.7.1",
     "lodash-es": "^4.17.21",
     "lodash.get": "^4.4.2",
+    "lodash.pick": "4.29.3",
     "markdown-it": "^14.0.0",
     "markdown-it-link-attributes": "^4.0.1",
     "event-source-polyfill": "^1.0.31",

pnpm-lock.yaml

@@ -92,6 +92,9 @@ importers:
       lodash.get:
         specifier: ^4.4.2
         version: 4.4.2
+      lodash.pick:
+        specifier: ^4.4.0
+        version: 4.4.0
       markdown-it:
         specifier: ^14.0.0
         version: 14.0.0
@@ -4306,6 +4309,9 @@ packages:
   lodash.mergewith@4.6.2:
     resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==}
 
+  lodash.pick@4.4.0:
+    resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==, tarball: https://registry.npmmirror.com/lodash.pick/-/lodash.pick-4.4.0.tgz}
+
   lodash.snakecase@4.1.1:
     resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==}
 
@@ -10743,6 +10749,8 @@ snapshots:
 
   lodash.mergewith@4.6.2: {}
 
+  lodash.pick@4.4.0: {}
+
   lodash.snakecase@4.1.1: {}
 
   lodash.startcase@4.4.0: {}

src/api/manage/manage.ts

@@ -82,7 +82,7 @@ export function putAction(url, parameter) {
     url: url,
     method: 'put',
     data: parameter
-  })
+  },{ isTransformResponse: false, successMessageMode: 'none' })
 }
 
 //get

src/hooks/component/JeecgList.ts

@@ -0,0 +1,49 @@
+import {getAction} from "@/api/manage/manage";
+import {useMessage} from "@/hooks/web/useMessage";
+
+export function useJeecgListMixin() {
+  const createMessage = useMessage().createMessage;
+
+  function searchQuery() {
+    loadData(1);
+    onClearSelected()
+  }
+
+  function loadData(arg) {
+    if (!url.list) {
+      createMessage.error("请设置url.list属性!")
+      return
+    }
+    //加载数据 若传入参数1则加载第一页的内容
+    if (arg === 1) {
+      ipagination.current = 1;
+    }
+    var params = getQueryParams();//查询条件
+    loading = true;
+    getAction(url.list, params).then((res) => {
+      if (res.success) {
+        //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+        this.dataSource = res.result.records || res.result;
+        if (res.result.total != 0) {
+          this.ipagination.total = res.result.total;
+        } else {
+          this.ipagination.total = 0;
+        }
+        //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+      }
+      if (res.code === 510) {
+        createMessage.warning(res.message)
+      }
+      this.loading = false;
+    })
+  }
+
+  function onClearSelected() {
+    selectedRowKeys = [];
+    selectionRows = [];
+  }
+
+  return {
+    searchQuery
+  }
+}

src/hooks/component/JeecgListMixin.js

@@ -3,13 +3,11 @@
  * 高级查询按钮调用 superQuery方法  高级查询组件ref定义为superQueryModal
  * data中url定义 list为查询列表  delete为删除单条记录  deleteBatch为批量删除
  */
-import { filterObj } from '/@/utils/common/compUtils';
-import {deleteAction, getAction, downFile, getFileAccessHttpUrl} from '/@/api/manage/manage'
-import { getToken } from '/@/utils/auth';
-import { useUserStore } from '/@/store/modules/user';
-
-import { Modal } from 'ant-design-vue'
+import {filterObj} from '/@/utils/common/compUtils';
+import {deleteAction, downFile, getAction} from '/@/api/manage/manage'
+import {getToken} from '/@/utils/auth';
 import {useMessage} from "@/hooks/web/useMessage";
+
 const { createMessage } = useMessage();
 export const JeecgListMixin = {
   data() {
@@ -168,10 +166,11 @@ export const JeecgListMixin = {
         }
       });
     },
-    handleEdit: function (record) {
-      this.$refs.modalForm.edit(record);
-      this.$refs.modalForm.title = "编辑";
-      this.$refs.modalForm.disableSubmit = false;
+    handleEdit: async function (modalFormRef, record) {
+      console.log(modalFormRef, "modalFormRefmodalFormRefmodalFormRef");
+      modalFormRef.value.title = "编辑";
+      modalFormRef.value.edit(record);
+      modalFormRef.value.disableSubmit = false;
     },
     handleAdd: function () {
       this.$refs.modalForm.add();
@@ -195,6 +194,10 @@ export const JeecgListMixin = {
       this.toggleSearchStatus = !this.toggleSearchStatus;
     },
 
+    modalFormOk() {
+      // 新增/修改 成功时，重载列表
+      this.loadData();
+    },
     handleDetail: function (record) {
       this.$refs.modalForm.edit(record);
       this.$refs.modalForm.title = "详情";

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

@@ -118,6 +118,103 @@ export const columns: BasicColumn[] = [
     }
   ];
 
+export const wasteColumns: BasicColumn[] = [
+  {
+    title: '站点名称',
+    align: 'left',
+    dataIndex: 'siteName',
+    resizable: true,
+  },
+  {
+    title: '姓名',
+    align: 'left',
+    dataIndex: 'contact',
+
+  },
+  {
+    title: '邮箱',
+    align: 'left',
+    dataIndex: 'fromEmail',
+    resizable: true,
+  },
+
+  {
+    title: '手机号',
+    align: 'left',
+    dataIndex: 'phone',
+    customRender: function ({text, record}) {
+      if (text == null || text == '' || text == undefined) {
+        return '--'
+      } else {
+        return text
+      }
+    }
+  },
+
+  {
+    title: '来源IP',
+    align: 'left',
+    dataIndex: 'fromIp',
+    resizable: true,
+    customRender: function ({text, record}) {
+      if (text == null || text == '' || text == undefined) {
+        return '--'
+      } else {
+        return text
+      }
+    }
+  },
+
+  {
+    title: '状态',
+    align: 'left',
+    dataIndex: 'readStatus'
+  },
+  {
+    title: '询盘详情',
+    align: 'left',
+    resizable: true,
+    dataIndex: 'details'
+  },
+  // {
+  //   title: '跟进人',
+  //   align: "center",
+  //   dataIndex: 'principalUid',
+  // },
+  {
+    title: '来源页面',
+    align: 'left',
+    resizable: true,
+    dataIndex: 'fromPage',
+  },
+  {
+    title: '询盘类型',
+    align: 'left',
+    dataIndex: 'wasteEnquiryType',
+  },
+  {
+    title: '来源国家',
+    align: 'left',
+    dataIndex: 'countryName',
+    customRender: function ({text, record}) {
+      if (text == null || text == '' || text == undefined) {
+        return '--'
+      } else {
+        return text
+      }
+    }
+  },
+  {
+    title: '询盘时间',
+    align: 'left',
+    resizable: true,
+    dataIndex: 'recordCtime',
+    customRender: function ({text, record}) {
+      return !text ? '' : (text.length > 16 ? text.substr(0, 16) : text)
+    }
+  }
+];
+
 // 高级查询数据
 export const superQuerySchema = {
   fromIp: {title: '询盘来源IP',order: 0,view: 'text', type: 'string',},

src/views/adweb/enquiry/AdwebEnquiryList.vue

@@ -5,21 +5,31 @@
       <a-col :xl="7" :xxl="6">
         <div class="choose-site">
           <span class="t1">站点：</span>
-          <select-site ref="selectSiteRef" @com-methods="changeSite" @set-site-info="getSiteList" />
+          <select-site ref="selectSiteRef" @com-methods="changeSite" @set-site-info="getSiteList"/>
         </div>
       </a-col>
       <a-col :xl="8" :xxl="6">
         <div class="choose-site">
           <span class="t1">询盘时间：</span>
-          <a-range-picker @change="onChangeDatePciker" :disabledDate="disabledDate" :value="rangeDate" style="width: 70%" />
+          <a-range-picker @change="onChangeDatePciker" :disabledDate="disabledDate"
+                          :value="rangeDate" style="width: 70%"/>
         </div>
       </a-col>
       <a-col :xl="9" :xxl="12">
-        <a-button :class="queryParam.dateType == '' ? 'active' : ''" @click="setTime('')">全部时间 </a-button>
-        <a-button :class="queryParam.dateType == 'thirtyDay' ? 'active' : ''" @click="setTime('thirtyDay')">近30天 </a-button>
-        <a-button :class="queryParam.dateType == 'sevenDay' ? 'active' : ''" @click="setTime('sevenDay')">近一周 </a-button>
-        <a-button :class="queryParam.dateType == 'yesterday' ? 'active' : ''" @click="setTime('yesterday')">昨日 </a-button>
-        <a-button :class="queryParam.dateType == 'today' ? 'active' : ''" @click="setTime('today')"> 今日 </a-button>
+        <a-button :class="queryParam.dateType == '' ? 'active' : ''" @click="setTime('')">全部时间
+        </a-button>
+        <a-button :class="queryParam.dateType == 'thirtyDay' ? 'active' : ''"
+                  @click="setTime('thirtyDay')">近30天
+        </a-button>
+        <a-button :class="queryParam.dateType == 'sevenDay' ? 'active' : ''"
+                  @click="setTime('sevenDay')">近一周
+        </a-button>
+        <a-button :class="queryParam.dateType == 'yesterday' ? 'active' : ''"
+                  @click="setTime('yesterday')">昨日
+        </a-button>
+        <a-button :class="queryParam.dateType == 'today' ? 'active' : ''" @click="setTime('today')">
+          今日
+        </a-button>
       </a-col>
     </a-row>
 
@@ -47,10 +57,10 @@
       </a-col>
       <a-col flex="2">
         <a-select
-                  :allowClear="true"
-                  placeholder="全部分类"
-                  style="width: 100%"
-                  @change="filterCategory"
+          :allowClear="true"
+          placeholder="全部分类"
+          style="width: 100%"
+          @change="filterCategory"
         >
           <a-select-option :key="2" :value="2">待分类</a-select-option>
           <a-select-option :key="1" :value="1">有效询盘</a-select-option>
@@ -102,43 +112,43 @@
     <!--引用表格-->
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <template #alertAfter>
-        <a-divider type="vertical" />
+        <a-divider type="vertical"/>
         <a @click="enquiryReady">标为已读</a>
 
         <template v-if="haveSubAccount && !isForwardSite">
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a
             :style="(userRole.indexOf('admin') > -1 || userRole.indexOf('adweb_admin') > -1 || userRole.indexOf('adweb_seo_manager') > -1 || userRole.indexOf('adweb_site_manager') > -1) ? 'pointer-events: none;' : ''"
-             @click="showEditPrincipalModal">
+            @click="showEditPrincipalModal">
             调整跟进人
           </a>
         </template>
 
         <template v-if="isForwardSite" @click="forwardDetailAll">
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a @click="forwardDetailAll">
             转发
           </a>
         </template>
 
-        <a-divider type="vertical" />
+        <a-divider type="vertical"/>
         <a @click="batchHandleDelete">删除</a>
       </template>
 
       <!--插槽:table标题-->
       <template #tableTitle>
         <!-- TODO 高级查询 -->
-<!--        <super-query :config="superQueryConfig" @search="handleSuperQuery" />-->
+        <!--        <super-query :config="superQueryConfig" @search="handleSuperQuery" />-->
       </template>
       <!--操作栏-->
-<!--      <template #action="{ record }">-->
-<!--        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />-->
-<!--      </template>-->
+      <!--      <template #action="{ record }">-->
+      <!--        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />-->
+      <!--      </template>-->
 
       <!-- 操作动作  -->
       <template #action="{ record }">
 
-        <div  style="padding: 5px 8px;display: flex;justify-content: space-around;">
+        <div style="padding: 5px 8px;display: flex;justify-content: space-around;">
           <a-tag v-if="isForwardSite" color="blue" @click="forwardDetail(record)"
                  style="cursor:pointer;">
             转发
@@ -157,7 +167,7 @@
               拒收
             </a-tag>
           </a-popconfirm>
-          <a-tag color="green" @click="enquiryRecord(record)" style="cursor:pointer;">
+          <a-tag color="green" @click="showEnquiryTrackRecord(record)" style="cursor:pointer;">
             跟踪
           </a-tag>
           <a-tag color="blue"
@@ -171,26 +181,27 @@
 
       <template #bodyCell="{ column, record, index, text }">
 
-<!-- 自定义显示字段       -->
+        <!-- 自定义显示字段       -->
 
-<!-- 询盘状态 -->
+        <!-- 询盘状态 -->
         <template v-if="column.key == 'userEffective'">
-          <a class="theme-color" v-if="text === 2" @click="showEnquiryDetail(record)">{{ record.userEffectiveStr }}</a>
+          <a class="theme-color" v-if="text === 2"
+             @click="showEnquiryDetail(record)">{{ record.userEffectiveStr }}</a>
           <span v-else-if="text == 0" style="color: #fa8c16">{{ record.userEffectiveStr }}</span>
           <span v-else>{{ record.userEffectiveStr }}</span>
 
         </template>
-<!-- 阅读状态 -->
+        <!-- 阅读状态 -->
         <template v-if="column.key == 'readStatus'">
           <a v-if="text == 0" class="theme-color" @click="showEnquiryDetail(record)">未读</a>
           <span v-else>已读</span>
         </template>
-<!-- 询盘详情 -->
+        <!-- 询盘详情 -->
         <div v-if="column.key == 'details'">
           <a @click="showEnquiryDetail(record)" style="margin: 0 10px 0 10px">
-            {{record.context ? record.context.substr(0, 50) : '--'}}</a>
+            {{ record.context ? record.context.substr(0, 50) : '--' }}</a>
         </div>
-<!-- 来源页面 -->
+        <!-- 来源页面 -->
 
         <template v-if="column.key == 'fromPage'">
           <template v-if="!text">-</template>
@@ -215,8 +226,8 @@
           </template>
           <template v-else>-</template>
         </template>
-<!-- 邮箱 -->
-        <div  v-if="column.key == 'fromEmail'">
+        <!-- 邮箱 -->
+        <div v-if="column.key == 'fromEmail'">
           <a-popover>
             <template slot="content">
               {{ text }}
@@ -230,7 +241,7 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <AdwebEnquiryModal ref="registerModal" @success="handleSuccess" />
+    <AdwebEnquiryModal ref="registerModal" @success="handleSuccess"/>
 
     <!--回收站-->
     <xp-recycle-bin-modal ref="XpRecycleBinModalRef" @ok="getTableAndNum"/>
@@ -249,721 +260,760 @@
       :confirm-loading="forwardLoading"
     >
       <a-radio-group v-model:value="selectedUserId">
-        <a-radio v-for="item in subAccountOptions" style="display: block; height: 30px; lineHeight: 30px;" :value="item.id">
+        <a-radio v-for="item in subAccountOptions"
+                 style="display: block; height: 30px; lineHeight: 30px;" :value="item.id">
           {{ item.username }}
         </a-radio>
       </a-radio-group>
     </a-modal>
 
+    <!--黑名单-->
+    <black-list ref="blackListRef" @ok="getTableAndNum"></black-list>
+
+    <!--跟踪记录-->
+    <enquiry-track-record ref="enquiryTrackRecordRef"></enquiry-track-record>
   </div>
 </template>
 
 <script lang="ts" name="adweb-adwebEnquiry" setup>
-  import toReadImg from '/@/assets/enquiry/enquiryListTop3.svg';
-  import toClassified from '/@/assets/enquiry/enquiryListTop2.svg';
-  import toTotal from '/@/assets/enquiry/enquiryListTop4.svg';
-
-  import selectSite from '@/components/adweb/selectSite.vue';
-  import {nextTick, onBeforeMount, onMounted, reactive, ref} from 'vue';
-  import { BasicTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './AdwebEnquiry.data';
-  import { batchDelete, deleteOne, getExportUrl, getImportUrl, list } from './AdwebEnquiry.api';
-  import AdwebEnquiryModal from './components/AdwebEnquiryModal.vue';
-  import { useUserStore } from '/@/store/modules/user';
-  import {getAction, postAction} from '@/api/manage/manage';
-
-  import { useMessage } from '@/hooks/web/useMessage';
-
-  import moment from 'moment';
-  import {any} from "vue-types";
-  import {filterOption} from "ant-design-vue/es/vc-mentions/src/util";
-  import enquiryDetail from "@/views/adweb/enquiry/modules/enquiryDetail.vue";
-  import XpRecycleBinModal from "@/views/adweb/system/modules/XpRecycleBinModal.vue";
-
-  const formRef = ref();
-  const queryParam = reactive<any>({});
-  const toggleSearchStatus = ref<boolean>(false);
-  const registerModal = ref();
-  const selectSiteRef = ref(null);
-  const { createMessage } = useMessage();
-  //注册table数据
-  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-    tableProps: {
-      title: '询盘信息存储表单',
-      api: list,
-      columns,
-      canResize: false,
-      useSearchForm: false,
-      actionColumn: {
-        width: 180,
-        fixed: 'right',
-      },
-      striped: true,
-      bordered: false,
-      immediate: false, // 不直接触发，通过reload事件触发接口
-      beforeFetch: (params) => {
-
-        //  如果查询条件中没有设置状态，则默认查出所有状态数据
-        if (queryParam.userEffective == undefined) {
-          queryParam.userEffective = '1,2';
-        }
-
-        return Object.assign(params, queryParam);
-      },
-    },
-    exportConfig: {
-      name: '询盘列表',
-      url: getExportUrl,
-      params: queryParam,
-    },
-    importConfig: {
-      url: getImportUrl,
-      success: handleSuccess,
+import toReadImg from '/@/assets/enquiry/enquiryListTop3.svg';
+import toClassified from '/@/assets/enquiry/enquiryListTop2.svg';
+import toTotal from '/@/assets/enquiry/enquiryListTop4.svg';
+
+import selectSite from '@/components/adweb/selectSite.vue';
+import {nextTick, onBeforeMount, onMounted, reactive, ref} from 'vue';
+import {BasicTable} from '/@/components/Table';
+import {useListPage} from '/@/hooks/system/useListPage';
+import {columns, superQuerySchema} from './AdwebEnquiry.data';
+import {batchDelete, deleteOne, getExportUrl, getImportUrl, list} from './AdwebEnquiry.api';
+import AdwebEnquiryModal from './components/AdwebEnquiryModal.vue';
+import {useUserStore} from '/@/store/modules/user';
+import {getAction, postAction} from '@/api/manage/manage';
+
+import {useMessage} from '@/hooks/web/useMessage';
+
+import moment from 'moment';
+import {any} from "vue-types";
+import {filterOption} from "ant-design-vue/es/vc-mentions/src/util";
+import enquiryDetail from "@/views/adweb/enquiry/modules/enquiryDetail.vue";
+import XpRecycleBinModal from "@/views/adweb/system/modules/XpRecycleBinModal.vue";
+import blackList from "@/views/adweb/enquiry/modules/blackList.vue";
+import enquiryTrackRecord from "@/views/adweb/enquiry/modules/enquiryTrackRecord.vue";
+
+const formRef = ref();
+const queryParam = reactive<any>({});
+const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const selectSiteRef = ref(null);
+const {createMessage} = useMessage();
+//注册table数据
+const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
+  tableProps: {
+    title: '询盘信息存储表单',
+    api: list,
+    columns,
+    canResize: false,
+    useSearchForm: false,
+    actionColumn: {
+      width: 180,
+      fixed: 'right',
     },
-  });
-  const [registerTable, { reload, clearSelectedRowKeys, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-
-  // const labelCol = reactive({
-  //   xs: 24,
-  //   sm: 4,
-  //   xl: 6,
-  //   xxl: 4,
-  // });
-  // const wrapperCol = reactive({
-  //   xs: 24,
-  //   sm: 20,
-  // });
-  //
-  // let siteCode: string | null = ref('');
-
-  // 站点列表
-  let siteList = ref([{'id': '', 'code': ''}]);
-
-  // 询盘数量
-  const enquiryNums = ref({
-    all: 0,
-    noRead: 0,
-    product: 0,
-    wait: 0,
-  });
-
-  // 过滤日期范围
-  let rangeDate = ref<any>(any);
-
-  // 子账号列表
-  let subAccountOptions = ref([{'id': '', 'username': ''}]);
-
-  // 是否有子账户
-  let haveSubAccount = ref(false);
-
-  // 导出excel进度
-  let excelLoading = ref<boolean>(false);
-
-  // 编辑转发进度
-  let forwardLoading = ref<boolean>(false);
-
-  // 选中跟进人
-  let selectedUserId = ref<any>(undefined);
-
-  let userEffectiveOption = ref<[]>([]);
-
-  // 询盘详情子组件
-  const enquiryDetailRef = ref(null);
-
-  // 回收站子组件
-  const XpRecycleBinModalRef = ref(null);
-
-  const userRole = ref('');
-
-  // 已经选择的站点code
-  const siteCode = ref<any>('');
-
-  const isForwardSite = ref<boolean>(false);
-
-  //转发的询盘id
-  const forwardEnquiryDetail = ref<any>(undefined);
-
-  //转发是否可见
-  const forwardVisible = ref(false);
-
-  onBeforeMount(() => {
-    siteCode.value = localStorage.getItem('siteCode');
-    getTurnInquiryCode();
-  });
-
-  onMounted(async () => {
-    userRole.value = useUserStore().roleList;
-    getEffectiveList();
-  });
-
-  function getSiteList(siteInfo: any[], selectedSiteInfo: any) {
-    siteList.value = siteInfo;
-
-    if (siteList.value.length === 1) {
-      queryParam.siteId = siteList.value[0].id;
-    } else {
-      let isInSite = false;
-      for (let index in siteList.value) {
-
-        if (localStorage.getItem('siteCode') !== null && siteList.value[index].code === localStorage.getItem('siteCode')) {
-          isInSite = true;
-          queryParam.siteId = siteList.value[index].id
-        }
+    striped: true,
+    bordered: false,
+    immediate: false, // 不直接触发，通过reload事件触发接口
+    beforeFetch: (params) => {
+
+      //  如果查询条件中没有设置状态，则默认查出所有状态数据
+      if (queryParam.userEffective == undefined) {
+        queryParam.userEffective = '1,2';
       }
 
-      if (localStorage.getItem('siteCode') == null || !isInSite) {
-        queryParam.siteId = siteList.value[0].id;
-        localStorage.setItem('siteCode', siteList.value[0].code);
+      return Object.assign(params, queryParam);
+    },
+  },
+  exportConfig: {
+    name: '询盘列表',
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess,
+  },
+});
+const [registerTable, {
+  reload,
+  clearSelectedRowKeys,
+  updateTableDataRecord,
+  findTableDataRecord,
+  getDataSource
+}, {rowSelection, selectedRowKeys}] = tableContext;
+
+// const labelCol = reactive({
+//   xs: 24,
+//   sm: 4,
+//   xl: 6,
+//   xxl: 4,
+// });
+// const wrapperCol = reactive({
+//   xs: 24,
+//   sm: 20,
+// });
+//
+// let siteCode: string | null = ref('');
+
+// 站点列表
+let siteList = ref([{'id': '', 'code': ''}]);
+
+// 询盘数量
+const enquiryNums = ref({
+  all: 0,
+  noRead: 0,
+  product: 0,
+  wait: 0,
+});
+
+// 过滤日期范围
+let rangeDate = ref<any>(any);
+
+// 子账号列表
+let subAccountOptions = ref([{'id': '', 'username': ''}]);
+
+// 是否有子账户
+let haveSubAccount = ref(false);
+
+// 导出excel进度
+let excelLoading = ref<boolean>(false);
+
+// 编辑转发进度
+let forwardLoading = ref<boolean>(false);
+
+// 选中跟进人
+let selectedUserId = ref<any>(undefined);
+
+let userEffectiveOption = ref<[]>([]);
+
+// 当前用户角色
+const userRole = ref('');
+
+// 已经选择的站点code
+const siteCode = ref<any>('');
+
+const isForwardSite = ref<boolean>(false);
+
+//转发的询盘id
+const forwardEnquiryDetail = ref<any>(undefined);
+
+//转发是否可见
+const forwardVisible = ref(false);
+
+// 询盘详情子组件
+const enquiryDetailRef = ref(null);
+
+// 回收站子组件
+const XpRecycleBinModalRef = ref(null);
+
+// 黑名单子组件
+const blackListRef = ref(null);
+
+// 跟踪记录
+const enquiryTrackRecordRef = ref(null);
+
+onBeforeMount(() => {
+  siteCode.value = localStorage.getItem('siteCode');
+  getTurnInquiryCode();
+});
+
+onMounted(async () => {
+  userRole.value = useUserStore().roleList;
+  getEffectiveList();
+});
+
+function getSiteList(siteInfo: any[], selectedSiteInfo: any) {
+  siteList.value = siteInfo;
+
+  if (siteList.value.length === 1) {
+    queryParam.siteId = siteList.value[0].id;
+  } else {
+    let isInSite = false;
+    for (let index in siteList.value) {
+
+      if (localStorage.getItem('siteCode') !== null && siteList.value[index].code === localStorage.getItem('siteCode')) {
+        isInSite = true;
+        queryParam.siteId = siteList.value[index].id
       }
     }
 
-    getTableAndNumWithQueryCondition();
+    if (localStorage.getItem('siteCode') == null || !isInSite) {
+      queryParam.siteId = siteList.value[0].id;
+      localStorage.setItem('siteCode', siteList.value[0].code);
+    }
   }
 
-  //重新刷新页面数据及获取询盘数量，不清除查询条件
-  function getTableAndNumWithQueryCondition() {
-    getEnquiryNums();
-    getSubAccountOptions();
-    loadData();
-  }
+  getTableAndNumWithQueryCondition();
+}
 
-  //切换站点
-  function changeSite(value, e) {
-    queryParam.siteId = e.info.id;
-    siteCode.value = localStorage.getItem('siteCode');
-    getTableAndNum(true);
-  }
+//重新刷新页面数据及获取询盘数量，不清除查询条件
+function getTableAndNumWithQueryCondition() {
+  getEnquiryNums();
+  getSubAccountOptions();
+  loadData();
+}
 
-  function filterCategory(value: string) {
-    queryParam.userEffective = value;
-  }
+//切换站点
+function changeSite(value, e) {
+  queryParam.siteId = e.info.id;
+  siteCode.value = localStorage.getItem('siteCode');
+  getTableAndNum(true);
+}
 
-  function filterStatus(value: number) {
-    queryParam.readStatus = value;
-  }
+function filterCategory(value: string) {
+  queryParam.userEffective = value;
+}
 
-  //重新刷新页面数据及获取询盘数量
-  function getTableAndNum(clearParam: boolean = false) {
-    // 设置默认站点
-    let siteId = queryParam.siteId;
+function filterStatus(value: number) {
+  queryParam.readStatus = value;
+}
 
-    for (let site of siteList.value) {
-      if (site.id === siteId) {
-        localStorage.setItem('siteCode', site.code);
-      }
-    }
+//重新刷新页面数据及获取询盘数量
+function getTableAndNum(clearParam: boolean = false) {
+  // 设置默认站点
+  let siteId = queryParam.siteId;
 
-    getEnquiryNums();
-    getSubAccountOptions();
-    if (clearParam) {
-      if (queryParam.readStatus) {
-        delete queryParam.readStatus;
-      }
-      if (queryParam.searchText) {
-        delete queryParam.searchText;
-      }
-      if (queryParam.searchContent) {
-        delete queryParam.searchContent;
-      }
-      if (queryParam.userEffective) {
-        delete queryParam.userEffective;
-      }
-      if (queryParam.principalUid) {
-        delete queryParam.principalUid;
-      }
+  for (let site of siteList.value) {
+    if (site.id === siteId) {
+      localStorage.setItem('siteCode', site.code);
     }
-
-    // queryParam.fields = 'id,,siteName,contact,fromEmail,whatsApp,phone,fromIp,readStatus,details,principalUid,fromPage,userEffective,countryName,pluginName,recordCtime,action';
-    // queryParam.userEffective = '1,2';
-    loadData();
   }
 
-  //搜索条件部分的逻辑
-  function onChangeDatePciker(date, dateString) {
-    if (dateString.length > 0) {
-      rangeDate.value = date;
-      queryParam.start = dateString[0];
-      queryParam.end = dateString[1];
-      queryParam.dateType = undefined;
+  getEnquiryNums();
+  getSubAccountOptions();
+  if (clearParam) {
+    if (queryParam.readStatus) {
+      delete queryParam.readStatus;
     }
-  }
-
-  //日期选择只能今天之前
-  function disabledDate(current) {
-    return current && current > moment().endOf('day');
-  }
-
-  //设置列表的时间查询条件
-  function setTime(time) {
-    queryParam.dateType = time;
-    queryParam.start = '';
-    queryParam.end = '';
-    // sevenDay   thirtyDay  today  yesterday
-    if (time == '') {
-      rangeDate.value = undefined;
-    } else if (time == 'sevenDay') {
-      rangeDate.value = [moment().subtract(6, 'days'), moment()];
-    } else if (time == 'thirtyDay') {
-      rangeDate.value = [moment().subtract(29, 'days'), moment()];
-    } else if (time == 'today') {
-      rangeDate.value = [moment(), moment()];
-    } else if (time == 'yesterday') {
-      rangeDate.value = [moment().subtract(1, 'days'), moment().subtract(1, 'days')];
+    if (queryParam.searchText) {
+      delete queryParam.searchText;
+    }
+    if (queryParam.searchContent) {
+      delete queryParam.searchContent;
+    }
+    if (queryParam.userEffective) {
+      delete queryParam.userEffective;
+    }
+    if (queryParam.principalUid) {
+      delete queryParam.principalUid;
     }
-    getTableAndNum();
   }
 
-  //获取不同状态询盘的数量
-  function getEnquiryNums() {
-    let siteId = '';
-
-    if (queryParam.siteId && queryParam.siteId != '') {
-      siteId = queryParam.siteId;
+  // queryParam.fields = 'id,,siteName,contact,fromEmail,whatsApp,phone,fromIp,readStatus,details,principalUid,fromPage,userEffective,countryName,pluginName,recordCtime,action';
+  // queryParam.userEffective = '1,2';
+  loadData();
+}
+
+//搜索条件部分的逻辑
+function onChangeDatePciker(date, dateString) {
+  if (dateString.length > 0) {
+    rangeDate.value = date;
+    queryParam.start = dateString[0];
+    queryParam.end = dateString[1];
+    queryParam.dateType = undefined;
+  }
+}
+
+//日期选择只能今天之前
+function disabledDate(current) {
+  return current && current > moment().endOf('day');
+}
+
+//设置列表的时间查询条件
+function setTime(time) {
+  queryParam.dateType = time;
+  queryParam.start = '';
+  queryParam.end = '';
+  // sevenDay   thirtyDay  today  yesterday
+  if (time == '') {
+    rangeDate.value = undefined;
+  } else if (time == 'sevenDay') {
+    rangeDate.value = [moment().subtract(6, 'days'), moment()];
+  } else if (time == 'thirtyDay') {
+    rangeDate.value = [moment().subtract(29, 'days'), moment()];
+  } else if (time == 'today') {
+    rangeDate.value = [moment(), moment()];
+  } else if (time == 'yesterday') {
+    rangeDate.value = [moment().subtract(1, 'days'), moment().subtract(1, 'days')];
+  }
+  getTableAndNum();
+}
+
+//获取不同状态询盘的数量
+function getEnquiryNums() {
+  let siteId = '';
+
+  if (queryParam.siteId && queryParam.siteId != '') {
+    siteId = queryParam.siteId;
+  } else {
+    siteId = '';
+  }
+  let d = {
+    siteId: siteId,
+    dateType: queryParam.dateType,
+    start: queryParam.start,
+    end: queryParam.end,
+  };
+  getAction('/adweb/adwebEnquiry/getEnquiryNums', d).then((res) => {
+
+    if (res.code == 200) {
+      enquiryNums.value.all = res.result.all;
+      enquiryNums.value.noRead = res.result.noRead;
+      enquiryNums.value.product = res.result.product;
+      enquiryNums.value.wait = res.result.wait;
     } else {
-      siteId = '';
+      enquiryNums.value.all = 0;
+      enquiryNums.value.noRead = 0;
+      enquiryNums.value.product = 0;
+      enquiryNums.value.wait = 0;
     }
-    let d = {
-      siteId: siteId,
-      dateType: queryParam.dateType,
-      start: queryParam.start,
-      end: queryParam.end,
-    };
-    getAction('/adweb/adwebEnquiry/getEnquiryNums', d).then((res) => {
-
-      if (res.code == 200) {
-        enquiryNums.value.all = res.result.all;
-        enquiryNums.value.noRead = res.result.noRead;
-        enquiryNums.value.product = res.result.product;
-        enquiryNums.value.wait =res.result.wait;
-      } else {
-        enquiryNums.value.all = 0;
-        enquiryNums.value.noRead = 0;
-        enquiryNums.value.product = 0;
-        enquiryNums.value.wait = 0;
-      }
-    });
-  }
+  });
+}
+
+// 获取子账户的下拉框选项
+function getSubAccountOptions() {
+  getAction('/usercountry/subAccounts/options?siteId=' + queryParam.siteId, null).then((res) => {
+    if (res.code === 200) {
+      subAccountOptions.value = res.result;
+      haveSubAccount.value = res.result !== null && res.result !== undefined && res.result.length > 0;
+    }
+  });
+}
 
-  // 获取子账户的下拉框选项
-  function getSubAccountOptions() {
-    getAction('/usercountry/subAccounts/options?siteId=' + queryParam.siteId, null).then((res) => {
-      if (res.code === 200) {
-        subAccountOptions.value = res.result;
-        haveSubAccount.value =  res.result !== null &&  res.result !== undefined &&  res.result.length > 0;
-      }
-    });
+function getList(type: String) {
+  //清空查询条件
+  queryParam.principalUid = undefined;
+  queryParam.searchText = undefined;
+  queryParam.searchContent = undefined;
+  if (type == 'noRead') {
+    queryParam.readStatus = '0'
+    queryParam.userEffective = undefined
   }
+  if (type == 'product') {
+    queryParam.userEffective = 1
+    console.log('1', queryParam)
 
-  function getList(type: String) {
-    //清空查询条件
-    queryParam.principalUid = undefined;
-    queryParam.searchText = undefined;
-    queryParam.searchContent = undefined;
-    if (type == 'noRead') {
-      queryParam.readStatus = '0'
-      queryParam.userEffective = undefined
-    }
-    if (type == 'product') {
-      queryParam.userEffective = 1
-      console.log('1', queryParam)
-
-      queryParam.readStatus = undefined
-      console.log('2', queryParam)
+    queryParam.readStatus = undefined
+    console.log('2', queryParam)
 
-    }
-    if (type == 'wait') {
-      queryParam.userEffective = 2
-      queryParam.readStatus = undefined
-    }
-    if (type == 'all') {
-      queryParam.userEffective = undefined
-      queryParam.readStatus = undefined
-    }
-    loadData(1)
   }
+  if (type == 'wait') {
+    queryParam.userEffective = 2
+    queryParam.readStatus = undefined
+  }
+  if (type == 'all') {
+    queryParam.userEffective = undefined
+    queryParam.readStatus = undefined
+  }
+  loadData(1)
+}
 
-  //批量设为已读
-  function enquiryReady() {
+//批量设为已读
+function enquiryReady() {
 
-    console.log(selectedRowKeys.value.length, "selectedRowKeysselectedRowKeysselectedRowKeys");
-    if (selectedRowKeys.value.length <= 0) {
-      createMessage.warning('请选择至少一条记录！');
-      return;
-    }
-    getAction('/adweb/adwebEnquiry/read', {id: selectedRowKeys.value.toString()}).then((res) => {
-      if (res.success) {
-        createMessage.success('批量设置已读成功！')
-        getTableAndNum();
-        clearSelectedRowKeys();
+  console.log(selectedRowKeys.value.length, "selectedRowKeysselectedRowKeysselectedRowKeys");
+  if (selectedRowKeys.value.length <= 0) {
+    createMessage.warning('请选择至少一条记录！');
+    return;
+  }
+  getAction('/adweb/adwebEnquiry/read', {id: selectedRowKeys.value.toString()}).then((res) => {
+    if (res.success) {
+      createMessage.success('批量设置已读成功！')
+      getTableAndNum();
+      clearSelectedRowKeys();
+    } else {
+      if (res.code == 403) {
+        createMessage.warning(res.message)
       } else {
-        if (res.code == 403) {
-          createMessage.warning(res.message)
-        } else {
-          createMessage.error('设置失败！')
-        }
+        createMessage.error('设置失败！')
       }
-    })
-  }
+    }
+  })
+}
 
-  // 加载table列表数据
-  function loadData(page: number = 1) {
-    reload({page: page});
-  }
+// 加载table列表数据
+function loadData(page: number = 1) {
+  reload({page: page});
+}
 
-  // 导出excel
-  function handleExportXlsLU() {
-    excelLoading.value = true;
+// 导出excel
+function handleExportXlsLU() {
+  excelLoading.value = true;
 
-    delete queryParam.userEffective;
+  delete queryParam.userEffective;
 
-    onExportXls().then(() => {
-      excelLoading.value = false;
-    });
-  }
+  onExportXls().then(() => {
+    excelLoading.value = false;
+  });
+}
 
-  //询盘详情
-  async function showEnquiryDetail(record) {
-    if (record.readStatus == 0) {
-      getAction('/adweb/adwebEnquiry/read?id=' + record.id, null).then(() => {
-        getTableAndNum();
-      })
-    }
+//询盘详情
+async function showEnquiryDetail(record) {
+  if (record.readStatus == 0) {
+    getAction('/adweb/adwebEnquiry/read?id=' + record.id, null).then(() => {
+      getTableAndNum();
+    })
+  }
 
-    await nextTick();
+  await nextTick();
 
-    if (enquiryDetailRef.value && enquiryDetailRef.value.init) {
-      enquiryDetailRef.value.init(record);
-    }
+  if (enquiryDetailRef.value && enquiryDetailRef.value.init) {
+    enquiryDetailRef.value.init(record);
   }
+}
 
-  //获取询盘分类列表
-  function getEffectiveList() {
-    getAction('/adweb/adwebEnquiry/getEnquiryCatalog', null).then(function (res) {
-      if (res.code == 200) {
-        userEffectiveOption.value = JSON.parse(res.result);
-      } else {
-        createMessage.error('获取询盘分类失败！')
-      }
-    }).catch(function (err) {
-      console.log(err)
-    })
-  }
+//获取询盘分类列表
+function getEffectiveList() {
+  getAction('/adweb/adwebEnquiry/getEnquiryCatalog', null).then(function (res) {
+    if (res.code == 200) {
+      userEffectiveOption.value = JSON.parse(res.result);
+    } else {
+      createMessage.error('获取询盘分类失败！')
+    }
+  }).catch(function (err) {
+    console.log(err)
+  })
+}
 
+//复制email到剪切板
+function copyEmailFunction(text) {
   //复制email到剪切板
-  function copyEmailFunction(text) {
-    //复制email到剪切板
-    if (!navigator.clipboard) {
-      console.log('浏览器不支持navigator');
-      let copy = (e) => {
-        e.preventDefault()
-        e.clipboardData.setData('text/plain', text)
-        createMessage.success('复制成功');
-        document.removeEventListener('copy', copy)
-      }
-      document.addEventListener('copy', copy)
-      document.execCommand("Copy");
-      return
-    }
-    navigator.clipboard.writeText(text).then(function () {
+  if (!navigator.clipboard) {
+    console.log('浏览器不支持navigator');
+    let copy = (e) => {
+      e.preventDefault()
+      e.clipboardData.setData('text/plain', text)
       createMessage.success('复制成功');
-    }, function (err) {
-      createMessage.error('复制失败', err);
-    });
-  }
+      document.removeEventListener('copy', copy)
+    }
+    document.addEventListener('copy', copy)
+    document.execCommand("Copy");
+    return
+  }
+  navigator.clipboard.writeText(text).then(function () {
+    createMessage.success('复制成功');
+  }, function (err) {
+    createMessage.error('复制失败', err);
+  });
+}
 
-  //获取需要轮流询盘的站点code,判断哪个站点的询盘需要开启转发功能
-  function getTurnInquiryCode() {
-    // 站点code
-    let dictSiteCode = [{'label': '', 'value': ''}]
+//获取需要轮流询盘的站点code,判断哪个站点的询盘需要开启转发功能
+function getTurnInquiryCode() {
+  // 站点code
+  let dictSiteCode = [{'label': '', 'value': ''}]
 
-    getAction('/adweb/adwebEnquiry/getTurnInquiryCode', null).then((res) => {
-      if (res.code === 200) {
-       Object.assign(dictSiteCode, res.result);
+  getAction('/adweb/adwebEnquiry/getTurnInquiryCode', null).then((res) => {
+    if (res.code === 200) {
+      Object.assign(dictSiteCode, res.result);
 
-        for (let it in dictSiteCode) {
-         if ( dictSiteCode[it].value === siteCode.value) {
-           isForwardSite.value = true
-         }
+      for (let it in dictSiteCode) {
+        if (dictSiteCode[it].value === siteCode.value) {
+          isForwardSite.value = true
         }
       }
-    })
-  }
-
-  //转发询盘
-  function forwardDetail(record) {
-    forwardEnquiryDetail.value = record.id;
-    forwardVisible.value = true;
-  }
-
-  //拒收
-  function enquiryAddBlackList(record) {
-    delete record.wasteEnquiry
-    postAction('/enquiry/blacklist/addBlacklist', record).then(res => {
-      if (res.success) {
-        createMessage.success(`拒收成功！`)
-        this.getTableAndNum()
+    }
+  })
+}
+
+//转发询盘
+function forwardDetail(record) {
+  forwardEnquiryDetail.value = record.id;
+  forwardVisible.value = true;
+}
+
+//拒收
+function enquiryAddBlackList(record) {
+  delete record.wasteEnquiry
+  postAction('/enquiry/blacklist/addBlacklist', record).then(res => {
+    if (res.success) {
+      createMessage.success(`拒收成功！`)
+      this.getTableAndNum()
+    } else {
+      if (res.code == 403 || res.code == 500) {
+        createMessage.warning(res.message)
       } else {
-        if (res.code == 403 || res.code == 500) {
-          createMessage.warning(res.message)
-        } else {
-          createMessage.error('拒收失败！')
-        }
-
+        createMessage.error('拒收失败！')
       }
-    })
-  }
-
 
-  // 编辑转发
-  function editForward() {
-    if (forwardEnquiryDetail === undefined) {
-      createMessage.warning('请选择询盘信息！');
-      return;
     }
-    if (!selectedUserId) {
-      createMessage.warning('请选择跟进人！');
-      return;
-    }
-
-    forwardLoading.value = true;
-    let param = {
-      'ids': forwardEnquiryDetail.value,
-      'uid': selectedUserId.value,
-      'code': siteCode.value
+  })
+}
+
+
+// 编辑转发
+function editForward() {
+  if (forwardEnquiryDetail === undefined) {
+    createMessage.warning('请选择询盘信息！');
+    return;
+  }
+  if (!selectedUserId) {
+    createMessage.warning('请选择跟进人！');
+    return;
+  }
+
+  forwardLoading.value = true;
+  let param = {
+    'ids': forwardEnquiryDetail.value,
+    'uid': selectedUserId.value,
+    'code': siteCode.value
+  }
+  getAction('/adweb/adwebEnquiry/setForward', param).then((res) => {
+    if (res.success) {
+      createMessage.success(res.message);
+      loadData();
+      cancelEditForward();
+      getEnquiryNums();
+      clearSelectedRowKeys();
+    } else {
+      createMessage.warning(res.message);
     }
-    getAction('/adweb/adwebEnquiry/setForward', param).then((res) => {
-      if (res.success) {
-        createMessage.success(res.message);
-        loadData();
-        cancelEditForward();
-        getEnquiryNums();
-        clearSelectedRowKeys();
-      } else {
-        createMessage.warning(res.message);
-      }
-    }).finally(() => {
-      forwardLoading.value = false;
-    });
-  }
+  }).finally(() => {
+    forwardLoading.value = false;
+  });
+}
 
-  // 取消转发的编辑
-  function cancelEditForward() {
-    selectedUserId.value = undefined;
-    forwardEnquiryDetail.value = undefined;
-    forwardVisible.value = false;
-  }
+// 取消转发的编辑
+function cancelEditForward() {
+  selectedUserId.value = undefined;
+  forwardEnquiryDetail.value = undefined;
+  forwardVisible.value = false;
+}
 
-  //回收箱
-  async function recycleBinVisible() {
+//回收箱
+async function recycleBinVisible() {
 
-    await nextTick();
+  await nextTick();
 
-    if (XpRecycleBinModalRef.value && XpRecycleBinModalRef.value.init) {
-      XpRecycleBinModalRef.value.init(queryParam.siteId, '1,2');
-    }
+  if (XpRecycleBinModalRef.value && XpRecycleBinModalRef.value.init) {
+    XpRecycleBinModalRef.value.init(queryParam.siteId, '1,2');
   }
+}
 
-  // 高级查询配置
-  const superQueryConfig = reactive(superQuerySchema);
-
-  /**
-   * 高级查询事件
-   */
-  function handleSuperQuery(params) {
-    Object.keys(params).map((k) => {
-      queryParam[k] = params[k];
-    });
-    searchQuery();
-  }
+//黑名单
+async function showBlackList() {
+  await nextTick();
 
-  /**
-   * 新增事件
-   */
-  function handleAdd() {
-    registerModal.value.disableSubmit = false;
-    registerModal.value.add();
+  if (blackListRef.value && blackListRef.value.init) {
+    blackListRef.value.init(queryParam.siteId);
   }
+}
 
-  /**
-   * 编辑事件
-   */
-  function handleEdit(record: Recordable) {
-    registerModal.value.disableSubmit = false;
-    registerModal.value.edit(record);
-  }
+//跟踪记录
+async function showEnquiryTrackRecord(record) {
+  await nextTick();
 
-  /**
-   * 详情
-   */
-  function handleDetail(record: Recordable) {
-    registerModal.value.disableSubmit = true;
-    registerModal.value.edit(record);
+  if (enquiryTrackRecordRef.value && enquiryTrackRecordRef.value.init) {
+    enquiryTrackRecordRef.value.init(record);
   }
+}
 
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
-  }
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
 
-  /**
-   * 批量删除事件
-   */
-  async function batchHandleDelete() {
-    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-  }
+/**
+ * 高级查询事件
+ */
+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() {
+
+  console.log(queryParam.userEffective, "queryParam.userEffectivequeryParam.userEffective");
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+</script>
 
-  /**
-   * 成功回调
-   */
-  function handleSuccess() {
-    (selectedRowKeys.value = []) && reload();
-  }
+<style lang="less" scoped>
+.jeecg-basic-table-form-container {
+  padding: 0;
 
-  /**
-   * 操作栏
-   */
-  function getTableAction(record) {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-      },
-    ];
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
   }
 
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      },
-      {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        },
-      },
-    ];
+  .query-group-cust {
+    min-width: 100px !important;
   }
 
-  /**
-   * 查询
-   */
-  function searchQuery() {
-
-    console.log(queryParam.userEffective, "queryParam.userEffectivequeryParam.userEffective");
-    reload();
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center;
   }
 
-  /**
-   * 重置
-   */
-  function searchReset() {
-    formRef.value.resetFields();
-    selectedRowKeys.value = [];
-    //刷新数据
-    reload();
+  .ant-form-item:not(.ant-form-item-with-help) {
+    margin-bottom: 16px;
+    height: 32px;
   }
-</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;
-    }
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+}
 
-    .ant-form-item:not(.ant-form-item-with-help) {
-      margin-bottom: 16px;
-      height: 32px;
-    }
+.theme-color {
+  color: @primary-color;
+}
 
-    :deep(.ant-picker),
-    :deep(.ant-input-number) {
-      width: 100%;
-    }
+.r1 {
+  .choose-site {
+    display: flex;
   }
 
-  .theme-color {
-    color: @primary-color;
+  .t1 {
+    font-size: 18px;
   }
 
-  .r1 {
-    .choose-site {
-      display: flex;
-    }
+  .ant-calendar-picker {
+    margin-right: 20px;
 
-    .t1 {
-      font-size: 18px;
-    }
+  }
 
-    .ant-calendar-picker {
-      margin-right: 20px;
 
-    }
+}
 
+.r2 {
+  background: #fff;
+  border-radius: 10px;
+  padding: 30px 20px;
+  margin-top: 20px;
 
+  .ant-col:not(:last-child) {
+    border-right: 1px solid #e6e6e6;
   }
 
-  .r2 {
-    background: #fff;
-    border-radius: 10px;
-    padding: 30px 20px;
-    margin-top: 20px;
-
-    .ant-col:not(:last-child) {
-      border-right: 1px solid #e6e6e6;
-    }
-
-    p {
-      margin: 0;
-      text-align: center;
+  p {
+    margin: 0;
+    text-align: center;
 
-      &.t1 {
-        color: #333;
-        margin-bottom: 15px;
+    &.t1 {
+      color: #333;
+      margin-bottom: 15px;
 
-        img {
-          margin-right: 10px;
-          width: 15px;
-          margin-top: -5px;
-        }
+      img {
+        margin-right: 10px;
+        width: 15px;
+        margin-top: -5px;
       }
+    }
 
-      &.t2 {
-        color: @primary-color;
-        font-size: 30px;
-        font-weight: 500;
-        line-height: 1;
-        text-decoration: underline;
-        cursor: pointer;
-        padding-left: 25px;
-      }
+    &.t2 {
+      color: @primary-color;
+      font-size: 30px;
+      font-weight: 500;
+      line-height: 1;
+      text-decoration: underline;
+      cursor: pointer;
+      padding-left: 25px;
     }
   }
+}
 
-  .r3 {
-    margin-top: 20px;
-  }
+.r3 {
+  margin-top: 20px;
+}
 </style>

src/views/adweb/enquiry/AdwebEnquiryListCopy.vue

@@ -332,7 +332,7 @@ import toTotal from '/@/assets/enquiry/enquiryListTop4.svg';
 import {postAction, getAction, downFile, putAction} from '/@/api/manage/manage'
 import {JeecgListMixin} from '/@/hooks/component/JeecgListMixin'
 import enquiryTrack from '/@/views/adweb/enquiry/modules/enquiryTrack.vue'
-import enquiryGenzong from '/@/views/adweb/enquiry/modules/enquiryGenzong.vue'
+import enquiryGenzong from '/src/views/adweb/enquiry/modules/enquiryTrackRecord.vue'
 import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue'
 import XpRecycleBinModal from '/@/views/adweb/system/modules/XpRecycleBinModal.vue'
 import blackList from '/@/views/adweb/enquiry/modules/blackList.vue'

src/views/adweb/enquiry/AdwebWasteEnquiryList.vue

@@ -1,251 +1,984 @@
 <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>
+
+    <a-row class="r1" :gutter="8">
+      <a-col :xl="7" :xxl="6">
+        <div class="choose-site">
+          <span class="t1">站点：</span>
+          <select-site ref="selectSiteRef" @com-methods="changeSite" @set-site-info="getSiteList" />
+        </div>
+      </a-col>
+      <a-col :xl="8" :xxl="6">
+        <div class="choose-site">
+          <span class="t1">询盘时间：</span>
+          <a-range-picker @change="onChangeDatePciker" :disabledDate="disabledDate" :value="rangeDate" style="width: 70%" />
+        </div>
+      </a-col>
+      <a-col :xl="9" :xxl="12">
+        <a-button :class="queryParam.dateType == '' ? 'active' : ''" @click="setTime('')">全部时间 </a-button>
+        <a-button :class="queryParam.dateType == 'thirtyDay' ? 'active' : ''" @click="setTime('thirtyDay')">近30天 </a-button>
+        <a-button :class="queryParam.dateType == 'sevenDay' ? 'active' : ''" @click="setTime('sevenDay')">近一周 </a-button>
+        <a-button :class="queryParam.dateType == 'yesterday' ? 'active' : ''" @click="setTime('yesterday')">昨日 </a-button>
+        <a-button :class="queryParam.dateType == 'today' ? 'active' : ''" @click="setTime('today')"> 今日 </a-button>
+      </a-col>
+    </a-row>
+
+    <a-row class="r3" type="flex" :gutter="8">
+      <a-col flex="2">
+        <a-input placeholder="邮箱/姓名/国家" v-model:value="queryParam.searchText"></a-input>
+      </a-col>
+
+      <a-col flex="2">
+        <a-select v-model="queryParam.readStatus"
+                  :allowClear="true"
+                  placeholder="全部阅读状态"
+                  style="width: 100%"
+                  @change="filterStatus"
+        >
+          <a-select-option value="0">
+            未读
+          </a-select-option>
+          <a-select-option value="1">
+            已读
+          </a-select-option>
+        </a-select>
+      </a-col>
+
+      <a-col  flex="2">
+        <a-select v-model:value="queryParam.wasteEnquiryType"
+                  :allowClear="true"
+                  placeholder="垃圾询盘类型"
+                  style="width: 100%"
+        >
+          <a-select-option value="keyword">
+            关键词
+          </a-select-option>
+          <a-select-option value="email">
+            邮箱
+          </a-select-option>
+          <a-select-option value="ip">
+            ip
+          </a-select-option>
+          <a-select-option value="other">
+            其他
+          </a-select-option>
+        </a-select>
+      </a-col>
+
+      <a-col v-if="haveSubAccount" flex="2">
+        <a-select placeholder="全部跟进人"
+                  v-model="queryParam.principalUid"
+                  showSearch
+                  allowClear
+                  style="width: 100%"
+                  :filterOption="filterOption">
+          <a-select-option key="ALL" value="ALL">所有人</a-select-option>
+          <a-select-option v-for="principal in subAccountOptions" :key="principal.id"
+                           :value="principal.id">
+            {{ principal.username }}
+          </a-select-option>
+        </a-select>
+      </a-col>
+
+      <a-col flex="500px" style="text-align:right">
+        <a-button type="primary" @click="searchQuery">查询</a-button>
+        <a-button ghost type="primary" @click="searchReset" style="margin-left: 8px">重置</a-button>
+        <a-button ghost type="primary" @click="handleExportXlsLU()"
+                  style="margin-left: 8px" :loading="excelLoading">导出Excel
+        </a-button>
+        <a-button ghost type="primary" @click="recycleBinVisible" style="margin-left: 8px">回收站
+        </a-button>
+        <a-button ghost type="primary" @click="showBlackList" style="margin-left: 8px">黑名单
+        </a-button>
+      </a-col>
+    </a-row>
+
     <!--引用表格-->
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #alertAfter>
+        <a-divider type="vertical" />
+        <a @click="enquiryReady">标为已读</a>
+
+        <a-divider type="vertical" />
+        <a @click="batchHandleDelete">删除</a>
+      </template>
+
       <!--插槽: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" />
+        <!-- TODO 高级查询 -->
+        <!--        <super-query :config="superQueryConfig" @search="handleSuperQuery" />-->
       </template>
       <!--操作栏-->
+      <!--      <template #action="{ record }">-->
+      <!--        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />-->
+      <!--      </template>-->
+
+      <!-- 操作动作  -->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+
+        <div  style="padding: 5px 8px;display: flex;justify-content: space-around;">
+          <a-tag v-if="isForwardSite" color="blue" @click="forwardDetail(record)"
+                 style="cursor:pointer;">
+            转发
+          </a-tag>
+          <a-tag color="purple" @click="showEnquiryDetail(record)" style="cursor:pointer;">
+            详情
+          </a-tag>
+          <a-popconfirm
+            title="确认拒收后，该用户会归入【黑名单】，后期不再接收该用户的询盘信息~"
+            ok-text="是"
+            cancel-text="否"
+            placement="topRight"
+            @confirm="enquiryAddBlackList(record)"
+          >
+            <a-tag color="orange" style="cursor:pointer;">
+              拒收
+            </a-tag>
+          </a-popconfirm>
+          <a-tag color="green" @click="showEnquiryTrackRecord(record)" style="cursor:pointer;">
+            跟踪
+          </a-tag>
+          <a-tag color="blue"
+                 v-if='record.visitId !== null && record.visitId !== "" && record.visitId !== undefined'
+                 style="cursor:pointer;" @click="enquiryTrack(record)">
+            访问记录
+          </a-tag>
+        </div>
+
       </template>
-      <template v-slot:bodyCell="{ column, record, index, text }">
+
+      <template #bodyCell="{ column, record, index, text }">
+
+        <!-- 自定义显示字段       -->
+
+        <!-- 询盘状态 -->
+        <template v-if="column.key == 'userEffective'">
+          <a class="theme-color" v-if="text === 2" @click="showEnquiryDetail(record)">{{ record.userEffectiveStr }}</a>
+          <span v-else-if="text == 0" style="color: #fa8c16">{{ record.userEffectiveStr }}</span>
+          <span v-else>{{ record.userEffectiveStr }}</span>
+
+        </template>
+        <!-- 阅读状态 -->
+        <template v-if="column.key == 'readStatus'">
+          <a v-if="text == 0" class="theme-color" @click="showEnquiryDetail(record)">未读</a>
+          <span v-else>已读</span>
+        </template>
+        <!-- 询盘详情 -->
+        <div v-if="column.key == 'details'">
+          <a @click="showEnquiryDetail(record)" style="margin: 0 10px 0 10px">
+            {{record.context ? record.context.substr(0, 50) : '--'}}</a>
+        </div>
+        <!-- 来源页面 -->
+
+        <template v-if="column.key == 'fromPage'">
+          <template v-if="!text">-</template>
+          <template v-else-if="text.indexOf('http') < 0">-</template>
+          <template v-else-if="text.indexOf('http') === 0">
+            <template v-if="text.lastIndexOf('/') <= 7">
+              <a :href="text" target="_blank"
+                 style="text-decoration: underline">Home</a>
+            </template>
+            <template v-else>
+              <a :href="text" target="_blank"
+                 style="text-decoration: underline">{{
+                  text.substring(text.lastIndexOf('/') + 1).slice(0, 45) + (text.substring(text.lastIndexOf('/') + 1).length > 45 ? "..." : "")
+                }}</a>
+            </template>
+          </template>
+          <template v-else-if="text.indexOf('http') > 0">
+            <a :href="text.substring(text.indexOf('http'))" target="_blank"
+               style="text-decoration: underline">{{
+                text.substring(0, text.indexOf('http')).slice(0, 45) + (text.substring(0, text.indexOf('http')).length > 45 ? "..." : "")
+              }}</a>
+          </template>
+          <template v-else>-</template>
+        </template>
+        <!-- 邮箱 -->
+        <div  v-if="column.key == 'fromEmail'">
+          <a-popover>
+            <template slot="content">
+              {{ text }}
+            </template>
+            <a @click.prevent="copyEmailFunction(text)" :href="'mailto:'+text"
+               v-if="text">{{ text.slice(0, 30) + (text.length > 30 ? "..." : "") }}</a>
+            <div v-else>--</div>
+          </a-popover>
+        </div>
+
+        <template  v-if="column.key == 'wasteEnquiryType'">
+          <a-tag v-if="text == 'keyword'" color="#2db7f5">关键词</a-tag>
+          <a-tag v-if="text == 'email'" color="#108ee9">邮箱</a-tag>
+          <a-tag v-if="text == 'ip'" color="#3D59AB">IP</a-tag>
+          <a-tag v-if="text == 'other'" color="#87CEEB">其他</a-tag>
+          <span v-if="text == '' || text == null" >-</span>
+        </template>
+
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <AdwebEnquiryModal ref="registerModal" @success="handleSuccess"></AdwebEnquiryModal>
+    <AdwebEnquiryModal ref="registerModal" @success="handleSuccess" />
+
+    <!--回收站-->
+    <xp-recycle-bin-modal ref="XpRecycleBinModalRef" @ok="getTableAndNum"/>
+
+    <!--询盘详情   reload用于子组件删除询盘功能刷新父组件table showDelBtn用于展示删除按钮-->
+    <enquiry-detail :userEffectiveOption="userEffectiveOption" :showDelBtn="true"
+                    @reload="getTableAndNum()" @ok="getTableAndNum"
+                    ref="enquiryDetailRef"></enquiry-detail>
+
+    <!-- 转发询盘 -->
+    <a-modal
+      title="转发"
+      :visible="forwardVisible"
+      @ok="editForward"
+      @cancel="cancelEditForward"
+      :confirm-loading="forwardLoading"
+    >
+      <a-radio-group v-model:value="selectedUserId">
+        <a-radio v-for="item in subAccountOptions" style="display: block; height: 30px; lineHeight: 30px;" :value="item.id">
+          {{ item.username }}
+        </a-radio>
+      </a-radio-group>
+    </a-modal>
+
+    <!--黑名单-->
+    <black-list ref="blackListRef" @ok="getTableAndNum"></black-list>
+
+    <!--跟踪记录-->
+    <enquiry-track-record ref="enquiryTrackRecordRef"></enquiry-track-record>
   </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);
-      },
+<script lang="ts" name="adweb-adwebWasteEnquiry" setup>
+
+import selectSite from '@/components/adweb/selectSite.vue';
+import {nextTick, onBeforeMount, onMounted, reactive, ref} from 'vue';
+import {BasicTable} from '/@/components/Table';
+import {useListPage} from '/@/hooks/system/useListPage';
+import {wasteColumns, superQuerySchema} from './AdwebEnquiry.data';
+import {batchDelete, deleteOne, getExportUrl, getImportUrl, list} from './AdwebEnquiry.api';
+import AdwebEnquiryModal from './components/AdwebEnquiryModal.vue';
+import {useUserStore} from '/@/store/modules/user';
+import {getAction, postAction} from '@/api/manage/manage';
+
+import {useMessage} from '@/hooks/web/useMessage';
+
+import moment from 'moment';
+import {any} from "vue-types";
+import {filterOption} from "ant-design-vue/es/vc-mentions/src/util";
+import enquiryDetail from "@/views/adweb/enquiry/modules/enquiryDetail.vue";
+import XpRecycleBinModal from "@/views/adweb/system/modules/XpRecycleBinModal.vue";
+import blackList from "@/views/adweb/enquiry/modules/blackList.vue";
+import enquiryTrackRecord from "@/views/adweb/enquiry/modules/enquiryTrackRecord.vue";
+
+const formRef = ref();
+const queryParam = reactive<any>({});
+const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const selectSiteRef = ref(null);
+const { createMessage } = useMessage();
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: '询盘信息存储表单',
+    api: list,
+    columns: wasteColumns,
+    canResize: false,
+    useSearchForm: false,
+    actionColumn: {
+      width: 180,
+      fixed: 'right',
     },
-    exportConfig: {
-      name: "询盘信息存储表单",
-      url: getExportUrl,
-      params: queryParam,
+    striped: true,
+    bordered: false,
+    immediate: false, // 不直接触发，通过reload事件触发接口
+    beforeFetch: (params) => {
+
+      //  如果查询条件中没有设置状态，则默认查出所有状态数据
+      if (queryParam.userEffective == undefined) {
+        queryParam.userEffective = '0';
+      }
+
+      return Object.assign(params, queryParam);
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+  },
+  exportConfig: {
+    name: '询盘列表',
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess,
+  },
+});
+const [registerTable, { reload, clearSelectedRowKeys, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+
+// const labelCol = reactive({
+//   xs: 24,
+//   sm: 4,
+//   xl: 6,
+//   xxl: 4,
+// });
+// const wrapperCol = reactive({
+//   xs: 24,
+//   sm: 20,
+// });
+//
+// let siteCode: string | null = ref('');
+
+// 站点列表
+let siteList = ref([{'id': '', 'code': ''}]);
+
+// 询盘数量
+const enquiryNums = ref({
+  all: 0,
+  noRead: 0,
+  product: 0,
+  wait: 0,
+});
+
+// 过滤日期范围
+let rangeDate = ref<any>(any);
+
+// 子账号列表
+let subAccountOptions = ref([{'id': '', 'username': ''}]);
+
+// 是否有子账户
+let haveSubAccount = ref(false);
+
+// 导出excel进度
+let excelLoading = ref<boolean>(false);
+
+// 编辑转发进度
+let forwardLoading = ref<boolean>(false);
+
+// 选中跟进人
+let selectedUserId = ref<any>(undefined);
+
+let userEffectiveOption = ref<[]>([]);
+
+// 当前用户角色
+const userRole = ref('');
+
+// 已经选择的站点code
+const siteCode = ref<any>('');
+
+const isForwardSite = ref<boolean>(false);
+
+//转发的询盘id
+const forwardEnquiryDetail = ref<any>(undefined);
+
+//转发是否可见
+const forwardVisible = ref(false);
+
+// 询盘详情子组件
+const enquiryDetailRef = ref(null);
+
+// 回收站子组件
+const XpRecycleBinModalRef = ref(null);
+
+// 黑名单子组件
+const blackListRef = ref(null);
+
+// 跟踪记录
+const enquiryTrackRecordRef = ref(null);
+
+onBeforeMount(() => {
+  siteCode.value = localStorage.getItem('siteCode');
+  getTurnInquiryCode();
+});
+
+onMounted(async () => {
+  userRole.value = useUserStore().roleList;
+  getEffectiveList();
+});
+
+function getSiteList(siteInfo: any[], selectedSiteInfo: any) {
+  siteList.value = siteInfo;
+
+  if (siteList.value.length === 1) {
+    queryParam.siteId = siteList.value[0].id;
+  } else {
+    let isInSite = false;
+    for (let index in siteList.value) {
+
+      if (localStorage.getItem('siteCode') !== null && siteList.value[index].code === localStorage.getItem('siteCode')) {
+        isInSite = true;
+        queryParam.siteId = siteList.value[index].id
+      }
+    }
+
+    if (localStorage.getItem('siteCode') == null || !isInSite) {
+      queryParam.siteId = siteList.value[0].id;
+      localStorage.setItem('siteCode', siteList.value[0].code);
+    }
+  }
+
+  getTableAndNumWithQueryCondition();
+}
+
+//重新刷新页面数据及获取询盘数量，不清除查询条件
+function getTableAndNumWithQueryCondition() {
+  getEnquiryNums();
+  getSubAccountOptions();
+  loadData();
+}
+
+//切换站点
+function changeSite(value, e) {
+  queryParam.siteId = e.info.id;
+  siteCode.value = localStorage.getItem('siteCode');
+  getTableAndNum(true);
+}
+
+function filterCategory(value: string) {
+  queryParam.userEffective = value;
+}
+
+function filterStatus(value: number) {
+  queryParam.readStatus = value;
+}
+
+//重新刷新页面数据及获取询盘数量
+function getTableAndNum(clearParam: boolean = false) {
+  // 设置默认站点
+  let siteId = queryParam.siteId;
+
+  for (let site of siteList.value) {
+    if (site.id === siteId) {
+      localStorage.setItem('siteCode', site.code);
+    }
+  }
+
+  getEnquiryNums();
+  getSubAccountOptions();
+  if (clearParam) {
+    if (queryParam.readStatus) {
+      delete queryParam.readStatus;
+    }
+    if (queryParam.searchText) {
+      delete queryParam.searchText;
+    }
+    if (queryParam.searchContent) {
+      delete queryParam.searchContent;
+    }
+    if (queryParam.userEffective) {
+      delete queryParam.userEffective;
+    }
+    if (queryParam.principalUid) {
+      delete queryParam.principalUid;
+    }
+  }
+
+  // queryParam.fields = 'id,,siteName,contact,fromEmail,whatsApp,phone,fromIp,readStatus,details,principalUid,fromPage,userEffective,countryName,pluginName,recordCtime,action';
+  // queryParam.userEffective = '1,2';
+  loadData();
+}
+
+//搜索条件部分的逻辑
+function onChangeDatePciker(date, dateString) {
+  if (dateString.length > 0) {
+    rangeDate.value = date;
+    queryParam.start = dateString[0];
+    queryParam.end = dateString[1];
+    queryParam.dateType = undefined;
+  }
+}
+
+//日期选择只能今天之前
+function disabledDate(current) {
+  return current && current > moment().endOf('day');
+}
+
+//设置列表的时间查询条件
+function setTime(time) {
+  queryParam.dateType = time;
+  queryParam.start = '';
+  queryParam.end = '';
+  // sevenDay   thirtyDay  today  yesterday
+  if (time == '') {
+    rangeDate.value = undefined;
+  } else if (time == 'sevenDay') {
+    rangeDate.value = [moment().subtract(6, 'days'), moment()];
+  } else if (time == 'thirtyDay') {
+    rangeDate.value = [moment().subtract(29, 'days'), moment()];
+  } else if (time == 'today') {
+    rangeDate.value = [moment(), moment()];
+  } else if (time == 'yesterday') {
+    rangeDate.value = [moment().subtract(1, 'days'), moment().subtract(1, 'days')];
+  }
+  getTableAndNum();
+}
+
+//获取不同状态询盘的数量
+function getEnquiryNums() {
+  let siteId = '';
+
+  if (queryParam.siteId && queryParam.siteId != '') {
+    siteId = queryParam.siteId;
+  } else {
+    siteId = '';
+  }
+  let d = {
+    siteId: siteId,
+    dateType: queryParam.dateType,
+    start: queryParam.start,
+    end: queryParam.end,
+  };
+  getAction('/adweb/adwebEnquiry/getEnquiryNums', d).then((res) => {
+
+    if (res.code == 200) {
+      enquiryNums.value.all = res.result.all;
+      enquiryNums.value.noRead = res.result.noRead;
+      enquiryNums.value.product = res.result.product;
+      enquiryNums.value.wait =res.result.wait;
+    } else {
+      enquiryNums.value.all = 0;
+      enquiryNums.value.noRead = 0;
+      enquiryNums.value.product = 0;
+      enquiryNums.value.wait = 0;
+    }
   });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-  const labelCol = reactive({
-    xs:24,
-    sm:4,
-    xl:6,
-    xxl:4
+}
+
+// 获取子账户的下拉框选项
+function getSubAccountOptions() {
+  getAction('/usercountry/subAccounts/options?siteId=' + queryParam.siteId, null).then((res) => {
+    if (res.code === 200) {
+      subAccountOptions.value = res.result;
+      haveSubAccount.value =  res.result !== null &&  res.result !== undefined &&  res.result.length > 0;
+    }
   });
-  const wrapperCol = reactive({
-    xs: 24,
-    sm: 20,
+}
+
+function getList(type: String) {
+  //清空查询条件
+  queryParam.principalUid = undefined;
+  queryParam.searchText = undefined;
+  queryParam.searchContent = undefined;
+  if (type == 'noRead') {
+    queryParam.readStatus = '0'
+    queryParam.userEffective = undefined
+  }
+  if (type == 'product') {
+    queryParam.userEffective = 1
+    console.log('1', queryParam)
+
+    queryParam.readStatus = undefined
+    console.log('2', queryParam)
+
+  }
+  if (type == 'wait') {
+    queryParam.userEffective = 2
+    queryParam.readStatus = undefined
+  }
+  if (type == 'all') {
+    queryParam.userEffective = undefined
+    queryParam.readStatus = undefined
+  }
+  loadData(1)
+}
+
+//批量设为已读
+function enquiryReady() {
+
+  console.log(selectedRowKeys.value.length, "selectedRowKeysselectedRowKeysselectedRowKeys");
+  if (selectedRowKeys.value.length <= 0) {
+    createMessage.warning('请选择至少一条记录！');
+    return;
+  }
+  getAction('/adweb/adwebEnquiry/read', {id: selectedRowKeys.value.toString()}).then((res) => {
+    if (res.success) {
+      createMessage.success('批量设置已读成功！')
+      getTableAndNum();
+      clearSelectedRowKeys();
+    } else {
+      if (res.code == 403) {
+        createMessage.warning(res.message)
+      } else {
+        createMessage.error('设置失败！')
+      }
+    }
+  })
+}
+
+// 加载table列表数据
+function loadData(page: number = 1) {
+  reload({page: page});
+}
+
+// 导出excel
+function handleExportXlsLU() {
+  excelLoading.value = true;
+
+  delete queryParam.userEffective;
+
+  onExportXls().then(() => {
+    excelLoading.value = false;
   });
+}
 
-  // 高级查询配置
-  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',
+//询盘详情
+async function showEnquiryDetail(record) {
+  if (record.readStatus == 0) {
+    getAction('/adweb/adwebEnquiry/read?id=' + record.id, null).then(() => {
+      getTableAndNum();
+    })
+  }
+
+  await nextTick();
+
+  if (enquiryDetailRef.value && enquiryDetailRef.value.init) {
+    enquiryDetailRef.value.init(record);
+  }
+}
+
+//获取询盘分类列表
+function getEffectiveList() {
+  getAction('/adweb/adwebEnquiry/getEnquiryCatalog', null).then(function (res) {
+    if (res.code == 200) {
+      userEffectiveOption.value = JSON.parse(res.result);
+    } else {
+      createMessage.error('获取询盘分类失败！')
+    }
+  }).catch(function (err) {
+    console.log(err)
+  })
+}
+
+//复制email到剪切板
+function copyEmailFunction(text) {
+  //复制email到剪切板
+  if (!navigator.clipboard) {
+    console.log('浏览器不支持navigator');
+    let copy = (e) => {
+      e.preventDefault()
+      e.clipboardData.setData('text/plain', text)
+      createMessage.success('复制成功');
+      document.removeEventListener('copy', copy)
+    }
+    document.addEventListener('copy', copy)
+    document.execCommand("Copy");
+    return
+  }
+  navigator.clipboard.writeText(text).then(function () {
+    createMessage.success('复制成功');
+  }, function (err) {
+    createMessage.error('复制失败', err);
+  });
+}
+
+//获取需要轮流询盘的站点code,判断哪个站点的询盘需要开启转发功能
+function getTurnInquiryCode() {
+  // 站点code
+  let dictSiteCode = [{'label': '', 'value': ''}]
+
+  getAction('/adweb/adwebEnquiry/getTurnInquiryCode', null).then((res) => {
+    if (res.code === 200) {
+      Object.assign(dictSiteCode, res.result);
+
+      for (let it in dictSiteCode) {
+        if ( dictSiteCode[it].value === siteCode.value) {
+          isForwardSite.value = true
         }
       }
-    ]
+    }
+  })
+}
+
+//转发询盘
+function forwardDetail(record) {
+  forwardEnquiryDetail.value = record.id;
+  forwardVisible.value = true;
+}
+
+//拒收
+function enquiryAddBlackList(record) {
+  delete record.wasteEnquiry
+  postAction('/enquiry/blacklist/addBlacklist', record).then(res => {
+    if (res.success) {
+      createMessage.success(`拒收成功！`)
+      this.getTableAndNum()
+    } else {
+      if (res.code == 403 || res.code == 500) {
+        createMessage.warning(res.message)
+      } else {
+        createMessage.error('拒收失败！')
+      }
+
+    }
+  })
+}
+
+
+// 编辑转发
+function editForward() {
+  if (forwardEnquiryDetail === undefined) {
+    createMessage.warning('请选择询盘信息！');
+    return;
   }
+  if (!selectedUserId) {
+    createMessage.warning('请选择跟进人！');
+    return;
+  }
+
+  forwardLoading.value = true;
+  let param = {
+    'ids': forwardEnquiryDetail.value,
+    'uid': selectedUserId.value,
+    'code': siteCode.value
+  }
+  getAction('/adweb/adwebEnquiry/setForward', param).then((res) => {
+    if (res.success) {
+      createMessage.success(res.message);
+      loadData();
+      cancelEditForward();
+      getEnquiryNums();
+      clearSelectedRowKeys();
+    } else {
+      createMessage.warning(res.message);
+    }
+  }).finally(() => {
+    forwardLoading.value = false;
+  });
+}
+
+// 取消转发的编辑
+function cancelEditForward() {
+  selectedUserId.value = undefined;
+  forwardEnquiryDetail.value = undefined;
+  forwardVisible.value = false;
+}
 
-  /**
-   * 查询
-   */
-  function searchQuery() {
-    reload();
+//回收箱
+async function recycleBinVisible() {
+
+  await nextTick();
+
+  if (XpRecycleBinModalRef.value && XpRecycleBinModalRef.value.init) {
+    XpRecycleBinModalRef.value.init(queryParam.siteId, '1,2');
+  }
+}
+
+//黑名单
+async function showBlackList() {
+  await nextTick();
+
+  if (blackListRef.value && blackListRef.value.init) {
+    blackListRef.value.init(queryParam.siteId);
   }
-  
-  /**
-   * 重置
-   */
-  function searchReset() {
-    formRef.value.resetFields();
-    selectedRowKeys.value = [];
-    //刷新数据
-    reload();
+}
+
+//跟踪记录
+async function showEnquiryTrackRecord(record) {
+  await nextTick();
+
+  if (enquiryTrackRecordRef.value && enquiryTrackRecordRef.value.init) {
+    enquiryTrackRecordRef.value.init(record);
   }
-  
+}
+
+// 高级查询配置
+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() {
 
+  console.log(queryParam.userEffective, "queryParam.userEffectivequeryParam.userEffective");
+  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;
+.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%;
+  }
+}
+
+.theme-color {
+  color: @primary-color;
+}
+
+.r1 {
+  .choose-site {
+    display: flex;
+  }
+
+  .t1 {
+    font-size: 18px;
+  }
+
+  .ant-calendar-picker {
+    margin-right: 20px;
+
+  }
+
+
+}
+
+.r2 {
+  background: #fff;
+  border-radius: 10px;
+  padding: 30px 20px;
+  margin-top: 20px;
+
+  .ant-col:not(:last-child) {
+    border-right: 1px solid #e6e6e6;
+  }
+
+  p {
+    margin: 0;
+    text-align: center;
+
+    &.t1 {
+      color: #333;
+      margin-bottom: 15px;
+
+      img {
+        margin-right: 10px;
+        width: 15px;
+        margin-top: -5px;
+      }
     }
-    :deep(.ant-picker),:deep(.ant-input-number){
-      width: 100%;
+
+    &.t2 {
+      color: @primary-color;
+      font-size: 30px;
+      font-weight: 500;
+      line-height: 1;
+      text-decoration: underline;
+      cursor: pointer;
+      padding-left: 25px;
     }
   }
+}
+
+.r3 {
+  margin-top: 20px;
+}
 </style>

src/views/adweb/enquiry/modules/blackList.vue

@@ -2,7 +2,7 @@
   <a-modal
     :title="title"
     :width="width"
-    v-model="modalVisible"
+    v-model:open="modalVisible"
     centered
     :closable="true"
     :keyboard="false"
@@ -10,7 +10,7 @@
   >
 
     <a-alert type="info" showIcon style="margin-bottom: 16px;">
-      <template slot="message">
+      <template #message>
         <span>已选择</span>
         <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
         <span>项</span>
@@ -47,13 +47,18 @@
       :rowSelection="{selectedRowKeys, onChange: onSelectChange}"
       @change="handleTableChange"
     >
-      <template slot="action" slot-scope="text,record">
-        <!--        <a @click="enquiryDetail(record)">详情</a>-->
-        <a @click="handleRevert(record)" style="margin-left: 8px">移出黑名单</a>
+      <template #bodyCell="{ column, record, index, text }">
+
+        <template  v-if="column.dataIndex === 'action'">
+          <!--        <a @click="enquiryDetail(record)">详情</a>-->
+          <a @click="handleRevert(record)" style="margin-left: 8px">移出黑名单</a>
+        </template>
+
       </template>
+
     </a-table>
 
-    <template slot="footer">
+    <template #footer>
       <a-button @click="handleCancel">关闭</a-button>
     </template>
 
@@ -68,7 +73,9 @@
 import {getAction, postAction, putAction} from '/@/api/manage/manage'
 import {JeecgListMixin} from '/@/hooks/component/JeecgListMixin'
 import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue'
-
+import {Modal} from "ant-design-vue";
+import {useMessage} from "@/hooks/web/useMessage";
+const { createMessage } = useMessage();
 
 export default {
   name: 'blackList',
@@ -88,7 +95,7 @@ export default {
         {
           title: '国家', align: 'left',
           dataIndex: 'countryName',
-          customRender: function (text) {
+          customCell: function (text) {
             if (text == null || text == '' || text == undefined) {
               return '--'
             } else {
@@ -100,8 +107,7 @@ export default {
           title: '操作',
           align: 'center',
           dataIndex: 'action',
-          width: 200,
-          scopedSlots: {customRender: 'action'}
+          width: 200
         }
       ],
       url: {
@@ -146,26 +152,27 @@ export default {
     },
 
     handleRevert(record) {
-      this.$confirm({
+
+      Modal.confirm({
         title: '恢复询盘',
         content: `您确定要移出这个询盘吗？`,
         centered: true,
         onOk: () => {
           getAction('/enquiry/blacklist/removeBlacklist?id=' + record.id).then(res => {
-            if (res.success) {
+            if (res.code === 200) {
               this.loadData()
               this.$emit('ok')
-              this.$message.success('移出黑名单成功')
+              createMessage.success('移出黑名单成功')
             } else {
-              if (res.code == 403) {
-                this.$message.warning(res.message)
+              if (res.code === 403 || res.code === 401) {
+                createMessage.warning(res.message)
               } else {
-                this.$message.error('恢复失败！')
+                createMessage.error('恢复失败！')
               }
             }
           })
         }
-      })
+      });
     },
 
     handleRevertBatch() {

src/views/adweb/enquiry/modules/enquiryGenzong.vue → src/views/adweb/enquiry/modules/enquiryTrackRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <!--    modal-->
   <a-modal
-    v-model="modalVisible"
+    v-model:open="modalVisible"
     :title="modalTitle"
     centered
     :confirm-loading="confirmLoading"
@@ -31,34 +31,37 @@
         </a-timeline>
 
         <a-divider>添加跟踪记录</a-divider>
-        <a-modal
+
+        <a-form
           ref="ruleForm"
           :model="enquiryRecordForm"
           :rules="enquiryRecordFormRules"
           :label-col="{span:'3'}"
           :wrapper-col="{span:'21'}"
         >
-          <a-form-item label="跟踪记录" prop="record">
+          <a-form-item label="跟踪记录" name="record">
             <a-textarea
               :auto-size="{ minRows: 6, maxRows: 10 }"
               :defaultValue="enquiryRecordForm.record"
               placeholder="跟踪记录"
-              v-model="enquiryRecordForm.record"
+              v-model:value="enquiryRecordForm.record"
               allow-clear
             />
           </a-form-item>
-        </a-modal>
+        </a-form>
       </a-spin>
     </template>
   </a-modal>
 </template>
 
 <script>
-import { getAction, postAction } from '/@/api/manage/manage'
+import {getAction, postAction, postActionForm} from '/@/api/manage/manage'
 import Qs from 'qs'
+import {useMessage} from "@/hooks/web/useMessage";
+const { createMessage } = useMessage();
 
 export default {
-  name: 'enquiryGenzong',
+  name: 'enquiryTrackRecord',
   data(){
     return {
       modalVisible: false,
@@ -85,9 +88,8 @@ export default {
   },
   methods:{
     init(record){
-      console.log(record)
       this.modalVisible = true
-      this.modalTitle = '询盘跟踪记录：' + record.noOut
+      this.modalTitle = '询盘跟踪记录：' + record.no
       this.modalEnquiryRecordStatus = true;
       this.enquiryInfo = record;
       this.cancelText = "关闭"
@@ -97,16 +99,10 @@ export default {
     handleOk() {
       let that = this
       let modalEnquiryRecordStatus = that.modalEnquiryRecordStatus;
-      that.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          if (modalEnquiryRecordStatus) {
-            that.addEnquiryRecord();
-          }
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
+
+      if (modalEnquiryRecordStatus) {
+        that.addEnquiryRecord();
+      }
     },
 
 
@@ -118,24 +114,24 @@ export default {
         enquiryId: that.enquiryInfo.id,
         content: that.enquiryRecordForm.record
       }
-      postAction('/adweb/adwebEnquiryRecord/add', Qs.stringify(params), 1000 * 60 * 2).then(function(res) {
+      postActionForm('/adweb/adwebEnquiryRecord/add', params, 1000 * 60 * 2).then(function(res) {
         that.spinning = false
         that.tipTitle = ''
-        if (res.code == 200) {
-          that.$message.success('添加成功！')
+        if (res.code === 200) {
+          createMessage.success('添加成功！')
           that.enquiryRecordForm = {
             record: ''
           }
           that.getEnquiryRecord(that.enquiryInfo.id);
         } else {
-          if (res.code == 403) {
-            that.$message.warning(res.message)
+          if (res.code === 403) {
+            createMessage.warning(res.message)
           } else {
-            that.$message.error('添加失败！')
+            createMessage.error('添加失败！')
           }
         }
       }).catch(function(err) {
-        that.$message.error('网络超时，请重试!')
+        createMessage.error('网络超时，请重试!')
         that.cleanAllFormData();
         that.loadData()
       })
@@ -151,10 +147,10 @@ export default {
         if (res.code == 200) {
           that.enquiryRecordList = res.result;
         } else {
-          that.$message.error('询盘跟踪记录失败！')
+          createMessage.error('询盘跟踪记录失败！')
         }
       }).catch(function(err) {
-        that.$message.error('网络超时，请重试!')
+        createMessage.error('网络超时，请重试!')
         that.cleanAllFormData();
       })
     },

src/views/adweb/enquiryPublicRules/publicBlackEmail/EnquiryPublicBlackEmailList.vue

@@ -0,0 +1,261 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="reload">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="12">
+            <a-form-item label="邮箱">
+              <a-input placeholder="输入邮箱查询" v-model:value="queryParam.email"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="黑白名单">
+              <a-select allowClear v-model:value="queryParam.blackOrWhite" placeholder="输入黑白名单类型">
+                <a-select-option value="0">黑名单</a-select-option>
+                <a-select-option value="1">白名单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8" style="justify-content: center;align-items: center;">
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="reload">
+                查询
+              </a-button>
+              <a-button ghost type="primary" @click="searchReset" style="margin-left: 8px">重置</a-button>
+              </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- table区域-begin -->
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-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>
+      </template>
+
+
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+
+      <template #bodyCell="{ column, record, index, text }">
+
+        <template v-if="column.dataIndex === 'blackOrWhite'">
+            <span>
+              <a-tag v-if="record.blackOrWhite === 0" color="red">黑名单</a-tag>
+              <a-tag v-else>白名单</a-tag>
+            </span>
+        </template>
+
+        <template v-if="column.dataIndex === 'wasteEnquiryNum'">
+            <span>
+                <span v-if="text === '' || text === null || text === 0">0</span>
+                <a v-else @click='wasteNumVisible(record.email)'>{{ text }}</a>
+            </span>
+        </template>
+
+        <template v-if="column.dataIndex === 'action'">
+            <span>
+              <a @click="handleEdit(record)">编辑</a>
+
+              <a-divider type="vertical" />
+              <a-dropdown>
+                <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+                <a-menu slot="overlay">
+                  <a-menu-item>
+                    <a @click="handleDetail(record)">详情</a>
+                  </a-menu-item>
+                  <a-menu-item>
+                    <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                      <a>删除</a>
+                    </a-popconfirm>
+                  </a-menu-item>
+                </a-menu>
+              </a-dropdown>
+            </span>
+        </template>
+
+
+      </template>
+    </BasicTable>
+
+    <enquiry-public-black-email-modal ref="modalFormRef" @ok="reload()"></enquiry-public-black-email-modal>
+    <xp-recycle-bin-modal ref="XpRecycleBinModalRef"/>
+  </a-card>
+</template>
+
+<script lang="ts" name="EnquiryPublicBlackEmailList" setup>
+
+  import '/@/assets/less/TableExpand.less';
+  import '/@/assets/less/common.less';
+  import {batchDelete, deleteOne, getExportUrl, getImportUrl, list} from './publicBlackEmail.api';
+  import EnquiryPublicBlackEmailModal from './modules/EnquiryPublicBlackEmailModal.vue';
+  import XpRecycleBinModal from './modules/XpRecycleBinModal.vue';
+  import {defineComponent, nextTick, onMounted, reactive, ref} from "vue";
+  import {columns} from './publicBlackEmail.data';
+  import {BasicTable, TableAction} from "@/components/Table";
+  import {useListPage} from "@/hooks/system/useListPage";
+
+  const XpRecycleBinModalRef = ref();
+  const modalFormRef = ref();
+  const description = ref<String>("询盘公共邮箱黑名单管理页面");
+  let queryParam = reactive<any>({});
+  const dictOptions = ref({});
+  const superFieldList = ref([]);
+
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '公共邮箱黑名单',
+      api: list,
+      columns: columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 180,
+        fixed: 'right',
+      },
+      striped: true,
+      bordered: false,
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '询盘列表',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+
+  const [registerTable, { reload, clearSelectedRowKeys, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+
+  onMounted(() => {
+    getSuperFieldList();
+  })
+
+  function getSuperFieldList(){
+    let fieldList=[];
+    fieldList.push({type:'string',value:'email',text:'邮箱',dictCode:''})
+    superFieldList.value = fieldList
+  }
+
+  async function wasteNumVisible(email){
+    await nextTick();
+
+    if (XpRecycleBinModalRef.value && XpRecycleBinModalRef.value.init) {
+      XpRecycleBinModalRef.value.init(email);
+    }
+  }
+
+  function handleEdit (record){
+    modalFormRef.value.title = "编辑";
+    modalFormRef.value.edit(record);
+    modalFormRef.value.disableSubmit = false;
+  }
+
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    modalFormRef.value.disableSubmit = true;
+    modalFormRef.value.edit(record);
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        }
+      }
+    ]
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    modalFormRef.value.disableSubmit = false;
+    modalFormRef.value.add();
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  function searchReset() {
+    queryParam = {}
+    reload();
+    clearSelectedRowKeys();
+  }
+
+</script>
+<style>
+.table-page-search-wrapper {
+  display: block;
+}
+</style>

src/views/adweb/enquiryPublicRules/publicBlackEmail/modules/EnquiryPublicBlackEmailForm.vue

@@ -0,0 +1,152 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form ref="formRef">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" :rules="[formRules.email]">
+              <a-input v-model:value="modelRef.email" placeholder="请输入邮箱"  ></a-input>
+            </a-form-item>
+            <a-form-item label="黑白名单" :labelCol="labelCol" :wrapperCol="wrapperCol" :rules="[formRules.blackOrWhite]">
+              <a-select placeholder="请选择黑白名单" v-model:value="modelRef.blackOrWhite">
+                <a-select-option :value="0">黑名单</a-select-option>
+                <a-select-option :value="1">白名单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script lang="ts" name="EnquiryPublicBlackEmailForm" setup>
+  import { httpAction, getAction } from '/@/api/manage/manage';
+  import pick from 'lodash.pick';
+
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import {computed, nextTick, onBeforeMount, reactive, ref, toRaw} from "vue";
+  import { Form } from 'ant-design-vue';
+
+  const useForm = Form.useForm;
+  const props = defineProps({
+    formData: {
+      type: Object,
+      default: ()=>{},
+      required: false
+    },
+    //表单模式：true流程表单 false普通表单
+    formBpm: {
+      type: Boolean,
+      default: false,
+      required: false
+    },
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false
+    }
+  });
+
+  let modelRef = reactive({'email': '', 'blackOrWhite': 0});
+
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 5 },
+  })
+
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  })
+
+  const confirmLoading = ref(false);
+
+  const validatorRules = reactive({});
+
+  const url = reactive({
+    add: "/adweb/enquiryPublicBlackEmail/add",
+    edit: "/adweb/enquiryPublicBlackEmail/edit",
+    queryById: "/adweb/enquiryPublicBlackEmail/queryById"
+  });
+
+  const formRules = reactive({
+    email: [
+      { required: true, message: '请输入邮箱' }
+    ],
+    blackOrWhite: [
+      { required: true, message: '请输入黑白名单', trigger: 'blur'  }
+    ]
+  })
+
+  const { resetFields, validate, validateInfos, mergeValidateInfo } = useForm(modelRef, formRules);
+
+  // 定义一个计算属性
+  const formDisabled = computed(() => {
+
+    if(props.formBpm===true){
+      if(props.formData.disabled===false){
+        return false
+      }
+      return true
+    }
+    return props.disabled
+  });
+
+  const showFlowSubmitButton = computed(() => {
+    if(props.formBpm===true){
+      if(props.formData.disabled===false){
+        return true
+      }
+    }
+    return false
+  });
+
+  onBeforeMount(() => {
+    showFlowData()
+  })
+
+  function add () {
+    edit({});
+  }
+
+  async function edit (record) {
+    Object.assign(modelRef, pick(record,'email','blackOrWhite'));
+  }
+
+  function showFlowData(){
+    if(props.formBpm === true){
+      let params = {id: props.formData.dataId};
+      getAction(url.queryById, params).then((res)=>{
+        if(res.code === 200){
+          edit(res.result);
+        }
+      });
+    }
+  }
+
+  const onSubmit = () => {
+    validate()
+      .then(() => {
+        console.log(toRaw(modelRef));
+
+      })
+      .catch(err => {
+        console.log('error', err);
+      });
+  };
+
+  function submitForm () {
+    onSubmit();
+  }
+
+  defineExpose({
+    submitForm,
+    add,
+    edit
+  });
+</script>

src/views/adweb/enquiryPublicRules/publicBlackEmail/modules/EnquiryPublicBlackEmailModal.vue

@@ -0,0 +1,93 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    v-model:open="visible">
+    <enquiry-public-black-email-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"
+                                     normal></enquiry-public-black-email-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">
+        提交
+      </a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script lang="ts" name="EnquiryPublicBlackEmailModal" setup>
+import EnquiryPublicBlackEmailForm from './EnquiryPublicBlackEmailForm.vue';
+import {nextTick, ref} from "vue";
+
+const title = ref("操作");
+const width = ref(800);
+const visible = ref(false);
+const disableSubmit = ref(false);
+const realForm = ref();
+
+
+const emit = defineEmits(["ok", "close"])
+
+async function add() {
+  visible.value = true
+  await nextTick();
+
+  realForm.value.add();
+}
+
+async function edit(record) {
+  visible.value = true
+  await nextTick();
+  realForm.value.edit(record);
+}
+
+async function close() {
+  emit('close');
+  await nextTick();
+  visible.value = false;
+}
+
+function handleOk() {
+  realForm.value.submitForm()
+}
+
+function submitCallback() {
+  emit('ok');
+  visible.value = false;
+}
+
+function handleCancel() {
+   close()
+}
+
+defineExpose({
+  title,
+  disableSubmit,
+  add,
+  edit
+});
+
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+.ant-btn {
+  margin-left: 30px;
+  margin-bottom: 30px;
+  float: right;
+}
+
+.drawer-footer {
+  position: absolute;
+  bottom: -8px;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+</style>

src/views/adweb/enquiryPublicRules/publicBlackEmail/modules/XpRecycleBinModal.vue

@@ -0,0 +1,139 @@
+<template>
+  <a-modal
+    :width="1200"
+    :title="title"
+    :visible="visible"
+    :destroyOnClose="true"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    :okButtonProps="{style:{display:'none'}}">
+
+
+    <a-form-model layout="inline" @keyup.enter.native="searchQuery" style="margin-bottom:15px">
+      <a-form-model-item>
+        <a-input placeholder="邮箱/姓名" v-model="queryParam.searchText"></a-input>
+      </a-form-model-item>
+      <a-form-model-item>
+        <a-button type="primary" @click="searchQuery">查询</a-button>
+        <a-button  @click="searchReset" style="margin-left:8px">重置</a-button>
+      </a-form-model-item>
+    </a-form-model>
+
+    <a-table
+      ref="table"
+      size="middle"
+      :columns="columns"
+      :loading="loading"
+      :dataSource="dataSource"
+      >
+      <!-- 显示头像 -->
+      <template slot="avatarslot" slot-scope="text, record, index">
+        <div class="anty-img-wrap">
+          <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/>
+        </div>
+      </template>
+      <div slot="contactSlot" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            {{text}}
+          </template>
+          <div style="width: 100px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis">{{text}}</div>
+        </a-popover>
+      </div>
+      <span slot="action" slot-scope="text, record">
+        <a @click="enquiryDetail(record)"> 详情</a>
+      </span>
+    </a-table>
+    <!--询盘详情-->
+    <enquiry-detail ref="enquiryDetail"></enquiry-detail>
+  </a-modal>
+</template>
+
+<script>
+import {getAction} from '/@/api/manage/manage'
+import {JeecgListMixin} from '/@/hooks/component/JeecgListMixin';
+import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue'
+
+export default {
+    name: 'XpRecycleBinModal',
+    mixins: [JeecgListMixin],
+    components:{enquiryDetail},
+    data() {
+      return {
+        title: '',
+        loading: false,
+        innerVisible: false,
+        dataSource: [],
+        visible:false,
+        columns: [],
+        url: {
+          list: '/adweb/adwebEnquiry/getWastedEnquiry',
+        },
+        disableMixinCreated:true,
+        email:'',
+      }
+    },
+
+    methods: {
+      init(email){
+        let that = this
+        that.columns = [
+            { title: '站点名称', align: 'left', dataIndex: 'siteName', scopedSlots: { customRender: 'contactSlot' }},
+            { title: '姓名', align: 'left', dataIndex: 'contact', scopedSlots: { customRender: 'contactSlot' }},
+            { title: '邮箱', align: 'left', dataIndex: 'fromEmail', scopedSlots: { customRender: 'contactSlot' } },
+            { title: '电话', align: 'left', dataIndex: 'phone' },
+            { title: '询盘时间', align: 'left', dataIndex: 'recordCtime' },
+            { title: '操作', align: 'center', dataIndex: 'action', scopedSlots: { customRender: 'action' } }
+          ]
+        that.email = email
+        that.loadData(email);
+        console.log(email)
+        that.visible = true
+      },
+
+      //询盘详情
+      enquiryDetail(record){
+        this.$nextTick(() => {
+          this.$refs.enquiryDetail.init(record)
+        })
+      },
+      searchQuery() {
+        this.loadData(this.email);
+      },
+
+      searchReset() {
+        this.queryParam = {}
+        this.loadData(this.email);
+      },
+
+
+      handleCancel() {
+        this.queryParam = {}
+        this.visible = false
+      },
+
+      loadData(email) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        params.email = email;
+        params.wasteEnquiryType = 'email';
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result;
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
+
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>

src/views/adweb/enquiryPublicRules/publicBlackEmail/publicBlackEmail.api.ts

@@ -0,0 +1,70 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/adweb/enquiryPublicBlackEmail/list',
+  deleteOne = '/adweb/enquiryPublicBlackEmail/delete',
+  deleteBatch = '/adweb/enquiryPublicBlackEmail/deleteBatch',
+  importExcel = 'adweb/enquiryPublicBlackEmail/importExcel',
+  exportXls = '/adweb/enquiryPublicBlackEmail/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/enquiryPublicRules/publicBlackEmail/publicBlackEmail.data.ts

@@ -0,0 +1,39 @@
+import {BasicColumn} from "@/components/Table";
+
+export const columns: BasicColumn[] = [
+  {
+    title: '序号',
+    dataIndex: 'index',
+    key: 'rowIndex',
+    width: 60,
+    align: "center",
+    customRender: function ({text, record, index, column}) {
+
+      return parseInt(index) + 1;
+    }
+  },
+  {
+    title: '邮箱',
+    align: "center",
+    sorter: true,
+    dataIndex: 'email'
+  },
+  {
+    title: '黑白名单',
+    align: "center",
+    dataIndex: 'blackOrWhite',
+  },
+  {
+    title: '询盘数量',
+    align: "center",
+    sorter: true,
+    dataIndex: 'wasteEnquiryNum',
+    scopedSlots: {customRender: 'wasteEnquiryNum'}
+  },
+  {
+    title: '创建时间',
+    align: "center",
+    dataIndex: 'createTime',
+    sorter: true
+  }
+];

src/views/adweb/enquiryPublicRules/publicBlackip/AdwebBlackIpList.vue

@@ -0,0 +1,222 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="ip">
+              <a-input placeholder="请输入ip" v-model="queryParam.ip"></a-input>
+            </a-form-item>
+          </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="黑白名单">
+                <a-select allowClear placeholder="请输入黑白名单" v-model="queryParam.blackOrWhite">
+                  <a-select-option value="0">黑名单</a-select-option>
+                  <a-select-option value="1">白名单</a-select-option>
+                </a-select>
+              </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-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('IP黑名单')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <span slot="wasteEnquiryNum" slot-scope="text, record">
+            <span v-if="text === '' || text === null || text === 0">0</span>
+            <a v-else  @click='wasteNumVisible(record.ip)'>{{ text }}</a>
+        </span>
+
+        <span slot="blackOrWhite" slot-scope="text, record">
+            <a-tag v-if="text === 0" color="red">黑名单</a-tag>
+            <a-tag v-else-if="text === 1">白名单</a-tag>
+            <a-tag v-else>--</a-tag>
+        </span>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <adweb-black-ip-modal ref="modalForm" @ok="modalFormOk"></adweb-black-ip-modal>
+    <xp-recycle-bin-modal ref="XpRecycleBinModal" @ok="getTableAndNum"/>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import AdwebBlackIpModal from './modules/AdwebBlackIpModal'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import XpRecycleBinModal from './modules/XpRecycleBinModal'
+
+  export default {
+    name: 'AdwebBlackIpList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      AdwebBlackIpModal,
+      JSuperQuery,
+      XpRecycleBinModal,
+    },
+    data () {
+      return {
+        description: 'IP黑名单管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'ip',
+            align:"center",
+            dataIndex: 'ip'
+          },
+          {
+            title:'黑白名单',
+            align:"center",
+            dataIndex: 'blackOrWhite',
+            scopedSlots: {customRender: 'blackOrWhite'}
+          },
+          {
+            title:'询盘数量',
+            align:"center",
+            dataIndex: 'wasteEnquiryNum',
+            scopedSlots: {customRender: 'wasteEnquiryNum'}
+          },
+          {
+            title: '创建时间',
+            align: "center",
+            dataIndex: 'createTime',
+            sorter: true
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/blackip/adwebBlackIp/list",
+          delete: "/blackip/adwebBlackIp/delete",
+          deleteBatch: "/blackip/adwebBlackIp/deleteBatch",
+          exportXlsUrl: "/blackip/adwebBlackIp/exportXls",
+          importExcelUrl: "blackip/adwebBlackIp/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'int',value:'status',text:'状态',dictCode:''})
+        fieldList.push({type:'string',value:'ip',text:'ip',dictCode:''})
+        fieldList.push({type:'int',value:'blackOrWhite',text:'黑白名单',dictCode:''})
+        this.superFieldList = fieldList
+      },
+      wasteNumVisible(ip){
+        this.$nextTick(() => {
+          this.$refs.XpRecycleBinModal.init(ip);
+        })
+      },
+      getTableAndNum(){
+        // 设置默认站点
+        let siteId = this.queryParam.siteId;
+        let siteList = this.siteList;
+        for (let site of siteList) {
+          if (site.id === siteId) {
+            localStorage.setItem("siteCode", site.code);
+          }
+        }
+
+
+        this.loadData(arg)
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/adweb/enquiryPublicRules/publicBlackip/modules/AdwebBlackIpForm.vue

@@ -0,0 +1,179 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="ip" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['ip',formRules.ip]" placeholder="请输入ip"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="黑白名单" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select v-decorator="['blackOrWhite',formRules.blackOrWhite]" placeholder="请选择黑白名单">
+                <a-select-option :value="0">黑名单</a-select-option>
+                <a-select-option :value="1">白名单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+
+  export default {
+    name: 'AdwebBlackIpForm',
+    components: {
+      JFormContainer,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        formRules: {
+          ip: {
+            rules: [
+              { required: true, message: '请输入ip'},
+              { max: 31, message: '关键词长度不能超过31'},
+            ],
+            trigger: 'blur'
+          },
+          blackOrWhite: {
+            initialValue: 0,
+            rules: [
+              { required: true, message: '请选择黑白名单'},
+            ],
+          },
+        },
+        url: {
+          add: "/blackip/adwebBlackIp/add",
+          edit: "/blackip/adwebBlackIp/edit",
+          queryById: "/blackip/adwebBlackIp/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'ip','blackOrWhite'))
+        })
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          });
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'ip','blackOrWhite'))
+      },
+    }
+  }
+</script>

src/views/adweb/enquiryPublicRules/publicBlackip/modules/AdwebBlackIpModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <adweb-black-ip-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></adweb-black-ip-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import AdwebBlackIpForm from './AdwebBlackIpForm'
+  export default {
+    name: 'AdwebBlackIpModal',
+    components: {
+      AdwebBlackIpForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/adweb/enquiryPublicRules/publicBlackip/modules/AdwebBlackIpModal__Style.vue

@@ -0,0 +1,83 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    :visible="visible">
+    <adweb-black-ip-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></adweb-black-ip-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import AdwebBlackIpForm from './AdwebBlackIpForm'
+
+  export default {
+    name: 'AdwebBlackIpModal',
+    components: {
+      AdwebBlackIpForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

src/views/adweb/enquiryPublicRules/publicBlackip/modules/XpRecycleBinModal.vue

@@ -0,0 +1,139 @@
+<template>
+  <a-modal
+    :width="1200"
+    :title="title"
+    :visible="visible"
+    :destroyOnClose="true"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    :okButtonProps="{style:{display:'none'}}">
+
+
+    <a-form-model layout="inline" @keyup.enter.native="searchQuery" style="margin-bottom:15px">
+      <a-form-model-item>
+        <a-input placeholder="邮箱/姓名" v-model="queryParam.searchText"></a-input>
+      </a-form-model-item>
+      <a-form-model-item>
+        <a-button type="primary" @click="searchQuery">查询</a-button>
+        <a-button  @click="searchReset" style="margin-left:8px">重置</a-button>
+      </a-form-model-item>
+    </a-form-model>
+
+    <a-table
+      ref="table"
+      size="middle"
+      :columns="columns"
+      :loading="loading"
+      :dataSource="dataSource"
+      >
+      <!-- 显示头像 -->
+      <template slot="avatarslot" slot-scope="text, record, index">
+        <div class="anty-img-wrap">
+          <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/>
+        </div>
+      </template>
+      <div slot="contactSlot" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            {{text}}
+          </template>
+          <div style="width: 100px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis">{{text}}</div>
+        </a-popover>
+      </div>
+      <span slot="action" slot-scope="text, record">
+        <a @click="enquiryDetail(record)"> 详情</a>
+      </span>
+    </a-table>
+    <!--询盘详情-->
+    <enquiry-detail ref="enquiryDetail"></enquiry-detail>
+  </a-modal>
+</template>
+
+<script>
+import { putAction, deleteAction, postAction, getAction } from '@/api/manage'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import enquiryDetail from '@views/adweb/enquiry/modules/enquiryDetail'
+
+  export default {
+    name: 'XpRecycleBinModal',
+    mixins: [JeecgListMixin],
+    components:{enquiryDetail},
+    data() {
+      return {
+        title: '',
+        loading: false,
+        innerVisible: false,
+        dataSource: [],
+        visible:false,
+        columns: [],
+        url: {
+          list: '/adweb/adwebEnquiry/getWastedEnquiry',
+        },
+        disableMixinCreated:true,
+        ip:'',
+      }
+    },
+
+    methods: {
+      init(ip){
+        let that = this
+        that.columns = [
+            { title: '站点名称', align: 'left', dataIndex: 'siteName', scopedSlots: { customRender: 'contactSlot' }},
+            { title: '姓名', align: 'left', dataIndex: 'contact', scopedSlots: { customRender: 'contactSlot' }},
+            { title: '邮箱', align: 'left', dataIndex: 'fromEmail', scopedSlots: { customRender: 'contactSlot' } },
+            { title: '电话', align: 'left', dataIndex: 'phone' },
+            { title: '询盘时间', align: 'left', dataIndex: 'recordCtime' },
+            { title: '操作', align: 'center', dataIndex: 'action', scopedSlots: { customRender: 'action' } }
+          ]
+        that.ip = ip
+        that.loadData(ip);
+        console.log(ip)
+        that.visible = true
+      },
+
+      //询盘详情
+      enquiryDetail(record){
+        this.$nextTick(() => {
+          this.$refs.enquiryDetail.init(record)
+        })
+      },
+      searchQuery() {
+        this.loadData(this.ip);
+      },
+
+      searchReset() {
+        this.queryParam = {}
+        this.loadData(this.ip);
+      },
+
+
+      handleCancel() {
+        this.queryParam = {}
+        this.visible = false
+      },
+
+      loadData(ip) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        params.ip = ip;
+        params.wasteEnquiryType = 'ip';
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result;
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
+
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>

src/views/adweb/enquiryPublicRules/publicRuleList/AdwebEnquiryRuleList.vue

@@ -0,0 +1,463 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="12">
+            <a-form-item label="关键词">
+              <a-input placeholder="输入关键词查询" v-model="queryParam.word"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="黑白名单">
+              <a-select allowClear v-model="queryParam.blackOrWhiteList" placeholder="输入黑白名单类型">
+                <a-select-option value="0">黑名单</a-select-option>
+                <a-select-option value="1">白名单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="作用域">
+              <a-select allowClear v-model="queryParam.useStatus" placeholder="输入关键词状态类型">
+                <a-select-option value="0">询盘关键词</a-select-option>
+                <a-select-option value="1">OpenAi关键词</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="关键词状态">
+              <a-select allowClear v-model="queryParam.isEnable" placeholder="输入关键词状态类型">
+                <a-select-option value="0">停用</a-select-option>
+                <a-select-option value="1">启用</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button ghost type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('用于询盘规则过滤')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+                @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-popover v-model:visible="outputVisible" title="请选择查询内容" trigger="click" >
+        <template #content>
+          <div style="width:100%;display:block;overflow:hidden">
+            <a-select show-search
+                      placeholder="请选择站点"
+                      :allowClear="true"
+                      option-filter-prop="children"
+                      :filter-option="filterOption"
+                      v-model="outputSiteCode" style="width: 300px">
+              <a-select-option v-for="data in siteinfo" :key="data.code" :value="data.code" :info="data">
+                {{ data.name }}
+              </a-select-option>
+            </a-select>
+            <br>
+            <a-range-picker
+              v-model:value="outputTime"
+              format="YYYY-MM-DD HH"
+              :disabled-date="disabledDate"
+              style="width: 300px; margin: 10px 0 10px 0;"
+            />
+          </div>
+          <a-button type="primary" :loading="outputLoading" @click="isOutputExcel">导出</a-button>
+        </template>
+        <a-button type="primary" @click="loadSiteList()">导出指定询盘</a-button>
+      </a-popover>
+
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+        <span slot="blackOrWhiteList_dictText" slot-scope="text, record">
+            <a-tag v-if="text === 0" color="red">黑名单</a-tag>
+            <a-tag v-else-if="text === 1">白名单</a-tag>
+            <a-tag v-else>--</a-tag>
+        </span>
+
+        <span slot="wasteEnquiryNum" slot-scope="text, record">
+           <template v-if="record.useStatus  == 0">
+             <span v-if="text === '' || text === null || text === 0" >0</span>
+            <a v-else  @click='wasteNumVisible(record.word)'>{{ text }}</a>
+           </template>
+           <template v-if="record.useStatus  == 1">
+             <span>-</span>
+           </template>
+        </span>
+
+        <span slot="isEnable_dictText" slot-scope="text, record">
+           <a-tag v-if="text === 0" color="orange">停用</a-tag>
+            <a-tag v-else-if="text === 1" color="green">启用</a-tag>
+            <a-tag v-else>--</a-tag>
+        </span>
+        <span slot="useStatus_dictText" slot-scope="text, record">
+           <a-tag v-if="text === 0" color="orange">询盘关键词</a-tag>
+            <a-tag v-else-if="text === 1" color="green">OpenAi关键词</a-tag>
+            <a-tag v-else>--</a-tag>
+        </span>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <adweb-enquiry-rule-modal ref="modalForm" @ok="modalFormOk"></adweb-enquiry-rule-modal>
+    <xp-recycle-bin-modal ref="XpRecycleBinModal"/>
+  </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import {mixinDevice} from '@/utils/mixin'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import AdwebEnquiryRuleModal from './modules/AdwebEnquiryRuleModal__Style.vue'
+import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+import {downFile, getAction, postAction} from "@api/manage";
+import Vue from "vue";
+import {ACCESS_TOKEN} from "@/store/mutation-types";
+import {Modal} from "ant-design-vue";
+import store from "@/store";
+import moment from "moment";
+import dayjs from "dayjs";
+import XpRecycleBinModal from './modules/XpRecycleBinModal'
+
+export default {
+  name: 'AdwebEnquiryRuleList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    AdwebEnquiryRuleModal,
+    JSuperQuery,
+    XpRecycleBinModal,
+  },
+  data() {
+    return {
+      description: '用于询盘规则过滤管理页面',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: "center",
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1;
+          }
+        },
+        {
+          title: '关键词',
+          align: "center",
+          dataIndex: 'word'
+        },
+        {
+          title:'关键词翻译',
+          align:"center",
+          dataIndex: 'translateWord',
+          scopedSlots: {customRender: 'translateWord'}
+        },
+        {
+          title: '黑白名单',
+          align: "center",
+          dataIndex: 'blackOrWhiteList',
+          width: 180,
+          sorter: true,
+          scopedSlots: {customRender: 'blackOrWhiteList_dictText'}
+        },
+        {
+          title:'询盘数量',
+          align:"center",
+          dataIndex: 'wasteEnquiryNum',
+          scopedSlots: {customRender: 'wasteEnquiryNum'}
+        },
+        {
+          title: '作用域',
+          align: "center",
+          dataIndex: 'useStatus',
+          width: 180,
+          sorter: true,
+          scopedSlots: {customRender: 'useStatus_dictText'}
+        },
+        {
+          title: '状态',
+          align: "center",
+          dataIndex: 'isEnable',
+          width: 180,
+          sorter: true,
+          scopedSlots: {customRender: 'isEnable_dictText'}
+        },
+        {
+          title: '创建时间',
+          align: "center",
+          dataIndex: 'createTime',
+          width: 180,
+          sorter: true
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
+      url: {
+        list: "/adweb/adwebEnquiryRule/list",
+        delete: "/adweb/adwebEnquiryRule/delete",
+        deleteBatch: "/adweb/adwebEnquiryRule/deleteBatch",
+        exportXlsUrl: "/adweb/adwebEnquiryRule/exportXls",
+        importExcelUrl: "adweb/adwebEnquiryRule/importExcel",
+        enquiryOutputExcelUrl: "/adweb/adwebEnquiry/enquiryOutputExcel",
+
+      },
+      dictOptions: {},
+      superFieldList: [],
+      outputVisible: false,
+      showOutput: false,
+      outputTime: [],
+      outputSiteCode: undefined,
+      siteinfo: {},
+      outputLoading: false,
+
+    }
+  },
+  created() {
+    this.getSuperFieldList();
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    initDictConfig() {
+    },
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({type: 'string', value: 'word', text: '关键词', dictCode: ''})
+      fieldList.push({type: 'int', value: 'blackOrWhiteList', text: '黑名单或白名单0为黑名单，1为白名单', dictCode: ''})
+      fieldList.push({type: 'int', value: 'isEnable', text: '是否启用该字段1为启用0为停用', dictCode: ''})
+      this.superFieldList = fieldList
+    },
+    handleExportXls(fileName){
+      if(!fileName || typeof fileName != "string"){
+        fileName = "导出文件"
+      }
+      let param = this.getQueryParams();
+      if(this.selectedRowKeys && this.selectedRowKeys.length>0){
+        param['selections'] = this.selectedRowKeys.join(",")
+      }
+      console.log("导出参数",param)
+      downFile(this.url.exportXlsUrl,param).then((data)=>{
+        if (!data) {
+          this.$message.warning("文件下载失败")
+          return
+        }
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.ms-excel'}), fileName+'.xlsx')
+        }else{
+          let url = window.URL.createObjectURL(new Blob([data],{type: 'application/vnd.ms-excel'}))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', fileName+'.xlsx')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        }
+      })
+    },
+    handleImportExcel(info){
+      if (info.file.status !== 'uploading') {
+        console.log(info.file, info.fileList);
+      }
+      if (info.file.status === 'done') {
+        if (info.file.response.success) {
+          // this.$message.success(`${info.file.name} 文件上传成功`);
+          if (info.file.response.code === 201) {
+            let { message, result: { msg, fileUrl, fileName } } = info.file.response
+            let href = window._CONFIG['domianURL'] + fileUrl
+            this.$warning({
+              title: message,
+              content: (
+                <div>
+                  <span>{msg}</span><br/>
+                  <span>具体详情请 <a href={href} target="_blank" download={fileName}>点击下载</a> </span>
+                </div>
+              )
+            })
+          } else {
+            this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
+          }
+          this.loadData()
+        } else {
+          this.$message.error(`${info.file.name} ${info.file.response.message}.`);
+        }
+      } else if (info.file.status === 'error') {
+        if (info.file.response.status === 500) {
+          let data = info.file.response
+          const token = Vue.ls.get(ACCESS_TOKEN)
+          if (token && data.message.includes("Token失效") && !window.location.href.includes('login')) {
+            Modal.error({
+              title: '登录已过期',
+              content: '很抱歉，登录已过期，请重新登录',
+              okText: '重新登录',
+              mask: false,
+              onOk: () => {
+                store.dispatch('Logout').then(() => {
+                  Vue.ls.remove(ACCESS_TOKEN)
+                  window.location.reload();
+                })
+              }
+            })
+          }
+        } else {
+          this.$message.error(`文件上传失败: ${info.file.msg} `);
+        }
+      }
+    },
+    searchQuery() {
+      //去除前后空格
+      if (this.queryParam.word) {
+        this.queryParam.word = this.queryParam.word.replace(/^\s*\*\s|\s*\*\s*$/g, '');
+      }
+      this.loadData(1);
+      this.onClearSelected()
+    },
+    //站点搜索
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    disabledDate(current) {
+      return current && current > dayjs().endOf('day');
+    },
+    loadSiteList(){
+      const that = this;
+      if (that.siteinfo.length > 0) {
+        return;
+      }
+      getAction('/sys/api/getSiteListByUid').then(function (res) {
+        if (res.code == 0) {
+          that.siteinfo = res.data
+        }else {
+          that.$message.error('站点获取失败，请刷新重试')
+        }
+      })
+    },
+    isOutputExcel(){
+      const that = this;
+      that.outputLoading = true;
+      let params = {};
+      const startTime = moment(that.outputTime[0]).set({'minute': 0, 'second': 0}).format('YYYY-MM-DD HH:mm:ss');
+      const endTime = moment(that.outputTime[1]).set({'minute': 0, 'second': 0}).format('YYYY-MM-DD HH:mm:ss');
+      if (that.outputTime && startTime !== endTime) {
+        params.startTime = startTime;
+        params.endTime = endTime;
+      }
+      if (that.outputSiteCode){
+        params.siteCode = that.outputSiteCode;
+      }
+      downFile(that.url.enquiryOutputExcelUrl,params).then((res)=>{
+        that.outputLoading = false;
+        if (!res) {
+          this.$message.warning("文件下载失败")
+          return
+        }
+        if (res.code === 500){
+          this.$message.error(res.message)
+          return;
+        }
+
+
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(new Blob([res],{type: 'application/vnd.ms-excel'}), fileName+'.xlsx')
+        }else{
+          let url = window.URL.createObjectURL(new Blob([res],{type: 'application/vnd.ms-excel'}))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', '导出询盘'+moment().format("HH:mm:ss")+'.xlsx')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        }
+      }).catch((err)=> {
+        that.outputLoading = false
+      })
+    },
+    wasteNumVisible(keyword){
+      this.$nextTick(() => {
+        this.$refs.XpRecycleBinModal.init(keyword);
+      })
+    },
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>

src/views/adweb/enquiryPublicRules/publicRuleList/modules/AdwebEnquiryRuleForm.vue

@@ -0,0 +1,217 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="关键词" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['word',formRules.word]" placeholder="请输入关键词"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="关键词翻译" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['translateWord',formRules.translateWord]" placeholder="请输入关键词翻译"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="黑白名单" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select v-decorator="['blackOrWhiteList',formRules.blackOrWhiteList]" placeholder="请选择黑白名单">
+                <a-select-option :value="0">黑名单</a-select-option>
+                <a-select-option :value="1">白名单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="作用域" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select v-decorator="['useStatus',formRules.useStatus]" placeholder="请选择作用域">
+                <a-select-option :value="0">询盘关键词</a-select-option>
+                <a-select-option :value="1">OpenAi关键词</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select v-decorator="['isEnable',formRules.isEnable]" placeholder="请选择是否启用该关键词">
+                <a-select-option :value="1">启用</a-select-option>
+                <a-select-option :value="0">停用</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JDictSelectTag from "@/components/dict/JDictSelectTag"
+
+  export default {
+    name: 'AdwebEnquiryRuleForm',
+    components: {
+      JFormContainer,
+      JDictSelectTag,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/adweb/adwebEnquiryRule/add",
+          edit: "/adweb/adwebEnquiryRule/edit",
+          queryById: "/adweb/adwebEnquiryRule/queryById"
+        },
+        formRules: {
+          word: {
+            rules: [
+              { required: true, message: '请输入关键词'},
+              { max: 100, message: '关键词长度不能超过100'},
+            ],
+            trigger: 'blur'
+          },
+          useStatus: {
+            initialValue: 0,
+            rules: [
+              { required: true, message: '请选择作用域'},
+            ],
+          },
+          blackOrWhiteList: {
+            initialValue: 0,
+            rules: [
+              { required: true, message: '请选择黑白名单'},
+            ],
+          },
+          isEnable: {
+            initialValue: 1,
+            rules: [
+              { required: true, message: '请选择是否启用该关键词' },
+            ],
+          },
+          translateWord: {
+
+          }
+        },
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'word','translateWord','blackOrWhiteList','isEnable'))
+        })
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          });
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'word','blackOrWhiteList','isEnable'))
+      },
+    }
+  }
+</script>

src/views/adweb/enquiryPublicRules/publicRuleList/modules/AdwebEnquiryRuleModal__Style.vue

@@ -0,0 +1,83 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    :visible="visible">
+    <adweb-enquiry-rule-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></adweb-enquiry-rule-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import AdwebEnquiryRuleForm from './AdwebEnquiryRuleForm'
+
+  export default {
+    name: 'AdwebEnquiryRuleModal',
+    components: {
+      AdwebEnquiryRuleForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

src/views/adweb/enquiryPublicRules/publicRuleList/modules/XpRecycleBinModal.vue

@@ -0,0 +1,139 @@
+<template>
+  <a-modal
+    :width="1200"
+    :title="title"
+    :visible="visible"
+    :destroyOnClose="true"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    :okButtonProps="{style:{display:'none'}}">
+
+
+    <a-form-model layout="inline" @keyup.enter.native="searchQuery" style="margin-bottom:15px">
+      <a-form-model-item>
+        <a-input placeholder="邮箱/姓名" v-model="queryParam.searchText"></a-input>
+      </a-form-model-item>
+      <a-form-model-item>
+        <a-button type="primary" @click="searchQuery">查询</a-button>
+        <a-button  @click="searchReset" style="margin-left:8px">重置</a-button>
+      </a-form-model-item>
+    </a-form-model>
+
+    <a-table
+      ref="table"
+      size="middle"
+      :columns="columns"
+      :loading="loading"
+      :dataSource="dataSource"
+      >
+      <!-- 显示头像 -->
+      <template slot="avatarslot" slot-scope="text, record, index">
+        <div class="anty-img-wrap">
+          <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/>
+        </div>
+      </template>
+      <div slot="contactSlot" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            {{text}}
+          </template>
+          <div style="width: 100px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis">{{text}}</div>
+        </a-popover>
+      </div>
+      <span slot="action" slot-scope="text, record">
+        <a @click="enquiryDetail(record)"> 详情</a>
+      </span>
+    </a-table>
+    <!--询盘详情-->
+    <enquiry-detail ref="enquiryDetail"></enquiry-detail>
+  </a-modal>
+</template>
+
+<script>
+import { putAction, deleteAction, postAction, getAction } from '@/api/manage'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import enquiryDetail from '@views/adweb/enquiry/modules/enquiryDetail'
+
+  export default {
+    name: 'XpRecycleBinModal',
+    mixins: [JeecgListMixin],
+    components:{enquiryDetail},
+    data() {
+      return {
+        title: '',
+        loading: false,
+        innerVisible: false,
+        dataSource: [],
+        visible:false,
+        columns: [],
+        url: {
+          list: '/adweb/adwebEnquiry/getWastedEnquiry',
+        },
+        disableMixinCreated:true,
+        keyword:'',
+      }
+    },
+
+    methods: {
+      init(keyword){
+        let that = this
+        that.columns = [
+            { title: '站点名称', align: 'left', dataIndex: 'siteName', scopedSlots: { customRender: 'contactSlot' }},
+            { title: '姓名', align: 'left', dataIndex: 'contact', scopedSlots: { customRender: 'contactSlot' }},
+            { title: '邮箱', align: 'left', dataIndex: 'fromEmail', scopedSlots: { customRender: 'contactSlot' } },
+            { title: '电话', align: 'left', dataIndex: 'phone' },
+            { title: '询盘时间', align: 'left', dataIndex: 'recordCtime' },
+            { title: '操作', align: 'center', dataIndex: 'action', scopedSlots: { customRender: 'action' } }
+          ]
+        that.keyword = keyword
+        that.loadData(keyword);
+        console.log(keyword)
+        that.visible = true
+      },
+
+      //询盘详情
+      enquiryDetail(record){
+        this.$nextTick(() => {
+          this.$refs.enquiryDetail.init(record)
+        })
+      },
+      searchQuery() {
+        this.loadData(this.keyword);
+      },
+
+      searchReset() {
+        this.queryParam = {}
+        this.loadData(this.keyword);
+      },
+
+
+      handleCancel() {
+        this.queryParam = {}
+        this.visible = false
+      },
+
+      loadData(keyword) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        params.keyword = keyword;
+        params.wasteEnquiryType = 'keyword';
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result;
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
+
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>

src/views/adweb/enquirySiteRules/siteBlackEmail/EnquirySiteBlackEmailList.vue

@@ -0,0 +1,248 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :sm="12">
+            <a-form-item label="站点">
+              <a-select placeholder="请选择站点" v-model="queryParam.siteId" showSearch :filterOption="filterOption" allowClear>
+                <a-select-option v-for="option in siteOptions" :key="option.id" :value="option.id">{{option.name}}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="邮箱">
+              <a-input placeholder="请输入邮箱" v-model="queryParam.email"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="黑白名单">
+              <a-select v-model="queryParam.blackOrWhite" allowClear placeholder="请选择黑白名单">
+                <a-select-option value="0">黑名单</a-select-option>
+                <a-select-option value="1">白名单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button ghost type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('enquiry_site_black_email')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <span slot="blackOrWhite" slot-scope="text, record">
+          <a-tag v-if="record.blackOrWhite === 0" color="red">黑名单</a-tag>
+          <a-tag v-else>白名单</a-tag>
+        </span>
+
+        <span slot="wasteEnquiryNum" slot-scope="text, record">
+            <span v-if="text === '' || text === null || text === 0">0</span>
+            <a v-else @click='wasteNumVisible(record.email,record.type,record.siteId)'>{{ text }}</a>
+        </span>
+
+        <span slot="type" slot-scope="text, record">
+          <a-tag v-if="text === '0'" color="cyan">通配</a-tag>
+          <a-tag v-else color="blue">完全匹配</a-tag>
+        </span>
+
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <enquiry-site-black-email-modal ref="modalForm" @ok="modalFormOk"></enquiry-site-black-email-modal>
+    <xp-recycle-bin-modal ref="XpRecycleBinModal"/>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import EnquirySiteBlackEmailModal from './modules/EnquirySiteBlackEmailModal__Style.vue'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import { httpAction, getAction } from '@/api/manage'
+  import XpRecycleBinModal from './modules/XpRecycleBinModal'
+
+  export default {
+    name: 'EnquirySiteBlackEmailList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      EnquirySiteBlackEmailModal,
+      JSuperQuery,
+      XpRecycleBinModal
+    },
+    data () {
+      return {
+        description: 'enquiry_site_black_email管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'站点名称',
+            align:"center",
+            dataIndex: 'siteName'
+          },
+          {
+            title:'邮箱',
+            align:"center",
+            sorter: true,
+            dataIndex: 'email'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type',
+            scopedSlots: { customRender: 'type' }
+          },
+          {
+            title:'黑白名单',
+            align:"center",
+            dataIndex: 'blackOrWhite',
+            scopedSlots: { customRender: 'blackOrWhite' }
+          },
+          {
+            title:'询盘数量',
+            align:"center",
+            dataIndex: 'wasteEnquiryNum',
+            scopedSlots: {customRender: 'wasteEnquiryNum'}
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime',
+            sorter: true,
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/adweb/enquirySiteBlackEmail/list",
+          delete: "/adweb/enquirySiteBlackEmail/delete",
+          deleteBatch: "/adweb/enquirySiteBlackEmail/deleteBatch",
+          exportXlsUrl: "/adweb/enquirySiteBlackEmail/exportXls",
+          importExcelUrl: "adweb/enquirySiteBlackEmail/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+        siteOptions:[]
+      }
+    },
+    created() {
+      this.getSiteList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      filterOption(input, option) {
+        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
+
+
+      //获取站点列表
+      getSiteList() {
+        let that = this
+        getAction('/sys/api/getSiteListByUid').then(function (res) {
+          if (res.code == 0) {
+            that.siteOptions = res.data;
+          } else {
+            that.$message.error('获取站点失败！')
+          }
+        }).catch(function (err) {
+          console.log(err)
+        })
+      },
+      wasteNumVisible(email, type, siteId){
+        this.$nextTick(() => {
+          this.$refs.XpRecycleBinModal.init(email, type, siteId);
+        })
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/adweb/enquirySiteRules/siteBlackEmail/modules/EnquirySiteBlackEmailForm.vue

@@ -0,0 +1,266 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+
+      <a-form :form="form" slot="detail">
+        <div class="ant-alert ant-alert-info" style="color: #e74c3c">
+          <span> 禁止以{{noEnquiryBlack}}单个字符作为黑名单邮箱</span>
+        </div>
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="站点" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-select placeholder="请选择站点" v-decorator="['siteId',validatorRules.siteId]" showSearch :filterOption="filterOption">
+                  <a-select-option v-for="option in siteOptions" :key="option.id" :value="option.id">{{option.name}}</a-select-option>
+                </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select v-decorator="['type',validatorRules.type]" placeholder="请选择类型">
+                <a-select-option :value="'0'">通配</a-select-option>
+                <a-select-option :value="'1'">完全匹配</a-select-option>
+              </a-select>
+            </a-form-item>
+
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['email',validatorRules.email]" placeholder="请输入邮箱"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="黑白名单" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select v-decorator="['blackOrWhite',validatorRules.blackOrWhite]" placeholder="请选择黑白名单">
+                <a-select-option :value="0">黑名单</a-select-option>
+                <a-select-option :value="1">白名单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JDate from '@/components/jeecg/JDate'
+
+  export default {
+    name: 'EnquirySiteBlackEmailForm',
+    components: {
+      JFormContainer,
+      JDate,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+          siteId: {
+            rules: [
+              { required: true, message: '请选择站点' }
+            ]
+          },
+          email: {
+            rules: [
+              { required: true, message: '请输入邮箱', trigger: 'blur' }
+            ]
+          },
+          blackOrWhite: {
+            rules: [
+              { required: true, message: '请选择黑白名单' }
+            ],
+          },
+          type: {
+            rules: [
+              { required: true, message: '请选择类型'}
+            ],
+          }
+        },
+        url: {
+          add: "/adweb/enquirySiteBlackEmail/add",
+          edit: "/adweb/enquirySiteBlackEmail/edit",
+          queryById: "/adweb/enquirySiteBlackEmail/queryById",
+          getDictByDictCode : "/sys/dict/getDictByDictCode"
+        },
+        siteOptions: [],
+        noEnquiryBlack: '',
+        noEnquiryBlackOption: []
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+      this.getSiteList();
+      this.getDictData();
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'siteId','email','type','status','blackOrWhite','createTime','updateTime'))
+        })
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          });
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            for(let i = 0; i< that.noEnquiryBlackOption.length; i++){
+              if(formData.email == that.noEnquiryBlackOption[i].title){
+                that.$message.warning("邮箱不能是"+ that.noEnquiryBlack + "单个字符。");
+                that.confirmLoading = false;
+                return;
+              }
+            }
+
+            for(let j = 0; j < that.siteOptions.length; j++){
+              if(formData.siteId == that.siteOptions[j].id){
+                formData.siteCode = that.siteOptions[j].code;
+              }
+            }
+
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'siteId','email','type','status','blackOrWhite','createTime','updateTime'))
+      },
+
+      filterOption(input, option) {
+        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
+
+      //获取站点列表
+      getSiteList() {
+        let that = this
+        getAction('/sys/api/getSiteListByUid').then(function (res) {
+          if (res.code == 0) {
+            that.siteOptions = res.data;
+          } else {
+            that.$message.error('获取站点失败！')
+          }
+        }).catch(function (err) {
+          console.log(err)
+        })
+      },
+
+      //黑名单类型改变
+      getDictData(){
+        let that = this;
+        let param = {
+          dictCode : 'no_enquiry_black'
+        }
+        getAction(that.url.getDictByDictCode,param).then(function (res) {
+          if(res.success){
+            that.noEnquiryBlackOption = res.result;
+            for(let i = 0;i < res.result.length; i++){
+              if(i == 0){
+                that.noEnquiryBlack = res.result[i].title;
+              }else{
+                that.noEnquiryBlack += res.result[i].title;
+              }
+            }
+          }
+        }).catch(function (err) {
+          console.log(err)
+        })
+      }
+    }
+  }
+</script>

src/views/adweb/enquirySiteRules/siteBlackEmail/modules/EnquirySiteBlackEmailModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <enquiry-site-black-email-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></enquiry-site-black-email-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import EnquirySiteBlackEmailForm from './EnquirySiteBlackEmailForm'
+  export default {
+    name: 'EnquirySiteBlackEmailModal',
+    components: {
+      EnquirySiteBlackEmailForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/adweb/enquirySiteRules/siteBlackEmail/modules/EnquirySiteBlackEmailModal__Style.vue

@@ -0,0 +1,102 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    :visible="visible">
+    <enquiry-site-black-email-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></enquiry-site-black-email-form>
+    <div class="drawer-footer">
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+     <div class="side_close_btn">
+          <a-button type="primary" icon="close" size="large" @click="handleCancel" />
+        </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import EnquirySiteBlackEmailForm from './EnquirySiteBlackEmailForm'
+
+  export default {
+    name: 'EnquirySiteBlackEmailModal',
+    components: {
+      EnquirySiteBlackEmailForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+    .ant-drawer-open{
+      /deep/ .ant-drawer-content{
+        overflow: inherit;
+        .side_close_btn{
+          position: absolute;
+          left: -60px;
+          top: calc(50% - 60px);
+          .ant-btn{
+            margin: 0;
+            width: 60px;
+            height: 60px;
+            border-radius: 0;
+          }
+        }
+      }
+
+    }
+</style>

src/views/adweb/enquirySiteRules/siteBlackEmail/modules/XpRecycleBinModal.vue

@@ -0,0 +1,144 @@
+<template>
+  <a-modal
+    :width="1200"
+    :title="title"
+    :visible="visible"
+    :destroyOnClose="true"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    :okButtonProps="{style:{display:'none'}}">
+
+
+    <a-form-model layout="inline" @keyup.enter.native="searchQuery" style="margin-bottom:15px">
+      <a-form-model-item>
+        <a-input placeholder="邮箱/姓名" v-model="queryParam.searchText"></a-input>
+      </a-form-model-item>
+      <a-form-model-item>
+        <a-button type="primary" @click="searchQuery">查询</a-button>
+        <a-button  @click="searchReset" style="margin-left:8px">重置</a-button>
+      </a-form-model-item>
+    </a-form-model>
+
+    <a-table
+      ref="table"
+      size="middle"
+      :columns="columns"
+      :loading="loading"
+      :dataSource="dataSource"
+      >
+      <!-- 显示头像 -->
+      <template slot="avatarslot" slot-scope="text, record, index">
+        <div class="anty-img-wrap">
+          <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/>
+        </div>
+      </template>
+      <div slot="contactSlot" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            {{text}}
+          </template>
+          <div style="width: 200px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis">{{text}}</div>
+        </a-popover>
+      </div>
+      <span slot="action" slot-scope="text, record">
+        <a @click="enquiryDetail(record)"> 详情</a>
+      </span>
+    </a-table>
+    <!--询盘详情-->
+    <enquiry-detail ref="enquiryDetail"></enquiry-detail>
+  </a-modal>
+</template>
+
+<script>
+import { putAction, deleteAction, postAction, getAction } from '@/api/manage'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import enquiryDetail from '@views/adweb/enquiry/modules/enquiryDetail'
+
+  export default {
+    name: 'XpRecycleBinModal',
+    mixins: [JeecgListMixin],
+    components:{enquiryDetail},
+    data() {
+      return {
+        title: '',
+        loading: false,
+        innerVisible: false,
+        dataSource: [],
+        visible:false,
+        columns: [],
+        url: {
+          list: '/adweb/adwebEnquiry/getWastedEnquiry',
+        },
+        disableMixinCreated:true,
+        email:'',
+        type:'',
+        siteId:'',
+      }
+    },
+
+    methods: {
+      init(email,type,siteId){
+        let that = this
+        that.columns = [
+            { title: '站点名称', align: 'left', dataIndex: 'siteName', scopedSlots: { customRender: 'contactSlot' }},
+            { title: '姓名', align: 'left', dataIndex: 'contact', scopedSlots: { customRender: 'contactSlot' }},
+            { title: '邮箱', align: 'left', dataIndex: 'fromEmail', scopedSlots: { customRender: 'contactSlot' } },
+            { title: '电话', align: 'left', dataIndex: 'phone' },
+            { title: '询盘时间', align: 'left', dataIndex: 'recordCtime' },
+            { title: '操作', align: 'center', dataIndex: 'action', scopedSlots: { customRender: 'action' } }
+          ]
+        that.email = email
+        that.type = type
+        that.siteId = siteId
+        that.loadData(email,type,siteId);
+        that.visible = true
+      },
+
+      //询盘详情
+      enquiryDetail(record){
+        this.$nextTick(() => {
+          this.$refs.enquiryDetail.init(record)
+        })
+      },
+      searchQuery() {
+        this.loadData(this.email,this.type,this.siteId);
+      },
+
+      searchReset() {
+        this.queryParam = {}
+        this.loadData(this.email,this.type,this.siteId);
+      },
+
+
+      handleCancel() {
+        this.queryParam = {}
+        this.visible = false
+      },
+
+      loadData(email,type,siteId) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        params.email = email;
+        params.type = type;
+        params.siteId = siteId;
+        params.wasteEnquiryType = 'email';
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result;
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
+
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>

src/views/adweb/enquirySiteRules/siteBlackIp/AdwebSiteBlackIpList.vue

@@ -0,0 +1,234 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :sm="12">
+            <a-form-item label="站点">
+              <a-select placeholder="请选择站点" v-model="queryParam.siteId" showSearch :filterOption="filterOption" allowClear>
+                <a-select-option v-for="option in siteOptions" :key="option.id" :value="option.id">{{option.name}}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="IP">
+              <a-input placeholder="请输入IP" v-model="queryParam.ip"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="黑白名单">
+              <a-select v-model="queryParam.blackOrWhite" allowClear placeholder="请选择黑白名单">
+                <a-select-option value="0">黑名单</a-select-option>
+                <a-select-option value="1">白名单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button ghost type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <span slot="wasteEnquiryNum" slot-scope="text, record">
+            <span v-if="text === '' || text === null || text === 0">0</span>
+            <a v-else  @click='wasteNumVisible(record.ip,record.siteId)'>{{ text }}</a>
+        </span>
+
+        <span slot="blackOrWhite" slot-scope="text, record">
+          <a-tag v-if="record.blackOrWhite === 0" color="red">黑名单</a-tag>
+          <a-tag v-else>白名单</a-tag>
+        </span>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <adweb-site-black-ip-modal ref="modalForm" @ok="modalFormOk"></adweb-site-black-ip-modal>
+    <xp-recycle-bin-modal ref="XpRecycleBinModal" @ok="getTableAndNum"/>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import AdwebSiteBlackIpModal from './modules/AdwebSiteBlackIpModal__Style.vue'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import { httpAction, getAction } from '@/api/manage'
+  import XpRecycleBinModal from './modules/XpRecycleBinModal'
+  export default {
+    name: 'AdwebSiteBlackIpList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      AdwebSiteBlackIpModal,
+      JSuperQuery,
+      XpRecycleBinModal,
+    },
+    data () {
+      return {
+        description: 'adweb_site_black_ip管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'站点名称',
+            align:"center",
+            dataIndex: 'siteName'
+          },
+          {
+            title:'ip',
+            align:"center",
+            dataIndex: 'ip'
+          },
+          {
+            title:'询盘数量',
+            align:"center",
+            dataIndex: 'wasteEnquiryNum',
+            scopedSlots: {customRender: 'wasteEnquiryNum'}
+          },
+          {
+            title:'黑白名单',
+            align:"center",
+            dataIndex: 'blackOrWhite',
+            scopedSlots: { customRender: 'blackOrWhite' }
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/adweb/adwebSiteBlackIp/list",
+          delete: "/adweb/adwebSiteBlackIp/delete",
+          deleteBatch: "/adweb/adwebSiteBlackIp/deleteBatch",
+          exportXlsUrl: "/adweb/adwebSiteBlackIp/exportXls",
+          importExcelUrl: "adweb/adwebSiteBlackIp/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+        siteOptions:[]
+      }
+    },
+    created() {
+       this.getSiteList();
+    },
+
+    methods: {
+      //获取站点列表
+      getSiteList() {
+        let that = this
+        getAction('/sys/api/getSiteListByUid').then(function (res) {
+          if (res.code == 0) {
+            that.siteOptions = res.data;
+          } else {
+            that.$message.error('获取站点失败！')
+          }
+        }).catch(function (err) {
+          console.log(err)
+        })
+      },
+
+      filterOption(input, option) {
+        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
+      wasteNumVisible(ip,siteId){
+        this.$nextTick(() => {
+          this.$refs.XpRecycleBinModal.init(ip,siteId);
+        })
+      },
+      getTableAndNum(){
+        // 设置默认站点
+        let siteId = this.queryParam.siteId;
+        let siteList = this.siteList;
+        for (let site of siteList) {
+          if (site.id === siteId) {
+            localStorage.setItem("siteCode", site.code);
+          }
+        }
+        this.loadData(arg)
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/adweb/enquirySiteRules/siteBlackIp/modules/AdwebSiteBlackIpForm.vue

@@ -0,0 +1,214 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="站点" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select placeholder="请选择站点" v-decorator="['siteId',validatorRules.siteId]" showSearch :filterOption="filterOption">
+                <a-select-option v-for="option in siteOptions" :key="option.id" :value="option.id">{{option.name}}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="ip" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['ip',validatorRules.ip]" placeholder="请输入ip"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="黑白名单" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select v-decorator="['blackOrWhite',validatorRules.blackOrWhite]" placeholder="请选择黑白名单">
+                <a-select-option :value="0">黑名单</a-select-option>
+                <a-select-option :value="1">白名单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JDate from '@/components/jeecg/JDate'
+
+  export default {
+    name: 'AdwebSiteBlackIpForm',
+    components: {
+      JFormContainer,
+      JDate,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+          siteId: {
+            rules: [
+              { required: true, message: '请选择站点'}
+            ]
+          },
+          ip: {
+            rules: [
+              { required: true, message: 'ip不能为空', trigger: 'blur' }
+            ]
+          },
+          blackOrWhite: {
+            rules: [
+              { required: true, message: '请选择黑白名单'}
+            ],
+          }
+        },
+        url: {
+          add: "/adweb/adwebSiteBlackIp/add",
+          edit: "/adweb/adwebSiteBlackIp/edit",
+          queryById: "/adweb/adwebSiteBlackIp/queryById"
+        },
+        siteOptions:[],
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+      this.getSiteList();
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'siteId','siteCode','status','ip','blackOrWhite','createTime'))
+        })
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          });
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+
+            for(let j = 0; j < that.siteOptions.length; j++){
+              if(formData.siteId == that.siteOptions[j].id){
+                formData.siteCode = that.siteOptions[j].code;
+              }
+            }
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'siteId','siteCode','status','ip','blackOrWhite','createTime'))
+      },
+
+      filterOption(input, option) {
+        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
+
+      //获取站点列表
+      getSiteList() {
+        let that = this
+        getAction('/sys/api/getSiteListByUid').then(function (res) {
+          if (res.code == 0) {
+            that.siteOptions = res.data;
+          } else {
+            that.$message.error('获取站点失败！')
+          }
+        }).catch(function (err) {
+          console.log(err)
+        })
+      },
+    }
+  }
+</script>

src/views/adweb/enquirySiteRules/siteBlackIp/modules/AdwebSiteBlackIpModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <adweb-site-black-ip-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></adweb-site-black-ip-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import AdwebSiteBlackIpForm from './AdwebSiteBlackIpForm'
+  export default {
+    name: 'AdwebSiteBlackIpModal',
+    components: {
+      AdwebSiteBlackIpForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/adweb/enquirySiteRules/siteBlackIp/modules/AdwebSiteBlackIpModal__Style.vue

@@ -0,0 +1,102 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    :visible="visible">
+    <adweb-site-black-ip-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></adweb-site-black-ip-form>
+    <div class="drawer-footer">
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+     <div class="side_close_btn">
+          <a-button type="primary" icon="close" size="large" @click="handleCancel" />
+        </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import AdwebSiteBlackIpForm from './AdwebSiteBlackIpForm'
+
+  export default {
+    name: 'AdwebSiteBlackIpModal',
+    components: {
+      AdwebSiteBlackIpForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+    .ant-drawer-open{
+      /deep/ .ant-drawer-content{
+        overflow: inherit;
+        .side_close_btn{
+          position: absolute;
+          left: -60px;
+          top: calc(50% - 60px);
+          .ant-btn{
+            margin: 0;
+            width: 60px;
+            height: 60px;
+            border-radius: 0;
+          }
+        }
+      }
+
+    }
+</style>

src/views/adweb/enquirySiteRules/siteBlackIp/modules/XpRecycleBinModal.vue

@@ -0,0 +1,142 @@
+<template>
+  <a-modal
+    :width="1200"
+    :title="title"
+    :visible="visible"
+    :destroyOnClose="true"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    :okButtonProps="{style:{display:'none'}}">
+
+
+    <a-form-model layout="inline" @keyup.enter.native="searchQuery" style="margin-bottom:15px">
+      <a-form-model-item>
+        <a-input placeholder="邮箱/姓名" v-model="queryParam.searchText"></a-input>
+      </a-form-model-item>
+      <a-form-model-item>
+        <a-button type="primary" @click="searchQuery">查询</a-button>
+        <a-button  @click="searchReset" style="margin-left:8px">重置</a-button>
+      </a-form-model-item>
+    </a-form-model>
+
+    <a-table
+      ref="table"
+      size="middle"
+      :columns="columns"
+      :loading="loading"
+      :dataSource="dataSource"
+      >
+      <!-- 显示头像 -->
+      <template slot="avatarslot" slot-scope="text, record, index">
+        <div class="anty-img-wrap">
+          <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/>
+        </div>
+      </template>
+      <div slot="contactSlot" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            {{text}}
+          </template>
+          <div style="width: 200px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis">{{text}}</div>
+        </a-popover>
+      </div>
+      <span slot="action" slot-scope="text, record">
+        <a @click="enquiryDetail(record)"> 详情</a>
+      </span>
+    </a-table>
+    <!--询盘详情-->
+    <enquiry-detail ref="enquiryDetail"></enquiry-detail>
+  </a-modal>
+</template>
+
+<script>
+import { putAction, deleteAction, postAction, getAction } from '@/api/manage'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import enquiryDetail from '@views/adweb/enquiry/modules/enquiryDetail'
+
+  export default {
+    name: 'XpRecycleBinModal',
+    mixins: [JeecgListMixin],
+    components:{enquiryDetail},
+    data() {
+      return {
+        title: '',
+        loading: false,
+        innerVisible: false,
+        dataSource: [],
+        visible:false,
+        columns: [],
+        url: {
+          list: '/adweb/adwebEnquiry/getWastedEnquiry',
+        },
+        disableMixinCreated:true,
+        ip:'',
+        siteId:''
+      }
+    },
+
+    methods: {
+      init(ip,siteId){
+        let that = this
+        that.columns = [
+            { title: '站点名称', align: 'left', dataIndex: 'siteName',scopedSlots: { customRender: 'contactSlot' }},
+            { title: '姓名', align: 'left', dataIndex: 'contact', scopedSlots: { customRender: 'contactSlot' }},
+            { title: '邮箱', align: 'left', dataIndex: 'fromEmail', scopedSlots: { customRender: 'contactSlot' } },
+            { title: '电话', align: 'left', dataIndex: 'phone' },
+            { title: '询盘时间', align: 'left', dataIndex: 'recordCtime' },
+            { title: '操作', align: 'center', dataIndex: 'action', scopedSlots: { customRender: 'action' } }
+          ]
+        that.ip = ip;
+        that.siteId = siteId;
+        that.loadData(ip,siteId);
+        console.log(ip)
+        that.visible = true
+      },
+
+      //询盘详情
+      enquiryDetail(record){
+        this.$nextTick(() => {
+          this.$refs.enquiryDetail.init(record)
+        })
+      },
+      searchQuery() {
+        this.loadData(this.ip,this.siteId);
+      },
+
+      searchReset() {
+        this.queryParam = {}
+        this.loadData(this.ip,this.siteId);
+      },
+
+
+      handleCancel() {
+        this.queryParam = {}
+        this.visible = false
+      },
+
+      loadData(ip,siteId) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        params.ip = ip;
+        params.siteId = siteId;
+        params.wasteEnquiryType = 'ip';
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result;
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
+
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>

src/views/adweb/enquirySiteRules/siteRuleList/AdwebEnquirySiteRuleList.vue

@@ -0,0 +1,259 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :sm="12">
+            <a-form-item label="站点">
+              <a-select placeholder="请选择站点" v-model="queryParam.siteId" showSearch :filterOption="filterOption" allowClear>
+                <a-select-option v-for="option in siteOptions" :key="option.id" :value="option.id">{{option.name}}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="关键词">
+              <a-input placeholder="输入关键词查询" v-model="queryParam.word"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="黑白名单">
+              <a-select allowClear v-model="queryParam.blackOrWhite" placeholder="输入黑白名单类型">
+                <a-select-option value="0">黑名单</a-select-option>
+                <a-select-option value="1">白名单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button ghost type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('adweb_enquiry_site_rule')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <span slot="blackOrWhite_dictText" slot-scope="text, record">
+            <a-tag v-if="text === 0" color="red">黑名单</a-tag>
+            <a-tag v-else-if="text === 1">白名单</a-tag>
+            <a-tag v-else>--</a-tag>
+        </span>
+
+        <span slot="wasteEnquiryNum" slot-scope="text, record">
+           <span v-if="text === '' || text === null || text === 0" >0</span>
+            <a v-else  @click='wasteNumVisible(record.word,record.siteId)'>{{ text }}</a>
+        </span>
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <adweb-enquiry-site-rule-modal ref="modalForm" @ok="modalFormOk"></adweb-enquiry-site-rule-modal>
+    <xp-recycle-bin-modal ref="XpRecycleBinModal"/>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import AdwebEnquirySiteRuleModal from './modules/AdwebEnquirySiteRuleModal__Style.vue'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import XpRecycleBinModal from './modules/XpRecycleBinModal'
+  import { getAction } from '@api/manage'
+
+  export default {
+    name: 'AdwebEnquirySiteRuleList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      AdwebEnquirySiteRuleModal,
+      JSuperQuery,
+      XpRecycleBinModal,
+    },
+    data () {
+      return {
+        description: 'adweb_enquiry_site_rule管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'站点名称',
+            align:"center",
+            dataIndex: 'siteName'
+          },
+          {
+            title:'关键词',
+            align:"center",
+            dataIndex: 'word'
+          },
+          {
+            title: '黑白名单',
+            align: "center",
+            dataIndex: 'blackOrWhite',
+            width: 180,
+            sorter: true,
+            scopedSlots: {customRender: 'blackOrWhite_dictText'}
+          },
+          {
+            title:'询盘数量',
+            align:"center",
+            dataIndex: 'wasteEnquiryNum',
+            scopedSlots: {customRender: 'wasteEnquiryNum'}
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/adweb/adwebEnquirySiteRule/list",
+          delete: "/adweb/adwebEnquirySiteRule/delete",
+          deleteBatch: "/adweb/adwebEnquirySiteRule/deleteBatch",
+          exportXlsUrl: "/adweb/adwebEnquirySiteRule/exportXls",
+          importExcelUrl: "adweb/adwebEnquirySiteRule/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+        siteOptions:[]
+      }
+    },
+    created() {
+    this.getSiteList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      wasteNumVisible(keyword,siteId){
+        this.$nextTick(() => {
+          this.$refs.XpRecycleBinModal.init(keyword,siteId);
+        })
+      },
+      filterOption(input, option) {
+        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
+
+      //获取站点列表
+      getSiteList() {
+        let that = this
+        getAction('/sys/api/getSiteListByUid').then(function (res) {
+          if (res.code == 0) {
+            that.siteOptions = res.data;
+          } else {
+            that.$message.error('获取站点失败！')
+          }
+        }).catch(function (err) {
+          console.log(err)
+        })
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/adweb/enquirySiteRules/siteRuleList/modules/AdwebEnquirySiteRuleForm.vue

@@ -0,0 +1,230 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="站点" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select placeholder="请选择站点" v-decorator="['siteId',formRules.siteId]" showSearch :filterOption="filterOption">
+                <a-select-option v-for="option in siteOptions" :key="option.id" :value="option.id">{{option.name}}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="关键词" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['word',formRules.word]" placeholder="请输入关键词"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="黑白名单" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select v-decorator="['blackOrWhite',formRules.blackOrWhite]" placeholder="请选择黑白名单">
+                <a-select-option :value="0">黑名单</a-select-option>
+                <a-select-option :value="1">白名单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-select v-decorator="['isEnable',formRules.isEnable]" placeholder="请选择是否启用该关键词">-->
+<!--                <a-select-option :value="1">启用</a-select-option>-->
+<!--                <a-select-option :value="0">停用</a-select-option>-->
+<!--              </a-select>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-item label="作用域" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-select v-decorator="['useStatus',formRules.useStatus]" placeholder="请选择作用域">-->
+<!--                <a-select-option :value="0">询盘关键词</a-select-option>-->
+<!--                <a-select-option :value="1">OpenAi关键词</a-select-option>-->
+<!--              </a-select>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JDate from '@/components/jeecg/JDate'
+
+  export default {
+    name: 'AdwebEnquirySiteRuleForm',
+    components: {
+      JFormContainer,
+      JDate,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/adweb/adwebEnquirySiteRule/add",
+          edit: "/adweb/adwebEnquirySiteRule/edit",
+          queryById: "/adweb/adwebEnquirySiteRule/queryById"
+        },
+        formRules: {
+          siteId: {
+            rules: [
+              { required: true, message: '请选择站点'},
+            ],
+            trigger: 'change'
+          },
+          word: {
+            rules: [
+              { required: true, message: '请输入关键词'},
+              { max: 100, message: '关键词长度不能超过100'},
+            ],
+            trigger: 'blur'
+          },
+          blackOrWhite: {
+            initialValue: 0,
+            rules: [
+              { required: true, message: '请选择黑白名单'},
+            ],
+          },
+        },
+        siteOptions:[],
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+      this.getSiteList();
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'siteId','siteCode','word','blackOrWhite','createTime'))
+        })
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          });
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'siteId','siteCode','status','word','blackOrWhiteList','isEnable','useStatus','createTime'))
+      },
+      filterOption(input, option) {
+        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
+
+      //获取站点列表
+      getSiteList() {
+        let that = this
+        getAction('/sys/api/getSiteListByUid').then(function (res) {
+          if (res.code == 0) {
+            that.siteOptions = res.data;
+          } else {
+            that.$message.error('获取站点失败！')
+          }
+        }).catch(function (err) {
+          console.log(err)
+        })
+      },
+    }
+  }
+</script>

src/views/adweb/enquirySiteRules/siteRuleList/modules/AdwebEnquirySiteRuleModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <adweb-enquiry-site-rule-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></adweb-enquiry-site-rule-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import AdwebEnquirySiteRuleForm from './AdwebEnquirySiteRuleForm'
+  export default {
+    name: 'AdwebEnquirySiteRuleModal',
+    components: {
+      AdwebEnquirySiteRuleForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/adweb/enquirySiteRules/siteRuleList/modules/AdwebEnquirySiteRuleModal__Style.vue

@@ -0,0 +1,102 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    :visible="visible">
+    <adweb-enquiry-site-rule-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></adweb-enquiry-site-rule-form>
+    <div class="drawer-footer">
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+     <div class="side_close_btn">
+          <a-button type="primary" icon="close" size="large" @click="handleCancel" />
+        </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import AdwebEnquirySiteRuleForm from './AdwebEnquirySiteRuleForm'
+
+  export default {
+    name: 'AdwebEnquirySiteRuleModal',
+    components: {
+      AdwebEnquirySiteRuleForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+    .ant-drawer-open{
+      /deep/ .ant-drawer-content{
+        overflow: inherit;
+        .side_close_btn{
+          position: absolute;
+          left: -60px;
+          top: calc(50% - 60px);
+          .ant-btn{
+            margin: 0;
+            width: 60px;
+            height: 60px;
+            border-radius: 0;
+          }
+        }
+      }
+
+    }
+</style>

src/views/adweb/enquirySiteRules/siteRuleList/modules/XpRecycleBinModal.vue

@@ -0,0 +1,142 @@
+<template>
+  <a-modal
+    :width="1200"
+    :title="title"
+    :visible="visible"
+    :destroyOnClose="true"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    :okButtonProps="{style:{display:'none'}}">
+
+
+    <a-form-model layout="inline" @keyup.enter.native="searchQuery" style="margin-bottom:15px">
+      <a-form-model-item>
+        <a-input placeholder="邮箱/姓名" v-model="queryParam.searchText"></a-input>
+      </a-form-model-item>
+      <a-form-model-item>
+        <a-button type="primary" @click="searchQuery">查询</a-button>
+        <a-button  @click="searchReset" style="margin-left:8px">重置</a-button>
+      </a-form-model-item>
+    </a-form-model>
+
+    <a-table
+      ref="table"
+      size="middle"
+      :columns="columns"
+      :loading="loading"
+      :dataSource="dataSource"
+      >
+      <!-- 显示头像 -->
+      <template slot="avatarslot" slot-scope="text, record, index">
+        <div class="anty-img-wrap">
+          <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/>
+        </div>
+      </template>
+      <div slot="contactSlot" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            {{text}}
+          </template>
+          <div style="width: 200px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis">{{text}}</div>
+        </a-popover>
+      </div>
+      <span slot="action" slot-scope="text, record">
+        <a @click="enquiryDetail(record)"> 详情</a>
+      </span>
+    </a-table>
+    <!--询盘详情-->
+    <enquiry-detail ref="enquiryDetail"></enquiry-detail>
+  </a-modal>
+</template>
+
+<script>
+import { putAction, deleteAction, postAction, getAction } from '@/api/manage'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import enquiryDetail from '@views/adweb/enquiry/modules/enquiryDetail'
+
+  export default {
+    name: 'XpRecycleBinModal',
+    mixins: [JeecgListMixin],
+    components:{enquiryDetail},
+    data() {
+      return {
+        title: '',
+        loading: false,
+        innerVisible: false,
+        dataSource: [],
+        visible:false,
+        columns: [],
+        url: {
+          list: '/adweb/adwebEnquiry/getWastedEnquiry',
+        },
+        disableMixinCreated:true,
+        keyword:'',
+        siteCode: ''
+      }
+    },
+
+    methods: {
+      init(keyword,siteId){
+        let that = this
+        that.columns = [
+            { title: '站点名称', align: 'left', dataIndex: 'siteName', scopedSlots: { customRender: 'contactSlot' }},
+            { title: '姓名', align: 'left', dataIndex: 'contact', scopedSlots: { customRender: 'contactSlot' }},
+            { title: '邮箱', align: 'left', dataIndex: 'fromEmail', scopedSlots: { customRender: 'contactSlot' } },
+            { title: '电话', align: 'left', dataIndex: 'phone' },
+            { title: '询盘时间', align: 'left', dataIndex: 'recordCtime' },
+            { title: '操作', align: 'center', dataIndex: 'action', scopedSlots: { customRender: 'action' } }
+          ]
+        that.keyword = keyword
+        that.siteId = siteId
+        that.loadData(keyword,siteId);
+        console.log(keyword)
+        that.visible = true
+      },
+
+      //询盘详情
+      enquiryDetail(record){
+        this.$nextTick(() => {
+          this.$refs.enquiryDetail.init(record)
+        })
+      },
+      searchQuery() {
+        this.loadData(this.keyword,this.siteId);
+      },
+
+      searchReset() {
+        this.queryParam = {}
+        this.loadData(this.keyword,this.siteId);
+      },
+
+
+      handleCancel() {
+        this.queryParam = {}
+        this.visible = false
+      },
+
+      loadData(keyword,siteId) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        params.keyword = keyword;
+        params.siteId = siteId;
+        params.wasteEnquiryType = 'keyword';
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result;
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
+
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>

src/views/adweb/system/modules/XpRecycleBinModal.vue

@@ -45,12 +45,12 @@
       @change="handleTableChange">
 
       <template #bodyCell="{ column, record, index, text }">
-        <!-- 显示头像 -->
-        <template  v-if="column.dataIndex === 'siteName'">
-          <div class="anty-img-wrap">
-            <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/>
-          </div>
-        </template>
+<!--        &lt;!&ndash; 显示头像 &ndash;&gt;-->
+<!--        <template  v-if="column.dataIndex === 'siteName'">-->
+<!--          <div class="anty-img-wrap">-->
+<!--            <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/>-->
+<!--          </div>-->
+<!--        </template>-->
 
 
         <template  v-if="column.dataIndex === 'contact'">
@@ -85,6 +85,9 @@
 import {putAction, deleteAction, postAction, getAction} from '/@/api/manage/manage'
 import {JeecgListMixin} from '/@/hooks/component/JeecgListMixin'
 import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue'
+import {Modal} from "ant-design-vue";
+import {useMessage} from "@/hooks/web/useMessage";
+const { createMessage } = useMessage();
 
 export default {
   name: 'XpRecycleBinModal',
@@ -117,23 +120,20 @@ export default {
           title: '站点名称',
           align: 'left',
           dataIndex: 'siteName',
-          scopedSlots: {customRender: 'contactSlot'}
         },
         {
           title: '姓名',
           align: 'left',
           dataIndex: 'contact',
-          scopedSlots: {customRender: 'contactSlot'}
         },
         {
           title: '邮箱',
           align: 'left',
           dataIndex: 'fromEmail',
-          scopedSlots: {customRender: 'contactSlot'}
         },
         {title: '电话', align: 'left', dataIndex: 'phone'},
         {title: '询盘时间', align: 'left', dataIndex: 'recordCtime'},
-        {title: '操作', align: 'center', dataIndex: 'action', scopedSlots: {customRender: 'action'}}
+        {title: '操作', align: 'center', dataIndex: 'action'}
       ]
       that.siteId = siteId;
       that.enquiryType = enquiryType;
@@ -179,32 +179,34 @@ export default {
     },
     // 恢复询盘
     handleRevert(userIds) {
-      this.$confirm({
+      const that = this
+
+      Modal.confirm({
         title: '恢复询盘',
         content: `您确定要恢复这 ${userIds.length} 个询盘吗？`,
-        centered: true,
         onOk: () => {
-          putAction(this.url.putRecycleBin, {no: userIds.join(',')}).then((res) => {
-            if (res.success) {
-              this.loadData(this.siteId);
-              this.handleOk()
-              this.handleClearSelection()
-              this.$message.success(`还原 ${userIds.length} 个询盘成功！`)
+          putAction(that.url.putRecycleBin, {no: userIds.join(',')}).then((res) => {
+
+            if (res.code === 200) {
+              that.loadData(that.siteId);
+              that.handleOk()
+              that.handleClearSelection()
+              createMessage.success(`还原 ${userIds.length} 个询盘成功！`)
             } else {
-              if (res.code == 403) {
-                this.$message.warning(res.message)
+              if (res.code === 403 || res.code === 401) {
+                createMessage.warning(res.message)
               } else {
-                this.$message.error('恢复失败！')
+                createMessage.error('恢复失败！')
               }
             }
           })
         }
-      })
+      });
     },
 
     loadData(siteId, arg) {
       if (!this.url.list) {
-        this.$message.error("请设置url.list属性!")
+        createMessage.error("请设置url.list属性!")
         return
       }
       //加载数据 若传入参数1则加载第一页的内容
@@ -225,7 +227,7 @@ export default {
           }
         }
         if (res.code === 510) {
-          this.$message.warning(res.message)
+          createMessage.warning(res.message)
         }
         this.loading = false;
       })