修复样式 更改接口

src/App.vue

@@ -1,12 +1,20 @@
 <template>
-  <div id="app">
+<a-config-provider :locale="locale">
+    <div id="app">
     <router-view />
   </div>
+  </a-config-provider>
 </template>
 
 <script>
+import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
 export default  {
   name:  'App',
+  data () {
+      return {
+        locale: zhCN,
+      }
+    },
   metaInfo() {
     return {
       title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,

src/api/api.js

@@ -31,7 +31,7 @@ const getPersonByNumType = (params)=>getAction("/erp/person/getPersonByNumType",
 const addAccount = (params)=>postAction("/erp/account/add",params);
 const editAccount = (params)=>putAction("/erp/account/update",params);
 const checkAccount = (params)=>getAction("/erp/account/checkIsNameExist",params);
-const getAccount = (params)=>getAction("/erp/account/getAccount",params);
+const getAccount = (params)=>getAction("/system/user/page",params);
 //收支项目
 const addInOutItem = (params)=>postAction("/erp/inOutItem/add",params);
 const editInOutItem = (params)=>putAction("/erp/inOutItem/update",params);
@@ -105,7 +105,7 @@ const getBatchNumberList = (params)=>getAction("/erp/depotItem/getBatchNumberLis
 const findFinancialDetailByNumber = (params)=>getAction("/erp/accountHead/getDetailByNumber",params);
 
 //租户信息
-const getAlltenantInfo = (params)=>getAction("/erp/tenant/listAllTenant",params);
+const getAlltenantInfo = (params)=>getAction("/system/tenant/page",params);
 export {
   getBuyAndSaleStatistics,
   buyOrSalePrice,

src/api/manage.js

@@ -183,7 +183,7 @@ export function getFileAccessHttpUrl(avatar,subStr) {
     return avatar;
   }else{
     if(avatar &&　avatar.length>0 && avatar.indexOf('[')==-1){
-      return window._CONFIG['domianURL'] + "/" + avatar;
+      return process.env.VUE_APP_BASE_API + "/" + avatar;
     }
   }
 }

src/api/system/dictDetail.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+export function get(dictName) {
+  const params = {
+    dictName,
+    page: 0,
+    size: 9999
+  }
+  return request({
+    url: 'api/dictDetail',
+    method: 'get',
+    params
+  })
+}
+
+export function getDictMap(dictName) {
+  const params = {
+    dictName,
+    page: 0,
+    size: 9999
+  }
+  return request({
+    url: 'api/dictDetail/map',
+    method: 'get',
+    params
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/dictDetail',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/dictDetail/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/dictDetail',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }

src/components/bpmnProcessDesigner/src/highlight/index.js

@@ -1,4 +1,4 @@
-const hljs = require("highlight.js/lib/core");
+const hljs = require("highlight.js/lib/");
 hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
 hljs.registerLanguage("json", require("highlight.js/lib/languages/json"));
 

src/components/jeecg/JEditableTable.vue

@@ -1394,7 +1394,6 @@
       },
       /** 添加一行 */
       add(num = 1, forceScrollToBottom = false) {
-        console.log(num,'num')
         if (num < 1) return
         // let timestamp = new Date().getTime()
         let rows = this.rows
@@ -2622,7 +2621,7 @@
       /** 上传请求地址 */
       getUploadAction(value) {
         if (!value) {
-          return window._CONFIG['domianURL'] + '/sys/common/upload'
+          return process.env.VUE_APP_BASE_API + "/common/upload"
         } else {
           return value
         }

src/components/jeecg/JImageUpload.vue

@@ -43,7 +43,7 @@
     name: 'JImageUpload',
     data(){
       return {
-        uploadAction:window._CONFIG['domianURL']+"/systemConfig/upload",
+        uploadAction:process.env.VUE_APP_BASE_API + "/common/upload",
         uploadLoading:false,
         picUrl:false,
         headers:{},

src/components/jeecg/JImportModal.vue

@@ -61,12 +61,12 @@
     watch: {
       url (val) {
         if(val){
-         this.uploadAction = window._CONFIG['domianURL']+val
+         this.uploadAction = process.env.VUE_APP_BASE_API+val
         }
       }
     },
     created () {
-      this.uploadAction = window._CONFIG['domianURL']+this.url
+      this.uploadAction = process.env.VUE_APP_BASE_API+this.url
     },
 
     methods:{

src/components/jeecg/JModal/index.vue

@@ -206,7 +206,7 @@
 
     .j-modal-title-row {
       .left {
-        width: calc(100% - 56px - 56px);
+        width: calc(~"100% - 56px - 56px");
       }
 
       .right {

src/components/jeecg/JUpload.vue

@@ -63,7 +63,7 @@
     name: 'JUpload',
     data(){
       return {
-        uploadAction:window._CONFIG['domianURL']+"/systemConfig/upload",
+        uploadAction:process.env.VUE_APP_BASE_API + "/common/upload",
         headers:{},
         fileList: [],
         newFileList: [],

src/components/jeecgbiz/modal/SelectUserListModal.vue

@@ -34,8 +34,8 @@
         model: {},
         confirmLoading: false,
         url: {
-          add: "/act/model/create",
-          list: "/sys/user/list"
+          add: "/erp/act/model/create",
+          list: "/erp/sys/user/list"
         },
         columns: [
           {

src/components/tools/DynamicNotice.vue

@@ -19,7 +19,7 @@
         if(!this.path){
           return null;
         }
-        return () => import(`@/views/${this.path}.vue`)
+        return () => Promise.resolve( require(`@/views/${this.path}.vue`).default)
       } 
     },
     props: ['path','formData'],

src/main.js

@@ -21,6 +21,9 @@ import JeecgComponents from '@/components/jeecg/index'
 // import Viser from 'viser-vue'
 import 'ant-design-vue/dist/antd.less';  // or 'ant-design-vue/dist/antd.less'
 
+import '@/assets/less/JAreaLinkage.less'
+import VueAreaLinkage from 'vue-area-linkage'
+
 import './assets/icons' // icon
 import './permission' // permission control
 // import './tongji' // 百度统计
@@ -66,6 +69,7 @@ import DocAlert from '@/components/DocAlert'
 import VueMeta from 'vue-meta'
 
 Vue.use(Antd)
+Vue.use(VueAreaLinkage);
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)

src/mixins/JeecgListMixin.js

@@ -278,7 +278,7 @@ export const JeecgListMixin = {
     /* 导出 */
     handleExportXls2(){
       let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()));
-      let url = `${window._CONFIG['domianURL']}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`;
+      let url = `${process.env.VUE_APP_BASE_API}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`;
       window.location.href = url;
     },
     handleExportXls(fileName){

src/store/modules/user.js

@@ -1,5 +1,7 @@
 import {login, logout, getInfo, socialLogin, socialLogin2} from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
+import { putAction,postAction,getAction } from '@/api/manage'
+import Vue from 'vue'
 
 const user = {
   state: {
@@ -44,6 +46,19 @@ const user = {
           res = res.data;
           setToken(res.token)
           commit('SET_TOKEN', res.token)
+          // 设定进销存参数  尝试同步zsw
+          let params = {};
+          params.currentPage = 1;
+          params.pageSize = 100;
+          getAction('/erp/materialProperty/list', params).then((mp) => {
+            console.log(mp);
+            if(mp && mp.code === 200){
+              if(mp.data) {
+                let thisRows = mp.data.rows; //属性列表
+                Vue.ls.set('materialPropertyList', thisRows);
+              }
+            }
+          })
           resolve()
         }).catch(error => {
           reject(error)

src/utils/util.js

@@ -1,5 +1,6 @@
 import api from '@/api/api'
 import isURL from '@/utils/validate'
+import { re } from 'mathjs'
 import XLSX from 'xlsx'
 
 export function timeFix() {
@@ -90,9 +91,9 @@ function generateChildRouters (data) {
     let componentPath = "";
     item.route = "1";
     if(item.component.indexOf("layouts")>=0){
-      componentPath = () => import('@/components'+item.component);
+      componentPath = () => Promise.resolve(require('@/components'+item.component).default);
     } else {
-      componentPath = () => import('@/views'+item.component);
+      componentPath = () => Promise.resolve(require('@/views'+item.component).default)
     }
     // eslint-disable-next-line
     let URL = (item.url|| '').replace(/{{([^}}]+)?}}/g, (s1, s2) => eval(s2)) // URL支持{{ window.xxx }}占位符变量
@@ -447,6 +448,9 @@ export function replaceAll(text, checker, replacer) {
  * @returns {string}
  */
 export function getMpListShort(thisRows, checker, replacer) {
+  if (!thisRows){
+    return "";
+  }
   let mPropertyListShort = ''
   let nativeNameStr = ''
   for (let i = 0; i < thisRows.length; i++) {

src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue

@@ -12,7 +12,7 @@
         </el-table-column>
         <el-table-column label="规则范围" align="center" prop="options" width="440px">
           <template slot-scope="scope">
-            <el-tag size="medium" v-if="scope.row.options" v-for="option in scope.row.options">
+            <el-tag size="medium" v-if="scope.row.options" v-for="option in scope.row.options" :key="option">
               {{ getAssignRuleOptionName(scope.row.type, option) }}
             </el-tag>
           </template>

src/views/erp/bill/dialog/LinkBillList.vue

@@ -84,7 +84,7 @@
           }
         ],
         url: {
-          list: "/depotHead/list"
+          list: "/erp/depotHead/list"
         }
       }
     },

src/views/erp/bill/mixins/BillListMixin.js

@@ -13,7 +13,7 @@ export const BillListMixin = {
   },
   computed: {
     importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      return `${process.env.VUE_APP_BASE_API}/${this.url.importExcelUrl}`;
     },
 
     isBatchDelEnabled: function () {

src/views/erp/bill/modules/AllocationOutModal.vue

@@ -170,9 +170,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/AssembleModal.vue

@@ -170,9 +170,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/DisassembleModal.vue

@@ -170,9 +170,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/InventoryReviewModal.vue

@@ -188,9 +188,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/OtherInModal.vue

@@ -196,9 +196,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/OtherOutModal.vue

@@ -194,9 +194,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/PurchaseBackModal.vue

@@ -271,9 +271,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/PurchaseInModal.vue

@@ -407,9 +407,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/PurchaseOrderModal.vue

@@ -204,9 +204,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/RetailBackModal.vue

@@ -251,9 +251,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/RetailOutModal.vue

@@ -264,9 +264,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/SaleBackModal.vue

@@ -278,9 +278,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/SaleOrderModal.vue

@@ -209,9 +209,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/bill/modules/SaleOutModal.vue

@@ -294,9 +294,9 @@
           }
         },
         url: {
-          add: '/depotHead/addDepotHeadAndDetail',
-          edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          add: '/erp/depotHead/addDepotHeadAndDetail',
+          edit: '/erp/depotHead/updateDepotHeadAndDetail',
+          detailList: '/erp/depotItem/getDetailList'
         }
       }
     },

src/views/erp/financial/dialog/DebtBillList.vue

@@ -132,7 +132,7 @@
           }
         ],
         url: {
-          list: "/depotHead/debtList"
+          list: "/erp/depotHead/debtList"
         }
       }
     },

src/views/erp/financial/mixins/FinancialListMixin.js

@@ -13,7 +13,7 @@ export const FinancialListMixin = {
   },
   computed: {
     importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      return `${process.env.VUE_APP_BASE_API}/${this.url.importExcelUrl}`;
     },
 
     isBatchDelEnabled: function () {

src/views/erp/financial/modules/AdvanceInModal.vue

@@ -169,9 +169,9 @@
           }
         },
         url: {
-          add: '/accountHead/addAccountHeadAndDetail',
-          edit: '/accountHead/updateAccountHeadAndDetail',
-          detailList: '/accountItem/getDetailList'
+          add: '/erp/accountHead/addAccountHeadAndDetail',
+          edit: '/erp/accountHead/updateAccountHeadAndDetail',
+          detailList: '/erp/accountItem/getDetailList'
         }
       }
     },

src/views/erp/financial/modules/GiroModal.vue

@@ -180,9 +180,9 @@
           }
         },
         url: {
-          add: '/accountHead/addAccountHeadAndDetail',
-          edit: '/accountHead/updateAccountHeadAndDetail',
-          detailList: '/accountItem/getDetailList'
+          add: '/erp/accountHead/addAccountHeadAndDetail',
+          edit: '/erp/accountHead/updateAccountHeadAndDetail',
+          detailList: '/erp/accountItem/getDetailList'
         }
       }
     },

src/views/erp/financial/modules/ItemInModal.vue

@@ -193,9 +193,9 @@
           }
         },
         url: {
-          add: '/accountHead/addAccountHeadAndDetail',
-          edit: '/accountHead/updateAccountHeadAndDetail',
-          detailList: '/accountItem/getDetailList'
+          add: '/erp/accountHead/addAccountHeadAndDetail',
+          edit: '/erp/accountHead/updateAccountHeadAndDetail',
+          detailList: '/erp/accountItem/getDetailList'
         }
       }
     },

