Merge branch 'zyh' into zyj

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 }