站点邮箱黑名单

src/components/Adweb/selectSite.vue

@@ -1,158 +1,98 @@
 <template>
-  <span v-if="siteinfo.length > 1">
-    <a-form-item name="siteCode">
-      <a-select
-        showSearch
-        :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-form-item>
-
-
-    <a-modal title="温馨提示" v-model: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>
+  <a-form-item name="siteCode">
+    <a-select
+      showSearch
+      :filter-option="filterOption"
+      v-model:value="siteCode"
+      @change="changeUser"
+      :style="'width:' + selectWidth"
+      :options="siteInfo"
+      :field-names="{ label: 'name', value: 'code' }"
+    />
+  </a-form-item>
 </template>
 
-<script>
-  import { getAction, postAction } from '/@/api/manage/manage';
+<script lang="ts" setup name="SelectSite">
+  import { getAction } from '/@/api/manage/manage';
 
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { onBeforeMount, onMounted, reactive, ref, watch } from 'vue';
 
-  const { createMessage, createConfirm } = useMessage();
-
-  export default {
-    name: 'SelectSite',
-    props: {
-      comProps: {},
-      siteListUrl: {
-        default: '/adweb/adwebSite/getSiteListByUid',
-      },
-      selectWidth: {
-        default: '100%',
-      },
-    },
-    data() {
-      return {
-        siteinfo: [],
-        siteCode: '',
-        selectSiteInfo: {},
-        visible: false,
-        productType: '',
-      };
+  const { createMessage } = useMessage();
+
+  const emit = defineEmits(['setSiteInfo']);
+
+  const props = defineProps({
+    siteListUrl: {
+      type: String,
+      default: '/adweb/adwebSite/getSiteListByUid',
     },
-    watch: {
-      // siteinfo(newVal) {
-      //   this.$emit('setSiteInfo', newVal)
-      // }
+    selectWidth: {
+      type: String,
+      default: '100%',
     },
-    mounted() {
-      this.getSiteInfo();
+  });
+
+  //站点搜索
+  const filterOption = (input: string, option: any) => {
+    return option.name.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+  };
+
+  let siteInfo = reactive([{ code: '', id: '', name: '' }]);
+  let selectSiteInfo = reactive({ code: '', id: '', name: '' });
+  let siteCode = ref();
+
+  onBeforeMount(() => {
+    getSiteInfo();
+  });
+
+  // 只要检测到该组件站点发生变化，就触发任何使用此组件的监听方法
+  watch(
+    () => siteCode,
+    (newValue, oldValue) => {
+      emit('setSiteInfo', selectSiteInfo); // 触发父方法
     },
-    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('站点获取失败，请刷新重试');
-          }
-        });
-      },
-
-      //改变站点
-      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);
+    { immediate: true, deep: true }
+  );
+
+  //进入获取站点code
+  function getSiteInfo() {
+    getAction(props.siteListUrl, null).then(function (res) {
+      if (res.code === 200) {
+        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;
+            selectSiteInfo = res.result[i];
+            siteCode.value = localStorage.getItem('siteCode');
           }
-        });
-      },
+        }
 
-      //站点搜索
-      filterOption(input, option) {
-        return `${option.info.name}`.toLowerCase().includes(`${input || ''}`.toLowerCase());
-      },
-    },
-  };
+        if (!isInSite) {
+          siteCode.value = res.result[0].code;
+          selectSiteInfo = res.result[0];
+          localStorage.setItem('siteCode', res.result[0].code);
+        }
+      } else {
+        createMessage.error('站点获取失败，请刷新重试');
+      }
+    });
+  }
+
+  //改变站点
+  function changeUser(value, e) {
+    siteCode.value = value;
+    localStorage.setItem('siteCode', value);
+
+    // 更改选中的站点对象
+    for (let i in siteInfo) {
+      if (siteInfo[i].code === value) {
+        selectSiteInfo = siteInfo[i];
+      }
+    }
+  }
 </script>
 
 <style lang="less">