src/views/erp/financial/modules/ItemOutModal.vue

@@ -193,9 +193,9 @@
           }
         },
         url: {
-          add: '/accountHead/addAccountHeadAndDetail',
-          edit: '/accountHead/updateAccountHeadAndDetail',
-          detailList: '/accountItem/getDetailList'
+          add: '/erp/accountHead/addAccountHeadAndDetail',
+          edit: '/erp/accountHead/updateAccountHeadAndDetail',
+          detailList: '/erp/accountItem/getDetailList'
         }
       }
     },

src/views/erp/financial/modules/MoneyInModal.vue

@@ -215,9 +215,9 @@
           }
         },
         url: {
-          add: '/accountHead/addAccountHeadAndDetail',
-          edit: '/accountHead/updateAccountHeadAndDetail',
-          detailList: '/accountItem/getDetailList'
+          add: '/erp/accountHead/addAccountHeadAndDetail',
+          edit: '/erp/accountHead/updateAccountHeadAndDetail',
+          detailList: '/erp/accountItem/getDetailList'
         }
       }
     },

src/views/erp/financial/modules/MoneyOutModal.vue

@@ -218,9 +218,9 @@
           }
         },
         url: {
-          add: '/accountHead/addAccountHeadAndDetail',
-          edit: '/accountHead/updateAccountHeadAndDetail',
-          detailList: '/accountItem/getDetailList'
+          add: '/erp/accountHead/addAccountHeadAndDetail',
+          edit: '/erp/accountHead/updateAccountHeadAndDetail',
+          detailList: '/erp/accountItem/getDetailList'
         }
       }
     },

