Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/views/saleLeads/detail.vue

@@ -501,7 +501,7 @@ export default {
         this.$message.success('提交成功')
         // this.$message({ type: "success", message: this.form.id ? "修改成功!" : "新增成功!" });
         // this.queryData(res.data.data);
-        this.$router.$avueRouter.closeTag("/saleLeads/index");
+        // this.$router.$avueRouter.closeTag("/saleLeads/index");
         data.corpId = res.data.data
         this.$router.push({
           path: '/workManagement/main-items/list',

src/views/saleLeads/index.vue

@@ -74,6 +74,7 @@ export default {
     }
   },
   activated() {
+    console.log(this.show, this.$store.getters.xsjhStatus)
     if (!this.show && !this.$store.getters.xsjhStatus) {
       this.show = true;
     }
@@ -238,6 +239,7 @@ export default {
         id: row.id,
         query: true, // 表示只是查询
       };
+      this.$store.commit("XSJH_IN_DETAIL");
     },
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {

src/views/workManagement/main-items/detailsPage.vue

@@ -993,7 +993,7 @@ export default {
     dispatch(row, index) {
       if (row.id) {
         this.pgList = []
-        if (row.frequency == 4 && row.second) {
+        if (row.second>1) {
           for (let i = 0; i < row.second; i++) {
             this.pgList.push({
               ...row,