2023-11-6

crm  uniaop  接口逻辑全部完成

supervise-crm-ui/.env.development

@@ -5,5 +5,5 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://192.168.1.107:8112"
+VUE_APP_URL = "http://192.168.1.103:7004"
 ##VUE_APP_URL = "http://8.130.39.13:8112"

supervise-crm-ui/.env.production

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = '/api/crm'
 
 ## 配置 正式接口地址
 VUE_APP_URL = "http://120.46.131.15:8111"

supervise-crm-ui/src/api/brank/brank.js

@@ -4,7 +4,6 @@ export default {
 
   addInfo: function(data) {
     return request({
-      baseURL: "/api/crm",
       url: '/v1/loanbankinformation/save',
       method: 'post',
       data: data
@@ -13,14 +12,12 @@ export default {
   
   fetchBySid: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/loanbankinformation/getBankInfBySid/' + sid
     })
   },
 
   updateData: function(data) {
     return request({
-      baseURL: "/api/crm",
       url: '/v1/loanbankinformation/update',
       method: 'post',
       data: data
@@ -29,7 +26,6 @@ export default {
 
   delBySids: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: 'v1/loanbankinformation/delete/' + sid,
       method: 'delete'
     })
@@ -38,7 +34,6 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-        baseURL: '/api/crm',
       url: '/v1/loanbankinformation/listPage',
       method: 'post',
       data: params,

supervise-crm-ui/src/api/customermanagement/customermanagement.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 // Pc端客户基础信息条件分页查询数据的列表
 export function pagerList(data) {
   return request({
-    url: '/crm/v1/crmcustomertemp/listPage',
+    url: '/v1/crmcustomertemp/listPage',
     method: 'post',
     data: data,
     headers: {
@@ -16,7 +16,7 @@ export function pagerList(data) {
 // 客户查询
 export function listPageByOrgPathSid(data) {
   return request({
-    url: '/crm/v1/crmcustomertemp/listPageByOrgPathSid',
+    url: '/v1/crmcustomertemp/listPageByOrgPathSid',
     method: 'post',
     data: data,
     headers: {
@@ -28,7 +28,7 @@ export function listPageByOrgPathSid(data) {
 // 添加 已改
 export function savePcCustomerInfo(data) {
   return request({
-    url: '/crm/v1/crmcustomertemp/save',
+    url: '/v1/crmcustomertemp/save',
     data: data,
     method: 'post',
     headers: {
@@ -40,7 +40,7 @@ export function savePcCustomerInfo(data) {
 // -- 修改 已改
 export function updatePcCustomerInfo(data) {
   return request({
-    url: '/crm/v1/crmcustomertemp/update/' + data.sid,
+    url: '/v1/crmcustomertemp/update/' + data.sid,
     method: 'post',
     data: data,
     headers: {
@@ -52,7 +52,7 @@ export function updatePcCustomerInfo(data) {
 // 详情、编辑回显 已改
 export function getPcCustomerInfoBySid(data) {
   return request({
-    url: '/crm/v1/crmcustomertemp/fetchSid/' + data,
+    url: 'v1/crmcustomertemp/fetchSid/' + data,
     method: 'get'
   })
 }
@@ -60,7 +60,7 @@ export function getPcCustomerInfoBySid(data) {
 // 删除 已改
 export function deleteBySids(data) {
   return request({
-    url: '/crm/v1/crmcustomertemp/del/',
+    url: '/v1/crmcustomertemp/del/',
     method: 'delete',
     data: data,
     headers: {
@@ -72,7 +72,7 @@ export function deleteBySids(data) {
 // 推送财务数据--是否确定车架号选择否
 export function sendFinCustomer(data, orgCode) {
   return request({
-    url: '/crm/v1/crmcustomertemp/sendFinCustomer/' + orgCode,
+    url: '/v1/crmcustomertemp/sendFinCustomer/' + orgCode,
     method: 'post',
     data: data,
     headers: {
@@ -84,7 +84,7 @@ export function sendFinCustomer(data, orgCode) {
 // 推送财务数据--是否确定车架号选择是
 export function sendFinCustomerTrue(data) {
   return request({
-    url: '/crm/v1/crmcustomertemp/sendFinCustomerTrue',
+    url: '/v1/crmcustomertemp/sendFinCustomerTrue',
     method: 'post',
     data: data,
     headers: {
@@ -137,7 +137,7 @@ export function KeHuNamesDown(data) {
 // Pc端保存登记单信息
 export function saveCustomersAll(data) {
   return request({
-    url: '/crm/v1/crmcustomer/saveCustomersAll', data,
+    url: '/v1/crmcustomer/saveCustomersAll', data,
     method: 'post',
     // data: data,
     headers: {
@@ -149,7 +149,7 @@ export function saveCustomersAll(data) {
 // Pc端修改登记单信息
 export function updateCustomersAll(data) {
   return request({
-    url: '/crm/v1/crmcustomer/updateCustomersAll/' + data,
+    url: '/v1/crmcustomer/updateCustomersAll/' + data,
     method: 'post',
     // data: data,
     headers: {
@@ -161,7 +161,7 @@ export function updateCustomersAll(data) {
 // Pc端登记单修改回显及详情信息
 export function selectCustomersAll(data) {
   return request({
-    url: '/crm/v1/crmcustomer/selectCustomersAll?sid=' + data,
+    url: '/v1/crmcustomer/selectCustomersAll?sid=' + data,
     method: 'get'
   })
 }
@@ -169,7 +169,7 @@ export function selectCustomersAll(data) {
 //
 export function listPage(data) {
   return request({
-    url: '/crm/v1/crmcustomer/listPage',
+    url: '/v1/crmcustomer/listPage',
     method: 'post',
     data: data,
     headers: {
@@ -181,7 +181,7 @@ export function listPage(data) {
 // Pc端根据sid查询客户基础信息是否存在
 export function getPcCustomerMobileAndName(mobile, name) {
   return request({
-    url: '/crm/v1/crmcustomer/getPcCustomerMobileAndName?mobile=' + mobile + '&name=' + name,
+    url: '/v1/crmcustomer/getPcCustomerMobileAndName?mobile=' + mobile + '&name=' + name,
     method: 'get'
   })
 }

supervise-crm-ui/src/api/dataDict/datadict.js

@@ -6,7 +6,6 @@ export default {
   // 行业品类 分类列表
   industryListPage: function(params) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/industrydictionary/listPage',
       method: 'post',
       data: params,
@@ -18,7 +17,6 @@ export default {
   // 行业品类 通过sid删除一条或多条记录
   industryDelBySids: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/industrydictionary/delete/' + sid,
       method: 'delete'
     })
@@ -26,7 +24,6 @@ export default {
   // 行业品类 保存行业品类
   saveindustry: function(params) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/industrydictionary/save',
       method: 'post',
       data: params,
@@ -39,7 +36,6 @@ export default {
   // 行业品类 修改行业品类
   updateindustry: function(params) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/industrydictionary/update',
       method: 'post',
       data: params,
@@ -52,7 +48,6 @@ export default {
   // 行业品类 通过sid查询一条记录
   industryFetchBySid: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/industrydictionary/getIndustryBySid/' + sid
     })
   },
@@ -62,7 +57,6 @@ export default {
   // 类别维护 类别列表
   classListPage: function(params) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/projtypedictionary/listPage',
       method: 'post',
       data: params,
@@ -74,7 +68,6 @@ export default {
   // 类别维护 通过sid删除一条或多条记录
   classDelBySids: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/projtypedictionary/delete/' + sid,
       method: 'delete'
     })
@@ -82,7 +75,6 @@ export default {
   // 类别维护 保存行业品类
   saveClass: function(params) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/projtypedictionary/save',
       method: 'post',
       data: params,
@@ -94,7 +86,6 @@ export default {
   // 类别维护 修改行业品类
   updateClass: function(params) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/projtypedictionary/update',
       method: 'post',
       data: params,
@@ -106,7 +97,6 @@ export default {
   // 类别维护 通过sid查询一条记录
   classFetchBySid: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/projtypedictionary/getProjTypeBySid/' + sid
     })
   },
@@ -116,7 +106,6 @@ export default {
   // 状态 分类列表
   projectstatedListPage: function(params) {
     return request({
-      baseURL: '/api/crm',
       url: '/projectstatedictionary/listPage',
       method: 'post',
       data: params,
@@ -128,7 +117,6 @@ export default {
   // 行业品类 通过sid删除一条或多条记录
   projectstatedDelBySids: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/projectstatedictionary/delete/' + sid,
       method: 'delete'
     })
@@ -136,7 +124,6 @@ export default {
   //  新增、保存状态
   saveprojectstated: function(params) {
     return request({
-      baseURL: '/api/crm',
       url: '/projectstatedictionary/save',
       method: 'post',
       data: params,
@@ -149,7 +136,6 @@ export default {
   // 行业品类 修改行业品类
   updateprojectstated: function(params) {
     return request({
-      baseURL: '/api/crm',
       url: '/projectstatedictionary/update',
       method: 'post',
       data: params,
@@ -162,7 +148,6 @@ export default {
   // 行业品类 通过sid查询一条记录
   projectstatedBySid: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/projectstatedictionary/getProjectStateBySid/' + sid
     })
   },

supervise-crm-ui/src/api/enterprise/enterprise.js

@@ -4,7 +4,6 @@ export default {
 
   addInfo: function(data) {
     return request({
-      baseURL: "/api/crm",
       url: '/v1/enterpriseinformation/save',
       method: 'post',
       data: data
@@ -13,14 +12,12 @@ export default {
 
   fetchBySid: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/enterpriseinformation/getEnterpriseBySid/' + sid
     })
   },
 
   updateData: function(data) {
     return request({
-      baseURL: "/api/crm",
       url: '/v1/enterpriseinformation/update',
       method: 'post',
       data: data
@@ -29,7 +26,6 @@ export default {
 
   delBySids: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/enterpriseinformation/delete/' + sid,
       method: 'delete'
     })
@@ -38,7 +34,6 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-        baseURL: '/api/crm',
       url: '/v1/enterpriseinformation/listPage',
       method: 'post',
       data: params,

supervise-crm-ui/src/api/portal/Upload.js

@@ -1,10 +1,10 @@
 import request from '@/utils/request'
 import qs from 'qs'
 // 统一请求路径前缀
-const base = process.env.VUE_APP_URL
+const base = process.env.VUE_APP_BASE_API
 
 // 文件上传接口
-export const uploadFile = '/api/crm/file/upload'
+export const uploadFile =base+ '/file/upload'
 // export const uploadFile = process.env.VUE_APP_BASE_API + '/customer/file/upload'
 
 

supervise-crm-ui/src/api/portal/areaPicker.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取省/portal/v1/regions/getProvince
 export function getProvince(data) {
   return request({
-    url: '/portal/v1/regions/getProvince',data,
+    url: 'v1/region/getProvince',data,
     method: 'get',
     params:data,
   })

supervise-crm-ui/src/api/project/project.js

@@ -5,7 +5,6 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/projectinformation/listPage',
       method: 'post',
       data: params,
@@ -18,7 +17,6 @@ export default {
   // 获取贷款行
   getLoanbankinformation: function(data) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/loanbankinformation/list',
       data,
       method: 'post',
@@ -29,7 +27,6 @@ export default {
   // 获取贷款行
   getUserListByOrg: function() {
     return request({
-        baseURL: '/api/portal',
       url: '/v1/sysorganization/getUserListByOrg/100',
       method: 'get',
     })
@@ -39,7 +36,7 @@ export default {
   // 获取项目单位
   getEnterpriseinformation: function(data) {
     return request({
-      baseURL: '/api/crm',
+
       url: '/v1/enterpriseinformation/list',
       data,
       method: 'post',
@@ -49,7 +46,7 @@ export default {
   // 获取行业字典信息
   getIndustrydictionary: function(data) {
     return request({
-      baseURL: '/api/crm',
+
       url: '/v1/industrydictionary/list',
       data,
       method: 'post',
@@ -60,7 +57,7 @@ export default {
   // 获取类型字典信息
   getProjtypedictionary: function(data) {
     return request({
-      baseURL: '/api/crm',
+
       url: '/v1/projtypedictionary/list',
       data,
       method: 'post',
@@ -71,7 +68,7 @@ export default {
   // 获取 状态字典信息
   getProjtypedstated: function(data) {
     return request({
-      baseURL: '/api/crm',
+
       url: '/projectstatedictionary/listAll',
       data,
       method: 'get',
@@ -81,7 +78,6 @@ export default {
 
   saveInfo: function(data) {
     return request({
-      baseURL: "/api/crm",
       url: '/v1/projectinformation/save',
       method: 'post',
       data: data
@@ -90,7 +86,6 @@ export default {
 
   addInfo: function(data) {
     return request({
-      baseURL: "/api/crm",
       url: '/v1/projectinformation/save',
       method: 'post',
       data: data
@@ -99,7 +94,7 @@ export default {
 
   fetchBySid: function(sid) {
     return request({
-      baseURL: '/api/crm',
+
       url: '/v1/projectinformation/getEnterpriseBySid/' + sid
     })
   },
@@ -107,14 +102,13 @@ export default {
 
   getInfoBySid: function(sid) {
     return request({
-      baseURL: '/api/crm',
+
       url: '/v1/projectinformation/getProjectBySid/' + sid
     })
   },
 
   updateData: function(data) {
     return request({
-      baseURL: "/api/crm",
       url: '/v1/projectinformation/update',
       method: 'post',
       data: data
@@ -123,41 +117,40 @@ export default {
   // 选择可用的仓库信息
   selectStoreHouse: function() {
     return request({
-      url: '/crm/v1/projectinformation/selectStoreHouse',
+      url: '/v1/projectinformation/selectStoreHouse',
       method: 'get',
     });
   },
 
   delBySids: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/projectinformation/delete/' + sid,
       method: 'delete'
     })
   },
   getStorehouseBySid: function(sid) {
     return request({
-      url: '/crm/v1/projectinformation/getStorehouseBySid/' + sid,
+      url: '/v1/projectinformation/getStorehouseBySid/' + sid,
       method: 'get'
     })
   },
   selectStoreHouseSid: function(sid) {
     return request({
-      url: '/crm/v1/storehouseproject/selectStoreBySid/' + sid,
+      url: '/v1/storehouseproject/selectStoreBySid/' + sid,
       method: 'post'
     })
   },
   // 获取所有贷款行名称
   getBankName: function() {
     return request({
-      url: '/crm/v1/projectinformation/getBankName',
+      url: '/v1/projectinformation/getBankName',
       method: 'get',
     });
   },
   // 获取所有项目类型名称
   getProjectType: function() {
     return request({
-      url: '/crm/v1/projectinformation/getProjectType',
+      url: '/v1/projectinformation/getProjectType',
       method: 'get',
     });
   },

supervise-crm-ui/src/api/projectStaff/index.js

@@ -5,14 +5,14 @@ export default {
   // 选择可用的项目
   projectinformation: function() {
     return request({
-      url: '/crm/v1/projectinformation/listAll ',
+      url: '/v1/projectinformation/listAllNew',
       method: 'get',
     });
   },
   // 组织结构
   sysorganization: function(sid) {
     return request({
-      url: '/portal/v1/sysorganization/userList/'+sid,
+      url: '/v1/sysorganization/userList/'+sid,
       method: 'get',
     });
   },
@@ -20,27 +20,27 @@ export default {
   // 组织结构
   associationUserList: function(sid) {
     return request({
-      url: '/portal/v1/sysorganization/associationUserList/'+sid,
+      url: '/v1/sysorganization/associationUserList/'+sid,
       method: 'get',
     });
   },
 
   getUserByType: function(id) {
     return request({
-      url: '/crm/userproject/getUserByType/'+ id,
+      url: '/userproject/getUserByType/'+ id,
       method: 'get'
     })
   },
   getUserProjectBySid: function(sid) {
     return request({
-      url: '/crm/userproject/getUserProjectBySid/'+ sid,
+      url: '/userproject/getUserProjectBySid/'+ sid,
       method: 'get'
     })
   },
   // 人员关联项目
   userprojectSave: function(data) {
     return request({
-      url: '/crm/userproject/save',
+      url: '/userproject/save',
       method: 'post',
       data: data
     });
@@ -49,7 +49,7 @@ export default {
   // 人员取消关联项目
   usercancellation: function(data) {
     return request({
-      url: '/crm/userproject/cancellation',
+      url: '/userproject/cancellation',
       method: 'post',
       data: data
     });
@@ -58,7 +58,7 @@ export default {
   // 消息模版
   templateMessage: function(sid) {
     return request({
-      url: '/crm/v1/TemplateMessage/listAll/'+ sid,
+      url: '/v1/TemplateMessage/listAll/'+ sid,
       method: 'get',
     });
   },
@@ -67,7 +67,7 @@ export default {
   // 保存 个人 能接受到的模版
   saveProjectTemplate: function(data) {
     return request({
-      url: '/crm/v1/ProjectTemplate/save',
+      url: '/v1/ProjectTemplate/save',
       method: 'post',
       data: data
     });

supervise-crm-ui/src/api/storehouse/storehouse.js

@@ -4,7 +4,6 @@ export default {
 
   addInfo: function(data) {
     return request({
-      baseURL: "/api/crm",
       url: '/v1/warehouselocation/save',
       method: 'post',
       data: data
@@ -13,14 +12,12 @@ export default {
 
   fetchBySid: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/warehouselocation/getWarehouseBySid//' + sid
     })
   },
 
   updateData: function(data) {
     return request({
-      baseURL: "/api/crm",
       url: '/v1/warehouselocation/update',
       method: 'post',
       data: data
@@ -29,7 +26,6 @@ export default {
 
   delBySids: function(sid) {
     return request({
-      baseURL: '/api/crm',
       url: '/v1/warehouselocation/delete/' + sid,
       method: 'delete'
     })
@@ -38,7 +34,6 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-        baseURL: '/api/crm',
       url: '/v1/warehouselocation/listPage',
       method: 'post',
       data: params,

supervise-crm-ui/src/api/system/Role/role.js

@@ -13,8 +13,7 @@ export function rolemenus(data) {
 // 获取左侧菜单
 export function getrolemenus(data) {
   return request({
-    baseURL: '/api',
+    url: '/v1/sysmenu/sourcemenutree',
-    url: '/portal/v1/sysmenu/sourcemenutree',
     method: 'POST',
     async: false,
 //  data: {userSid: data.userSid, sourceSid: '000011'},

supervise-crm-ui/src/main.js

@@ -16,7 +16,12 @@ import eimage from '@/components/E-image/index.vue'
 import moment from 'moment'
 import Print from '@/utils/print' // 引入附件的js文件
 import request from '@/utils/request'
-import { setDefaultOrgPath, setDefaultOrgPathName, setStorage } from './utils/auth.js'
+import {
+  setDefaultOrgPath,
+  setDefaultOrgPathName,
+  setStorage,
+   getStorage
+} from './utils/auth.js'
 import VueAMap from 'vue-amap'
 
 Vue.use(ElementUI)
@@ -36,7 +41,9 @@ Vue.use(Print) // 注册
 Vue.use(VueAMap)
 VueAMap.initAMapApiLoader({
   key: 'ccda12d8bffc72e9f1a32c599323a876', // 此处的key,在高德开放平台申请
-  plugin: ['AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PlaceSearch', 'AMap.Geolocation', 'AMap.Geocoder'], // 此处的插件按需添加
+  plugin: ['AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PlaceSearch', 'AMap.Geolocation',
+    'AMap.Geocoder'
+  ], // 此处的插件按需添加
   v: '1.4.4',
   uiVersion: '1.0'
 })
@@ -44,13 +51,16 @@ VueAMap.initAMapApiLoader({
 Vue.config.productionTip = false
 
 // let token = null
+let token =
+  'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE2OTkzNDQ4OTZ9.R2iCiCKfnz2b66b7uv_5CQg5URPe5AvQLlE59mITUu0'
 // token = GetQueryString('token')
-// if (token) {
+if (token) {
-//   setStorage(token)
+    console.log('token》》》》》',token)
-//   const href = window.location.href
+  setStorage(token)
-// // href = href.split(`token=${token}`)[0]
+  const href = window.location.href
-// // window.location.href = href.slice(0, href.length - 1)
+  // href = href.split(`token=${token}`)[0]
-// }
+  // window.location.href = href.slice(0, href.length - 1)
+}
 
 var one = window.location.href.indexOf('&organizationData') + 18
 if (parseInt(one) > 18) {
@@ -62,16 +72,73 @@ if (parseInt(one) > 18) {
     setDefaultOrgPathName(obj.defaultOrgPathName)
   }
 }
-
 // 获取登录用户信息
 function getUserInfo() {
+  console.log('2222')
+    console.log('token' ,getStorage()) // for debug
+  return request({
+    url: '/v1/sysuser/loginDetailsNew',
+    method: 'post',
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  }).then(rep => {
+    const data = rep.data
+    console.log('xxxxx')
+    const user = {
+      roleSid: data.roleSid,
+      name: data.name,
+      userName: data.userName,
+      departmentName: data.departmentName, // 部门名称
+      departmentSid: data.departmentSid, // 部门sid
+      isAdmin: data.isAdmin,
+      staffSid: data.staffSid, // 业务员sid
+      userSid: data.sid,
+      orgSid: data.organizationSid, // 单位sid
+      Orgname: data.organizationName,
+      dwjb: data.dwjb,
+      orgNamePath: data.orgNamePath, // 使用组织全路径名称
+      orgSidPath: data.orgSidPath // 使用组织全路径Sid
+    }
+    // 结果存入缓存
+    window.sessionStorage.setItem('staffSid', user.staffSid)
+    window.sessionStorage.setItem('userSid', user.userSid)
+    window.sessionStorage.setItem('Orgname', user.Orgname)
+    window.sessionStorage.setItem('orgSid', user.orgSid)
+    window.sessionStorage.setItem('departmentName', user.departmentName)
+    window.sessionStorage.setItem('name', user.name)
+    window.sessionStorage.setItem('user', user)
+    window.sessionStorage.setItem('departmentName', user.departmentName)
+    window.sessionStorage.setItem('departmentSid', user.departmentSid)
+    window.sessionStorage.setItem('orgNamePath', user.orgNamePath)
+    window.sessionStorage.setItem('orgSidPath', user.orgSidPath)
     new Vue({
       el: '#app',
       router,
       store,
       render: h => h(App)
     })
+  })
 }
 
 getUserInfo()
 
+function GetQueryString(name) {
+  var one = window.location.href.indexOf('?token=') + 7
+  if (one < 7) {
+    return null
+  }
+  var two = window.location.href.lastIndexOf('&') // + 1
+  var data = window.location.href.substr(one)
+  if (two > one) {
+    data = window.location.href.slice(one, two)
+    console.log('token', data)
+  }
+  if (data) {
+    return data
+  }
+  return null
+  // var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)')
+  // var r = window.location.search.substr(1).match(reg)
+  // if (r != null) return unescape(r[2]); return null
+}

supervise-crm-ui/src/utils/auth.js

@@ -17,7 +17,7 @@ export function removeToken() {
 
 export function getStorage() {
   return sessionStorage.getItem('token')
-  // return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI0MjdhMmZiMC02MGM1LTQwOWYtYmVhNC00ZWI0NDEwNDFhZTYiLCJpc3MiOiJXQksiLCJleHAiOjE2NzQ2NzU5Mzl9.1P6VgCk3sXxWkl1364y7xhfc4ifdg6uGkzkF6uEmhIo'
+  // return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE2OTkzNDQ4OTZ9.R2iCiCKfnz2b66b7uv_5CQg5URPe5AvQLlE59mITUu0'
 }
 
 export function setStorage(session) {

supervise-crm-ui/src/utils/request.js

@@ -1,7 +1,13 @@
 import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
+import {
+  MessageBox,
+  Message
+} from 'element-ui'
 import store from '@/store'
-import { getToken, getStorage } from '@/utils/auth'
+import {
+  getToken,
+  getStorage
+} from '@/utils/auth'
 
 // create an axios instance
 const service = axios.create({
@@ -62,7 +68,8 @@ service.interceptors.response.use(
       })
 
       // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
-      if (statusCode === 401 || res.code === '5000' || res.code === 5000 || res.code === 50012 || res.code === 50014) {
+      if (statusCode === 401 || res.code === '5000' || res.code === 5000 || res.code === 50012 || res.code ===
+        50014) {
         // to re-login
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
           confirmButtonText: '重新登录',

supervise-crm-ui/src/views/enterprise/enterpriseAdd.vue

@@ -11,7 +11,7 @@
       </div>
     </div>
 
-    <div>
+    <div class="listconadd">
 
       <el-card class="box-card">
         <div class="item">

supervise-crm-ui/src/views/project/projectAdd.vue

@@ -163,7 +163,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item class="trightb_item">
-                <el-input v-model="formobj.useLimit" placeholder="请输入授信额度" style="width:100%" class="addinputw"
+                <el-input v-model="formobj.useLimit" placeholder="请输入用信额度" style="width:100%" class="addinputw"
                   clearable />
               </el-form-item>
             </el-col>

supervise-crm-ui/src/views/project/projectAdd2.vue

@@ -145,7 +145,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item class="trightb_item">
-                <el-input v-model="formobj.baseInfo.useLimit" placeholder="请输入授信额度" style="width:100%" class="addinputw"
+                <el-input v-model="formobj.baseInfo.useLimit" placeholder="请输入用信额度" style="width:100%" class="addinputw"
                   clearable   oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"/>
               </el-form-item>
             </el-col>

supervise-uniapp/App.vue

@@ -3,8 +3,8 @@
 	export default {
 		globalData: {
 			// wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin",
-			wxSilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxSilentLogin",// 静默登录
+			// wxSilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxSilentLogin",// 静默登录
-			// wxSilentLoginURL: "http://192.168.1.110:8112/portal/v1/wxuser/wxSilentLogin",
+			wxSilentLoginURL: "http://192.168.1.103:7009/v1/app/wxuser/wxSilentLogin",
 			wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxAuthLogin",
 			SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin",// 注册
 			token: "",

supervise-uniapp/common/request.api.js

@@ -1,7 +1,7 @@
 import request from '@/utils/requester.js'
 
 export default {
-	login: (params = {}) => request.post("/api/portal/v1/sysuser/login", params),
+	login: (params = {}) => request.post("/v1/app/sysuser/login", params),
 	sayhello: (params = {}) => request.get("/sayb", params),
 	getSalesReport: (params = {}) => request.get("/system/reportCenter/getSalesReport", params),
 	getGoodsOnWay: (params = {}) => request.get("/system/reportCenter/getGoodsOnWay", params),
@@ -11,12 +11,12 @@ export default {
 	useropenid: (params = {}) => request.post("/api/portal/useropenid/save", params),
 
 	// 获取 验证码 
-	sendVerificationCode: (params = {}) => request.get("/api/portal/v1/wxuser/sendVerificationCode/" + params.phone +
+	sendVerificationCode: (params = {}) => request.get("/v1/app/wxuser/sendVerificationCode/" + params.phone +
 		"/" +
 		params.type, params),
 
 	// 绑定手机号 
-	wxBindMobile: (params = {}) => request.post("/api/portal/v1/wxuser/wxBindMobile", params),
+	wxBindMobile: (params = {}) => request.post("/v1/app/wxuser/wxBindMobile", params),
 
 	// 查看预警信息
 	selectBusinessRiskInfo: (params = {}) => request.post("/wxmpapi/v1/businessData/selectBusinessRiskInfo", params),
@@ -104,35 +104,35 @@ export default {
 
 
 	// 获取待办工作列表
-	todoAllTaskList: (params = {}) => request.post("/api/portal/v1/flow/todoAllTaskList/" + params.params.userSid,
+	todoAllTaskList: (params = {}) => request.post("/v1/app/flow/todoAllTaskList/" + params.params.userSid,
 		params),
 
 	// 获取已办工作列表
-	doneAllTaskList: (params = {}) => request.post("/api/portal/v1/flow/doneAllTaskList/" + params.params.userSid,
+	doneAllTaskList: (params = {}) => request.post("/v1/app/flow/doneAllTaskList/" + params.params.userSid,
 		params),
 
 	// 获取业务流转记录
-	flowRecordList: (params = {}) => request.get("/api/portal/v1/flow/task/flowRecord/" + params.procInsId + "/" +
+	flowRecordList: (params = {}) => request.get("/v1/app/flow/task/flowRecord/" + params.procInsId + "/" +
 		params.deployId, {}),
 
 	// 同意申请
-	completeProcess: (params = {}) => request.post("/enterprisecentre/v1/sealrecord/complete", params),
+	completeProcess: (params = {}) => request.post("/v1/sealrecord/complete", params),
 
 	// 终止申请
-	breakProcess: (params = {}) => request.post("/enterprisecentre/v1/sealrecord/breakProcess", params),
+	breakProcess: (params = {}) => request.post("/v1/sealrecord/breakProcess", params),
 
 	// 撤回申请
-	revokeProcess: (params = {}) => request.post("/enterprisecentre/v1/sealrecord/revokeProcess", params),
+	revokeProcess: (params = {}) => request.post("/v1/sealrecord/revokeProcess", params),
 
 	// 获取用章申请详情
-	sealApplyDetail: (params = {}) => request.get("/enterprisecentre/v1/sealrecord/fetchDetailsBySid/" + params,
+	sealApplyDetail: (params = {}) => request.get("/v1/sealrecord/fetchDetailsBySid/" + params,
 		params),
 
 
 	// 获取云仓列表
-	storeHouseListPage: (params = {}) => request.post("/api/portal/v1/flow/storeHouseListPage", params),
+	storeHouseListPage: (params = {}) => request.post("/v1/app/shstorehouse/storeHouseListPage", params),
 	// 获取云仓详情
-	storeHouseDetail: (params = {}) => request.get("/api/portal/v1/flow/fetchDetailsBySid/" + params, params),
+	storeHouseDetail: (params = {}) => request.get("/v1/app/shstorehouse/fetchDetailsBySid/" + params, params),
 	
 	
 

supervise-uniapp/pages/index/DataAssembleList2.vue

@@ -65,7 +65,7 @@
 				datetimeShow: false,
 				allCredit: "",
 				allUseCredit: "",
-				orderDate:"",
+				orderDate:beforeDay(null,-1),
 				params: {
 					userSid: getApp().globalData.sid ,
 					orderDate: "",

supervise-uniapp/pages/index/RegulatoryReporting.vue

@@ -541,6 +541,13 @@
 			justify-content: space-between;
 
 			.top-name {
+					flex: 1;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				-webkit-box-orient: vertical;
+				margin-right: 20px;
 				font-size: 16px;
 				color: #000;
 			}