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

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

@@ -102,10 +102,12 @@ v-if="edition === 1" :href="record.fromPage.substring(record.fromPage.indexOf('h
         </div>
       </a-spin>
     </div>
+
+    <!-- 垃圾询盘原因填写   -->
     <a-modal
       :title="wasteEnquiryTitle"
       :width="width"
-      v-model="wasteEnquiryVisible"
+      v-model:open="wasteEnquiryVisible"
       centered
       :closable="true"
       :keyboard="false"
@@ -122,250 +124,254 @@ v-if="edition === 1" :href="record.fromPage.substring(record.fromPage.indexOf('h
           <span>&nbsp&nbsp&nbsp&nbsp当垃圾询盘类型选择确认后，对应类型的内容便会加入对应黑名单中，同时获取询盘时会把此内容的询盘当作垃圾询盘处理，请谨慎操作。</span>
         </div>
         <p><span>垃圾询盘类型：</span>
-          <a-radio-group v-model="wasteEnquiryType" @change="onChangeWasteEnquiry">
+          <a-radio-group v-model:value="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'">
+        <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 }" />
+               <a-textarea v-model:value="wasteEnquirySeason" :placeholder="wasteEnquiryPlaceholder" :auto-size="{ minRows: 3 }" />
              </i>
           </span>
         </p>
-        <p v-if="wasteEnquiryType == 'other'">
+        <p v-if="wasteEnquiryType === 'other'">
           <span>原因：</span>
-          <a-textarea v-model="wasteEnquirySeason" :placeholder="wasteEnquiryPlaceholder" :auto-size="{ minRows: 3 }" />
+          <a-textarea v-model:value="wasteEnquirySeason" :placeholder="wasteEnquiryPlaceholder" :auto-size="{ minRows: 3 }" />
         </p>
       </div>
     </a-modal>
   </a-modal>
 </template>
 
-<script>
+<script lang="js">
 
-import {getAction, postActionForm} from '/@/api/manage/manage'
+  import {getAction, postActionForm} from '/@/api/manage/manage'
 
-import {useUserStore} from "@/store/modules/user";
+  import {useUserStore} from "@/store/modules/user";
+  import {useMessage} from "@/hooks/web/useMessage";
 
+  const { createMessage } = useMessage();
 
-export default {
-  name: 'EnquiryDetail',
+  export default {
+    name: 'EnquiryDetail',
 
-  props:{
-    userEffectiveOption: Array,
-    showDelBtn:{
-      default: false,
-      type: Boolean,
-      //目前只支持询盘列表通过询盘详情删除询盘，其他地方不展示删除按钮
-    }
-  },
-  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,
+        //目前只支持询盘列表通过询盘详情删除询盘，其他地方不展示删除按钮
+      }
+    },
+    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:''
+      }
+    },
 
-  mounted() {
-    this.userRole = useUserStore().roleList;
-  },
+    mounted() {
+      this.userRole = useUserStore().roleList;
+    },
 
-  methods: {
-    init (record) {
-      this.translateContent = ''
-      this.modalVisible=true
-      this.record = record
-      this.modelUserEffective = record.userEffective
+    methods: {
+      init (record) {
+        this.translateContent = ''
+        this.modalVisible=true
+        this.record = record
+        this.modelUserEffective = record.userEffective
 
-      record.cartItems = JSON.parse(record.cartItems);
-    },
+        record.cartItems = JSON.parse(record.cartItems);
+      },
 
-    filter_Null_format(value) {
+      filter_Null_format(value) {
 
-      if(value === '' || value === null || value === undefined){
-        return  '--'
-      }else{
-        return value
-      }
-    },
+        if(value === '' || value === null || value === undefined){
+          return  '--'
+        }else{
+          return value
+        }
+      },
 
-    handleCancel () {
-      this.$emit('close');
-      this.translateContent = ''
-      this.modalVisible = false;
-    },
+      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)
+      async handleDel() {
+        //目前该方法只在询盘列表使用
+        await getAction('/adweb/adwebEnquiry/delBatch', {id: this.record.id}).then((res) => {
+          if (res.success) {
+           createMessage.success(`删除询盘成功！`)
           } else {
-            this.$message.error('删除失败！')
+            if (res.code == 403) {
+             createMessage.warning(res.message)
+            } else {
+             createMessage.error('删除失败！')
+            }
           }
+        })
+        //当删除之后，调用父组件中的重新刷新
+        this.$emit('reload');
+        this.modalVisible = false;
+      },
+
+      onChangeUserEffect(e){
+        let that = this
+
+        console.log(e.target.value, "e.target.valuee.target.value");
+        if(e.target.value === 0){
+          that.wasteEnquiryVisible = true
+        }else{
+          that.submitUserEffect();
         }
-      })
-      //当删除之后，调用父组件中的重新刷新
-      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);
 
-    //翻译
-    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){
+              createMessage.error("该内容暂不支持翻译")
+              return;
+            }
+            if (beforeList.length > 0) {
+              that.translateContent = beforeList
+            }
+          } else {
+            createMessage.error("该内容暂不支持翻译")
+          }
+        }).catch(function(err) {
+          console.log(err)
+        })
+      },
 
