Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

duhe

8 天以前 70a0ddfff13ca0cf225a636d21164714bff5f0af

 src/views/component/CustomerTypeDialog/index.vue

@@ -377,7 +377,7 @@
    async loadTreeData() {
      this.treeLoading = true
      try {
        const response = await axios.get(`${this.baseURL}/Gy_BadReason/Gy_CusTypeTreeListByLevel`)
        const response = await axios.get(`${this.$baseUrl}/Gy_BadReason/Gy_CusTypeTreeListByLevel`)

        if (response.data.count === 1) {
          this.treeData = JSON.parse(response.data.data)
@@ -398,7 +398,7 @@
      try {
        const sWhere = this.buildQueryCondition()

        const response = await axios.get(`${this.baseURL}/Gy_BadReason/Gy_CusTypeList`, {
        const response = await axios.get(`${this.$baseUrl}/Gy_BadReason/Gy_CusTypeList`, {
          params: {
            sWhere: sWhere,
            user: this.user,
@@ -531,7 +531,7 @@
    async loadTableDataWithCondition(sWhere) {
      this.loading = true
      try {
        const response = await axios.get(`${this.baseURL}/Gy_BadReason/Gy_CusTypeList`, {
        const response = await axios.get(`${this.$baseUrl}/Gy_BadReason/Gy_CusTypeList`, {
          params: {
            sWhere: sWhere,
            user: this.user
@@ -663,7 +663,7 @@
    // 获取默认过滤方案
    async getDefaultFilterScheme() {
      try {
        const response = await axios.get(`${this.baseURL}/Xt_FastICScheme/Chooselist`, {
        const response = await axios.get(`${this.$baseUrl}/Xt_FastICScheme/Chooselist`, {
          params: {
            user: this.user,
            HModuleName: this.HModuleName,