Merge branch 'cpq-dev' of wangfan/adweb3-web into master

package.json

@@ -53,6 +53,7 @@
     "@traptitech/markdown-it-katex": "^3.6.0",
     "md5": "^2.3.0",
     "mockjs": "^1.1.0",
+    "moment": "^2.30.1",
     "nprogress": "^0.2.0",
     "path-to-regexp": "^6.2.1",
     "pinia": "2.1.7",

pnpm-lock.yaml

@@ -104,6 +104,9 @@ importers:
       mockjs:
         specifier: ^1.1.0
         version: 1.1.0
+      moment:
+        specifier: ^2.30.1
+        version: 2.30.1
       nprogress:
         specifier: ^0.2.0
         version: 0.2.0
@@ -4522,6 +4525,9 @@ packages:
     resolution: {integrity: sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==}
     hasBin: true
 
+  moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==, tarball: https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz}
+
   mri@1.2.0:
     resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
     engines: {node: '>=4'}
@@ -10958,6 +10964,8 @@ snapshots:
     dependencies:
       commander: 11.1.0
 
+  moment@2.30.1: {}
+
   mri@1.2.0: {}
 
   mrmime@2.0.0: {}

src/api/manage/manage.ts

@@ -19,7 +19,7 @@ export function postAction(url, parameter, timeout) {
 }
 
 //post
-export function postAction2(url, parameter) {
+export function postActionBlob(url, parameter) {
   return defHttp.request({
     url: url,
     method: 'post',
@@ -44,13 +44,15 @@ export function postAction3(url, parameter) {
   })
 }
 
-export function postAction4(url, parameter) {
-  return defHttp.request({
+export function postActionForm(url, parameter) {
+  return defHttp.post({
     url: url,
-    method: 'post',
-    data: parameter,
-    timeout: 1000 * 60 * 3,
-  })
+    params: parameter,
+    timeout: 1000 * 120,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+  }, { isTransformResponse: false, successMessageMode: 'none' })
 }
 
 export function postAction5(url, parameter, timeout) {
@@ -177,3 +179,23 @@ export function uploadAction(url, parameter) {
   })
 }
 
+/**
+ * 获取文件服务访问路径
+ * @param avatar
+ * @param subStr
+ * @returns {*}
+ */
+export function getFileAccessHttpUrl(avatar, subStr) {
+  if (!subStr) subStr = 'http'
+  try {
+    if (avatar && avatar.startsWith(subStr)) {
+      return avatar;
+    } else {
+      if (avatar && avatar.length > 0 && avatar.indexOf('[') == -1) {
+        return window._CONFIG['staticDomainURL'] + "/" + avatar;
+      }
+    }
+  } catch (err) {
+    return;
+  }
+}

src/assets/enquiry/enquiryListTop3.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve">
+<title>待阅读询盘</title>
+<desc>Created with Sketch.</desc>
+<g id="页面-1">
+	<g id="待阅读询盘">
+		<path id="形状" d="M151.9,193.2c-1.1,0-2.3-0.4-3.2-1.2L115.9,164H4.9c-2.7,0-4.9-2.2-4.9-5V26.7c0-2.8,2.2-5,4.9-5h176.8
+			c2.7,0,4.9,2.2,4.9,5V159c0,2.8-2.2,5-4.9,5h-21.4l-3.6,24.9c-0.3,1.8-1.5,3.4-3.1,4C153,193,152.4,193.2,151.9,193.2z M9.9,154
+			h107.8c1.2,0,2.3,0.4,3.2,1.2l27.4,23.3l3-20.3c0.4-2.4,2.4-4.3,4.9-4.3h20.7V31.7H9.9V154z"/>
+		<g id="编组" transform="translate(23.000000, 76.426630)">
+			<path id="路径" d="M27,17.8H5.3c-2.7,0-4.9-2.5-4.9-5.6s2.2-5.6,4.9-5.6H27c2.7,0,4.9,2.5,4.9,5.6C32,15.3,29.8,17.8,27,17.8z"
+				/>
+			<path id="路径_1_" d="M79.1,17.8h-26c-2.7,0-4.9-2.5-4.9-5.6s2.2-5.6,4.9-5.6h26c2.7,0,4.9,2.5,4.9,5.6S81.8,17.8,79.1,17.8z"
+				/>
+			<path id="路径_2_" d="M126.9,17.8h-21.7c-2.7,0-4.9-2.5-4.9-5.6s2.2-5.6,4.9-5.6h21.7c2.7,0,4.9,2.5,4.9,5.6
+				S129.6,17.8,126.9,17.8z"/>
+		</g>
+		<ellipse id="椭圆形" cx="179.8" cy="27.4" rx="20.2" ry="20.6"/>
+	</g>
+</g>
+</svg>

src/assets/enquiry/enquiryListTop4.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#333333;}
+</style>
+<title>累计</title>
+<desc>Created with Sketch.</desc>
+<g id="页面-1">
+	<g id="累计">
+		<path id="形状" class="st0" d="M196.6,93.4L166.9,80l30-14.7c1.7-0.8,2.8-2.6,2.7-4.5c0-1.9-1.2-3.6-2.9-4.4L102,13.9
+			c-1.3-0.6-2.7-0.6-4,0L3.4,56.6c-1.7,0.7-2.9,2.4-2.9,4.3c0,1.9,1,3.6,2.7,4.4l30,14.7L3.3,93.4c-1.6,0.8-2.8,2.5-2.8,4.4
+			s1,3.6,2.7,4.4l30.4,14.9L3.4,130.9c-1.7,0.8-2.8,2.5-2.9,4.4c0,1.9,1,3.6,2.7,4.4l94.6,46.4c0.7,0.3,1.4,0.5,2.1,0.5
+			c0.8,0,1.5-0.2,2.1-0.5l94.6-46.4c1.7-0.8,2.8-2.6,2.7-4.5c0-1.9-1.1-3.6-2.9-4.4l-30.3-13.7l30.4-14.9c1.7-0.8,2.7-2.5,2.7-4.4
+			v-0.1C199.5,95.9,198.3,94.2,196.6,93.4z M16.7,61.2L100,23.6l83.3,37.6L100,102L16.7,61.2z M100,176.2l-83.3-40.9l26.1-11.8
+			c0.6-0.3,1.2-0.7,1.7-1.2l53.3,26.2c1.3,0.6,2.9,0.7,4.3,0l53.1-26.1c0.4,0.4,0.9,0.7,1.4,0.9l26.6,12L100,176.2z M100,138.9
+			L16.7,98.1l26.1-11.7c0.5-0.2,1-0.6,1.3-0.9l53.7,26.3c1.3,0.6,2.8,0.7,4.3,0l53.7-26.3c0.4,0.4,0.9,0.7,1.4,0.9L183.3,98
+			L100,138.9z"/>
+	</g>
+</g>
+</svg>

src/assets/less/home.less

@@ -12,7 +12,6 @@
     margin-bottom: 15px;
 
     .t1 {
-      color: #fff;
       font-size: 18px;
       margin-right: 5px
     }

src/components/Modal/src/index.less

@@ -41,7 +41,7 @@
   }
 
   .ant-modal-body {
-    padding: 0;
+    padding: 24px;
 
     > .scrollbar > .scrollbar__bar.is-horizontal {
       display: none;
@@ -57,7 +57,7 @@
   }
 
   .ant-modal-header {
-    padding: 16px;
+    padding: 16px 24px;
   }
 
   .ant-modal-content {

src/components/adweb/selectSite.vue

@@ -1,193 +1,185 @@
 <template>
-  <span>
-    <a-select show-search
-              option-filter-prop="children"
-              :filterOption="filterOption"
-              v-model="siteCode" @change="changeUser" :style="'width:'+selectWidth">
+  <span v-if="siteinfo.length > 1">
+    <a-select
+      show-search
+      option-filter-prop="children"
+      :filterOption="filterOption"
+      v-model:value="siteCode"
+      @change="changeUser"
+      :style="'width:' + selectWidth"
+    >
       <a-select-option v-for="data in siteinfo" :key="data.code" :value="data.code" :info="data">
         {{ data.name }}
       </a-select-option>
     </a-select>
 
-    <a-modal
-      title="温馨提示"
-      :visible="visible"
-      :closable="false"
-      :keyboard="false"
-      :maskClosable="false"
-      :footer="null"
-      centered
-      dialogClass="wp-tips"
-    >
-      <div style="text-align: center;line-height: 2">
-         <p>您当前选择的是 WordPress 嵌套网站，需要在系统操作之前，请返回首页重新选择站点操作。本网站的产品类型是 {{
-             productType
-           }}。</p>
-          <router-link :to="{ path: '/websiteManage/dashboard/analysis' }">
-            <a-button type="primary">返回首页</a-button>
-          </router-link>
+    <a-modal title="温馨提示" :open="visible" :closable="false" :keyboard="false" :maskClosable="false" :footer="null" centered dialogClass="wp-tips">
+      <div style="text-align: center; line-height: 2">
+        <p>您当前选择的是 WordPress 嵌套网站，需要在系统操作之前，请返回首页重新选择站点操作。本网站的产品类型是 {{ productType }}。</p>
+        <router-link :to="{ path: '/websiteManage/dashboard/analysis' }">
+          <a-button type="primary">返回首页</a-button>
+        </router-link>
       </div>
     </a-modal>
   </span>
-
 </template>
 
 <script>
-import {getAction, postAction} from '/@/api/manage/manage'
-
-import {useMessage} from '/@/hooks/web/useMessage';
-
-const {createMessage, createConfirm} = useMessage();
-export default {
-  data() {
-    return {
-      siteinfo: [],
-      siteCode: '',
-      selectSiteInfo: {},
-      visible: false,
-      productType: ''
-    }
-  },
-  props: {
-    comProps: {},
-    siteListUrl: {
-      default: '/adweb/adwebSite/getSiteListByUid'
+  import { getAction, postAction } from '/@/api/manage/manage';
+
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const { createMessage, createConfirm } = useMessage();
+
+  export default {
+    name: 'SelectSite',
+    props: {
+      comProps: {},
+      siteListUrl: {
+        default: '/adweb/adwebSite/getSiteListByUid',
+      },
+      selectWidth: {
+        default: '300px',
+      },
     },
-    selectWidth: {
-      default: '300px'
-    }
-  },
-  mounted() {
-    this.getSiteInfo()
-  },
-  methods: {
-    //进入获取站点code
-    getSiteInfo() {
-      let route = this.$route.name
-      let that = this
-      getAction(that.siteListUrl).then(function (res) {
-        if (res.code == 200) {
-          that.siteinfo = res.result
-          let isInSite = false
-          for (let i in res.result) {
-            if (localStorage.getItem('siteCode') !== null && res.result[i].code === localStorage.getItem('siteCode')) {
-              isInSite = true
-              that.selectSiteInfo = res.result[i]
+    data() {
+      return {
+        siteinfo: [],
+        siteCode: '',
+        selectSiteInfo: {},
+        visible: false,
+        productType: '',
+      };
+    },
+    watch: {
+      // siteinfo(newVal) {
+      //   this.$emit('setSiteInfo', newVal)
+      // }
+    },
+    mounted() {
+      this.getSiteInfo();
+    },
+    methods: {
+      //进入获取站点code
+      getSiteInfo() {
+        let that = this;
+        getAction(that.siteListUrl).then(function (res) {
+          if (res.code === 200) {
+            that.siteinfo = res.result;
+            let isInSite = false;
+            for (let i in res.result) {
+              if (localStorage.getItem('siteCode') !== null && res.result[i].code === localStorage.getItem('siteCode')) {
+                isInSite = true;
+                that.selectSiteInfo = res.result[i];
+              }
             }
+            if (localStorage.getItem('siteCode') !== null && isInSite) {
+              that.siteCode = localStorage.getItem('siteCode');
+            } else {
+              that.siteCode = res.result[0].code;
+              that.selectSiteInfo = res.result[0];
+              localStorage.setItem('siteCode', res.result[0].code);
+            }
+            that.$nextTick(() => {
+              that.$emit('setSiteInfo', res.result, that.selectSiteInfo);
+            });
+            // if(route == 'websiteManage-dashboard-analysis'){
+            //   that.getPermissionList(that.siteCode)
+            // }
+            // that.getAllInfo()
+          } else {
+            createMessage.error('站点获取失败，请刷新重试');
           }
-          if (localStorage.getItem('siteCode') !== null && isInSite) {
-            that.siteCode = localStorage.getItem("siteCode")
+        });
+      },
+
+      //改变站点
+      changeUser(value, e) {
+        let that = this;
+        let route = this.$route.name;
+        that.siteCode = value;
+        localStorage.setItem('siteCode', value);
+
+        postAction('/adweb/adwebSiteManage/queryWordPressConfig', { siteCode: value }).then(function (res) {
+          if (
+            res.code == 200 &&
+            res.result.wordpressSwitch &&
+            res.result.wordpressSwitch == 1 &&
+            (route == 'pageManage-allPage' ||
+              route == 'pageManage-addPage' ||
+              route == 'website-enterpriseInfo-baseInfo' ||
+              route == 'website-enterpriseInfo-bannerAdv' ||
+              route == 'website-enterpriseInfo-customRevier' ||
+              route == 'website-enterpriseInfo-enterpriseintroduction' ||
+              route == 'company-advantage' ||
+              route == 'website-enterpriseInfo-projectApplication' ||
+              route == 'website-enterpriseInfo-honor' ||
+              route == 'website-productSummary-productList5684' ||
+              route == 'website-productSummary-category' ||
+              route == 'website-productSummary-productsTag' ||
+              route == 'product-draft' ||
+              route == 'website-productSummary-productList' ||
+              route == 'website-productSummary-downloadDocument' ||
+              route == 'website-productSummary-faq' ||
+              route == 'website-productSummary-productAdd' ||
+              route == 'website-newsSummary-category' ||
+              route == 'website-newsSummary-contentTag' ||
+              route == 'website-newsSummary-AdwebMaterialNewsList' ||
+              route == 'websit-newsSummary-addContent' ||
+              route == 'website-enterpriseInfo-enterprisehistory' ||
+              route == 'website-enterpriseInfo-FactoryEnvironment' ||
+              route == 'website-enterpriseInfo-serviceGuarantee' ||
+              route == 'website-enterpriseInfo-QuestionList' ||
+              route == 'website-enterpriseInfo-socialmedialinks' ||
+              route == 'website-productSummary-category1' ||
+              route == 'website-productSummary-productList1' ||
+              route == 'website-newsSummary-category1' ||
+              route == 'operate-blog-update')
+          ) {
+            that.productType = res.result.productType;
+            that.visible = true;
           } else {
-            that.siteCode = res.result[0].code
-            that.selectSiteInfo = res.result[0]
-            localStorage.setItem("siteCode", res.result[0].code)
+            // that.getPermissionList(value)
+            that.$emit('comMethods', value, e);
           }
-          that.$nextTick(() => {
-            that.$emit('setSiteInfo', res.result, that.selectSiteInfo)
-          })
-          // if(route == 'websiteManage-dashboard-analysis'){
-          //   that.getPermissionList(that.siteCode)
-          // }
-          // that.getAllInfo()
-        } else {
-          createMessage.error('站点获取失败，请刷新重试');
-        }
-      })
-    },
-
-
-    //改变站点
-    changeUser(value, e) {
-      let that = this
-      let route = this.$route.name
-      that.siteCode = value
-      localStorage.setItem("siteCode", value)
-
-      postAction('/adweb/adwebSiteManage/queryWordPressConfig', {siteCode: value}).then(function (res) {
-        if (res.code == 200 && res.result.wordpressSwitch && res.result.wordpressSwitch == 1
-          && (route == 'pageManage-allPage'
-            || route == 'pageManage-addPage'
-
-            || route == 'website-enterpriseInfo-baseInfo'
-            || route == 'website-enterpriseInfo-bannerAdv'
-            || route == 'website-enterpriseInfo-customRevier'
-            || route == 'website-enterpriseInfo-enterpriseintroduction'
-            || route == 'company-advantage'
-            || route == 'website-enterpriseInfo-projectApplication'
-            || route == 'website-enterpriseInfo-honor'
-            || route == 'website-productSummary-productList5684'
-
-            || route == 'website-productSummary-category'
-            || route == 'website-productSummary-productsTag'
-            || route == 'product-draft'
-            || route == 'website-productSummary-productList'
-            || route == 'website-productSummary-downloadDocument'
-            || route == 'website-productSummary-faq'
-            || route == 'website-productSummary-productAdd'
-
-            || route == 'website-newsSummary-category'
-            || route == 'website-newsSummary-contentTag'
-            || route == 'website-newsSummary-AdwebMaterialNewsList'
-            || route == 'websit-newsSummary-addContent'
-            || route == 'website-enterpriseInfo-enterprisehistory'
-            || route == 'website-enterpriseInfo-FactoryEnvironment'
-            || route == 'website-enterpriseInfo-serviceGuarantee'
-            || route == 'website-enterpriseInfo-QuestionList'
-            || route == 'website-enterpriseInfo-socialmedialinks'
-
-            || route == 'website-productSummary-category1'
-            || route == 'website-productSummary-productList1'
-            || route == 'website-newsSummary-category1'
-            || route == 'operate-blog-update')
-
-        ) {
-          that.productType = res.result.productType
-          that.visible = true;
-        } else {
-          // that.getPermissionList(value)
-          that.$emit('comMethods', value, e)
-        }
-      })
+        });
+      },
+
+      //站点搜索
+      filterOption(input, option) {
+        return `${option.info.name}`.toLowerCase().includes(`${input || ''}`.toLowerCase());
+      },
+
+      // getPermissionList(value){
+      //   let that = this
+      //   that.$store.dispatch('GetPermissionList', value).then(res => {
+      //     const menuData = res.result.menu;
+      //     if (menuData === null || menuData === "" || menuData === undefined) {
+      //       return;
+      //     }
+      //     let constRoutes = [];
+      //     constRoutes = generateIndexRouter(menuData);
+      //     that.$store.dispatch('UpdateAppRouter',  { constRoutes }).then(() => {
+      //       router.addRoutes(store.getters.addRouters)
+      //     })
+      //   })
+      // }
     },
-
-    //站点搜索
-    filterOption(input, option) {
-
-      return `${option.info.name}`.toLowerCase().includes(`${input || ''}`.toLowerCase())
-    },
-
-    // getPermissionList(value){
-    //   let that = this
-    //   that.$store.dispatch('GetPermissionList', value).then(res => {
-    //     const menuData = res.result.menu;
-    //     if (menuData === null || menuData === "" || menuData === undefined) {
-    //       return;
-    //     }
-    //     let constRoutes = [];
-    //     constRoutes = generateIndexRouter(menuData);
-    //     that.$store.dispatch('UpdateAppRouter',  { constRoutes }).then(() => {
-    //       router.addRoutes(store.getters.addRouters)
-    //     })
-    //   })
-    // }
-
-
-  }
-}
+  };
 </script>
 
 <style lang="less">
-.wp-tips {
-  .ant-modal-header {
-    padding: 10px;
-  }
+  .wp-tips {
+    .ant-modal-header {
+      padding: 10px;
+    }
 
-  .ant-modal-body {
-    padding: 24px;
+    .ant-modal-body {
+      padding: 24px;
 
-    p {
-      margin-bottom: 10px;
+      p {
+        margin-bottom: 10px;
+      }
     }
   }
-}
 </style>

src/hooks/component/JeecgListMixin.js

@@ -0,0 +1,240 @@
+/**
+ * 新增修改完成调用 modalFormOk方法 编辑弹框组件ref定义为modalForm
+ * 高级查询按钮调用 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 {useMessage} from "@/hooks/web/useMessage";
+const { createMessage } = useMessage();
+export const JeecgListMixin = {
+  data() {
+    return {
+      //token header
+      tokenHeader: {'X-Access-Token': getToken()},
+      /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
+      queryParam: {},
+      /* 数据源 */
+      dataSource: [],
+      /* 分页参数 */
+      ipagination: {
+        current: 1,
+        pageSize: 30,
+        pageSizeOptions: ['15', '30', '50', '100'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条"
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
+      /* 排序参数 */
+      isorter: {
+        column: 'createTime',
+        order: 'desc',
+      },
+      /* 筛选参数 */
+      filters: {},
+      /* table加载状态 */
+      loading: false,
+      /* table选中keys*/
+      selectedRowKeys: [],
+      /* table选中records*/
+      selectionRows: [],
+      /* 查询折叠 */
+      toggleSearchStatus: false,
+      /* 高级查询条件生效状态 */
+      superQueryFlag: false,
+      /* 高级查询条件 */
+      superQueryParams: '',
+      /** 高级查询拼接方式 */
+      superQueryMatchType: 'and',
+    }
+  },
+  created() {
+
+    if (!this.disableMixinCreated) {
+      // console.log(' -- mixin created -- ')
+      this.loadData();
+      //初始化字典配置 在自己页面定义
+      this.initDictConfig();
+    }
+
+  },
+  methods: {
+    loadData(arg) {
+      if (!this.url.list) {
+        createMessage.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      getAction(this.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;
+      })
+    },
+    initDictConfig() {
+      // console.log("--这是一个假的方法!")
+    },
+    handleSuperQuery(params, matchType) {
+      //高级查询方法
+      if (!params) {
+        this.superQueryParams = ''
+        this.superQueryFlag = false
+      } else {
+        this.superQueryFlag = true
+        this.superQueryParams = JSON.stringify(params)
+        this.superQueryMatchType = matchType
+      }
+      this.loadData(1)
+    },
+    getQueryParams() {
+      //获取查询条件
+      let sqp = {}
+      if (this.superQueryParams) {
+        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+        sqp['superQueryMatchType'] = this.superQueryMatchType
+      }
+      var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      return filterObj(param);
+    },
+    getQueryField() {
+      //TODO 字段权限控制
+      var str = "id,";
+      this.columns.forEach(function (value) {
+        str += "," + value.dataIndex;
+      });
+      return str;
+    },
+
+    onSelectChange(selectedRowKeys, selectionRows) {
+      this.selectedRowKeys = selectedRowKeys;
+      this.selectionRows = selectionRows;
+    },
+    onClearSelected() {
+      this.selectedRowKeys = [];
+      this.selectionRows = [];
+    },
+    searchQuery() {
+      this.loadData(1);
+      this.onClearSelected()
+    },
+    superQuery() {
+      this.$refs.superQueryModal.show();
+    },
+    searchReset() {
+      this.queryParam = {}
+      this.loadData(1);
+      this.onClearSelected();
+    },
+
+    handleDelete: function (id) {
+      if (!this.url.delete) {
+        createMessage.error("请设置url.delete属性!")
+        return
+      }
+      var that = this;
+      deleteAction(that.url.delete, {id: id}).then((res) => {
+        if (res.success) {
+          that.$message.success(res.message);
+          that.loadData();
+          that.onClearSelected();
+        } else {
+          that.$message.warning(res.message);
+        }
+      });
+    },
+    handleEdit: function (record) {
+      this.$refs.modalForm.edit(record);
+      this.$refs.modalForm.title = "编辑";
+      this.$refs.modalForm.disableSubmit = false;
+    },
+    handleAdd: function () {
+      this.$refs.modalForm.add();
+      this.$refs.modalForm.title = "新增";
+      this.$refs.modalForm.disableSubmit = false;
+    },
+    handleTableChange(pagination, filters, sorter) {
+      //分页、排序、筛选变化时触发
+      //TODO 筛选
+      if (Object.keys(sorter).length > 0 && sorter.column) {
+        this.isorter.column = sorter.field;
+        this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+      } else {
+        this.isorter.column = 'createTime';
+        this.isorter.order = 'desc';
+      }
+      this.ipagination = pagination;
+      this.loadData();
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus;
+    },
+
+    handleDetail: function (record) {
+      this.$refs.modalForm.edit(record);
+      this.$refs.modalForm.title = "详情";
+      this.$refs.modalForm.disableSubmit = true;
+    },
+    /* 导出 */
+    handleExportXls2() {
+      let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()));
+      let url = `${window._CONFIG['domianURL']}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`;
+      window.location.href = url;
+    },
+    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) {
+          createMessage.warning("文件下载失败")
+          return
+        }
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(new Blob([data], {type: 'application/vnd.ms-excel'}), fileName + '.xls')
+        } 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 + '.xls')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        }
+      })
+    }
+  }
+
+}

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