-      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("该内容暂不支持翻译")
+      backToEcglish(){
+        this.translateContent = ''
+      },
+
+      wasteEnquiryOk(){
+        let that = this;
+        if(that.wasteEnquiryType === 'keyword'){
+          let season = that.wasteEnquirySeason.trim();
+          if(season == null || season === ""){
+            createMessage.warning("关键词不能为空")
+            that.wasteEnquirySeason = null;
             return;
           }
-          if (beforeList.length > 0) {
-            that.translateContent = beforeList
+        }
+        if(that.wasteEnquiryType === 'other'){
+          let season = that.wasteEnquirySeason.trim();
+          if(season == null || season === ""){
+            createMessage.warning("原因不能为空")
+            that.wasteEnquirySeason = null;
+            return;
           }
-        } 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;
+        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 == 'other'){
-        let season = that.wasteEnquirySeason.trim();
-        if(season == null || season == ""){
-          that.$message.warning("原因不能为空")
-          that.wasteEnquirySeason = null;
-          return;
+        if(that.wasteEnquiryType === 'ip'){
+          that.wasteEnquirySeason = that.record.customerIp;
         }
-      }
-      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 = "请输入原因";
-      }
-    },
+        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
-      }
-      postActionForm('/adweb/adwebEnquiry/update/user/effective', 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
-          }
+      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
+        }
+        postActionForm('/adweb/adwebEnquiry/update/user/effective', d).then(function(res) {
+          that.spinning = false
+          if (res.code === 200) {
+            createMessage.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('分类修改失败！')
+            if (res.code === 403) {
+              createMessage.warning(res.message)
+            } else {
+              createMessage.error('分类修改失败！')
+            }
           }
-        }
-      }).catch(function(err) {
-        console.log(err)
-      }).finally(()=>{
-        that.wasteEnquiryType = "";
-        that.wasteEnquirySeason = "";
-        that.wasteEnquiryPlaceholder = "";
-      })
+        }).catch(function(err) {
+          console.log(err)
+        }).finally(()=>{
+          that.wasteEnquiryType = "";
+          that.wasteEnquirySeason = "";
+          that.wasteEnquiryPlaceholder = "";
+        })
+      }
     }
   }
-}
 </script>
 
 

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

@@ -46,10 +46,13 @@
   </a-modal>
 </template>
 
-<script>
+<script lang="js">
   import { getAction } from '/@/api/manage/manage';
   import { JeecgListMixin } from '/@/hooks/component/JeecgListMixin';
   import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue';
+  import { useMessage } from '@/hooks/web/useMessage';
+
+  const { createMessage } = useMessage();
 
   export default {
     name: 'XpRecycleBinModal',
@@ -111,7 +114,7 @@
       loadData(email) {
         console.log(!this.url.list);
         if (!this.url.list) {
-          this.$message.error('请设置url.list属性!');
+          createMessage.error('请设置url.list属性!');
           return;
         }
         var params = this.getQueryParams(); //查询条件
@@ -123,7 +126,7 @@
             this.dataSource = res.result;
           }
           if (res.code === 510) {
-            this.$message.warning(res.message);
+            createMessage.warning(res.message);
           }
           this.loading = false;
         });

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

@@ -46,10 +46,13 @@
   </a-modal>
 </template>
 
-<script>
+<script lang="js">
   import { getAction } from '/@/api/manage/manage';
   import { JeecgListMixin } from '/@/hooks/component/JeecgListMixin';
   import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue';
+  import { useMessage } from '@/hooks/web/useMessage';
+
+  const { createMessage } = useMessage();
 
   export default {
     name: 'XpRecycleBinModal',
@@ -110,7 +113,7 @@
 
       loadData(ip) {
         if (!this.url.list) {
-          this.$message.error('请设置url.list属性!');
+          createMessage.error('请设置url.list属性!');
           return;
         }
         var params = this.getQueryParams(); //查询条件
@@ -122,7 +125,7 @@
             this.dataSource = res.result;
           }
           if (res.code === 510) {
-            this.$message.warning(res.message);
+            createMessage.warning(res.message);
           }
           this.loading = false;
         });

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

@@ -46,10 +46,13 @@
   </a-modal>
 </template>
 
-<script>
-  import { putAction, deleteAction, postAction, getAction } from '/@/api/manage/manage';
+<script lang="js">
+  import { getAction } from '/@/api/manage/manage';
 
   import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue';
+  import { useMessage } from '@/hooks/web/useMessage';
+
+  const { createMessage } = useMessage();
 
   export default {
     name: 'XpRecycleBinModal',
@@ -109,7 +112,7 @@
 
       loadData(keyword) {
         if (!this.url.list) {
-          this.$message.error('请设置url.list属性!');
+          createMessage.error('请设置url.list属性!');
           return;
         }
         var params = this.getQueryParams(); //查询条件
@@ -121,7 +124,7 @@
             this.dataSource = res.result;
           }
           if (res.code === 510) {
-            this.$message.warning(res.message);
+            createMessage.warning(res.message);
           }
           this.loading = false;
         });

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