src/views/erp/material/MaterialCategoryList.vue

@@ -161,7 +161,7 @@ export default {
   },
   computed: {
     importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      return `${process.env.VUE_APP_BASE_API}/${this.url.importExcelUrl}`;
     }
   },
   methods: {

src/views/erp/material/MaterialList.vue

@@ -215,13 +215,13 @@
           {title: '最低售价', dataIndex: 'lowDecimal', align: 'center', width: 80}
         ],
         url: {
-          list: "/material/list",
-          delete: "/material/delete",
-          deleteBatch: "/material/deleteBatch",
-          importExcelUrl: "/material/importExcel",
-          exportXlsUrl: "/material/exportExcel",
-          batchSetStatusUrl: "/material/batchSetStatus",
-          batchSetMaterialCurrentStockUrl: "/material/batchSetMaterialCurrentStock"
+          list: "/erp/material/list",
+          delete: "/erp/material/delete",
+          deleteBatch: "/erp/material/deleteBatch",
+          importExcelUrl: "/erp/material/importExcel",
+          exportXlsUrl: "/erp/material/exportExcel",
+          batchSetStatusUrl: "/erp/material/batchSetStatus",
+          batchSetMaterialCurrentStockUrl: "/erp/material/batchSetMaterialCurrentStock"
         }
       }
     },