@@ -5,307 +5,118 @@ import { render } from '/@/utils/common/renderUtils';
 import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
-  {
-    title: '询盘来源IP',
-    align: "center",
-    dataIndex: 'fromIp'
-  },
-  {
-    title: '询盘发送者邮箱账号',
-    align: "center",
-    dataIndex: 'fromEmail'
-  },
-  {
-    title: '询盘模块：admp_web：admp网站询盘 ；email：邮件询盘  ；diy_element：自定义组件询盘',
-    align: "center",
-    dataIndex: 'modular'
-  },
-  {
-    title: '发送人姓名',
-    align: "center",
-    dataIndex: 'fromUser'
-  },
-  {
-    title: '0删除，1有效，默认值1   2：待解析  3:数据解析中 4.解析失败',
-    align: "center",
-    dataIndex: 'status'
-  },
-  {
-    title: '数据解析次数',
-    align: "center",
-    dataIndex: 'dealCount'
-  },
-  {
-    title: '系统有效性  0：无效       1；有效 后台字段',
-    align: "center",
-    dataIndex: 'sysEffective'
-  },
-  {
-    title: '用户有效性  0：无效       1：有效   2 : 待定 取自字典表',
-    align: "center",
-    dataIndex: 'userEffective'
-  },
-  {
-    title: '敏感信息',
-    align: "center",
-    dataIndex: 'sensitiveMessage'
-  },
-  {
-    title: '询盘阶段,由跟踪来决定（1：待沟通 ；2：沟通中；3：成单；4;放弃）',
-    align: "center",
-    dataIndex: 'phase'
-  },
-  {
-    title: '跟进跟进状态,由跟踪来决定（1：待跟进 ；2：跟进中；3：完成；4;停止）',
-    align: "center",
-    dataIndex: 'trackStatus'
-  },
-  {
-    title: '询盘所属用户主账号ID',
-    align: "center",
-    dataIndex: 'uid'
-  },
-  {
-    title: '询盘跟进人 id',
-    align: "center",
-    dataIndex: 'tracker'
-  },
-  {
-    title: '询盘创建时间',
-    align: "center",
-    dataIndex: 'recordCtime'
-  },
-  {
-    title: 'ADMP平台创建时间',
-    align: "center",
-    dataIndex: 'ctime'
-  },
-  {
-    title: '国家/地区（根据ip获取）',
-    align: "center",
-    dataIndex: 'country'
-  },
-  {
-    title: '通过ip解析获得国家码',
-    align: "center",
-    dataIndex: 'countryIsoCode'
-  },
-  {
-    title: '通过ip解析获得区域码',
-    align: "center",
-    dataIndex: 'areaIsoCode'
-  },
-  {
-    title: '询盘插件名称，名称小写，如：wpforms',
-    align: "center",
-    dataIndex: 'pluginName'
-  },
-  {
-    title: '站点code，关联站点表',
-    align: "center",
-    dataIndex: 'siteCode'
-  },
-  {
-    title: '站点token',
-    align: "center",
-    dataIndex: 'siteToken'
-  },
-  {
-    title: '询盘来自站点的域名',
-    align: "center",
-    dataIndex: 'siteHost'
-  },
-  {
-    title: '询盘原站点记录ID',
-    align: "center",
-    dataIndex: 'recordId'
-  },
-  {
-    title: '状态更新时间',
-    align: "center",
-    dataIndex: 'utime'
-  },
-  {
-    title: '回复时间',
-    align: "center",
-    dataIndex: 'replyTime'
-  },
-  {
-    title: '转发状态：0未转发，1已转发，默认值0',
-    align: "center",
-    dataIndex: 'forward'
-  },
-  {
-    title: '转发时间',
-    align: "center",
-    dataIndex: 'forwardTime'
-  },
-  {
-    title: '访客id',
-    align: "center",
-    dataIndex: 'visitId'
-  },
-  {
-    title: '来源于站点的id',
-    align: "center",
-    dataIndex: 'siteId'
-  },
-  {
-    title: '公司id',
-    align: "center",
-    dataIndex: 'companyId'
-  },
-  {
-    title: '联系人id，字符串组合',
-    align: "center",
-    dataIndex: 'contactIds'
-  },
-  {
-    title: '定时器任务修改查询唯一标识（10位随机数）',
-    align: "center",
-    dataIndex: 'jobId'
-  },
-  {
-    title: '回复状态',
-    align: "center",
-    dataIndex: 'replayStatus'
-  },
-  {
-    title: '外部编号',
-    align: "center",
-    dataIndex: 'noOut'
-  },
-  {
-    title: '处理后的询盘当地时间字段',
-    align: "center",
-    dataIndex: 'modifyRecordCtime'
-  },
-  {
-    title: 'transContent',
-    align: "center",
-    dataIndex: 'transContent'
-  },
-  {
-    title: '国家code',
-    align: "center",
-    dataIndex: 'countryCode'
-  },
-  {
-    title: '国家名',
-    align: "center",
-    dataIndex: 'countryName'
-  },
-  {
-    title: 'whatsApp',
-    align: "center",
-    dataIndex: 'whatsApp'
-  },
-  {
-    title: '0：不是；1：是',
-    align: "center",
-    dataIndex: 'wasteEnquiry'
-  },
-  {
-    title: '推送状态，0：待发送，1：成功，2不予发送',
-    align: "center",
-    dataIndex: 'pushStatus'
-  },
-  {
-    title: '推送错误次数',
-    align: "center",
-    dataIndex: 'pushErrorNum'
-  },
-  {
-    title: '姓名',
-    align: "center",
-    dataIndex: 'name'
-  },
-  {
-    title: '邮箱地址',
-    align: "center",
-    dataIndex: 'email'
-  },
-  {
-    title: '询盘信息',
-    align: "center",
-    dataIndex: 'message'
-  },
-  {
-    title: '公司名称',
-    align: "center",
-    dataIndex: 'company'
-  },
-  {
-    title: '来源页面',
-    align: "center",
-    dataIndex: 'fromPage'
-  },
-  {
-    title: 'form表单传入Ip',
-    align: "center",
-    dataIndex: 'customerIp'
-  },
-  {
-    title: '手机号',
-    align: "center",
-    dataIndex: 'phone'
-  },
-  {
-    title: 'whatsapp',
-    align: "center",
-    dataIndex: 'whatsapp'
-  },
-  {
-    title: '阅读状态，0是未阅读，1是已阅读',
-    align: "center",
-    dataIndex: 'readStatus'
-  },
-  {
-    title: '负责人的id',
-    align: "center",
-    dataIndex: 'principalUid'
-  },
-  {
-    title: '0代表系统根据规则分配，1代表主账户指定',
-    align: "center",
-    dataIndex: 'principalType'
-  },
-  {
-    title: 'form表单中的地址',
-    align: "center",
-    dataIndex: 'address'
-  },
-  {
-    title: '客户自定义字段',
-    align: "center",
-    dataIndex: 'specialField'
-  },
-  {
-    title: '向Wp发送请求时间',
-    align: "center",
-    dataIndex: 'requestTime'
-  },
-  {
-    title: 'Adweb实时获取WebHookS消息时间，定时器无该值',
-    align: "center",
-    dataIndex: 'acquireMessageTime'
-  },
-  {
-    title: '疑似垃圾询盘理由',
-    align: "center",
-    dataIndex: 'effectiveReason'
-  },
-  {
-    title: '垃圾询盘类型，关键词：keyword，邮箱：email，ip: ip，其他：other',
-    align: "center",
-    dataIndex: 'wasteEnquiryType'
-  },
-  {
-    title: '询盘关联产品',
-    align: "center",
-    dataIndex: 'cartItems'
-  },
-];
+    {
+      title: '站点名称',
+      align: 'left',
+      dataIndex: 'siteName',
+      resizable: true,
+    },
+    {
+      title: '姓名',
+      align: 'left',
+      dataIndex: 'contact',
+
+    },
+    {
+      title: '邮箱',
+      align: 'left',
+      dataIndex: 'fromEmail',
+      resizable: true,
+    },
+    {
+      title: 'whatsApp',
+      align: 'left',
+      dataIndex: 'whatsApp',
+      customRender: function ({text, record}) {
+        if (text == null || text == '' || text == undefined) {
+          return '--'
+        } else {
+          return text
+        }
+      }
+    },
+
+    {
+      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: 'userEffective',
+    },
+    {
+      title: '来源国家',
+      align: 'left',
+      dataIndex: 'countryName',
+      customRender: function ({text, record}) {
+        if (text == null || text == '' || text == undefined) {
+          return '--'
+        } else {
+          return text
+        }
+      }
+    },
+    {
+      title: '来源插件',
+      align: 'left',
+      dataIndex: 'pluginName',
+    },
+    {
+      title: '询盘时间',
+      align: 'left',
+      resizable: true,
+      dataIndex: 'recordCtime',
+      customRender: function ({text, record}) {
+        return !text ? '' : (text.length > 16 ? text.substr(0, 16) : text)
+      }
+    }
+  ];
 
 // 高级查询数据
 export const superQuerySchema = {

src/views/adweb/enquiry/AdwebEnquiryList.vue

@@ -1,118 +1,769 @@
 <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="r2">
+      <a-col :span="8">
+        <p class="t1"><img :src="toReadImg"/>待阅读询盘</p>
+        <p class="t2" @click="getList('noRead')">{{ enquiryNums.noRead }}</p>
+      </a-col>
+      <a-col :span="8">
+        <p class="t1"><img :src="toClassified"/>待分类询盘</p>
+        <p class="t2" @click="getList('wait')">{{ enquiryNums.wait }}</p>
+      </a-col>
+      <a-col :span="8">
+        <p class="t1"><img :src="toTotal"/>累计询盘</p>
+        <p class="t2" @click="getList('all')">{{ enquiryNums.all }}</p>
+      </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-input placeholder="询盘内容" v-model:value="queryParam.searchContent"></a-input>
+      </a-col>
+      <a-col flex="2">
+        <a-select
+                  :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>
+        </a-select>
+      </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 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>
+
+        <template v-if="haveSubAccount && !isForwardSite">
+          <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">
+            调整跟进人
+          </a>
+        </template>
+
+        <template v-if="isForwardSite" @click="forwardDetailAll">
+          <a-divider type="vertical" />
+          <a @click="forwardDetailAll">
+            转发
+          </a>
+        </template>
+
+        <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="enquiryRecord(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>
     </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>
+
   </div>
 </template>
 
 <script lang="ts" name="adweb-adwebEnquiry" setup>
-  import { ref, reactive } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  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 { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './AdwebEnquiry.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import AdwebEnquiryModal from './components/AdwebEnquiryModal.vue'
+  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 userStore = useUserStore();
+  const selectSiteRef = ref(null);
+  const { createMessage } = useMessage();
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {
       title: '询盘信息存储表单',
       api: list,
       columns,
-      canResize:false,
+      canResize: false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        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: "询盘信息存储表单",
+      name: '询盘列表',
       url: getExportUrl,
       params: queryParam,
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
   });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-  const labelCol = reactive({
-    xs:24,
-    sm:4,
-    xl:6,
-    xxl:4
+  const [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,
   });
-  const wrapperCol = reactive({
-    xs: 24,
-    sm: 20,
+
+  // 过滤日期范围
+  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
+        }
+      }
+
+      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;
+      }
+    });
+  }
+
+  // 获取子账户的下拉框选项
+  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)
+
+      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;
+    });
+  }
+
+  //询盘详情
+  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;
+  }
+
+  //回收箱
+  async function recycleBinVisible() {
+
+    await nextTick();
+
+    if (XpRecycleBinModalRef.value && XpRecycleBinModalRef.value.init) {
+      XpRecycleBinModalRef.value.init(queryParam.siteId, '1,2');
+    }
+  }
+
   // 高级查询配置
   const superQueryConfig = reactive(superQuerySchema);
 
