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

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

@@ -1,61 +1,47 @@
 <template>
-  <a-modal
-    :title="title"
-    :width="width"
-    v-model:open="modalVisible"
-    centered
-    :closable="true"
-    :keyboard="false"
-    :maskClosable="false"
-  >
-
-    <a-alert type="info" showIcon style="margin-bottom: 16px;">
+  <a-modal :title="title" :width="width" v-model:open="modalVisible" centered :closable="true" :keyboard="false" :maskClosable="false">
+    <a-alert type="info" showIcon style="margin-bottom: 16px">
       <template #message>
         <span>已选择</span>
-        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
+        <a style="font-weight: 600; padding: 0 4px">{{ selectedRowKeys.length }}</a>
         <span>项</span>
-        <template v-if="selectedRowKeys.length>0">
-          <a-divider type="vertical"/>
+        <template v-if="selectedRowKeys.length > 0">
+          <a-divider type="vertical" />
           <a @click="onClearSelected">清空选择</a>
-          <a-divider type="vertical"/>
+          <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-modal layout="inline" @keyup.enter.native="searchQuery" style="margin-bottom: 15px">
       <a-form-item>
-        <a-input placeholder="邮箱/姓名/国家" v-model="queryParam.queryParam"></a-input>
+        <a-input placeholder="邮箱/姓名/国家" v-model="queryParam.queryParam" />
       </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-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"
+      :scroll="{ x: true }"
+      :rowKey="(record, index) => record.id"
       :pagination="ipagination"
       :loading="loading"
       class="j-table-force-nowrap"
-      :rowSelection="{selectedRowKeys, onChange: onSelectChange}"
+      :rowSelection="{ selectedRowKeys, onChange: onSelectChange }"
       @change="handleTableChange"
     >
       <template #bodyCell="{ column, record, index, text }">
-
-        <template  v-if="column.dataIndex === 'action'">
+        <template v-if="column.dataIndex === 'action'">
           <!--        <a @click="enquiryDetail(record)">详情</a>-->
           <a @click="handleRevert(record)" style="margin-left: 8px">移出黑名单</a>
         </template>
-
       </template>
-
     </a-table>
 
     <template #footer>
@@ -63,130 +49,123 @@
     </template>
 
     <!--询盘详情-->
-    <enquiry-detail ref="enquiryDetail"></enquiry-detail>
-
+    <enquiry-detail ref="enquiryDetail" />
   </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'
-import {Modal} from "ant-design-vue";
-import {useMessage} from "@/hooks/web/useMessage";
-const { createMessage } = useMessage();
-
-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',
-          customCell: function (text) {
-            if (text == null || text == '' || text == undefined) {
-              return '--'
-            } else {
-              return text
-            }
-          }
-        },
-        {
-          title: '操作',
-          align: 'center',
-          dataIndex: 'action',
-          width: 200
+  import { getAction, postAction, putAction } from '/@/api/manage/manage';
+  import { JeecgListMixin } from '/@/hooks/component/JeecgListMixin';
+  import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue';
+  import { Modal } from 'ant-design-vue';
+  import { useMessage } from '@/hooks/web/useMessage';
+  const { createMessage } = useMessage();
+
+  export default {
+    name: 'BlackList',
+    components: { enquiryDetail },
+
+    filters: {
+      filter_Null_format(value) {
+        if (value === '' || value === null || value === undefined) {
+          return '--';
+        } else {
+          return value;
         }
-      ],
-      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)
-      })
     },
+    mixins: [JeecgListMixin],
 
-    handleCancel() {
-      this.$emit('close');
-      this.modalVisible = false;
+    props: {
+      userEffectiveOption: {},
     },
-
-    handleRevert(record) {
-
-      Modal.confirm({
-        title: '恢复询盘',
-        content: `您确定要移出这个询盘吗？`,
-        centered: true,
-        onOk: () => {
-          getAction('/enquiry/blacklist/removeBlacklist?id=' + record.id).then(res => {
-            if (res.code === 200) {
-              this.loadData()
-              this.$emit('ok')
-              createMessage.success('移出黑名单成功')
-            } else {
-              if (res.code === 403 || res.code === 401) {
-                createMessage.warning(res.message)
+    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',
+            customCell: function (text) {
+              if (text == null || text == '' || text == undefined) {
+                return '--';
               } else {
-                createMessage.error('恢复失败！')
+                return text;
               }
-            }
-          })
-        }
-      });
+            },
+          },
+          {
+            title: '操作',
+            align: 'center',
+            dataIndex: 'action',
+            width: 200,
+          },
+        ],
+        url: {
+          list: '/enquiry/blacklist/list',
+        },
+        disableMixinCreated: true,
+      };
     },
 
-    handleRevertBatch() {
-      this.handleRevert({id: this.selectedRowKeys.toString()})
-    }
+    methods: {
+      init(siteId) {
+        this.modalVisible = true;
+        this.queryParam.siteId = siteId;
+        this.loadData(1);
+      },
 
-  }
-}
-</script>
+      //询盘详情
+      enquiryDetail(record) {
+        this.$nextTick(() => {
+          this.$refs.enquiryDetail.init(record);
+        });
+      },
 