@@ -231,7 +231,7 @@
     },
     computed: {
       importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
+        return `${process.env.VUE_APP_BASE_API}${this.url.importExcelUrl}`;
       }
     },
     methods: {

src/views/erp/material/MaterialPropertyList.vue

@@ -104,9 +104,9 @@
           }
         ],
         url: {
-          list: "/materialProperty/list",
-          delete: "/materialProperty/delete",
-          deleteBatch: "/materialProperty/deleteBatch"
+          list: "/erp/materialProperty/list",
+          delete: "/erp/materialProperty/delete",
+          deleteBatch: "/erp/materialProperty/deleteBatch"
         }
       }
     },

src/views/erp/material/modules/MaterialCategoryModal.vue

@@ -76,7 +76,7 @@
           serialNo: {rules: [{required: true, message: '请输入编号!'}]}
         },
         url: {
-          add: "/materialCategory/add",
+          add: "/erp/materialCategory/add",
         }
       }
     },

src/views/erp/material/modules/MaterialModal.vue

@@ -415,10 +415,10 @@
           }
         },
         url: {
-          add: '/material/add',
-          edit: '/material/update',
-          materialsExtendList: '/materialsExtend/getDetailList',
-          depotWithStock: '/depot/getAllListWithStock'
+          add: '/erp/material/add',
+          edit: '/erp/material/update',
+          materialsExtendList: '/erp/materialsExtend/getDetailList',
+          depotWithStock: '/erp/depot/getAllListWithStock'
         },
       }
     },

src/views/erp/report/AccountReport.vue

@@ -129,8 +129,8 @@
           }
         ],
         url: {
-          list: "/account/list",
-          getStatistics: "/account/getStatistics"
+          list: "/erp/account/list",
+          getStatistics: "/erp/account/getStatistics"
         }
       }
     },

src/views/erp/report/AllocationDetail.vue