src/hooks/component/JeecgList.ts

@@ -1,6 +1,6 @@
-import {TableActionType} from "@/components/Table";
-import {FormActionType} from "@/components/Form";
-import {Ref, toRefs} from "vue";
+import { TableActionType } from '@/components/Table';
+import { FormActionType } from '@/components/Form';
+import { Ref, toRefs } from 'vue';
 
 // 替换v2中迁移过来的JeecgListMixins，将组件的通用方法提取出来，放置此处
 
@@ -11,35 +11,33 @@ type UseTableMethod = TableActionType & {
 interface ListOptions {
   tableContext: [
     (instance: TableActionType, formInstance: UseTableMethod) => void,
-      TableActionType & {
+    TableActionType & {
       getForm: () => FormActionType;
     },
     {
       rowSelection: any;
       selectedRows: Ref<Recordable[]>;
       selectedRowKeys: Ref<any[]>;
-    }
-  ],
+    },
+  ];
 
-  modalFormRef: Ref<any>,
-  formRef: Ref<any>,
-  batchDelete: any,
-  deleteOne: any
+  modalFormRef: Ref<any>;
+  formRef: Ref<any>;
+  batchDelete: any;
+  deleteOne: any;
 }
 
 export function useCommonList(options: ListOptions) {
   const batchDelete = options.batchDelete;
   const deleteOne = options.deleteOne;
 
-  const {modalFormRef, formRef} = toRefs(options)
+  const { modalFormRef, formRef } = toRefs(options);
 
-  const [registerTable, {
-    reload,
-    clearSelectedRowKeys,
-    updateTableDataRecord,
-    findTableDataRecord,
-    getDataSource
-  }, {rowSelection, selectedRowKeys}] = options.tableContext;
+  const [
+    registerTable,
+    { reload, clearSelectedRowKeys, updateTableDataRecord, findTableDataRecord, getDataSource },
+    { rowSelection, selectedRowKeys },
+  ] = options.tableContext;
 
   /**
    * 成功回调
@@ -52,16 +50,16 @@ export function useCommonList(options: ListOptions) {
    * 新增事件
    */
   function handleAdd() {
-    modalFormRef.value.title = "新增";
+    modalFormRef.value.title = '新增';
     modalFormRef.value.disableSubmit = false;
     modalFormRef.value.add();
   }
 
   /*
-*
-* 编辑*/
+   *
+   * 编辑*/
   function handleEdit(record) {
-    modalFormRef.value.title = "编辑";
+    modalFormRef.value.title = '编辑';
     modalFormRef.value.edit(record);
     modalFormRef.value.disableSubmit = false;
   }
@@ -77,7 +75,7 @@ export function useCommonList(options: ListOptions) {
    * 批量删除事件
    */
   async function batchHandleDelete() {
-    await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
 
   /**
@@ -88,16 +86,15 @@ export function useCommonList(options: ListOptions) {
     modalFormRef.value.edit(record);
   }
 
-
   /**
    * 操作栏
    */
   function getTableAction(record) {
     return [
       {
-        label: "编辑",
-        onClick: handleEdit.bind(null, record)
-      }
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
     ];
   }
 
@@ -105,7 +102,7 @@ export function useCommonList(options: ListOptions) {
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({id: record.id}, handleSuccess);
+    await deleteOne({ id: record.id }, handleSuccess);
   }
 
   /**
@@ -121,20 +118,20 @@ export function useCommonList(options: ListOptions) {
   function getDropDownAction(record) {
     return [
       {
-        label: "详情",
-        onClick: handleDetail.bind(null, record)
-      }, {
-        label: "删除",
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
         popConfirm: {
-          title: "是否确认删除",
+          title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: "topLeft"
-        }
-      }
+          placement: 'topLeft',
+        },
+      },
     ];
   }
 
-
   function searchReset() {
     formRef.value.resetFields();
     selectedRowKeys.value = [];
@@ -152,6 +149,6 @@ export function useCommonList(options: ListOptions) {
     handleDelete,
     handleAdd,
     searchQuery,
-    searchReset
-  }
+    searchReset,
+  };
 }

src/views/adweb/enquiry/AdwebEnquiryList.vue

@@ -4,7 +4,7 @@
       <a-col :xl="7" :xxl="6">
         <div class="choose-site">
           <span class="t1">站点：</span>
-          <select-site ref="selectSiteRef" @com-methods="changeSite" @set-site-info="getSiteList" />
+          <select-site ref="selectSiteRef" @set-site-info="getSiteList" select-width="100%" />
         </div>
       </a-col>
       <a-col :xl="8" :xxl="6">
@@ -384,40 +384,9 @@
     initWebSocket();
   });
 
-  function getSiteList(siteInfo: any[], selectedSiteInfo: any) {
-    siteList.value = siteInfo;
+  function getSiteList(selectedSiteInfo: any) {
+    queryParam.siteId = selectedSiteInfo.id;
 
-    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);
   }
 
@@ -431,15 +400,6 @@
 
   //重新刷新页面数据及获取询盘数量
   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) {
@@ -460,8 +420,6 @@
       }
     }
 
-    // queryParam.fields = 'id,,siteName,contact,fromEmail,whatsApp,phone,fromIp,readStatus,details,principalUid,fromPage,userEffective,countryName,pluginName,recordCtime,action';
-    // queryParam.userEffective = '1,2';
     loadData();
   }
 
@@ -591,7 +549,9 @@
 
   // 加载table列表数据
   function loadData(page: number = 1) {
-    reload({ page: page });
+    nextTick().then(() => {
+      reload({ page: page });
+    });
   }
 
   // 导出excel
@@ -906,6 +866,9 @@
 </script>
 
 <style lang="less" scoped>
+  .ant-form-item {
+    flex: 1;
+  }
   .jeecg-basic-table-form-container {
     padding: 0;
 

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

@@ -8,7 +8,7 @@
     :keyboard="false"
     :maskClosable="false"
   >
-    <template slot="footer">
+    <template #footer>
       <a-popconfirm
         title="您确定要删除这个询盘吗"
         ok-text="是"
@@ -47,18 +47,21 @@
           <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"
+              <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"
+              <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"
+            <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>
@@ -109,7 +112,7 @@
       :maskClosable="false"
       @cancel="wasteEnquiryCancel"
     >
-      <template slot="footer">
+      <template #footer>
         <a-button @click="wasteEnquiryCancel">关闭</a-button>
         <a-button type="primary" @click="wasteEnquiryOk">确认</a-button>
       </template>
@@ -152,7 +155,16 @@ import {useUserStore} from "@/store/modules/user";
 
 
 export default {
-  name: 'enquiryDetail',
+  name: 'EnquiryDetail',
+
+  props:{
+    userEffectiveOption: Array,
+    showDelBtn:{
+      default: false,
+      type: Boolean,
+      //目前只支持询盘列表通过询盘详情删除询盘，其他地方不展示删除按钮
+    }
+  },
   data () {
     return {
       title:"询盘详情",
@@ -175,15 +187,6 @@ export default {
     }
   },
 
-  props:{
-    userEffectiveOption: Array,
-    showDelBtn:{
-      default: false,
-      type: Boolean,
-      //目前只支持询盘列表通过询盘详情删除询盘，其他地方不展示删除按钮
-    }
-  },
-
   mounted() {
     this.userRole = useUserStore().roleList;
   },

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

@@ -21,21 +21,20 @@
           </a-row>
         </a-form>
       </template>
-
     </j-form-container>
   </a-spin>
 </template>
 
 <script lang="ts" name="EnquiryPublicBlackEmailForm" setup>
-  import {getAction, httpAction} from '/@/api/manage/manage';
+  import { getAction, httpAction } from '/@/api/manage/manage';
   import pick from 'lodash.pick';
 
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
-  import {computed, onBeforeMount, reactive, ref, toRaw} from 'vue';
-  import {Form} from 'ant-design-vue';
-  import {useMessage} from "@/hooks/web/useMessage";
+  import { computed, onBeforeMount, reactive, ref, toRaw } from 'vue';
+  import { Form } from 'ant-design-vue';
+  import { useMessage } from '@/hooks/web/useMessage';
 
-  const emit = defineEmits(["ok", "close"])
+  const emit = defineEmits(['ok', 'close']);
 
   const { createMessage, createConfirm } = useMessage();
 
@@ -61,7 +60,7 @@
     },
   });
 
-  let modelRef = reactive({id: '', email: '', blackOrWhite: null });
+  let modelRef = reactive({ id: '', email: '', blackOrWhite: null });
 
   const labelCol = reactive({
     xs: { span: 24 },
@@ -142,27 +141,28 @@
         let httpUrl = '';
         let method = '';
 
-        if(!modelRef.id){
+        if (!modelRef.id) {
           httpUrl = url.add;
           method = 'post';
-        }else{
+        } else {
           httpUrl = url.edit;
           method = 'put';
         }
-
         let formData = toRaw(modelRef);
-        console.log("表单提交数据",formData)
-
-        httpAction(httpUrl, formData, method).then((res)=>{
-          if(res.success){
-            createMessage.success(res.message);
-            emit('ok');
-          }else{
-            createMessage.warning(res.message);
-          }
-        }).finally(() => {
-          confirmLoading.value = false;
-        })
+        console.log('表单提交数据', formData);
+
+        httpAction(httpUrl, formData, method)
+          .then((res) => {
+            if (res.success) {
+              createMessage.success(res.message);
+              emit('ok');
+            } else {
+              createMessage.warning(res.message);
+            }
+          })
+          .finally(() => {
+            confirmLoading.value = false;
+          });
       })
       .catch((err) => {
         console.log('error', err);

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

@@ -5,16 +5,16 @@
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam">
         <a-row :gutter="24">
           <a-col :xl="6" :sm="12">
-            <select-site ref="selectSiteRef" @com-methods="changeSite" @set-site-info="getSiteList" />
+            <select-site ref="selectSiteRef" @set-site-info="getSiteList" />
           </a-col>
           <a-col :md="6" :sm="12">
-            <a-form-item name="IP">
+            <a-form-item name="ip">
               <a-input allow-clear placeholder="请输入IP" v-model:value="queryParam.ip" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="10">
             <a-form-item name="blackOrWhite">
-              <a-select allow-clear v-model="queryParam.blackOrWhite" placeholder="请选择黑白名单">
+              <a-select allow-clear v-model:value="queryParam.blackOrWhite" placeholder="请选择黑白名单">
                 <a-select-option value="0">黑名单</a-select-option>
                 <a-select-option value="1">白名单</a-select-option>
               </a-select>
@@ -23,7 +23,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" preIcon="ant-design:search-outlined">查询</a-button>
-              <a-button ghost type="primary" @click="searchReset" preIcon="ant-reload:search-outlined" style="margin-left: 8px">重置</a-button>
+              <a-button ghost type="primary" @click="searchReset" preIcon="ant-design:reload-outlined" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -76,7 +76,7 @@
           <template v-if="column.dataIndex === 'wasteEnquiryNum'">
             <span>
               <span v-if="text === '' || text === null || text === 0">0</span>
-              <a v-else @click="wasteNumVisible(record.ip, siteId)">{{ text }}</a>
+              <a v-else @click="wasteNumVisible(record.ip)">{{ text }}</a>
             </span>
           </template>
 
@@ -106,8 +106,9 @@
       </BasicTable>
     </div>
 
-    <adweb-site-black-ip-modal ref="modalFormRef" @ok="modalFormOk" />
-    <xp-recycle-bin-modal ref="XpRecycleBinModalRef" @ok="getTableAndNum" />
+    <adweb-site-black-ip-modal ref="modalFormRef" @ok="handleSuccess" />
+
+    <xp-recycle-bin-modal ref="XpRecycleBinModalRef" />
   </a-card>
 </template>
 
@@ -115,7 +116,7 @@
   import '/@/assets/less/common.less';
   import '/@/assets/less/TableExpand.less';
 
-  import AdwebSiteBlackIpModal from './modules/AdwebSiteBlackIpModal__Style.vue';
+  import AdwebSiteBlackIpModal from './modules/AdwebSiteBlackIpModal.vue';
   import XpRecycleBinModal from './modules/XpRecycleBinModal.vue';
 
   import { batchDelete, deleteOne, getExportUrl, getImportUrl, list } from './siteBlackIP.api';
@@ -126,6 +127,7 @@
   import { nextTick, onMounted, reactive, ref } from 'vue';
   import { useCommonList } from '@/hooks/component/JeecgList';
   import SelectSite from '@/components/Adweb/selectSite.vue';
+  import { integer } from 'vue-types';
 
   const description = ref('adweb_site_black_ip管理页面');
   const dictOptions = reactive({});
@@ -135,6 +137,7 @@
   const formRef = ref();
   const XpRecycleBinModalRef = ref();
   const modalFormRef = ref();
+  const siteId = ref(integer);
 
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
@@ -177,34 +180,26 @@
 
   onMounted(() => {});
 
-  async function wasteNumVisible(ip, siteId) {
-    await nextTick();
+  function getSiteList(selectedSiteInfo: any) {
+    queryParam.siteId = selectedSiteInfo.id;
 
-    XpRecycleBinModalRef.value.init(ip, siteId);
+    // 选择站点是api操作，所以需要nextTick
+    nextTick().then(() => {
+      reload();
+    });
   }
 
-  function getTableAndNum() {
-    // 设置默认站点
-    let siteId = this.queryParam.siteId;
-    let siteList = this.siteList;
-    for (let site of siteList) {
-      if (site.id === siteId) {
-        localStorage.setItem('siteCode', site.code);
-      }
-    }
-    this.loadData(arg);
+  async function wasteNumVisible(ip) {
+    await nextTick();
+
+    XpRecycleBinModalRef.value.init(ip, queryParam.siteId);
   }
 
   /**
    * 成功回调
    */
-  function handleSuccess() {
+  function handleSuccess(siteId) {
+    queryParam.siteId = siteId;
     (selectedRowKeys.value = []) && reload();
   }
-
-  function getSiteList(siteInfo: any[], selectedSiteInfo: any) {
-    queryParam.siteId = selectedSiteInfo.id;
-    console.log(selectedSiteInfo.id, 'selectedSiteInfoselectedSiteInfoselectedSiteInfo');
-    reload();
-  }
 </script>

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

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

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

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

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

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

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

@@ -9,8 +9,8 @@
     :okButtonProps="{ style: { display: 'none' } }"
   >
     <a-form layout="inline" @keyup.enter.native="searchQuery" style="margin-bottom: 15px">
-      <a-form-item>
-        <a-input placeholder="邮箱/姓名" v-model="queryParam.searchText" />
+      <a-form-item name="searchText">
+        <a-input allow-clear placeholder="邮箱/姓名" v-model:value="queryParam.searchText" />
       </a-form-item>
       <a-form-item>
         <a-button type="primary" @click="searchQuery">查询</a-button>
@@ -20,105 +20,99 @@
 
     <a-table ref="table" size="middle" :columns="columns" :loading="loading" :dataSource="dataSource">
       <!-- 显示头像 -->
-      <template #avatarslot="text, record, index">
-        <div class="anty-img-wrap">
-          <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user" />
-        </div>
-      </template>
-      <template #contactSlot="text, record">
-        <div>
-          <a-popover>
-            <template #content>
-              {{ text }}
-            </template>
-            <div style="width: 200px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis">{{ text }}</div>
-          </a-popover>
-        </div>
-      </template>
-      <template #action="text, record">
-        <span>
-          <a @click="showEnquiryDetail(record)"> 详情</a>
-        </span>
+      <template #bodyCell="{ column, record, index, text }">
+        <template v-if="column.dataIndex === 'contact'">
+          <div>
+            <a-popover>
+              <template #content>
+                {{ text }}
+              </template>
+              <div style="width: 200px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis">{{ text }}</div>
+            </a-popover>
+          </div>
+        </template>
+        <template v-if="column.dataIndex === 'action'">
+          <span>
+            <a @click="showEnquiryDetail(record)"> 详情</a>
+          </span>
+        </template>
       </template>
     </a-table>
     <!--询盘详情-->
-    <enquiry-detail ref="enquiryDetail" />
+    <enquiry-detail ref="enquiryDetailRef" />
   </a-modal>
 </template>
 
 <script lang="ts" setup name="XpRecycleBinModal">
   import { getAction } from '/@/api/manage/manage';
   import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue';
-  import { reactive, ref } from 'vue';
+  import { nextTick, reactive, ref } from 'vue';
+  import { useMessage } from '@/hooks/web/useMessage';
 
   const title = ref('');
-  const loading = ref(false);
-  const innerVisible = ref(false);
-  const visible = ref(false);
-  const disableMixinCreated = ref(false);
-  const ip = ref('');
-  const siteId = ref('');
-  const dataSource = reactive([]);
+  const enquiryDetailRef = ref();
   const columns = reactive([
-    { 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: 'siteName' },
+    { title: '姓名', align: 'left', dataIndex: 'contact' },
+    { title: '邮箱', align: 'left', dataIndex: 'fromEmail' },
     { title: '电话', align: 'left', dataIndex: 'phone' },
     { title: '询盘时间', align: 'left', dataIndex: 'recordCtime' },
-    { title: '操作', align: 'center', dataIndex: 'action', scopedSlots: { customRender: 'action' } },
+    { title: '操作', align: 'center', dataIndex: 'action' },
   ]);
   const url = reactive({
     list: '/adweb/adwebEnquiry/getWastedEnquiry',
   });
+  const { createMessage } = useMessage();
+  let loading = ref(false);
+  let visible = ref(false);
+  let ip = ref('');
+  let siteId = ref('');
+  let dataSource = reactive([]);
+  let queryParam = reactive<any>({});
 
-  function init(ip, siteId) {
-    console.log(ip, siteId);
-    ip.value = ip;
-    siteId.value = siteId;
-    loadData(ip, siteId);
-    console.log(ip);
+  function init(ipParam, siteIdParam) {
+    ip.value = ipParam;
+    siteId.value = siteIdParam;
     visible.value = true;
+
+    loadData(ip.value, siteId.value);
   }
 
   //询盘详情
-  function showEnquiryDetail(record) {
-    this.$nextTick(() => {
-      this.$refs.enquiryDetail.init(record);
+  async function showEnquiryDetail(record) {
+    await nextTick().then(() => {
+      enquiryDetailRef.value.init(record);
     });
   }
 
   function searchQuery() {
-    this.loadData(this.ip, this.siteId);
+    loadData(ip.value, siteId.value);
   }
 
   function searchReset() {
-    this.queryParam = {};
-    this.loadData(this.ip, this.siteId);
+    queryParam = {};
+    loadData(ip.value, siteId.value);
   }
 
   function handleCancel() {
-    this.queryParam = {};
-    this.visible = false;
+    queryParam = {};
+    visible.value = false;
   }
 
   function loadData(ip, siteId) {
-    if (!this.url.list) {
-      this.$message.error('请设置url.list属性!');
-      return;
-    }
-    var params = this.getQueryParams(); //查询条件
-    this.loading = true;
+    let params = queryParam; //查询条件
+    loading.value = true;
     params.ip = ip;
     params.siteId = siteId;
     params.wasteEnquiryType = 'ip';
-    getAction(this.url.list, params).then((res) => {
-      if (res.success) {
-        this.dataSource = res.result;
+    getAction(url.list, params).then((res) => {
+      if (res.code === 200) {
+        dataSource = res.result;
       }
       if (res.code === 510) {
-        this.$message.warning(res.message);
+        createMessage.warning(res.message);
       }
-      this.loading = false;
+      loading.value = false;
     });
   }
 

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

@@ -1,21 +1,14 @@
 <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;">
+  <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>
+        <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="handleClearSelection">清空选择</a>
-          <a-divider type="vertical"/>
+          <a-divider type="vertical" />
           <a @click="handleRevertBatch">批量还原</a>
           <!--          <a-divider type="vertical"/>
                     <a @click="handleDeleteBatch">批量删除</a>-->
@@ -23,13 +16,13 @@
       </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.searchText"></a-input>
+        <a-input placeholder="邮箱/姓名/国家" v-model="queryParam.searchText" />
       </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>
 
@@ -41,213 +34,199 @@
       :loading="loading"
       :dataSource="dataSource"
       :pagination="ipagination"
-      :rowSelection="{selectedRowKeys, onChange: handleTableSelectChange}"
-      @change="handleTableChange">
-
+      :rowSelection="{ selectedRowKeys, onChange: handleTableSelectChange }"
+      @change="handleTableChange"
+    >
       <template #bodyCell="{ column, record, index, text }">
-<!--        &lt;!&ndash; 显示头像 &ndash;&gt;-->
-<!--        <template  v-if="column.dataIndex === 'siteName'">-->
-<!--          <div class="anty-img-wrap">-->
-<!--            <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/>-->
-<!--          </div>-->
-<!--        </template>-->
-
-
-        <template  v-if="column.dataIndex === 'contact'">
+        <template v-if="column.dataIndex === 'contact'">
           <a-popover>
-            <template slot="content">
+            <template #content>
               {{ text }}
             </template>
-            <div
-              style="width: 100px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
+            <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>
+    <enquiry-detail ref="enquiryDetail" />
   </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'
-import {Modal} from "ant-design-vue";
-import {useMessage} from "@/hooks/web/useMessage";
-const { createMessage } = useMessage();
-
-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',
-        },
-        {
-          title: '姓名',
-          align: 'left',
-          dataIndex: 'contact',
-        },
-        {
-          title: '邮箱',
-          align: 'left',
-          dataIndex: 'fromEmail',
+  import { putAction, deleteAction, postAction, getAction } from '/@/api/manage/manage';
+  import { JeecgListMixin } from '/@/hooks/component/JeecgListMixin';
+  import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue';
+  import { Modal } from 'ant-design-vue';
+  import { useMessage } from '@/hooks/web/useMessage';
+  const { createMessage } = useMessage();
+
+  export default {
+    name: 'XpRecycleBinModal',
+    components: { enquiryDetail },
+    mixins: [JeecgListMixin],
+    data() {
+      return {
+        title: '询盘回收站',
+        loading: false,
+        innerVisible: false,
+        selectedRowKeys: [],
+        dataSource: [],
+        visible: false,
+        columns: [],
+        siteId: '',
+        enquiryType: '',
+        url: {
+          list: '/adweb/adwebEnquiry/queryWasteEnquiryList',
+          putRecycleBin: '/adweb/adwebEnquiry/refreshBatch',
         },
-        {title: '电话', align: 'left', dataIndex: 'phone'},
-        {title: '询盘时间', align: 'left', dataIndex: 'recordCtime'},
-        {title: '操作', align: 'center', dataIndex: '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()
+        disableMixinCreated: true,
+      };
     },
 
-    searchReset() {
-      this.queryParam = {}
-      this.loadData(this.siteId);
-      this.onClearSelected();
-    },
+    methods: {
+      init(siteId, enquiryType) {
+        let that = this;
+        that.columns = [
+          {
+            title: '站点名称',
+            align: 'left',
+            dataIndex: 'siteName',
+          },
+          {
+            title: '姓名',
+            align: 'left',
+            dataIndex: 'contact',
+          },
+          {
+            title: '邮箱',
+            align: 'left',
+            dataIndex: 'fromEmail',
+          },
+          { title: '电话', align: 'left', dataIndex: 'phone' },
+          { title: '询盘时间', align: 'left', dataIndex: 'recordCtime' },
+          { title: '操作', align: 'center', dataIndex: 'action' },
+        ];
+        that.siteId = siteId;
+        that.enquiryType = enquiryType;
+        that.loadData(siteId);
+        that.visible = true;
+      },
 
-    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);
-    },
+      //询盘详情
+      enquiryDetail(record) {
+        this.$nextTick(() => {
+          this.$refs.enquiryDetail.init(record);
+        });
+      },
+      searchQuery() {
+        this.loadData(this.siteId);
+        this.onClearSelected();
+      },
 
-    handleOk() {
-      this.loadData(this.siteId);
-      this.$emit('ok')
-    },
-    handleCancel() {
-      this.visible = false
-    },
-    // 恢复询盘
-    handleRevert(userIds) {
-      const that = this
+      searchReset() {
+        this.queryParam = {};
+        this.loadData(this.siteId);
+        this.onClearSelected();
+      },
 
-      Modal.confirm({
-        title: '恢复询盘',
-        content: `您确定要恢复这 ${userIds.length} 个询盘吗？`,
-        onOk: () => {
-          putAction(that.url.putRecycleBin, {no: userIds.join(',')}).then((res) => {
+      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);
+      },
 
-            if (res.code === 200) {
-              that.loadData(that.siteId);
-              that.handleOk()
-              that.handleClearSelection()
-              createMessage.success(`还原 ${userIds.length} 个询盘成功！`)
-            } else {
-              if (res.code === 403 || res.code === 401) {
-                createMessage.warning(res.message)
+      handleOk() {
+        this.loadData(this.siteId);
+        this.$emit('ok');
+      },
+      handleCancel() {
+        this.visible = false;
+      },
+      // 恢复询盘
+      handleRevert(userIds) {
+        const that = this;
+
+        Modal.confirm({
+          title: '恢复询盘',
+          content: `您确定要恢复这 ${userIds.length} 个询盘吗？`,
+          onOk: () => {
+            putAction(that.url.putRecycleBin, { no: userIds.join(',') }).then((res) => {
+              if (res.code === 200) {
+                that.loadData(that.siteId);
+                that.handleOk();
+                that.handleClearSelection();
+                createMessage.success(`还原 ${userIds.length} 个询盘成功！`);
               } else {
-                createMessage.error('恢复失败！')
+                if (res.code === 403 || res.code === 401) {
+                  createMessage.warning(res.message);
+                } else {
+                  createMessage.error('恢复失败！');
+                }
               }
-            }
-          })
-        }
-      });
-    },
+            });
+          },
+        });
+      },
 
-    loadData(siteId, 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;
-      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;
-          }
+      loadData(siteId, arg) {
+        if (!this.url.list) {
+          createMessage.error('请设置url.list属性!');
+          return;
         }
-        if (res.code === 510) {
-          createMessage.warning(res.message)
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
         }
-        this.loading = false;
-      })
-    },
+        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) {
+            createMessage.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
+      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>