@@ -133,7 +784,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -141,7 +792,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -149,28 +800,28 @@
     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();
   }
-   
+
   /**
    * 操作栏
    */
@@ -182,7 +833,7 @@
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -191,24 +842,27 @@
       {
         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();
   }
-  
+
   /**
    * 重置
    */
@@ -218,34 +872,98 @@
     //刷新数据
     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{
+
+    .query-group-cust {
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
-      text-align: center
+      text-align: center;
     }
-    .ant-form-item:not(.ant-form-item-with-help){
+
+    .ant-form-item:not(.ant-form-item-with-help) {
       margin-bottom: 16px;
       height: 32px;
     }
-    :deep(.ant-picker),:deep(.ant-input-number){
+
+    :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;
+        }
+      }
+
+      &.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/AdwebEnquiryListCopy.vue

@@ -0,0 +1,1427 @@
+<template>
+  <div class="p-2">
+    <a-row class="r1" :gutter="8">
+      <a-col :xl="7" :xxl="6" v-if="siteList.length > 1">
+        <div class="choose-site">
+          <span class="t1">站点：</span>
+          <select-site @comMethods="changeSite"/>
+        </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="r2">
+      <a-col :span="8">
+        <p class="t1"><img :src="toReadImg"/>待阅读询盘</p>
+        <p class="t2" @click="getList('noRead')">{{ enquiryNums.noRead }}</p>
+      </a-col>
+      <a-col :span="8">
+        <p class="t1"><img :src="toClassified"/>待分类询盘</p>
+        <p class="t2" @click="getList('wait')">{{ enquiryNums.wait }}</p>
+      </a-col>
+      <a-col :span="8">
+        <p class="t1"><img :src="toTotal"/>累计询盘</p>
+        <p class="t2" @click="getList('all')">{{ enquiryNums.all }}</p>
+      </a-col>
+    </a-row>
+
+    <a-row class="r3" type="flex" :gutter="8">
+      <a-col flex="2">
+        <a-input placeholder="邮箱/姓名/国家" v-model="queryParam.searchText"></a-input>
+      </a-col>
+      <a-col flex="2">
+        <a-input placeholder="询盘内容" v-model="queryParam.searchContent"></a-input>
+      </a-col>
+      <a-col flex="2">
+        <a-select v-model="queryParam.userEffective"
+                  :allowClear="true"
+                  placeholder="全部分类"
+                  style="width: 100%"
+        >
+          <a-select-option :key="2" :value="2">待分类</a-select-option>
+          <a-select-option :key="1" :value="1">有效询盘</a-select-option>
+        </a-select>
+      </a-col>
+      <a-col flex="2">
+        <a-select v-model="queryParam.readStatus"
+                  :allowClear="true"
+                  placeholder="全部阅读状态"
+                  style="width: 100%"
+        >
+          <a-select-option value="0">
+            未读
+          </a-select-option>
+          <a-select-option value="1">
+            已读
+          </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>
+
+    <a-flex class="r4" vertical>
+
+      <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>
+        <a @click="enquiryReady" style="margin-left: 24px">标为已读</a>
+        <a v-if="haveSubAccount && siteCode !== dictSiteCode"
+           :style="(userRole.indexOf('admin') > -1 || userRole.indexOf('adweb_admin') > -1 || userRole.indexOf('adweb_seo_manager') > -1 || userRole.indexOf('adweb_site_manager') > -1) ? 'margin-left: 24px;pointer-events: none;' : 'margin-left: 24px;'"
+           @click="showEditPrincipalModal">
+          调整跟进人
+        </a>
+        <a v-if="siteCode === dictSiteCode" @click="forwardDetailAll" style="margin-left: 24px">
+          转发
+        </a>
+        <a @click="enquiryDeleteAll" style="margin-left: 24px">删除</a>
+      </div>
+
+      <a-table
+        :columns="defColumns"
+        :data-source="dataSource"
+        size="middle"
+        :scroll="{x:true}"
+        :rowKey="record => record.id"
+        :pagination="ipagination"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange"
+      >
+        <template slot="readStatus" slot-scope="text,record">
+          <a v-if="text == 0" class="theme-color" @click="enquiryDetail(record)">未读</a>
+          <span v-else>已读</span>
+        </template>
+        <template slot="principalUidSlot" slot-scope="text,record">
+          <a-select placeholder="请选择跟进人"
+                    v-model="record.principalUid"
+                    style="width: 180px;"
+                    showSearch
+                    :filterOption="filterOption"
+                    @change="selectPrincipal(record)"
+                    :disabled="userRole.indexOf('admin') > -1 || userRole.indexOf('adweb_admin') > -1 || userRole.indexOf('adweb_seo_manager') > -1 || userRole.indexOf('adweb_site_manager') > -1 || siteCode === dictSiteCode">
+            <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>
+        </template>
+        <template slot="tips" slot-scope="text">
+          <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 v-if="edition === 1" :href="text" target="_blank"
+                 style="text-decoration: underline">Home</a>
+              <span v-else>Home</span>
+            </template>
+            <template v-else>
+              <a v-if="edition === 1" :href="text" target="_blank"
+                 style="text-decoration: underline">{{
+                  text.substring(text.lastIndexOf('/') + 1).slice(0, 45) + (text.substring(text.lastIndexOf('/') + 1).length > 45 ? "..." : "")
+                }}</a>
+              <span v-else>{{ text.substring(text.lastIndexOf('/') + 1) }}</span>
+            </template>
+          </template>
+          <template v-else-if="text.indexOf('http') > 0">
+            <a v-if="edition === 1" :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>
+            <span v-else>{{ text.substring(0, text.indexOf('http')) }}</span>
+          </template>
+          <template v-else>-</template>
+        </template>
+
+        <template slot="userEffective" slot-scope="text, record">
+          <a class="theme-color" v-if="text === 2"
+             @click="enquiryDetail(record)">{{ record.userEffectiveStr }}</a>
+          <span v-else-if="text == 0" style="color: #fa8c16">{{ record.userEffectiveStr }}</span>
+          <span v-else>{{ record.userEffectiveStr }}</span>
+        </template>
+
+        <div slot="action" slot-scope="text, record" style="padding: 5px 8px;">
+          <a-tag v-if="siteCode === dictSiteCode" color="blue" @click="forwardDetail(record)"
+                 style="cursor:pointer;">
+            转发
+          </a-tag>
+          <a-tag color="purple" @click="enquiryDetail(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="enquiryRecord(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>
+        <div slot="contactSlot" slot-scope="text, record">
+          <div style="width: 150px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
+            {{ text }}
+          </div>
+        </div>
+        <div slot="filterDropdown">
+          <a-card>
+            <a-checkbox-group @change="onColSettingsChange" v-model="settingColumns"
+                              :defaultValue="settingColumns">
+              <a-row>
+                <template v-for="(item,index) in columns" v-if="item.dataIndex != 'pluginName'">
+                  <template v-if="item.dataIndex === 'action'"></template>
+                  <template v-else-if="item.dataIndex === 'principalUid'">
+                    <template v-if="haveSubAccount">
+                      <a-col :span="12">
+                        <a-checkbox :value="item.dataIndex">{{ item.title }}</a-checkbox>
+                      </a-col>
+                    </template>
+                  </template>
+                  <template v-else-if="item.dataIndex === 'siteName'">
+                    <template
+                      v-if="siteList !== null && siteList !== undefined && siteList.length >= 2">
+                      <a-col :span="12">
+                        <a-checkbox :value="item.dataIndex">{{ item.title }}</a-checkbox>
+                      </a-col>
+                    </template>
+                  </template>
+                  <template v-else>
+                    <a-col :span="12">
+                      <a-checkbox :value="item.dataIndex">{{ item.title }}</a-checkbox>
+                    </a-col>
+                  </template>
+                </template>
+              </a-row>
+            </a-checkbox-group>
+          </a-card>
+        </div>
+        <div slot="copyEmail" slot-scope="text, record">
+          <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>
+
+        <div slot="detailsSlot" slot-scope="text, record">
+          <a @click="enquiryDetail(record)" style="margin: 0 10px 0 10px">
+            {{record.context ? record.context.substr(0, 50) : '--'}}</a>
+        </div>
+
+        <a-icon slot="filterIcon" type='setting' :style="{ fontSize:'16px',color:  '#108ee9' }"/>
+      </a-table>
+    </a-flex>
+
+    <!--访问记录-->
+    <enquiry-track ref="enquiryTrack"></enquiry-track>
+    <!--跟踪记录-->
+    <enquiry-genzong ref="enquiryGenzong"></enquiry-genzong>
+    <!--回收站-->
+    <xp-recycle-bin-modal ref="XpRecycleBinModal" @ok="getTableAndNum"/>
+    <!--询盘详情   reload用于子组件删除询盘功能刷新父组件table showDelBtn用于展示删除按钮-->
+    <enquiry-detail :userEffectiveOption="userEffectiveOption" :showDelBtn="true"
+                    @reload="getTableAndNum()" @ok="getTableAndNum"
+                    ref="enquiryDetail"></enquiry-detail>
+    <!--黑名单-->
+    <black-list ref="blackList" @ok="getTableAndNum"></black-list>
+    <!-- 调整产品跟进人 -->
+    <a-modal
+      title="跟进人"
+      :visible="modalVisible"
+      @ok="editPrincipal"
+      @cancel="cancelEditPrincipal"
+    >
+      <a-radio-group v-model="selectedUserId">
+        <a-radio :style="radioStyle" value="ALL">
+          所有人
+        </a-radio>
+        <a-radio v-for="item in subAccountOptions" :style="radioStyle" :value="item.id">
+          {{ item.username }}
+        </a-radio>
+      </a-radio-group>
+    </a-modal>
+
+    <!-- 转发询盘 -->
+    <a-modal
+      title="转发"
+      :visible="forwardVisible"
+      @ok="editForward"
+      @cancel="cancelEditForward"
+      :confirm-loading="forwardLoading"
+    >
+      <a-radio-group v-model="selectedUserId">
+        <!--        <a-radio :style="radioStyle" value="ALL">-->
+        <!--          所有人-->
+        <!--        </a-radio>-->
+        <a-radio v-for="item in otherSubAccountOptions" :style="radioStyle" :value="item.id">
+          {{ item.username }}
+        </a-radio>
+      </a-radio-group>
+    </a-modal>
+  </div>
+
+</template>
+
+<script>
+import toReadImg from '/@/assets/enquiry/enquiryListTop3.svg';
+import toClassified from '/@/assets/enquiry/enquiryListTop2.svg';
+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 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 Qs from 'qs'
+import selectSite from '/@/components/adweb/selectSite.vue'
+import '/@/assets/less/common.less'
+import moment from 'moment'
+import {useUserStore} from "@/store/modules/user";
+import {createLocalStorage} from "@/utils/cache";
+import {useMessage} from "@/hooks/web/useMessage";
+
+const $ls = createLocalStorage();
+const { createMessage } = useMessage();
+
+export default {
+  name: 'AdwebEnquiryList',
+  mixins: [JeecgListMixin],
+  components: {
+    enquiryTrack,
+    enquiryGenzong,
+    XpRecycleBinModal,
+    enquiryDetail,
+    blackList,
+    selectSite
+  },
+  data() {
+    return {
+      toReadImg,
+      toClassified,
+      toTotal,
+      userRole: '',
+      siteList: [],
+      userEffectiveOption: Array(),
+      userEffective: [],
+      excelLoading: false,
+      forwardLoading: false,
+      targetUserEffect: undefined,
+      rangeDate: undefined,
+      // 表头
+      settingColumns: [
+        'siteName',
+        'contact',
+        'fromEmail',
+        'phone',
+        'readStatus',
+        'principalUid',
+        'fromPage',
+        'userEffective',
+        'countryName',
+        'recordCtime',
+        'pluginName',
+        'action',
+      ],
+      columns: [
+        {
+          title: '站点名称',
+          align: 'left',
+          dataIndex: 'siteName'
+        },
+        {
+          title: '姓名',
+          align: 'left',
+          dataIndex: 'contact',
+          scopedSlots: {
+            customCell: 'contactSlot',
+          }
+        },
+        {
+          title: '邮箱',
+          align: 'left',
+          dataIndex: 'fromEmail',
+          scopedSlots: {
+            customCell: 'copyEmail',
+          },
+        },
+        {
+          title: 'whatsApp',
+          align: 'left',
+          dataIndex: 'whatsApp',
+          customCell: function (text) {
+            if (text == null || text == '' || text == undefined) {
+              return '--'
+            } else {
+              return text
+            }
+          }
+        },
+
+        {
+          title: '手机号',
+          align: 'left',
+          dataIndex: 'phone',
+          customCell: function (text) {
+            if (text == null || text == '' || text == undefined) {
+              return '--'
+            } else {
+              return text
+            }
+          }
+        },
+
+        {
+          title: '来源IP',
+          align: 'left',
+          dataIndex: 'fromIp',
+          customCell: function (text) {
+            if (text == null || text == '' || text == undefined) {
+              return '--'
+            } else {
+              return text
+            }
+          }
+        },
+
+        {
+          title: '状态',
+          align: 'left',
+          dataIndex: 'readStatus',
+          scopedSlots: {
+            customCell: 'readStatus'
+          },
+        },
+        {
+          title: '询盘详情',
+          align: 'left',
+          dataIndex: 'details',
+          scopedSlots: {
+            customCell: 'detailsSlot',
+          }
+        },
+        {
+          title: '跟进人',
+          align: "center",
+          dataIndex: 'principalUid',
+          scopedSlots: {
+            filterDropdown: 'filterDropdown2',
+            filterIcon: 'filterIcon2',
+            customCell: 'principalUidSlot',
+          }
+        },
+        {
+          title: '来源页面',
+          align: 'left',
+          dataIndex: 'fromPage',
+          scopedSlots: {
+            customCell: 'tips'
+          },
+        },
+        {
+          title: '分类',
+          align: 'left',
+          dataIndex: 'userEffective',
+          scopedSlots: {
+            customCell: 'userEffective'
+          }
+        },
+        {
+          title: '来源国家',
+          align: 'left',
+          dataIndex: 'countryName',
+          customCell: function (text) {
+            if (text == null || text == '' || text == undefined) {
+              return '--'
+            } else {
+              return text
+            }
+          }
+        },
+        {
+          title: '来源插件',
+          align: 'left',
+          dataIndex: 'pluginName',
+        },
+        {
+          title: '询盘时间',
+          align: 'left',
+          dataIndex: 'recordCtime',
+          customCell: function (text) {
+            return !text ? '' : (text.length > 16 ? text.substr(0, 16) : text)
+          }
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'left',
+          width: "180px",
+          fixed: 'right',
+          scopedSlots: {
+            filterDropdown: 'filterDropdown',
+            filterIcon: 'filterIcon',
+            customCell: 'action'
+          }
+        }
+      ],
+      defColumns: [],
+      url: {
+        list: "/adweb/adwebEnquiry/list"
+      },
+      enquiryNums: {
+        all: 0,
+        noRead: 0,
+        product: 0,
+        wait: 0
+      },
+      ipagination: {
+        current: 1,
+        pageSize: 30,
+        pageSizeOptions: ['15', '30', '45', '60'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条"
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
+      queryParam: {
+        readStatus: undefined,
+        userEffective: undefined
+      },
+      disableMixinCreated: true,
+      // 调整跟进人相关的字段 start
+      modalVisible: false,
+      forwardVisible: false,
+      //转发询盘信息
+      forwardEnquiryDetail: undefined,
+      siteCode: undefined,
+      subAccountOptions: [],
+      otherSubAccountOptions: [],
+      haveSubAccount: false,
+      radioStyle: {
+        display: 'block',
+        height: '30px',
+        lineHeight: '30px',
+      },
+      tempTopNumber: 0,
+      selectedUserId: undefined,
+      // 调整跟进人相关的字段 end
+      routerQuery: {},
+      edition: 1,
+      dictSiteCode: '',
+    }
+  },
+  created() {
+    this.siteCode = localStorage.getItem('siteCode');
+    this.getTurnInquiryCode();
+  },
+  mounted() {
+    this.userRole = useUserStore().roleList;
+    this.getSiteListWithQueryConditon();
+    this.getEffectiveList();
+  },
+  watch: {
+    $route: {
+      immediate: true,
+      handler() {
+        this.queryParam.dateType = '';
+        let query = this.$route.query;
+        this.routerQuery = query
+        // 时间筛选
+        if (query.dateType || query.start || query.end || query.offset) {
+          this.queryParam.start = query.start;
+          this.queryParam.end = query.end;
+          if (query.dateType && query.offset) {
+            //判断是否有偏移量
+            this.setTimeWithoutReloadData(query.dateType, query.offset);
+            this.queryParam.start = moment(this.rangeDate[0]._d).format("YYYY-MM-DD")
+            this.queryParam.end = moment(this.rangeDate[1]._d).format("YYYY-MM-DD")
+            this.queryParam.dateType = query.dateType;
+          } else if (query.dateType && !query.offset) {
+            this.queryParam.dateType = query.dateType;
+            this.setTimeWithoutReloadData(this.queryParam.dateType);
+          } else {
+            if (query.start && query.end) {
+              this.queryParam.dateType = undefined;
+              this.rangeDate = [moment(query.start), moment(query.end)];
+              // this.rangeDate = [moment(this.queryParam.start), moment(this.queryParam.end)];
+            }
+          }
+        }
+        // 其它筛选条件
+        if (query.searchText) {
+          this.queryParam.searchText = query.searchText;
+        }
+        if (query.searchContent) {
+          this.queryParam.searchContent = query.searchContent;
+        }
+        if (query.readStatus) {
+          this.queryParam.readStatus = query.readStatus;
+        }
+      }
+    }
+  },
+  methods: {
+    // ====================和调整跟进人相关的方法 start ======================
+    // 获取子账户的下拉框选项
+    getSubAccountOptions() {
+      let that = this;
+      getAction('/usercountry/subAccounts/options?siteId=' + that.queryParam.siteId).then(res => {
+        if (res.code === 200) {
+          that.subAccountOptions = res.result;
+          that.haveSubAccount = res.result !== null && res.result !== undefined && res.result.length > 0;
+          that.initColumns();
+        }
+      })
+    },
+    // 显示选择跟进人的弹窗
+    showEditPrincipalModal() {
+      let that = this;
+      if (that.selectedRowKeys.length <= 0) {
+        createMessage.warning('请选择至少一条记录！');
+        return;
+      }
+      that.modalVisible = true;
+    },
+    // 编辑跟进人
+    editPrincipal() {
+      if (this.selectedRowKeys.length <= 0) {
+        createMessage.warning('请选择至少一条记录！');
+        return;
+      }
+      if (!this.selectedUserId) {
+        createMessage.warning('请选择跟进人！');
+        return;
+      }
+      var ids = "";
+      for (var a = 0; a < this.selectedRowKeys.length; a++) {
+        ids += this.selectedRowKeys[a] + ",";
+      }
+      var that = this;
+      that.loading = true;
+      let param = {
+        'ids': ids,
+        'uid': that.selectedUserId
+      }
+      getAction('/adweb/adwebEnquiry/setPrincipalBatch', param).then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          that.loadData();
+          that.onClearSelected();
+          that.cancelEditPrincipal();
+        } else {
+          createMessage.warning(res.message);
+        }
+      }).finally(() => {
+        that.loading = false;
+      });
+    },
+    // 单个产品，点击下拉框直接修改
+    selectPrincipal(record) {
+      console.log(record);
+      let params = {
+        productId: record.id,
+        uid: record.principalUid === undefined ? 'ALL' : record.principalUid
+      }
+      getAction('/adweb/adwebEnquiry/setPrincipal', params).then((res) => {
+        if (res.code == 200) {
+          createMessage.success('操作成功！');
+        } else {
+          if (res.code == 403 || res.code == 500) {
+            createMessage.warning(res.message)
+            this.loadData();
+          } else {
+            createMessage.success('操作失败！');
+          }
+        }
+      })
+    },
+    // 取消跟进人的编辑
+    cancelEditPrincipal() {
+      this.selectedUserId = undefined;
+      this.modalVisible = false;
+    },
+    // ====================和调整跟进人相关的方法 end ======================
+    //日期选择只能今天之前
+    disabledDate(current) {
+      return current && current > moment().endOf('day');
+    },
+    //访问记录
+    enquiryTrack(record) {
+      this.$nextTick(() => {
+        this.$refs.enquiryTrack.init(record)
+      })
+    },
+    //跟踪记录
+    enquiryRecord(record) {
+      this.$nextTick(() => {
+        this.$refs.enquiryGenzong.init(record)
+      })
+    },
+    //转发询盘
+    forwardDetail(record) {
+      let that = this;
+      that.getOtherSubAccountOptions(record);
+      this.forwardEnquiryDetail = record.id;
+      that.forwardVisible = true;
+    },
+    //批量转发询盘
+    forwardDetailAll() {
+      if (this.selectedRowKeys.length <= 0) {
+        createMessage.warning('请选择至少一条记录！');
+        return;
+      }
+      getAction('/usercountry/otherSubAccounts/options?siteId=' + this.queryParam.siteId).then(res => {
+        if (res.code === 200) {
+          this.otherSubAccountOptions = res.result;
+        }
+      })
+      this.forwardEnquiryDetail = ""
+      for (var a = 0; a < this.selectedRowKeys.length; a++) {
+        this.forwardEnquiryDetail += this.selectedRowKeys[a] + ",";
+      }
+      this.forwardVisible = true;
+    },
+    // 编辑转发
+    editForward() {
+      if (this.forwardEnquiryDetail === undefined) {
+        createMessage.warning('请选择询盘信息！');
+        return;
+      }
+      if (!this.selectedUserId) {
+        createMessage.warning('请选择跟进人！');
+        return;
+      }
+
+      var that = this;
+      that.forwardLoading = true;
+      let param = {
+        'ids': that.forwardEnquiryDetail,
+        'uid': that.selectedUserId,
+        'code': that.siteCode
+      }
+      getAction('/adweb/adwebEnquiry/setForward', param).then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          that.loadData();
+          that.cancelEditForward();
+          that.getEnquiryNums();
+          that.selectedRowKeys = [];
+        } else {
+          createMessage.warning(res.message);
+        }
+      }).finally(() => {
+        that.forwardLoading = false;
+      });
+    },
+
+    // 取消转发的编辑
+    cancelEditForward() {
+      this.selectedUserId = undefined;
+      this.forwardEnquiryDetail = undefined;
+      this.forwardVisible = false;
+    },
+    // 获取子账户的下拉框选项
+    getOtherSubAccountOptions(record) {
+      let that = this;
+      getAction('/usercountry/otherSubAccounts/options?siteId=' + that.queryParam.siteId).then(res => {
+        if (res.code === 200) {
+          that.otherSubAccountOptions = res.result.filter(item => item.id !== record.principalUid);
+        }
+      })
+    },
+
+    //获取需要轮流询盘的站点code
+    getTurnInquiryCode() {
+      getAction('/adweb/adwebEnquiry/getTurnInquiryCode').then((res) => {
+        if (res.code === 200) {
+          this.dictSiteCode = res.result[0].value;
+        }
+      })
+    },
+    //询盘详情
+    enquiryDetail(record) {
+      if (record.readStatus == 0) {
+        getAction('/adweb/adwebEnquiry/read?id=' + record.id).then(res => {
+          this.getTableAndNum()
+        })
+      }
+      this.$nextTick(() => {
+        this.$refs.enquiryDetail.init(record)
+      })
+    },
+    productDetail(record) {
+      const param = {
+        siteCode: record.siteCode,
+        fromPage: record.fromPage,
+      }
+      getAction('/adweb/adwebEnquiry/getProductDetail', param).then(res => {
+        console.log(res)
+      })
+    },
+    //黑名单
+    showBlackList() {
+      this.$nextTick(() => {
+        this.$refs.blackList.init(this.queryParam.siteId)
+      })
+    },
+    //回收箱
+    recycleBinVisible() {
+      this.$nextTick(() => {
+        this.$refs.XpRecycleBinModal.init(this.queryParam.siteId, '1,2')
+      })
+    },
+
+    //重新刷新页面数据及获取询盘数量
+    getTableAndNum(arg, clearParam) {
+      // 设置默认站点
+      let siteId = this.queryParam.siteId;
+      let siteList = this.siteList;
+      for (let site of siteList) {
+        if (site.id === siteId) {
+          localStorage.setItem("siteCode", site.code);
+        }
+      }
+
+      this.getEnquiryNums()
+      this.getSubAccountOptions();
+      if (clearParam) {
+        if (this.queryParam.readStatus) {
+          delete this.queryParam.readStatus
+        }
+        if (this.queryParam.searchText) {
+          delete this.queryParam.searchText
+        }
+        if (this.queryParam.searchContent) {
+          delete this.queryParam.searchContent
+        }
+        if (this.queryParam.userEffective) {
+          delete this.queryParam.userEffective
+        }
+        if (this.queryParam.principalUid) {
+          delete this.queryParam.principalUid;
+        }
+      }
+      this.loadData(arg)
+    },
+
+    //重新刷新页面数据及获取询盘数量，不清除查询条件
+    getTableAndNumWithQueryCondition(arg) {
+      this.getEnquiryNums()
+      this.getSubAccountOptions();
+      this.loadData(arg)
+    },
+
+    //重写重置,原先整体查询条件重置，改为只清空部分
+    searchReset() {
+      //this.queryParam = {}
+      if (this.queryParam.readStatus) {
+        delete this.queryParam.readStatus
+      }
+      if (this.queryParam.searchText) {
+        delete this.queryParam.searchText
+      }
+      if (this.queryParam.searchContent) {
+        delete this.queryParam.searchContent
+      }
+      if (this.queryParam.userEffective) {
+        delete this.queryParam.userEffective
+      }
+      if (this.queryParam.principalUid) {
+        delete this.queryParam.principalUid;
+      }
+      this.getTableAndNum(1);
+      this.onClearSelected();
+    },
+
+    changeSite(value, e) {
+
+      this.selectSiteInfo = e.info
+      this.queryParam.siteId = this.selectSiteInfo.id;
+      this.siteCode = localStorage.getItem('siteCode');
+      this.getTableAndNum(undefined, true)
+    },
+
+    //设置列表的时间查询条件
+    setTime(time) {
+      this.queryParam.dateType = time
+      this.queryParam.start = ''
+      this.queryParam.end = ''
+      // sevenDay   thirtyDay  today  yesterday
+      if (time == '') {
+        this.rangeDate = undefined
+      } else if (time == 'sevenDay') {
+        this.rangeDate = [moment().subtract(6, "days"), moment()]
+      } else if (time == 'thirtyDay') {
+        this.rangeDate = [moment().subtract(29, "days"), moment()]
+      } else if (time == 'today') {
+        this.rangeDate = [moment(), moment()]
+      } else if (time == 'yesterday') {
+        this.rangeDate = [moment().subtract(1, "days"), moment().subtract(1, "days")]
+      }
+      this.getTableAndNum()
+    },
+
+    //设置列表的时间查询条件，但不查询数据
+    setTimeWithoutReloadData(time, offset) {
+      if (!offset) {
+        offset = 0;
+      }
+      if (time == 'today' || time == 'yesterday') {
+        offset = 0;
+      }
+      offset = Number(offset);
+      this.queryParam.dateType = time
+      this.queryParam.start = ''
+      this.queryParam.end = ''
+      if (time == '') {
+        this.rangeDate = undefined
+      } else if (time == 'sevenDay') {
+        this.rangeDate = [moment().subtract(6 + offset, "days"), moment().subtract(offset, "days")]
+      } else if (time == 'thirtyDay') {
+        this.rangeDate = [moment().subtract(29 + offset, "days"), moment().subtract(offset, "days")]
+      } else if (time == 'today') {
+        this.rangeDate = [moment().subtract(offset, "days"), moment().subtract(offset, "days")]
+      } else if (time == 'yesterday') {
+        this.rangeDate = [moment().subtract(1 + offset, "days"), moment().subtract(1 + offset, "days")]
+      }
+    },
+
+    //搜索条件部分的逻辑
+    onChangeDatePciker(date, dateString) {
+      if (dateString.length > 0) {
+        this.rangeDate = date
+        this.queryParam.start = dateString[0]
+        this.queryParam.end = dateString[1]
+        this.queryParam.dateType = undefined
+        this.getTableAndNum()
+      }
+    },
+
+    getList(type) {
+      //清空查询条件
+      this.queryParam.principalUid = undefined;
+      this.queryParam.searchText = undefined;
+      this.queryParam.searchContent = undefined;
+      if (type == 'noRead') {
+        this.queryParam.readStatus = '0'
+        this.queryParam.userEffective = undefined
+      }
+      if (type == 'product') {
+        this.queryParam.userEffective = 1
+        console.log('1', this.queryParam)
+
+        this.queryParam.readStatus = undefined
+        console.log('2', this.queryParam)
+
+      }
+      if (type == 'wait') {
+        this.queryParam.userEffective = 2
+        this.queryParam.readStatus = undefined
+      }
+      if (type == 'all') {
+        this.queryParam.userEffective = undefined
+        this.queryParam.readStatus = undefined
+      }
+      this.loadData(1)
+    },
+
+
+    //获取站点列表，获取表格数据的时候不清除查询条件
+    getSiteListWithQueryConditon() {
+      let that = this
+      getAction('/adweb/adwebSite/getSiteListByUid').then(function (res) {
+        if (res.code === 200) {
+
+
+          if (res.result.length === 1) {
+            that.queryParam.siteId = res.result[0].id
+          } else {
+            let isInSite = false
+            for (let i in res.result) {
+              if (localStorage.getItem('siteCode') !== null && res.result[i].code === localStorage.getItem('siteCode')) {
+                isInSite = true
+                that.queryParam.siteId = res.result[i].id
+              }
+            }
+            if (localStorage.getItem('siteCode') !== null && isInSite) {
+            } else {
+              that.queryParam.siteId = res.result[0].id
+              localStorage.setItem('siteCode', res.result[0].code)
+            }
+          }
+
+          that.siteList = res.result;
+          that.initColumns();
+          //如果首页查询数据，直接走下面，return掉，防止接口多次请求
+          if (that.routerQuery.timeType) {
+            let start
+            if (that.routerQuery.timeType == 'thisWeek') {
+              start = moment().subtract(moment().day() - 1, 'days').format('YYYY-MM-DD')
+            }
+            if (that.routerQuery.timeType == 'thisMonth') {
+              start = moment().startOf('month').format('YYYY-MM-DD');
+            }
+            let end = moment().format('YYYY-MM-DD')
+            that.rangeDate = [moment(start), moment(end)];
+            that.queryParam.start = start
+            that.queryParam.end = end
+            that.queryParam.dateType = undefined
+            that.getTableAndNum()
+            return
+          }
+
+          if (that.routerQuery.siteCode) {
+            that.queryParam.siteId = Number(that.routerQuery.siteCode)
+          }
+          that.getTableAndNumWithQueryCondition()
+        } else {
+          createMessage.error('获取站点失败！')
+        }
+      }).catch(function (err) {
+        console.log(err)
+      })
+    },
+
+    //获取询盘分类列表
+    getEffectiveList() {
+      let that = this
+      getAction('/adweb/adwebEnquiry/getEnquiryCatalog').then(function (res) {
+        if (res.code == 200) {
+          that.userEffectiveOption = JSON.parse(res.result);
+        } else {
+          createMessage.error('获取询盘分类失败！')
+        }
+      }).catch(function (err) {
+        console.log(err)
+      })
+    },
+
+    //批量分配询盘
+    changeUserEffective(e) {
+      let that = this
+      if (e == '') {
+        return
+      }
+      let d = {
+        id: that.selectedRowKeys.toString(),
+        userEffective: e
+      }
+      postAction('/adweb/adwebEnquiry/update/user/effective', Qs.stringify(d)).then(function (res) {
+        if (res.code == 200) {
+          createMessage.success('批量分类修改成功！');
+          that.getTableAndNum()
+        } else {
+          if (res.code == 403) {
+            createMessage.warning(res.message)
+          } else {
+            createMessage.error('分类修改失败！')
+          }
+        }
+      }).catch(function (err) {
+        console.log(err)
+      })
+    },
+
+    // 删除
+    enquiryDelete(id) {
+      getAction('/adweb/adwebEnquiry/delBatch', {id: id}).then((res) => {
+        if (res.success) {
+          createMessage.success(`删除询盘成功！`)
+          this.getTableAndNum()
+        } else {
+          if (res.code == 403) {
+            createMessage.warning(res.message)
+          } else {
+            createMessage.error('删除失败！')
+          }
+        }
+      })
+    },
+    //批量删除
+    enquiryDeleteAll() {
+      if (this.selectedRowKeys.length <= 0) {
+        createMessage.warning('请选择至少一条记录！');
+        return;
+      }
+      getAction('/adweb/adwebEnquiry/delBatch', {id: this.selectedRowKeys.toString()}).then((res) => {
+        if (res.success) {
+          createMessage.success(`批量删除询盘成功！`)
+          this.getTableAndNum()
+          this.onClearSelected();
+        } else {
+          if (res.code == 403) {
+            createMessage.warning(res.message)
+          } else {
+            createMessage.error('删除失败！')
+          }
+        }
+      })
+    },
+    //批量设为已读
+    enquiryReady() {
+      if (this.selectedRowKeys.length <= 0) {
+        createMessage.warning('请选择至少一条记录！');
+        return;
+      }
+      getAction('/adweb/adwebEnquiry/read', {id: this.selectedRowKeys.toString()}).then((res) => {
+        if (res.success) {
+          createMessage.success('批量设置已读成功！')
+          this.getTableAndNum()
+          this.onClearSelected();
+        } else {
+          if (res.code == 403) {
+            createMessage.warning(res.message)
+          } else {
+            createMessage.error('设置失败！')
+          }
+        }
+      })
+    },
+
+    //拒收
+    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('拒收失败！')
+          }
+
+        }
+      })
+    },
+
+    //获取不同状态询盘的数量
+    getEnquiryNums() {
+      let siteId = ''
+      let that = this
+      if (that.queryParam.siteId && that.queryParam.siteId != '') {
+        siteId = that.queryParam.siteId
+      } else {
+        siteId = ''
+      }
+      let d = {
+        siteId: siteId,
+        dateType: that.queryParam.dateType,
+        start: that.queryParam.start,
+        end: that.queryParam.end
+      }
+      getAction('/adweb/adwebEnquiry/getEnquiryNums', d).then(res => {
+        if (res.code == 200) {
+          that.enquiryNums.all = res.result.all
+          that.enquiryNums.noRead = res.result.noRead
+          that.enquiryNums.product = res.result.product
+          that.enquiryNums.wait = res.result.wait
+        } else {
+          that.enquiryNums.all = 0
+          that.enquiryNums.noRead = 0
+          that.enquiryNums.product = 0
+          that.enquiryNums.wait = 0
+        }
+
+      })
+    },
+
+
+    filterOption(inputValue, option) {
+      return option.componentOptions.children[0].text.indexOf(inputValue) >= 0
+    },
+
+
+    //列设置更改事件
+    onColSettingsChange(checkedValues) {
+      var key = this.$route.name + ":colsettings";
+      $ls.set(key, checkedValues, 7 * 24 * 60 * 60 * 1000)
+      this.settingColumns = checkedValues;
+      const cols = this.columns.filter(item => {
+        if (item.key == 'rowIndex' || item.dataIndex == 'action') {
+          return true
+        }
+        if (this.settingColumns.includes(item.dataIndex)) {
+          return true
+        }
+        return false
+      })
+      this.defColumns = cols;
+    },
+
+    initColumns() {
+      let that = this;
+
+      // 从缓存中获取存放的展示列
+      var key = this.$route.name + ":colsettings";
+      let columnIndexs = $ls.get(key);
+
+      if (columnIndexs !== null && columnIndexs !== undefined) {
+        that.settingColumns = columnIndexs;
+      }
+
+      // 重置显示的列
+      that.defColumns = this.columns.filter(item => {
+        if (item.dataIndex === 'action') {
+          return true;
+        }
+        if (item.dataIndex === 'principalUid') {
+          return that.haveSubAccount;
+        }
+        if (item.dataIndex === 'siteName') {
+          return that.siteList !== null && that.siteList !== undefined && that.siteList.length >= 2
+        }
+
+        if (that.userRole.indexOf('admin') > -1 || that.userRole.indexOf('adweb_admin') > -1 || that.userRole.indexOf('adweb_seo_manager') > -1 || that.userRole.indexOf('adweb_site_manager') > -1) {
+          if (item.dataIndex === 'pluginName') {
+            return true;
+          }
+        }
+        if (that.settingColumns.includes(item.dataIndex)) {
+          return true;
+        }
+        return false;
+      });
+    },
+    handleExportXlsLU(fileName) {
+      let that = this
+      if (that.edition == 2) {
+        createMessage.warning('"演示版"没有操作权限，如果需要操作，请切换到"正式版"再操作！');
+        return;
+      } else {
+        let param = this.getQueryParams();
+        if (!param.userEffective) {
+          param.userEffective = '1,2';
+        }
+        if (param.siteId === 0) {
+          createMessage.warning("请先选择站点！");
+          return;
+        }
+        this.excelLoading = true;
+        downFile("/adweb/adwebEnquiry/exportExcel", param).then((data) => {
+          this.excelLoading = false;
+          if (!data) {
+            createMessage.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对象
+          }
+        })
+      }
+    },
+//复制email到剪切板
+    copyEmailFunction(text) {
+      let that = this;
+      //复制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('复制失败');
+      });
+    },
+    loadData(arg) {
+      if (!this.url.list) {
+        createMessage.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      var params = this.getQueryParams();//查询条件
+      if (!params.userEffective) {
+        params.userEffective = '1,2';
+      }
+      this.loading = true;
+      getAction(this.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;
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.ant-alert {
+  /deep/ .ant-btn {
+    border-radius: 0;
+    margin-left: 10px;
+  }
+}
+
+.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;
+      }
+    }
+
+    &.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;
+}
+
+.r4 {
+  margin-top: 20px;
+
+  /deep/ .ant-table-tbody {
+    background: #fff;
+  }
+
+  /deep/ .ant-table-tbody > tr > td {
+    border-bottom: 1px solid #f7f7f7;
+  }
+}
+</style>