@@ -186,7 +186,7 @@
           {title: '备注', dataIndex: 'newRemark', width: 100}
         ],
         url: {
-          list: "/depotHead/findAllocationDetail",
+          list: "/erp/depotHead/findAllocationDetail",
         }
       }
     },

src/views/erp/report/BuyInReport.vue

@@ -122,7 +122,7 @@
           {title: '实际采购金额', dataIndex: 'inOutSumPrice', sorter: (a, b) => a.inOutSumPrice - b.inOutSumPrice, width: 100}
         ],
         url: {
-          list: "/depotItem/buyIn"
+          list: "/erp/depotItem/buyIn"
         }
       }
     },

src/views/erp/report/CustomerAccount.vue

@@ -153,7 +153,7 @@
           {title: '单据日期', dataIndex: 'oTime', width: 160}
         ],
         url: {
-          list: "/depotHead/findStatementAccount",
+          list: "/erp/depotHead/findStatementAccount",
         }
       }
     },

src/views/erp/report/InDetail.vue

@@ -178,7 +178,7 @@
           {title: '备注', dataIndex: 'newRemark', width: 100}
         ],
         url: {
-          list: "/depotHead/findInDetail",
+          list: "/erp/depotHead/findInDetail",
         }
       }
     },

src/views/erp/report/InMaterialCount.vue

@@ -156,7 +156,7 @@
           {title: '入库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum, width: 120}
         ],
         url: {
-          list: "/depotHead/findInOutMaterialCount",
+          list: "/erp/depotHead/findInOutMaterialCount",
         }
       }
     },

src/views/erp/report/InOutStockReport.vue

@@ -147,9 +147,9 @@
           {title: '结存金额', dataIndex: 'thisAllPrice', sorter: (a, b) => a.thisAllPrice - b.thisAllPrice, width: 60}
         ],
         url: {
-          list: "/depotItem/findByAll",
-          totalCountMoney: "/depotItem/totalCountMoney",
-          exportXlsUrl: "/depotItem/exportExcel"
+          list: "/erp/depotItem/findByAll",
+          totalCountMoney: "/erp/depotItem/totalCountMoney",
+          exportXlsUrl: "/erp/depotItem/exportExcel"
         }
       }
     },

src/views/erp/report/MaterialStock.vue

@@ -180,7 +180,7 @@
           }
         ],
         url: {
-          list: "/material/getListWithStock"
+          list: "/erp/material/getListWithStock"
         }
       }
     },

src/views/erp/report/OutDetail.vue

@@ -178,7 +178,7 @@
           {title: '备注', dataIndex: 'newRemark', width: 100}
         ],
         url: {
-          list: "/depotHead/findInDetail",
+          list: "/erp/depotHead/findInDetail",
         }
       }
     },

src/views/erp/report/OutMaterialCount.vue

@@ -156,7 +156,7 @@
           {title: '出库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum, width: 120}
         ],
         url: {
-          list: "/depotHead/findInOutMaterialCount",
+          list: "/erp/depotHead/findInOutMaterialCount",
         }
       }
     },

src/views/erp/report/SaleOutReport.vue

@@ -127,7 +127,7 @@
           {title: '实际销售金额', dataIndex: 'outInSumPrice', sorter: (a, b) => a.outInSumPrice - b.outInSumPrice, width: 100}
         ],
         url: {
-          list: "/depotItem/saleOut"
+          list: "/erp/depotItem/saleOut"
         }
       }
     },

src/views/erp/report/StockWarningReport.vue

@@ -129,7 +129,7 @@
           {title: '建议出库量', dataIndex: 'highCritical', sorter: (a, b) => a.highCritical - b.highCritical, width: 80}
         ],
         url: {
-          list: "/depotItem/findStockWarningCount"
+          list: "/erp/depotItem/findStockWarningCount"
         }
       }
     },

src/views/erp/report/VendorAccount.vue

@@ -154,7 +154,7 @@
           {title: '单据日期', dataIndex: 'oTime', width: 160}
         ],
         url: {
-          list: "/depotHead/findStatementAccount",
+          list: "/erp/depotHead/findStatementAccount",
         }
       }
     },

src/views/erp/report/batchStock.vue

@@ -131,7 +131,7 @@
           {title: '库存', dataIndex: 'stock', width: 80}
         ],
         url: {
-          list: "/depotItem/batchStock"
+          list: "/erp/depotItem/batchStock"
         }
       }
     },

src/views/erp/report/modules/AccountInOutList.vue