@@ -47,10 +47,12 @@
 </template>
 
 <script lang="js">
-  import { putAction, deleteAction, postAction, getAction } from '/@/api/manage/manage';
+  import { getAction } from '/@/api/manage/manage';
 
   import enquiryDetail from '/@/views/adweb/enquiry/modules/enquiryDetail.vue';
+  import { useMessage } from '@/hooks/web/useMessage';
 
+  const { createMessage } = useMessage();
   export default {
     name: 'XpRecycleBinModal',
     components: { enquiryDetail },
@@ -112,7 +114,7 @@
 
       loadData(keyword, siteId) {
         if (!this.url.list) {
-          this.$message.error('请设置url.list属性!');
+          createMessage.error('请设置url.list属性!');
           return;
         }
         var params = this.getQueryParams(); //查询条件
@@ -125,7 +127,7 @@
             this.dataSource = res.result;
           }
           if (res.code === 510) {
-            this.$message.warning(res.message);
+            createMessage.warning(res.message);
           }
           this.loading = false;
         });

src/views/adweb/seo/SeoKeywordsRankList.vue

@@ -301,7 +301,7 @@
   </div>
 </template>
 
-<script>
+<script lang="js">
   import { getAction, downFile } from '@/api/manage/manage';
   import selectSite from '@/components/Adweb/selectSite.vue';
   import { filterObj } from '/@/utils/common/compUtils';
@@ -536,7 +536,7 @@
             }
           }
           if (res.code === 510) {
-            // this.$message.warning(res.message)
+            // createMessage.warning(res.message)
           }
           this.loading = false;
         });
@@ -718,7 +718,7 @@
           keywordType: keywordType,
         };
         if (param.siteCode === '') {
-          // this.$message.warning("请先选择站点！");
+          // createMessage.warning("请先选择站点！");
           return;
         }
         if (keywordType == 1) {
@@ -735,12 +735,12 @@
           }
           if (!data) {
             console.log(321);
-            // this.$message.warning("文件下载失败")
+            // createMessage.warning("文件下载失败")
             return;
           }
           if (data.size === 0) {
             console.log(111);
-            // this.$message.warning("当前站点未有关键词数据，文件导出失败")
+            // createMessage.warning("当前站点未有关键词数据，文件导出失败")
             return;
           }
           if (typeof window.navigator.msSaveBlob !== 'undefined') {
@@ -842,7 +842,7 @@
             }
           }
           if (res.code === 510) {
-            // this.$message.warning(res.message)
+            // createMessage.warning(res.message)
           }
           this.longLoading = false;
         });

src/views/adweb/subscribePlan/components/IntegrityCheckingDrawer.vue

@@ -99,9 +99,11 @@
   </a-drawer>
 </template>
 
-<script>
+<script lang="js">
   import { getAction, postAction } from '/src/api/manage/manage';
+  import { useMessage } from '@/hooks/web/useMessage';
 
+  const { createMessage } = useMessage();
   export default {
     name: 'IntegrityCheckingDrawer',
 
@@ -164,7 +166,7 @@
           weight += parseFloat(d[i].weight);
         }
         if (parseFloat(weight) !== 100) {
-          this.$message.error('权重之和应为100');
+          createMessage.error('权重之和应为100');
           return;
         }
         this.loading = true;
@@ -175,14 +177,14 @@
           .then((res) => {
             this.loading = false;
             if (res.code == 200) {
-              this.$message.success('保存成功');
+              createMessage.success('保存成功');
               this.showDrawer(this.id);
             } else {
-              this.$message.error(res.message);
+              createMessage.error(res.message);
             }
           })
           .catch((e) => {
-            this.$message.error('保存数据失败！');
+            createMessage.error('保存数据失败！');
           });
       },
       showDrawer(id) {
@@ -200,7 +202,7 @@
             }
           })
           .catch((e) => {
-            this.$message.warning('获取数据失败！');
+            createMessage.warning('获取数据失败！');
           });
         this.visible = true;
       },
@@ -258,7 +260,7 @@
       up(index) {
         let that = this;
         if (that.editingKey !== '') {
-          that.$message.warn('请先完成编辑！');
+          createMessage.warn('请先完成编辑！');
           return;
         }
         if (index === 0) {
@@ -278,7 +280,7 @@
       down(index) {
         let that = this;
         if (that.editingKey !== '') {
-          that.$message.warn('请先完成编辑！');
+          createMessage.warn('请先完成编辑！');
           return;
         }
         if (index === that.data.length - 1) {
@@ -299,10 +301,10 @@
         that.changeLoading = true;
         postAction('/materialcollect/changeRequired?id=' + record.id + '&planId=' + record.planId).then((res) => {
           if (res.success) {
-            that.$message.success(res.result);
+            createMessage.success(res.result);
             that.showDrawer(that.id);
           } else {
-            that.$message.error(res.message);
+            createMessage.error(res.message);
           }
           that.changeLoading = false;
         });