+      handleCancel() {
+        this.$emit('close');
+        this.modalVisible = false;
+      },
 
-<style lang="less" scoped>
-.wrap {
+      handleRevert(record) {
+        Modal.confirm({
+          title: '恢复询盘',
+          content: `您确定要移出这个询盘吗？`,
+          centered: true,
+          onOk: () => {
+            getAction('/enquiry/blacklist/removeBlacklist?id=' + record.id).then((res) => {
+              if (res.code === 200) {
+                this.loadData();
+                this.$emit('ok');
+                createMessage.success('移出黑名单成功');
+              } else {
+                if (res.code === 403 || res.code === 401) {
+                  createMessage.warning(res.message);
+                } else {
+                  createMessage.error('恢复失败！');
+                }
+              }
+            });
+          },
+        });
+      },
 
-}
+      handleRevertBatch() {
+        this.handleRevert({ id: this.selectedRowKeys.toString() });
+      },
+    },
+  };
+</script>
 
+<style lang="less" scoped>
+  .wrap {
+  }
 </style>

src/views/adweb/site/AdwebSiteList.vue

@@ -154,6 +154,7 @@
     <!-- 表单区域 -->
     <AdwebSiteModal ref="registerModal" @success="handleSuccess" />
 
+    <site-set-enquiry ref="siteSetEnquiryRef" @success="reload" />
     <!-- 自动化嵌入GTM 代码     -->
     <gtm-add ref="gtmRef" />
     <!--SEO流程-->
@@ -176,6 +177,7 @@
   import GtmAdd from '@/views/adweb/site/components/GtmAdd.vue';
   import { RoleEnum } from '@/enums/roleEnum';
   import { useMessage } from '@/hooks/web/useMessage';
+  import SiteSetEnquiry from '@/views/adweb/site/components/SiteSetEnquiry.vue';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
@@ -186,6 +188,7 @@
   const seoProcessVisible = ref(false);
   const seoProcessRef = ref();
   const gtmRef = ref();
+  const siteSetEnquiryRef = ref();
 
   const isAdmin = computed(() => userStore.getRoleList.includes(RoleEnum.ADMIN));
   const { createMessage } = useMessage();
@@ -340,6 +343,10 @@
         label: '详情',
         onClick: handleDetail.bind(null, record),
       },
+      {
+        label: '询盘设置',
+        onClick: setEnquiry.bind(null, record),
+      },
     ];
 
     if (record.status != 0) {
@@ -355,8 +362,6 @@
         label: '跟踪代码',
         onClick: addGtm.bind(null, record),
       });
-
-      console.log(dropDown, 'dropDowndropDown');
     }
 
     if (isAdmin.value) {
@@ -372,6 +377,16 @@
     return dropDown;
   }
 
+  // 添加gtm
+  function addGtm(r) {
+    gtmRef.value.init(r);
+  }
+
+  // 询盘设置
+  function setEnquiry(r) {
+    siteSetEnquiryRef.value.init(r);
+  }
+
   /**
    * 查询
    */
@@ -399,11 +414,6 @@
   function closeProcess() {
     seoProcessVisible.value = false;
   }
-
-  // 添加gtm
-  function addGtm(r) {
-    gtmRef.value.init(r);
-  }
 </script>
 
 <style lang="less" scoped>

src/views/adweb/site/components/GtmAdd.vue

@@ -24,7 +24,7 @@
           <div>
             <p style="text-align: center; font-weight: bold">系统生成的跟踪代码已添加至网站，请勿重复添加跟踪代码。</p>
           </div>
-          <a-form-item label="GTM Head" prop="head">
+          <a-form-item label="GTM Head" name="head">
             <a-textarea
               v-model:value="googleGtmForm.head"
               id="googleGtmHead"
@@ -33,7 +33,7 @@
               :readOnly="true"
             />
           </a-form-item>
-          <a-form-item label="GTM Body" prop="body">
+          <a-form-item label="GTM Body" name="body">
             <a-textarea
               v-model:value="googleGtmForm.body"
               id="googleGtmBody"

src/views/adweb/site/components/SiteSetEnquiry.vue