@@ -108,7 +108,7 @@
           sm: { span: 16 },
         },
         url: {
-          list: "/account/findAccountInOutList"
+          list: "/erp/account/findAccountInOutList"
         }
       }
     },

src/views/erp/report/modules/MaterialInOutList.vue

@@ -88,7 +88,7 @@
           sm: { span: 16 },
         },
         url: {
-          list: "/depotItem/findDetailByTypeAndMaterialId"
+          list: "/erp/depotItem/findDetailByTypeAndMaterialId"
         }
       }
     },

src/views/erp/system/AccountList.vue

@@ -139,10 +139,10 @@
           }
         ],
         url: {
-          list: "/account/list",
-          delete: "/account/delete",
-          deleteBatch: "/account/deleteBatch",
-          setDefault: "/account/updateIsDefault"
+          list: "/erp/account/list",
+          delete: "/erp/account/delete",
+          deleteBatch: "/erp/account/deleteBatch",
+          setDefault: "/erp/account/updateIsDefault"
         }
       }
     },

src/views/erp/system/CustomerList.vue

@@ -157,18 +157,18 @@
           }
         ],
         url: {
-          list: "/supplier/list",
-          delete: "/supplier/delete",
-          deleteBatch: "/supplier/deleteBatch",
-          importExcelUrl: "/supplier/importCustomer",
-          exportXlsUrl: "/supplier/exportExcel",
-          batchSetStatusUrl: "/supplier/batchSetStatus"
+          list: "/erp/supplier/list",
+          delete: "/erp/supplier/delete",
+          deleteBatch: "/erp/supplier/deleteBatch",
+          importExcelUrl: "/erp/supplier/importCustomer",
+          exportXlsUrl: "/erp/supplier/exportExcel",
+          batchSetStatusUrl: "/erp/supplier/batchSetStatus"
         }
       }
     },
     computed: {
       importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
+        return `${process.env.VUE_APP_BASE_API}${this.url.importExcelUrl}`;
       }
     },
     methods: {

src/views/erp/system/DepotList.vue

@@ -136,10 +136,10 @@
           }
         ],
         url: {
-          list: "/depot/list",
-          delete: "/depot/delete",
-          deleteBatch: "/depot/deleteBatch",
-          setDefault: "/depot/updateIsDefault"
+          list: "/erp/depot/list",
+          delete: "/erp/depot/delete",
+          deleteBatch: "/erp/depot/deleteBatch",
+          setDefault: "/erp/depot/updateIsDefault"
         }
       }
     },

src/views/erp/system/FunctionList.vue

@@ -126,9 +126,9 @@
           }
         ],
         url: {
-          list: "/function/list",
-          delete: "/function/delete",
-          deleteBatch: "/function/deleteBatch"
+          list: "/erp/function/list",
+          delete: "/erp/function/delete",
+          deleteBatch: "/erp/function/deleteBatch"
         }
       }
     },

src/views/erp/system/InOutItemList.vue

@@ -132,9 +132,9 @@
           }
         ],
         url: {
-          list: "/inOutItem/list",
-          delete: "/inOutItem/delete",
-          deleteBatch: "/inOutItem/deleteBatch"
+          list: "/erp/inOutItem/list",
+          delete: "/erp/inOutItem/delete",
+          deleteBatch: "/erp/inOutItem/deleteBatch"
         }
       }
     },

src/views/erp/system/LogList.vue

@@ -151,7 +151,7 @@
           offset: 1
         },
         url: {
-          list: "/log/list",
+          list: "/erp/log/list",
         }
       }
     },

src/views/erp/system/MemberList.vue

@@ -153,18 +153,18 @@
           }
         ],
         url: {
-          list: "/supplier/list",
-          delete: "/supplier/delete",
-          deleteBatch: "/supplier/deleteBatch",
-          importExcelUrl: "/supplier/importMember",
-          exportXlsUrl: "/supplier/exportExcel",
-          batchSetStatusUrl: "/supplier/batchSetStatus"
+          list: "/erp/supplier/list",
+          delete: "/erp/supplier/delete",
+          deleteBatch: "/erp/supplier/deleteBatch",
+          importExcelUrl: "/erp/supplier/importMember",
+          exportXlsUrl: "/erp/supplier/exportExcel",
+          batchSetStatusUrl: "/erp/supplier/batchSetStatus"
         }
       }
     },
     computed: {
       importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
+        return `${process.env.VUE_APP_BASE_API}${this.url.importExcelUrl}`;
       }
     },
     methods: {

src/views/erp/system/MsgList.vue

@@ -110,9 +110,9 @@
           width: 50
         }],
 		    url: {
-          list: "/msg/list",
-          batchUpdateStatus:"/msg/batchUpdateStatus",
-          readAllMsg:"/msg/readAllMsg",
+          list: "/erp/msg/list",
+          batchUpdateStatus:"/erp/msg/batchUpdateStatus",
+          readAllMsg:"/erp/msg/readAllMsg",
         },
         loading:false,
         openPath:'',

