snow 2 jaren geleden
bovenliggende
commit
9924ec8ae0

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


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


+ 20 - 19
src/apis/axios.js

@@ -68,25 +68,6 @@ export default async(
   //     return Promise.reject(new Error('服务器异常,请联系管理员!'))
   //   }
   // )
-  // 添加响应拦截器
-  axios.interceptors.response.use(
-    async response => {
-      if (response.status === 200) {
-        const code = response.data.code
-        const message = response.data.message
-
-        if (code >= 100 && code <= 104 && message !== '账户已禁用' && message !== '没有该公司的默认角色') {
-          removeToken()
-          removeMenu()
-          removeBtn()
-        }
-      }
-      return response
-    },
-    error => {
-      return Promise.reject(error.response.data)
-    }
-  )
   return new Promise((resolve, reject) => {
     axios(obj)
       .then(response => {
@@ -101,3 +82,23 @@ export default async(
       })
   })
 }
+
+// 添加响应拦截器
+axios.interceptors.response.use(
+  async response => {
+    if (response.status === 200) {
+      const code = response.data.code
+      const message = response.data.message
+
+      if (code >= 100 && code <= 104 && message !== '账户已禁用' && message !== '没有该公司的默认角色') {
+        removeToken()
+        removeMenu()
+        removeBtn()
+      }
+    }
+    return response
+  },
+  error => {
+    return Promise.reject(error.response.data)
+  }
+)

+ 1 - 0
src/apis/user/axios.js

@@ -73,6 +73,7 @@ axios.interceptors.request.use(
     const isAllowRelaComNo = !store.state.user.isSupertube && !noRelation
     config.data.relaComNo = isAllowRelaComNo ? innerRelaComNo : ''
     if (needRela) config.data.relaComNo = relaComNo || innerRelaComNo
+
     const deleteKeys = ['needRela', 'noRelation']
     deleteKeys.forEach(key => key in config.data && delete config.data[key])
     return config

+ 2 - 0
src/utils/index.js

@@ -376,6 +376,8 @@ export function convertCompanylist(list) {
 const $space = ' '
 const $wrap = '\n'
 export function replaceTextWrapAndSpace(text = '') {
+  if (!text) return ''
+
   let _text = text
   const hasSpace = _text.includes($space)
   const hasWrap = _text.includes($wrap)

+ 2 - 0
src/views/goodStore/goodsCost/components/addEdit.vue

@@ -170,6 +170,7 @@
 <script>
 import asyncRequest from '@/apis/service/goodStore/goodsCost'
 import resToken from '@/mixins/resToken'
+import { replaceTextWrapAndSpace } from '@/utils'
 export default {
   name: 'Brand',
   mixins: [resToken],
@@ -254,6 +255,7 @@ export default {
       this.$refs.ruleForm.validateField('platform')
     },
     async submitForm() {
+      this.ruleForm.online_remark = replaceTextWrapAndSpace(this.ruleForm.online_remark)
       await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (!this.loading) {

+ 4 - 1
src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1075,6 +1075,7 @@ import {
 } from "../columns";
 import { add_sum, accMul } from "@/utils/validate";
 import CompanySort from '@/components/globalComponents/company-sort/index.vue'
+import { replaceTextWrapAndSpace } from "@/utils";
 export default {
   name: "goodsCostAdd",
   mixins: [resToken, companyHelper],
@@ -1202,7 +1203,9 @@ export default {
     async submitForm() {
       this.sch_is_noble();
       this.good_type_change();
-
+      this.ruleForm.good_remark = replaceTextWrapAndSpace(this.ruleForm.good_remark)
+      this.ruleForm.craft_desc = replaceTextWrapAndSpace(this.ruleForm.craft_desc)
+      this.ruleForm.after_sales = replaceTextWrapAndSpace(this.ruleForm.after_sales)
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           if (!this.loading) {

+ 2 - 0
src/views/goodStore/goodsOnline/add.vue

@@ -199,6 +199,7 @@ import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import searchGoodModal from "@/components/search-good-modal";
 import { rules, options1 } from "./columns";
+import { replaceTextWrapAndSpace } from "@/utils";
 export default {
   name: "goodsOnlineAdd",
   mixins: [resToken],
@@ -269,6 +270,7 @@ export default {
       });
     },
     async submitForm() {
+      this.ruleForm.online_remark = replaceTextWrapAndSpace(this.ruleForm.online_remark)
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           if (!this.loading) {

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