snow 2 years ago
parent
commit
75c38d93dd

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 4 - 4
src/views/interest/action/index.vue

@@ -414,7 +414,7 @@ export default {
         } else if (res && res.code >= 100 && res.code <= 104) {
           await this.logout();
         } else {
-          this.$message.warning(res.message);
+          if(res.message !== '获取成功') this.$message.warning(res.message);
         }
         loadding.close();
       }
@@ -455,7 +455,7 @@ export default {
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
-        this.$message.warning(res.message);
+        if(res.message !== '获取成功') this.$message.warning(res.message);
       }
       this.isBtnDisabled = false;
     },
@@ -476,7 +476,7 @@ export default {
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
-        this.$message.warning(res.message);
+        if(res.message !== '获取成功')  this.$message.warning(res.message);
       }
 
       this.loading = false;
@@ -491,7 +491,7 @@ export default {
         } else if (res && res.code >= 100 && res.code <= 104) {
           await this.logout();
         } else {
-          this.$message.warning(res.message);
+          if(res.message !== '获取成功')  this.$message.warning(res.message);
         }
       }
     },

+ 2 - 2
src/views/interest/dataShare/index.vue

@@ -179,12 +179,12 @@ import { statusList } from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import companyHelper from "@/mixins/companyHelper";
+// import companyHelper from "@/mixins/companyHelper";
 import { mapGetters } from "vuex";
 
 export default {
   name: "role",
-  mixins: [mixinPage, resToken, companyHelper],
+  mixins: [mixinPage, resToken],
   components: {
     addEdit
   },

+ 3 - 3
src/views/interest/handover/index.vue

@@ -176,7 +176,7 @@
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import asyncRequest from "@/apis/service/interest/handover";
-import companyHelper from "@/mixins/companyHelper"
+// import companyHelper from "@/mixins/companyHelper"
 import addEdit from "./components/addEdit.vue";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
@@ -185,7 +185,7 @@ export default {
   components: {
     addEdit,
   },
-  mixins: [mixinPage, resToken, companyHelper],
+  mixins: [mixinPage, resToken],
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
 
@@ -370,7 +370,7 @@ export default {
       this.loading = true;
       const res = await asyncRequest.list({
         ...this.parmValue,
-        companyNo: this.currentCompany
+        // companyNo: this.currentCompany
       });
 
       if (res && res.code === 0 && res.data) {

+ 1 - 1
src/views/interest/processPermission/index.vue

@@ -277,7 +277,7 @@ export default {
         } else if (res && res.code >= 100 && res.code <= 104) {
           await this.logout();
         } else {
-          this.$message.warning(res.message);
+          if(res.message !== '获取成功') this.$message.warning(res.message);
         }
       }
     },

+ 8 - 2
src/views/serviceParam/storeSet/index.vue

@@ -235,11 +235,12 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/serviceParam/storeSet";
+import companyHelper from "@/mixins/companyHelper";
 import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
 export default {
   name: "storeSet",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {
     addEdit,
   },
@@ -467,7 +468,12 @@ export default {
       this.parmValue.contactor_name = this.select === "2" ? this.input : "";
       this.parmValue.mobile = this.select === "3" ? this.input : "";
       this.parmValue.company_new_name = this.select === "4" ? this.input : "";
-      const { code, data } = await asyncRequest.list(this.parmValue);
+      
+      const { code, data } = await asyncRequest.list({
+        ...this.parmValue,
+        needRela: true
+      });
+
       if (code === 0) {
         const { list, count } = data ?? {};
         this.tableData = list;

+ 3 - 3
src/views/serviceParam/workCompany/index.vue

@@ -203,13 +203,13 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/serviceParam/workCompany";
-import companyHelper from "@/mixins/companyHelper"
+// import companyHelper from "@/mixins/companyHelper"
 import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
 
 export default {
   name: "workCompany",
-  mixins: [mixinPage, resToken, companyHelper],
+  mixins: [mixinPage, resToken],
   components: {
     addEdit,
   },
@@ -384,7 +384,7 @@ export default {
       const res = await asyncRequest.list({
         ...this.parmValue,
         ...this.pageInfo,
-        needRela: true
+        // needRela: true
       });
       
       if (res && res.code === 0 && res.data) {

Some files were not shown because too many files changed in this diff