src/views/erp/system/OrganizationList.vue

@@ -162,7 +162,7 @@ export default {
   },
   computed: {
     importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      return `${process.env.VUE_APP_BASE_API}/${this.url.importExcelUrl}`;
     }
   },
   methods: {

src/views/erp/system/PersonList.vue

@@ -132,9 +132,9 @@
           }
         ],
         url: {
-          list: "/person/list",
-          delete: "/person/delete",
-          deleteBatch: "/person/deleteBatch"
+          list: "/erp/person/list",
+          delete: "/erp/person/delete",
+          deleteBatch: "/erp/person/deleteBatch"
         }
       }
     },

src/views/erp/system/PlatformConfigList.vue

@@ -83,9 +83,9 @@
           }
         ],
         url: {
-          list: "/platformConfig/list",
-          delete: "/platformConfig/delete",
-          deleteBatch: "/platformConfig/deleteBatch"
+          list: "/erp/platformConfig/list",
+          delete: "/erp/platformConfig/delete",
+          deleteBatch: "/erp/platformConfig/deleteBatch"
         },
       }
     },

src/views/erp/system/PluginList.vue

@@ -164,16 +164,16 @@
           }
         ],
         url: {
-          list: "/plugin/list",
-          delete: "/plugin/delete",
-          deleteBatch: "/plugin/deleteBatch",
-          importJarUrl: "/plugin/uploadInstallPluginJar",
+          list: "/erp/plugin/list",
+          delete: "/erp/plugin/delete",
+          deleteBatch: "/erp/plugin/deleteBatch",
+          importJarUrl: "/erp/plugin/uploadInstallPluginJar",
         }
       }
     },
     computed: {
       importUrl: function () {
-        return `${window._CONFIG['domianURL']}${this.url.importJarUrl}`;
+        return `${process.env.VUE_APP_BASE_API}${this.url.importJarUrl}`;
       }
     },
     methods: {

src/views/erp/system/RoleList.vue

@@ -144,15 +144,15 @@
           }
         ],
         url: {
-          list: "/role/list",
-          delete: "/role/delete",
-          deleteBatch: "/role/deleteBatch"
+          list: "/erp/role/list",
+          delete: "/erp/role/delete",
+          deleteBatch: "/erp/role/deleteBatch"
         },
       }
     },
     computed: {
       importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+        return `${process.env.VUE_APP_BASE_API}/${this.url.importExcelUrl}`;
       }
     },
     methods: {

src/views/erp/system/TenantList.vue

@@ -144,8 +144,8 @@
           }
         ],
         url: {
-          list: "/tenant/list",
-          batchSetStatusUrl: "/tenant/batchSetStatus"
+          list: "/erp/tenant/list",
+          batchSetStatusUrl: "/erp/tenant/batchSetStatus"
         },
       }
     },

src/views/erp/system/UserList.vue

@@ -147,11 +147,11 @@
           }
         ],
         url: {
-          list: "/user/list",
-          delete: "/user/delete",
-          deleteBatch: "/user/deleteBatch",
-          resetPwd: "/user/resetPwd",
-          batchSetStatusUrl: "/user/batchSetStatus"
+          list: "/erp/user/list",
+          delete: "/erp/user/delete",
+          deleteBatch: "/erp/user/deleteBatch",
+          resetPwd: "/erp/user/resetPwd",
+          batchSetStatusUrl: "/erp/user/batchSetStatus"
         },
       }
     },

src/views/erp/system/VendorList.vue

@@ -156,18 +156,18 @@
           }
         ],
         url: {
-          list: "/supplier/list",
-          delete: "/supplier/delete",
-          deleteBatch: "/supplier/deleteBatch",
-          importExcelUrl: "/supplier/importVendor",
-          exportXlsUrl: "/supplier/exportExcel",
-          batchSetStatusUrl: "/supplier/batchSetStatus"
+          list: "/erp/supplier/list",
+          delete: "/erp/supplier/delete",
+          deleteBatch: "/erp/supplier/deleteBatch",
+          importExcelUrl: "/erp/supplier/importVendor",
+          exportXlsUrl: "/erp/supplier/exportExcel",
+          batchSetStatusUrl: "/erp/supplier/batchSetStatus"
         }
       }
     },
     computed: {
       importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
+        return `${process.env.VUE_APP_BASE_API}${this.url.importExcelUrl}`;
       }
     },
     methods: {

src/views/erp/system/modules/OrganizationModal.vue

@@ -78,7 +78,7 @@
           orgNo: {rules: [{required: true, message: '请输入编码!'}]}
         },
         url: {
-          add: "/organization/add",
+          add: "/erp/organization/add",
         }
       }
     },