src/views/adweb/enquiry/AdwebWasteEnquiryList.vue

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

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

@@ -0,0 +1,185 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="width"
+    v-model="modalVisible"
+    centered
+    :closable="true"
+    :keyboard="false"
+    :maskClosable="false"
+  >
+
+    <a-alert type="info" showIcon style="margin-bottom: 16px;">
+      <template slot="message">
+        <span>已选择</span>
+        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
+        <span>项</span>
+        <template v-if="selectedRowKeys.length>0">
+          <a-divider type="vertical"/>
+          <a @click="onClearSelected">清空选择</a>
+          <a-divider type="vertical"/>
+          <a @click="handleRevertBatch">批量移出</a>
+        </template>
+      </template>
+    </a-alert>
+
+
+    <a-modal layout="inline" @keyup.enter.native="searchQuery" style="margin-bottom:15px">
+      <a-form-item>
+        <a-input placeholder="邮箱/姓名/国家" v-model="queryParam.queryParam"></a-input>
+      </a-form-item>
+      <a-form-item>
+        <a-button type="primary" @click="searchQuery">查询</a-button>
+        <a-button @click="searchReset" style="margin-left:8px">重置</a-button>
+      </a-form-item>
+    </a-modal>
+
+
+    <a-table
+      :columns="columns"
+      :data-source="dataSource"
+      size="small"
+      :scroll="{x:true}"
+      :rowKey="(record,index) => record.id"
+      :pagination="ipagination"
+      :loading="loading"
+      class="j-table-force-nowrap"
+      :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>
+    </a-table>
+
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+    </template>
+
+    <!--询盘详情-->
+    <enquiry-detail ref="enquiryDetail"></enquiry-detail>
+
+  </a-modal>
+</template>
+
+<script>
+
+import {getAction, postAction, putAction} from '/@/api/manage/manage'
+import {JeecgListMixin} from '/@/hooks/component/JeecgListMixin'
+import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue'
+
+
+export default {
+  name: 'blackList',
+  mixins: [JeecgListMixin],
+  components: {enquiryDetail},
+  data() {
+    return {
+      title: "黑名单",
+      width: 1000,
+      modalVisible: false,
+      spinning: false,
+      columns: [
+        {title: '姓名', align: 'left', dataIndex: 'name',},
+        {title: '邮箱', align: 'left', dataIndex: 'email'},
+        {title: '电话', align: 'left', dataIndex: 'phone'},
+
+        {
+          title: '国家', align: 'left',
+          dataIndex: 'countryName',
+          customRender: function (text) {
+            if (text == null || text == '' || text == undefined) {
+              return '--'
+            } else {
+              return text
+            }
+          }
+        },
+        {
+          title: '操作',
+          align: 'center',
+          dataIndex: 'action',
+          width: 200,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
+      url: {
+        list: '/enquiry/blacklist/list'
+      },
+      disableMixinCreated: true
+    }
+  },
+
+  props: {
+    userEffectiveOption: {}
+  },
+
+  filters: {
+    filter_Null_format(value) {
+      if (value === '' || value === null || value === undefined) {
+        return '--'
+      } else {
+        return value
+      }
+    }
+  },
+
+
+  methods: {
+    init(siteId) {
+      this.modalVisible = true
+      this.queryParam.siteId = siteId
+      this.loadData(1);
+    },
+
+    //询盘详情
+    enquiryDetail(record) {
+      this.$nextTick(() => {
+        this.$refs.enquiryDetail.init(record)
+      })
+    },
+
+    handleCancel() {
+      this.$emit('close');
+      this.modalVisible = false;
+    },
+
+    handleRevert(record) {
+      this.$confirm({
+        title: '恢复询盘',
+        content: `您确定要移出这个询盘吗？`,
+        centered: true,
+        onOk: () => {
+          getAction('/enquiry/blacklist/removeBlacklist?id=' + record.id).then(res => {
+            if (res.success) {
+              this.loadData()
+              this.$emit('ok')
+              this.$message.success('移出黑名单成功')
+            } else {
+              if (res.code == 403) {
+                this.$message.warning(res.message)
+              } else {
+                this.$message.error('恢复失败！')
+              }
+            }
+          })
+        }
+      })
+    },
+
+    handleRevertBatch() {
+      this.handleRevert({id: this.selectedRowKeys.toString()})
+    }
+
+  }
+}
+</script>
+
+
+<style lang="less" scoped>
+.wrap {
+
+}
+
+</style>

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

@@ -0,0 +1,408 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="width"
+    v-model:open="modalVisible"
+    centered
+    :closable="true"
+    :keyboard="false"
+    :maskClosable="false"
+  >
+    <template slot="footer">
+      <a-popconfirm
+        title="您确定要删除这个询盘吗"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="handleDel"
+        v-if="showDelBtn"
+      >
+        <a-button>删除</a-button>
+      </a-popconfirm>
+      <a-button type="primary" @click="handleCancel">关闭</a-button>
+    </template>
+
+    <div class="wrap">
+      <a-spin :spinning="spinning" tip="正在修改询盘分类">
+        <p><span>咨询时间：</span>{{ filter_Null_format(record.recordCtime) }}</p>
+        <p><span>公司：</span>{{ filter_Null_format(record.formCompany) }}</p>
+        <p><span>姓名：</span>{{ filter_Null_format(record.contact)}}</p>
+        <p><span>邮箱：</span><a :href="'mailto:'+record.fromEmail">{{filter_Null_format(record.fromEmail)}}</a></p>
+        <p><span>电话：</span>{{ filter_Null_format(record.phone)}}</p>
+        <p><span>whatsApp：</span>{{filter_Null_format(record.whatsApp)}}</p>
+        <p><span>客户IP：</span>{{ filter_Null_format(record.customerIp) }}</p>
+        <p style="display: none"><span>来源IP：</span>{{ filter_Null_format(record.fromIp) }}</p>
+        <p><span>来源国家/地区：</span>{{ filter_Null_format(record.countryName) }}</p>
+        <template v-if="record.cartItems != null">
+          <p><span>感兴趣的产品：</span>
+            <div class="product-list">
+              <template v-for="item in record.cartItems">
+                数量：{{ item.quantity }}, 产品： <a :href="item.productLink" target="_blank">{{ item.productTitle }}</a><br/>
+              </template>
+            </div>
+          </p>
+        </template>
+
+        <p><span>来源页：</span>
+          <template v-if="!record.fromPage">-</template>
+          <template v-else-if="record.fromPage.indexOf('http') < 0">-</template>
+          <template v-else-if="record.fromPage.indexOf('http') === 0">
+            <template v-if="record.fromPage.lastIndexOf('/') <= 7">
+              <a v-if="edition === 1" :href="record.fromPage" target="_blank"
+                 style="text-decoration: underline">Home</a>
+              <span v-else>Home</span>
+            </template>
+            <template v-else>
+              <a v-if="edition === 1" :href="record.fromPage" target="_blank"
+                 style="text-decoration: underline">{{ record.fromPage.substring(record.fromPage.lastIndexOf('/') + 1) }}</a>
+              <span v-else>{{ record.fromPage.substring(record.fromPage.lastIndexOf('/') + 1) }}</span>
+            </template>
+          </template>
+          <template v-else-if="record.fromPage.indexOf('http') > 0">
+            <a v-if="edition === 1" :href="record.fromPage.substring(record.fromPage.indexOf('http'))" target="_blank"
+               style="text-decoration: underline">{{ record.fromPage.substring(0, record.fromPage.indexOf('http')) }}</a>
+            <span v-else>{{ record.fromPage.substring(0, record.fromPage.indexOf('http')) }}</span>
+          </template>
+          <template v-else>-</template>
+        </p>
+        <p v-if="userEffectiveOption != undefined"><span>询盘分类：</span>
+          <a-radio-group v-model:value="modelUserEffective" @change="onChangeUserEffect">
+            <a-radio v-for="item in userEffectiveOption" :key="item.value" :value="parseInt(item.value)" >
+              {{item.label}}
+            </a-radio>
+          </a-radio-group>
+        </p>
+        <p class="translate">
+          <span>详细内容：</span>
+          <a-spin tips="翻译中" :spinning="translateStatus">
+            <span style="flex: auto;" >
+              <div v-html="record.context" v-if="translateContent == ''">
+              </div>
+              <div v-html="translateContent">
+              </div>
+                  <!-- {{translateContent == '' ?  record.context : translateContent}} -->
+                  <i @click="enquiryTransContent">
+                   <img v-if="translateContent == '' " src="../../.././../assets/enquiry/translate1.svg" />
+                  </i>
+                  <i @click="backToEcglish">
+                   <img v-if="translateContent != '' " src="../../.././../assets/enquiry/translate2.svg" />
+                  </i>
+               </span>
+          </a-spin>
+        </p>
+        <p v-if="record.userEffective == 0 && (userRole.indexOf('admin') > -1 || userRole.indexOf('adweb_admin') > -1 || userRole.indexOf('adweb_seo_manager') > -1 || userRole.indexOf('adweb_site_manager') > -1)"><span>疑似原因：</span>{{  filter_Null_format(record.effectiveReason) }}</p>
+        <div class="info" v-if="record.specialFieldList && record.specialFieldList.length > 0">
+          <a-descriptions title="扩展信息" bordered :column=1  class="slef_desc">
+            <a-descriptions-item :label="item.field" v-for="item in record.specialFieldList">
+              {{  filter_Null_format(item.value) }}
+            </a-descriptions-item>
+          </a-descriptions>
+        </div>
+      </a-spin>
+    </div>
+    <a-modal
+      :title="wasteEnquiryTitle"
+      :width="width"
+      v-model="wasteEnquiryVisible"
+      centered
+      :closable="true"
+      :keyboard="false"
+      :maskClosable="false"
+      @cancel="wasteEnquiryCancel"
+    >
+      <template slot="footer">
+        <a-button @click="wasteEnquiryCancel">关闭</a-button>
+        <a-button type="primary" @click="wasteEnquiryOk">确认</a-button>
+      </template>
+
+      <div class="wrap">
+        <div class="ant-alert ant-alert-info" style="color: #e74c3c;padding: 5px 8px;">
+          <span>&nbsp&nbsp&nbsp&nbsp当垃圾询盘类型选择确认后，对应类型的内容便会加入对应黑名单中，同时获取询盘时会把此内容的询盘当作垃圾询盘处理，请谨慎操作。</span>
+        </div>
+        <p><span>垃圾询盘类型：</span>
+          <a-radio-group v-model="wasteEnquiryType" @change="onChangeWasteEnquiry">
+            <a-radio v-for="item in wasteEnquiryOption" :key="item.value" :value="item.value" >
+              {{item.label}}
+            </a-radio>
+          </a-radio-group>
+        </p>
+        <p v-if="wasteEnquiryType == 'keyword'">
+          <span>关键词：</span>
+          <span style="flex: auto">
+            详细内容：{{record.context}}
+             <i>
+               <a-textarea v-model="wasteEnquirySeason" :placeholder="wasteEnquiryPlaceholder" :auto-size="{ minRows: 3 }" />
+             </i>
+          </span>
+        </p>
+        <p v-if="wasteEnquiryType == 'other'">
+          <span>原因：</span>
+          <a-textarea v-model="wasteEnquirySeason" :placeholder="wasteEnquiryPlaceholder" :auto-size="{ minRows: 3 }" />
+        </p>
+      </div>
+    </a-modal>
+  </a-modal>
+</template>
+
+<script>
+
+import {getAction, postAction, postActionForm} from '/@/api/manage/manage'
+import Qs from 'qs'
+
+import {useUserStore} from "@/store/modules/user";
+
+
+export default {
+  name: 'enquiryDetail',
+  data () {
+    return {
+      title:"询盘详情",
+      width:900,
+      modalVisible: false,
+      record:{},
+      spinning:false,
+      value:1,
+      translateStatus:false,
+      translateContent:'',
+      modelUserEffective:2,
+      edition: 1,
+      userRole: '',
+      wasteEnquiryTitle:"垃圾询盘类型",
+      wasteEnquiryVisible: false,
+      wasteEnquiryOption:[{label:'关键词',value:'keyword'},{label:'邮箱',value:'email'},{label:'IP',value:'ip'},{label:'其他',value:'other'}],
+      wasteEnquirySeason:'',
+      wasteEnquiryType:'',
+      wasteEnquiryPlaceholder:''
+    }
+  },
+
+  props:{
+    userEffectiveOption: Array,
+    showDelBtn:{
+      default: false,
+      type: Boolean,
+      //目前只支持询盘列表通过询盘详情删除询盘，其他地方不展示删除按钮
+    }
+  },
+
+  mounted() {
+    this.userRole = useUserStore().roleList;
+  },
+
+  methods: {
+    init (record) {
+      this.translateContent = ''
+      this.modalVisible=true
+      this.record = record
+      this.modelUserEffective = record.userEffective
+
+      record.cartItems = JSON.parse(record.cartItems);
+    },
+
+    filter_Null_format(value) {
+
+      if(value === '' || value === null || value === undefined){
+        return  '--'
+      }else{
+        return value
+      }
+    },
+
+    handleCancel () {
+      this.$emit('close');
+      this.translateContent = ''
+      this.modalVisible = false;
+    },
+
+    async handleDel() {
+      //目前该方法只在询盘列表使用
+      await getAction('/adweb/adwebEnquiry/delBatch', {id: this.record.id}).then((res) => {
+        if (res.success) {
+          this.$message.success(`删除询盘成功！`)
+        } else {
+          if (res.code == 403) {
+            this.$message.warning(res.message)
+          } else {
+            this.$message.error('删除失败！')
+          }
+        }
+      })
+      //当删除之后，调用父组件中的重新刷新
+      this.$emit('reload');
+      this.modalVisible = false;
+    },
+
+    onChangeUserEffect(e){
+      let that = this
+      if(e.target.value == '0'){
+        that.wasteEnquiryVisible = true
+      }else{
+        that.submitUserEffect();
+      }
+    },
+
+    //翻译
+    enquiryTransContent(r) {
+      let that = this;
+      that.translateStatus = true;
+      // 创建一个表单数据
+      const formData = new FormData();
+      formData.append('id', that.record.id);
+      formData.append('query', that.translateContent === '' ?  that.record.context : that.translateContent);
+
+      let recordId = that.record.id;
+      postActionForm('/adweb/adwebEnquiry/enquiryTrans', formData, 1000 * 60 * 2).then(function(res) {
+        that.translateStatus = false
+        if (res.code === 200) {
+          let beforeList = res.result;
+          if(beforeList == null){
+            that.$message.error("该内容暂不支持翻译")
+            return;
+          }
+          if (beforeList.length > 0) {
+            that.translateContent = beforeList
+          }
+        } else {
+          that.$message.error("该内容暂不支持翻译")
+        }
+      }).catch(function(err) {
+        console.log(err)
+      })
+    },
+
+    backToEcglish(){
+      this.translateContent = ''
+    },
+
+    wasteEnquiryOk(){
+      let that = this;
+      if(that.wasteEnquiryType == 'keyword'){
+        let season = that.wasteEnquirySeason.trim();
+        if(season == null || season == ""){
+          that.$message.warning("关键词不能为空")
+          that.wasteEnquirySeason = null;
+          return;
+        }
+      }
+      if(that.wasteEnquiryType == 'other'){
+        let season = that.wasteEnquirySeason.trim();
+        if(season == null || season == ""){
+          that.$message.warning("原因不能为空")
+          that.wasteEnquirySeason = null;
+          return;
+        }
+      }
+      that.wasteEnquiryVisible = false;
+      that.submitUserEffect();
+    },
+    wasteEnquiryCancel(){
+      let that = this;
+      that.wasteEnquiryVisible = false;
+      that.modelUserEffective = that.record.userEffective;
+      that.wasteEnquiryType = "";
+      that.wasteEnquirySeason = "";
+      that.wasteEnquiryPlaceholder = "";
+    },
+    onChangeWasteEnquiry(e){
+      let that = this;
+      that.wasteEnquirySeason = "";
+      that.wasteEnquiryType = e.target.value;
+      if(that.wasteEnquiryType == 'email'){
+        that.wasteEnquirySeason = that.record.fromEmail;
+      }
+      if(that.wasteEnquiryType == 'ip'){
+        that.wasteEnquirySeason = that.record.customerIp;
+      }
+      if(that.wasteEnquiryType == 'keyword'){
+        that.wasteEnquiryPlaceholder = "请输入关键词";
+      }
+      if(that.wasteEnquiryType == 'other'){
+        that.wasteEnquiryPlaceholder = "请输入原因";
+      }
+    },
+
+    submitUserEffect(){
+      let that = this;
+      this.spinning = true
+      let d = {
+        id: that.record.id,
+        siteId: that.record.siteId,
+        siteCode: that.record.siteCode,
+        userEffective: that.modelUserEffective,
+        wasteEnquiryType: that.wasteEnquiryType,
+        wasteEnquirySeason: that.wasteEnquirySeason
+      }
+      postAction('/adweb/adwebEnquiry/update/user/effective', Qs.stringify(d)).then(function(res) {
+        that.spinning = false
+        if (res.code == 200) {
+          that.$message.success('分类修改成功！');
+          that.$emit('ok')
+          that.record.userEffective = that.modelUserEffective
+          if(that.wasteEnquiryType == "ip"){
+            that.record.effectiveReason = "人工操作-ip-" + that.wasteEnquirySeason
+          }else if(that.wasteEnquiryType == "email"){
+            that.record.effectiveReason = "人工操作-邮箱-" + that.wasteEnquirySeason
+          }else if(that.wasteEnquiryType == "keyword"){
+            that.record.effectiveReason = "人工操作-关键词-" + that.wasteEnquirySeason
+          }else if(that.wasteEnquiryType == "other"){
+            that.record.effectiveReason = "人工操作-其他-" + that.wasteEnquirySeason
+          }
+
+        } else {
+          if (res.code == 403) {
+            that.$message.warning(res.message)
+          } else {
+            that.$message.error('分类修改失败！')
+          }
+        }
+      }).catch(function(err) {
+        console.log(err)
+      }).finally(()=>{
+        that.wasteEnquiryType = "";
+        that.wasteEnquirySeason = "";
+        that.wasteEnquiryPlaceholder = "";
+      })
+    }
+  }
+}
+</script>
+
+
+<style lang="less" scoped>
+.wrap {
+  p{
+    margin-bottom: 10px;
+    border-bottom: 1px solid #e7e7e7;
+    padding-bottom: 10px;
+    display: flex;
+    color: #000;
+    &:last-child{
+      border-bottom: none;
+    }
+    span{
+      color: #000;
+      flex: 110px 0 0;
+    }
+  }
+  /deep/ .ant-radio-wrapper {
+    color: rgba(0, 0, 0, 1);
+  }
+
+  .translate{
+    img{
+      width: 26px;
+      cursor: pointer;
+    }
+  }
+  .my-text::first-line {
+    white-space: pre-line;
+    position: relative; /* 父元素设置为相对定位 */
+
+  }
+  .child {
+    position: absolute; /* 子元素设置为绝对定位 */
+        bottom: 0; /* 将其放置在父元素的底部 */
+        left: 0; /* 将其放置在父元素的左侧 */
+  }
+}
+
+</style>

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

@@ -0,0 +1,192 @@
+<template>
+  <!--    modal-->
+  <a-modal
+    v-model="modalVisible"
+    :title="modalTitle"
+    centered
+    :confirm-loading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    :closable="false"
+    :keyboard="false"
+    :maskClosable="false"
+    width="50%"
+    okText="确定"
+    :cancelText="cancelText"
+  >
+    <template v-if="modalEnquiryRecordStatus">
+      <a-spin :spinning="spinning" :tip="tipTitle">
+        <a-divider class="mt-0">历史跟踪记录</a-divider>
+
+        <a-timeline class="time-line-wrap">
+          <a-timeline-item v-for="(line, index) in enquiryRecordList" :key="index">
+            <p class="m-0">
+              <a-icon type="history"/>&nbsp;&nbsp;{{line.ctime}}&nbsp;&nbsp;&nbsp;&nbsp;<a-icon type="user"/>
+              {{line.realname}}
+            </p>
+            <p class="mt-5">
+              <a-icon type="form"/>&nbsp;&nbsp;{{line.content}}
+            </p>
+          </a-timeline-item>
+        </a-timeline>
+
+        <a-divider>添加跟踪记录</a-divider>
+        <a-modal
+          ref="ruleForm"
+          :model="enquiryRecordForm"
+          :rules="enquiryRecordFormRules"
+          :label-col="{span:'3'}"
+          :wrapper-col="{span:'21'}"
+        >
+          <a-form-item label="跟踪记录" prop="record">
+            <a-textarea
+              :auto-size="{ minRows: 6, maxRows: 10 }"
+              :defaultValue="enquiryRecordForm.record"
+              placeholder="跟踪记录"
+              v-model="enquiryRecordForm.record"
+              allow-clear
+            />
+          </a-form-item>
+        </a-modal>
+      </a-spin>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+import { getAction, postAction } from '/@/api/manage/manage'
+import Qs from 'qs'
+
+export default {
+  name: 'enquiryGenzong',
+  data(){
+    return {
+      modalVisible: false,
+      modalTitle: '',
+      confirmLoading:false,
+      modalEnquiryRecordStatus:false,
+      cancelText: "取消",
+      spinning:false,
+      enquiryRecordList: [],
+      tipTitle:'',
+      enquiryInfo:{},
+      enquiryRecordForm: {
+        record: ''
+      },
+      enquiryRecordFormRules: {
+        record: [
+          { required: true, message: '跟踪记录不能为空', trigger: 'blur' }
+        ]
+      },
+    }
+  },
+  mounted() {
+
+  },
+  methods:{
+    init(record){
+      console.log(record)
+      this.modalVisible = true
+      this.modalTitle = '询盘跟踪记录：' + record.noOut
+      this.modalEnquiryRecordStatus = true;
+      this.enquiryInfo = record;
+      this.cancelText = "关闭"
+      this.getEnquiryRecord(record.id);
+    },
+
+    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
+        }
+      })
+    },
+
+
+    addEnquiryRecord() {
+      let that = this;
+      that.spinning = true
+      that.tipTitle = '正在添加询盘跟踪记录'
+      let params = {
+        enquiryId: that.enquiryInfo.id,
+        content: that.enquiryRecordForm.record
+      }
+      postAction('/adweb/adwebEnquiryRecord/add', Qs.stringify(params), 1000 * 60 * 2).then(function(res) {
+        that.spinning = false
+        that.tipTitle = ''
+        if (res.code == 200) {
+          that.$message.success('添加成功！')
+          that.enquiryRecordForm = {
+            record: ''
+          }
+          that.getEnquiryRecord(that.enquiryInfo.id);
+        } else {
+          if (res.code == 403) {
+            that.$message.warning(res.message)
+          } else {
+            that.$message.error('添加失败！')
+          }
+        }
+      }).catch(function(err) {
+        that.$message.error('网络超时，请重试!')
+        that.cleanAllFormData();
+        that.loadData()
+      })
+    },
+
+    getEnquiryRecord(id) {
+      let that = this;
+      that.spinning = true
+      that.tipTitle = '正在获取询盘跟踪记录'
+      getAction('/adweb/adwebEnquiryRecord/enquiryRecordList?enquiryId=' + id).then(function(res) {
+        that.spinning = false
+        that.tipTitle = ''
+        if (res.code == 200) {
+          that.enquiryRecordList = res.result;
+        } else {
+          that.$message.error('询盘跟踪记录失败！')
+        }
+      }).catch(function(err) {
+        that.$message.error('网络超时，请重试!')
+        that.cleanAllFormData();
+      })
+    },
+
+
+    handleCancel() {
+      let that = this
+      that.cleanAllFormData()
+    },
+
+
+    cleanAllFormData() {
+      let that = this
+      that.translateStatus = false,
+        that.modalVisible = false,
+        that.modalTitle = '',
+        that.okBtnStatus = {},
+        that.cancelBtnStatus = {},
+        that.enquiryRecordForm = {
+          record: ''
+        },
+        that.spinning = false,
+        that.tipTitle = '',
+        that.confirmLoading = false,
+        that.enquiryInfo = {},
+        that.enquiryRecordList = []
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,141 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="width"
+    v-model="modalVisible"
+    centered
+    :closable="true"
+    :keyboard="false"
+    :maskClosable="false"
+    width="50%"
+  >
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+    </template>
+
+    <div class="wrap">
+<!--      <p style="font-size: 13px;color: #999">展示数据为记录询盘的前后七天时间范围！</p>-->
+      <a-spin :spinning="spinning" tip="正在获取访问记录数据">
+        <a-empty v-if="trackData.length == 0"></a-empty>
+        <a-row v-for="(item,index) in trackData" :key="index">
+          <a-col :span="24" class="c1">
+            <span class="time">{{ item.serverDatePrettyFirstAction }} - {{ item.serverTimePrettyFirstAction }}</span>
+            <span>访问终端：{{item.deviceType}}</span>
+            <span>来源媒介：{{ item.referrerTypeName }}</span>
+            <span>操作系统：{{ item.operatingSystemCode }}</span>
+          </a-col>
+          <a-col :span="24">
+            <p class="t1">{{item.actionDetails.length}}页面分析- {{item.visitDurationPretty}}<span style="float: right">停留时间</span></p>
+            <a-steps direction="vertical" >
+              <a-step status="finish" v-for="(child,index2) in item.actionDetails" :key="index2" v-if="child.pageTitle != null">
+                <div slot="title">
+                  <span>{{ child.pageTitle }}</span> <a-tag style="margin-left: 15px" v-if="filterGetMax(child.timeSpent,index) && item.actionDetails.length > 2" color="orange">停留最久</a-tag>
+                </div>
+                <div slot="description">
+                  <a :href="child.url" target="_blank">{{ child.url }}</a>
+                  <span style="float: right">{{child.timeSpentPretty}}</span>
+                </div>
+                <a-icon slot="icon" type="folder" />
+              </a-step>
+            </a-steps>
+          </a-col>
+          <a-divider></a-divider>
+        </a-row>
+      </a-spin>
+
+
+    </div>
+
+  </a-modal>
+</template>
+
+<script>
+import { getAction } from '/@/api/manage/manage'
+
+export default {
+  name: 'enquiryTrack',
+  data () {
+    return {
+      title:"访问记录",
+      width:800,
+      modalVisible: false,
+      disableSubmit: false,
+      record:{},
+      trackData:[],
+      maxArr:[],
+      spinning:false
+
+    }
+  },
+
+  filters:{
+
+  },
+
+
+  methods: {
+    init (record) {
+      this.modalVisible=true
+      this.maxArr = []
+      this.record = record
+      this.spinning = true
+      getAction('/adweb/adwebEnquiry/getMatomoWebTrackFromEnquiryId?id=' + record.id).then(res => {
+        this.spinning = false
+          if(res.code == 200){
+            this.trackData = res.result
+            this.getMAx()
+          }
+      })
+    },
+
+    filterGetMax(value,index) {
+      for(let i in this.maxArr){
+          if(value == this.maxArr[index]){
+            return true
+          }else{
+            return false
+          }
+      }
+    },
+
+
+    handleCancel () {
+      this.$emit('close');
+      this.modalVisible = false;
+    },
+
+    getMAx(){
+      let trankData = this.trackData
+      for(let i in trankData){
+        this.maxArr.push(Math.max.apply(Math,trankData[i].actionDetails.map(item => { return item.timeSpent })))
+      }
+    }
+
+  }
+}
+</script>
+
+
+<style lang="less" scoped>
+
+
+
+.wrap{
+  .c1{
+    span{
+      color: #333;
+      &:not(:last-child){
+        margin-right: 35px;
+      }
+      &.time{
+        font-size: 20px;
+      }
+    }
+  }
+  .t1{
+    font-size: 14px;
+    color: #333;
+    margin: 20px 0 10px;
+  }
+}
+</style>

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

@@ -0,0 +1,251 @@
+<template>
+  <a-modal
+    :width="1200"
+    :title="title"
+    :visible="visible"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    :okButtonProps="{style:{display:'none'}}">
+
+    <a-alert type="info" showIcon style="margin-bottom: 16px;">
+      <template #message>
+        <span>已选择</span>
+        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
+        <span>项</span>
+        <template v-if="selectedRowKeys.length>0">
+          <a-divider type="vertical"/>
+          <a @click="handleClearSelection">清空选择</a>
+          <a-divider type="vertical"/>
+          <a @click="handleRevertBatch">批量还原</a>
+          <!--          <a-divider type="vertical"/>
+                    <a @click="handleDeleteBatch">批量删除</a>-->
+        </template>
+      </template>
+    </a-alert>
+
+    <a-modal layout="inline" @keyup.enter.native="searchQuery" style="margin-bottom:15px">
+      <a-form-item>
+        <a-input placeholder="邮箱/姓名/国家" v-model="queryParam.searchText"></a-input>
+      </a-form-item>
+      <a-form-item>
+        <a-button type="primary" @click="searchQuery">查询</a-button>
+        <a-button @click="searchReset" style="margin-left:8px">重置</a-button>
+      </a-form-item>
+    </a-modal>
+
+    <a-table
+      ref="table"
+      rowKey="id"
+      size="middle"
+      :columns="columns"
+      :loading="loading"
+      :dataSource="dataSource"
+      :pagination="ipagination"
+      :rowSelection="{selectedRowKeys, onChange: handleTableSelectChange}"
+      @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>
+
+
+        <template  v-if="column.dataIndex === 'contact'">
+          <a-popover>
+            <template slot="content">
+              {{ text }}
+            </template>
+            <div
+              style="width: 100px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
+              {{ text }}
+            </div>
+          </a-popover>
+        </template>
+
+
+        <template v-if="column.dataIndex === 'action'">
+          <span>
+            <a @click="enquiryDetail(record)"> 详情</a>
+            <a @click="handleRevert([record.id])" style="margin-left: 8px">还原询盘</a>
+          </span>
+        </template>
+
+      </template>
+
+    </a-table>
+    <!--询盘详情-->
+    <enquiry-detail ref="enquiryDetail"></enquiry-detail>
+  </a-modal>
+</template>
+
+<script>
+import {putAction, deleteAction, postAction, 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,
+      selectedRowKeys: [],
+      dataSource: [],
+      visible: false,
+      columns: [],
+      siteId: '',
+      enquiryType: '',
+      url: {
+        list: '/adweb/adwebEnquiry/queryWasteEnquiryList',
+        putRecycleBin: '/adweb/adwebEnquiry/refreshBatch'
+      },
+      disableMixinCreated: true,
+    }
+  },
+
+  methods: {
+    init(siteId, enquiryType) {
+      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.siteId = siteId;
+      that.enquiryType = enquiryType;
+      that.loadData(siteId);
+      that.visible = true
+
+    },
+
+    //询盘详情
+    enquiryDetail(record) {
+      this.$nextTick(() => {
+        this.$refs.enquiryDetail.init(record)
+      })
+    },
+    searchQuery() {
+      this.loadData(this.siteId);
+      this.onClearSelected()
+    },
+
+    searchReset() {
+      this.queryParam = {}
+      this.loadData(this.siteId);
+      this.onClearSelected();
+    },
+
+    handleTableChange(pagination, filters, sorter) {
+      //分页、排序、筛选变化时触发
+      //TODO 筛选
+      if (Object.keys(sorter).length > 0) {
+        this.isorter.column = sorter.field;
+        this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+      }
+      this.ipagination = pagination;
+      this.loadData(this.siteId);
+    },
+
+    handleOk() {
+      this.loadData(this.siteId);
+      this.$emit('ok')
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    // 恢复询盘
+    handleRevert(userIds) {
+      this.$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} 个询盘成功！`)
+            } else {
+              if (res.code == 403) {
+                this.$message.warning(res.message)
+              } else {
+                this.$message.error('恢复失败！')
+              }
+            }
+          })
+        }
+      })
+    },
+
+    loadData(siteId, arg) {
+      if (!this.url.list) {
+        this.$message.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      params.siteId = siteId;
+      params.enquiryType = this.enquiryType;
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records || res.result;
+          if (res.result.total != 0) {
+            this.ipagination.total = res.result.total;
+          } else {
+            this.ipagination.total = 0;
+          }
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message)
+        }
+        this.loading = false;
+      })
+    },
+
+    handleRevertBatch() {
+      this.handleRevert(this.selectedRowKeys)
+    },
+    handleDeleteBatch() {
+      this.handleDelete(this.selectedRowKeys)
+    },
+    handleClearSelection() {
+      this.handleTableSelectChange([], [])
+    },
+    handleTableSelectChange(selectedRowKeys, selectionRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectionRows = selectionRows
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped></style>