@@ -0,0 +1,181 @@
+<template>
+  <a-drawer
+    :title="modalTitle"
+    :maskClosable="true"
+    width="850"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="modalVisible"
+    :ok-button-props="okBtnStatus"
+    destroy-on-close
+    style="overflow: auto; padding-bottom: 53px"
+  >
+    <a-form ref="ruleForm" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form-item label="企业名称" name="companyName">
+        <a-input :auto-size="{ minRows: 0, maxRows: 255 }" placeholder="请输入企业名称" v-model:value="companyName" />
+      </a-form-item>
+      <div v-for="(item, index) in setEnquiryForm.emailList" :key="index">
+        <a-form-item
+          label="询盘接收邮箱："
+          :name="'emailList.' + index + '.email'"
+          :rules="[{ required: false, message: '邮箱不能为空', trigger: 'change' }]"
+        >
+          <a-input style="width: 250px; margin-right: 20px" v-model:value="item.email" />
+          <a-button
+            v-show="index === setEnquiryForm.emailList.length - 1"
+            style="margin-right: 10px"
+            type="primary"
+            @click="handleSetEnquiryFormInput(item, index, true)"
+            >+
+          </a-button>
+          <a-button v-show="setEnquiryForm.emailList.length !== 1" @click="handleSetEnquiryFormInput(item, index, false)">-</a-button>
+        </a-form-item>
+      </div>
+      <a-button style="margin-left: 25px" @click="clearSetEnquiryEmailList()">清空全部邮箱</a-button>
+      <p style="color: red; margin-left: 25px">Tips:设置该邮箱用于接收通过Adweb发送询盘~~</p>
+    </a-form>
+
+    <div
+      :style="{
+        position: 'absolute',
+        right: 0,
+        bottom: 0,
+        width: '100%',
+        borderTop: '1px solid #e9e9e9',
+        padding: '10px 16px',
+        background: '#fff',
+        textAlign: 'right',
+        zIndex: 1,
+      }"
+    >
+      <a-button type="primary" @click="submitSetEnquiry" v-if="okBtnStatus" :loading="spinning"> 提交 </a-button>
+    </div>
+  </a-drawer>
+</template>
+<script setup lang="ts">
+  import { reactive, ref } from 'vue';
+  import { getAction, postAction, postActionForm } from '/@/api/manage/manage';
+  import { useMessage } from '@/hooks/web/useMessage';
+  import { Modal } from 'ant-design-vue';
+  const { createMessage } = useMessage();
+
+  const modalTitle = ref('询盘设置');
+
+  const labelCol = reactive({ span: 3 });
+  const wrapperCol = reactive({ span: 21 });
+  let siteInfo = reactive({ id: '', code: '', domain: '', name: '' });
+  const spinning = ref(false);
+  const tipTitle = ref('');
+
+  const okBtnStatus = ref(true);
+  const modalVisible = ref(false);
+
+  let setEnquiryForm = ref({
+    isSendEmailByAdweb: false,
+    emailList: [{ email: '' }],
+  });
+  let setEnquiryUrl = '/adweb/adwebSiteManage/setEnquiryEmailListBySiteCode';
+  const emit = defineEmits(['success']);
+  const companyName = ref('');
+
+  function init(record) {
+    modalVisible.value = true;
+    companyName.value = record.companyName;
+    siteInfo = record;
+    setEnquiryForm.value.emailList = [];
+
+    if (record.enquiryEmailList) {
+      //r.enquiryEmailList 转数组并去除[]""
+      let split = record.enquiryEmailList.replace(/[\[\]"]/g, '').split(',');
+
+      split.forEach(function (item) {
+        setEnquiryForm.value.emailList.push({
+          email: item,
+        });
+      });
+    } else {
+      setEnquiryForm.value.emailList = [
+        {
+          email: '',
+        },
+      ];
+    }
+  }
+
+  function handleCancel() {
+    cleanAllFormData();
+  }
+
+  function cleanAllFormData() {
+    okBtnStatus.value = true;
+
+    spinning.value = false;
+    tipTitle.value = '';
+
+    modalVisible.value = false;
+    modalTitle.value = '';
+  }
+
+  function handleSetEnquiryFormInput(item, index, flag) {
+    if (setEnquiryForm.value.emailList.length === 1 && !flag) {
+      createMessage.warning('无法再减少输入框！');
+      return;
+    } else if (setEnquiryForm.value.emailList.length === 10 && flag) {
+      createMessage.warning('无法再增加输入框！');
+      return;
+    }
+    flag ? setEnquiryForm.value.emailList.push({ email: '' }) : setEnquiryForm.value.emailList.splice(index, 1);
+  }
+
+  function clearSetEnquiryEmailList() {
+    Modal.confirm({
+      title: '提示',
+      content: `是否清空询盘邮箱列表？`,
+      centered: true,
+      closable: true,
+      okText: '确定',
+      cancelText: '取消',
+      onOk: () => {
+        setEnquiryForm.value.emailList = [{ email: '' }];
+      },
+    });
+  }
+
+  function submitSetEnquiry() {
+    spinning.value = true;
+    let emailList = [];
+
+    setEnquiryForm.value.emailList.forEach((item) => {
+      emailList.push(item.email.trim());
+    });
+    let params = new FormData();
+    params.append('siteCode', siteInfo.code);
+    if (companyName.value) {
+      params.append('companyName', companyName.value);
+    }
+
+    params.append('emailList', emailList);
+    postActionForm(setEnquiryUrl, params, 120000)
+      .then(function (res) {
+        if (res.code == 200) {
+          createMessage.success(res.message);
+          setEnquiryForm.value.emailList = [];
+          companyName.value = '';
+
+          modalVisible.value = false;
+          cleanAllFormData();
+          emit('success');
+        } else {
+          spinning.value = false;
+          createMessage.error(res.message);
+        }
+      })
+      .catch(function () {
+        spinning.value = false;
+        createMessage.error('网络超时，请重试!');
+      });
+  }
+
+  defineExpose({ init });
+</script>