src/views/erp/system/modules/RolePushBtnModal.vue

@@ -107,7 +107,7 @@
           }
         ],
         url: {
-          list: "/function/findRoleFunctionsById"
+          list: "/erp/function/findRoleFunctionsById"
         }
       }
     },

src/views/login.vue

@@ -174,9 +174,11 @@ export default {
             Cookies.remove('tenantName');
           }
           // 发起登陆
-          this.$store.dispatch("Login", this.loginForm).then(() => {
+          this.$store.dispatch("Login", this.loginForm)
+          .then(() => {
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
+          }).catch((err) => {
+            console.log(err);
             this.loading = false;
             this.getCode();
           });

src/views/pay/refund/index.vue

@@ -74,7 +74,7 @@
       <!--      <el-table-column label="商户名称" align="center" prop="merchantName" width="120"/>-->
       <!--      <el-table-column label="应用名称" align="center" prop="appName" width="120"/>-->
       <el-table-column label="支付渠道" align="center" width="130">
-        <template v-slot="scope">
+        <template slot-scope="scope">
           <el-popover trigger="hover" placement="top">
             <p>商户名称: {{ scope.row.merchantName }}</p>
             <p>应用名称: {{ scope.row.appName }}</p>
@@ -88,7 +88,7 @@
       <!--      <el-table-column label="交易订单号" align="center" prop="tradeNo" width="140"/>-->
       <!--      <el-table-column label="商户订单编号" align="center" prop="merchantOrderId" width="140"/>-->
       <el-table-column label="商户订单号" align="left" width="230">
-        <template v-slot="scope">
+        <template slot-scope="scope">
           <p class="order-font">
             <el-tag size="mini">退款</el-tag>
             {{ scope.row.merchantRefundNo }}
@@ -100,7 +100,7 @@
         </template>
       </el-table-column>
       <el-table-column label="支付订单号" align="center" prop="merchantRefundNo" width="250">
-        <template v-slot="scope">
+        <template slot-scope="scope">
           <p class="order-font">
             <el-tag size="mini">交易</el-tag>
             {{ scope.row.tradeNo }}
@@ -112,27 +112,27 @@
         </template>
       </el-table-column>
       <el-table-column label="支付金额(元)" align="center" prop="payAmount" width="100">
-        <template v-slot="scope" class="">
+        <template slot-scope="scope" class="">
           ￥{{ parseFloat(scope.row.payAmount / 100).toFixed(2) }}
         </template>
       </el-table-column>
       <el-table-column label="退款金额(元)" align="center" prop="refundAmount" width="100">
-        <template scope="scope">
+        <template slot-scope="scope">
           ￥{{ parseFloat(scope.row.refundAmount / 100).toFixed(2) }}
         </template>
       </el-table-column>
       <el-table-column label="退款类型" align="center" prop="type" width="80">
-        <template v-slot="scope">
+        <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
       <el-table-column label="退款状态" align="center" prop="status">
-        <template v-slot="scope">
+        <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="回调状态" align="center" prop="notifyStatus">
-        <template v-slot="scope">
+        <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.PAY_ORDER_NOTIFY_STATUS" :value="scope.row.notifyStatus" />
         </template>
       </el-table-column>
@@ -183,7 +183,7 @@
           <el-tag class="tag-purple" size="mini">{{ parseFloat(refundDetail.refundAmount / 100).toFixed(2) }}</el-tag>
         </el-descriptions-item>
         <el-descriptions-item label="退款类型">
-          <template v-slot="scope">
+          <template slot-scope="scope">
             <dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_TYPE" :value="refundDetail.type" />
           </template>
         </el-descriptions-item>

src/views/system/sensitiveWord/index.vue

@@ -56,7 +56,7 @@
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <el-tag :disable-transitions="true" v-for="(tag, index) in scope.row.tags" :index="index">
+          <el-tag :disable-transitions="true" v-for="(tag, index) in scope.row.tags" :key="index" :index="index">
             {{ tag }}
           </el-tag>
         </template>