diff --git a/supervise-crm-ui/.env.development b/supervise-crm-ui/.env.development index d08634fb..8846d0e2 100644 --- a/supervise-crm-ui/.env.development +++ b/supervise-crm-ui/.env.development @@ -5,5 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -VUE_APP_URL = "http://192.168.1.193:8112" +VUE_APP_URL = "http://192.168.1.110:8112" ##VUE_APP_URL = "http://8.130.39.13:8112" diff --git a/supervise-crm-ui/src/api/project/project.js b/supervise-crm-ui/src/api/project/project.js index 2c1f6b86..36fc6e6d 100644 --- a/supervise-crm-ui/src/api/project/project.js +++ b/supervise-crm-ui/src/api/project/project.js @@ -109,5 +109,18 @@ export default { method: 'post' }) }, - + // 获取所有贷款行名称 + getBankName: function() { + return request({ + url: '/crm/v1/projectinformation/getBankName', + method: 'get', + }); + }, + // 获取所有项目类型名称 + getProjectType: function() { + return request({ + url: '/crm/v1/projectinformation/getProjectType', + method: 'get', + }); + }, } diff --git a/supervise-crm-ui/src/views/project/index.vue b/supervise-crm-ui/src/views/project/index.vue index 8541f50f..64fd4850 100644 --- a/supervise-crm-ui/src/views/project/index.vue +++ b/supervise-crm-ui/src/views/project/index.vue @@ -11,6 +11,26 @@ + + + + + + + + + + + +
查询 @@ -103,10 +123,14 @@ size: 10, params: { entryName: '', + projectType: '', + bankName: '', }, total: 0 }, - viewState: 1 + viewState: 1, + storehouseList:[], + ProjectTypeList:[], } }, mounted() { @@ -142,6 +166,7 @@ // 初始化 init() { this.getList() + this.getBankName() }, // 序号 indexMethod(index) { @@ -149,6 +174,14 @@ var pageindex = index + 1 + pagestart return pageindex }, + getBankName(){ + req.getBankName().then((res)=>{ + this.storehouseList=res.data + }) + req.getProjectType().then((res)=>{ + this.ProjectTypeList=res.data + }) + }, // 查询列表信息 getList() { this.listLoading = true @@ -175,7 +208,9 @@ size: 10, total: 0, params: { - entryName: "" + entryName: '', + projectType: '', + bankName: '', } } this.getList() diff --git a/supervise-crm-ui/src/views/project/projectAdd.vue b/supervise-crm-ui/src/views/project/projectAdd.vue index 108c8440..fbb01723 100644 --- a/supervise-crm-ui/src/views/project/projectAdd.vue +++ b/supervise-crm-ui/src/views/project/projectAdd.vue @@ -56,17 +56,7 @@ - - - 授信额度 - - - - - - - + @@ -83,12 +73,12 @@ - + 客户经理 - + @@ -98,10 +88,50 @@ + + + + + 项目单位 + + + + + + + + + + + + 项目联系人 + + + + + + + + + - 接洽日期 + 授信额度 + + + + + + + + + + 授信日期 @@ -111,44 +141,57 @@ + + + - 签约日期 + 用信总额 - + + + + + 用信日期 + + + + + - + - 项目单位 + 签约日期 - - - + + - 项目联系人 + 放款日期 - + + @@ -307,7 +350,10 @@ bankSid: "", bmanagerName: '', // 客户经理 managerSid: "", - engaDate: "", // 接洽日期 + engaDate: "", // 授信日期 + useLimit: "", // 用信总额 + loanDate: "", // 放款日期 + useDate: "", // 用信日期 signingDate: "", // 签约日期 enterpriseName: "", // 项目单位 enterpriseSid: "", @@ -583,7 +629,10 @@ bankSid: "", bmanagerName: '', // 客户经理 managerSid: "", - engaDate: "", // 接洽日期 + engaDate: "", + useLimit: "", + loanDate: "", + useDate: "", signingDate: "", // 签约日期 enterpriseName: "", // 项目单位 enterpriseSid: "", @@ -626,6 +675,9 @@ this.formobj.bmanagerName=resp.data.bmanagerName this.formobj.managerSid=resp.data.managerSid this.formobj.engaDate=resp.data.engaDate + this.formobj.useLimit=resp.data.useLimit + this.formobj.loanDate=resp.data.loanDate + this.formobj.useDate=resp.data.useDate this.formobj.signingDate=resp.data.signingDate this.formobj.enterpriseName=resp.data.enterpriseName this.formobj.enterpriseSid=resp.data.enterpriseSid @@ -672,7 +724,6 @@ this.ImgSid=[...new Set(this.ValSid )] this.formobj.storeHouseProjectDto.shSids=oldArr } - console.log(this.ImgSid) this.drawer=false this.$refs.multipleTable.clearSelection(); }, @@ -691,6 +742,12 @@ .trightb_item { padding-top: 5px; } + .trightbs { + display: flex; + align-items: center; + text-align: ; + justify-content: center; + } .span { margin-left: 50px; @@ -711,6 +768,12 @@ /deep/ .el-collapse-item__content { padding-bottom: 0; } + /deep/ .formadd .el-row .trightbs{ + border-top: 1px solid #e0e3eb; + } + /deep/ .formadd .el-row .trightb_items{ + border-top: 1px solid #e0e3eb; + } .Images{ width: 150px; height: 100px; diff --git a/supervise-crm-ui/src/views/project/projectInfo.vue b/supervise-crm-ui/src/views/project/projectInfo.vue index e0888156..72ab297e 100644 --- a/supervise-crm-ui/src/views/project/projectInfo.vue +++ b/supervise-crm-ui/src/views/project/projectInfo.vue @@ -46,43 +46,66 @@ {{temp.typeName}} + + - 授信额度 + 贷款行 - {{temp.creditLimit}} + {{temp.bankName}} - - - 贷款行 + 客户经理 - {{temp.bankName}} + {{temp.bmanagerName}} + + + - 客户经理 + 项目单位 + + + {{temp.enterpriseName}} + + + + + 项目联系人 + + - {{temp.bmanagerName}} + {{temp.econtacts}} - 接洽日期 + 授信额度 + + + + + {{temp.creditLimit}} + + + + + 授信日期 @@ -90,9 +113,11 @@ {{temp.engaDate}} + + - 签约日期 + 用信总额 @@ -100,30 +125,41 @@ {{temp.signingDate}} - + + + 用信日期 + + + + + {{temp.engaDate}} + + + - 项目单位 + 签约日期 - - - {{temp.enterpriseName}} - + + + {{temp.signingDate}} + - - 项目联系人 - + + 放款日期 + - + - {{temp.econtacts}} + {{temp.engaDate}} + diff --git a/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue b/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue index 974e264c..ca410092 100644 --- a/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue +++ b/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue @@ -93,6 +93,16 @@ }, name: "/khzxgysgl/index", path: "/khzxgysgl/index" + }, + { + alwaysShow: true, + component: "Yjsq", + meta: { + icon: "el-icon-menu", + title: "印鉴使用申请", + }, + name: "/Yjsq/index", + path: "/Yjsq/index" }, { alwaysShow: true, diff --git a/supervise-enterprise-ui/src/router/modules/codemenu.js b/supervise-enterprise-ui/src/router/modules/codemenu.js index e83ba18f..ca8328d6 100644 --- a/supervise-enterprise-ui/src/router/modules/codemenu.js +++ b/supervise-enterprise-ui/src/router/modules/codemenu.js @@ -14,6 +14,19 @@ const codemenu = [{ } }] }, { + path: '/Yjsq', + component: Layout, + redirect: '/Yjsq/index', + children: [{ + path: '/Yjsq/index', + component: () => import('@/views/Yjsq/index.vue'), + name: 'Yjsq', + meta: { + title: '印鉴使用申请', + noCache: true + } + }] +},{ path: '/kucuncgsq', component: Layout, redirect: '/khzxcgsq/index', diff --git a/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue new file mode 100644 index 00000000..9b059661 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue @@ -0,0 +1,372 @@ + + + + + \ No newline at end of file diff --git a/supervise-enterprise-ui/src/views/Yjsq/index.vue b/supervise-enterprise-ui/src/views/Yjsq/index.vue new file mode 100644 index 00000000..1b79abcb --- /dev/null +++ b/supervise-enterprise-ui/src/views/Yjsq/index.vue @@ -0,0 +1,229 @@ + + + + + \ No newline at end of file diff --git a/supervise-uniapp/App.vue b/supervise-uniapp/App.vue index dea58b33..cd0d74e5 100644 --- a/supervise-uniapp/App.vue +++ b/supervise-uniapp/App.vue @@ -3,7 +3,8 @@ export default { globalData: { // wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin", - wxSilentLoginURL: "http://192.168.1.110:8112/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", wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal//v1/wxuser/wxAuthLogin", SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin",// 注册 token: "", diff --git a/supervise-uniapp/common/config.js b/supervise-uniapp/common/config.js index 6137029a..bb2594a4 100644 --- a/supervise-uniapp/common/config.js +++ b/supervise-uniapp/common/config.js @@ -7,9 +7,9 @@ */ module.exports = { // baseUrl: 'https://jianguan.yyundong.com/api', - // baseUrl: 'https://supervise.yxtsoft.com', + baseUrl: 'https://supervise.yxtsoft.com', // baseUrl: 'http://192.168.1.193:8112', - baseUrl: 'http://192.168.1.110:8112', + // baseUrl: 'http://192.168.1.110:8112', tokenName: "Authorization", // 请求头中token的名字，与服务器端对应 loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码 loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 diff --git a/supervise-uniapp/common/request.api.js b/supervise-uniapp/common/request.api.js index 5da68b84..9cfe7ac1 100644 --- a/supervise-uniapp/common/request.api.js +++ b/supervise-uniapp/common/request.api.js @@ -72,7 +72,7 @@ export default { // 获取首页面数据 - getWorkData: (params = {}) => request.get("/report/messagepushlog/numberOfJobs/" + params, params), + getWorkData: (params = {}) => request.get("/reportwxmpapi/messagepushlog/numberOfJobs/" + params, params), // 获取云仓列表 storeHouseListPage: (params = {}) => request.post("/api/portal/v1/flow/storeHouseListPage", params), @@ -87,8 +87,8 @@ export default { getProjectBySid: (params = {}) => request.get("/api/crm/v1/projectinformation/getProjectBySid/" + params, params), - // 获取我的项目-仓库详情 - getStorehouseBySid: (params = {}) => request.get("/api/crm/v1/projectinformation/getStorehouseBySid/" + params, + // 获取我的项目-仓库详情 + getStorehouseBySid: (params = {}) => request.post("/api/crm/v1/storehouseproject/selectStoreBySid/" + params, params), // 获取库存信息列表 @@ -105,9 +105,9 @@ export default { // 修改密码 - updatePassword: (params = {}) => request.post("/portal/v1/sysuser/updatePassword", params), + updatePassword: (params = {}) => request.post("/api/portal/v1/sysuser/updatePassword", params), // 修改头像 - uploadHandImage: (params = {}) => request.post("/portal/v1/sysuser/uploadImage", params), + uploadHandImage: (params = {}) => request.post("/api/portal/v1/sysuser/uploadImage", params), } \ No newline at end of file diff --git a/supervise-uniapp/manifest.json b/supervise-uniapp/manifest.json index 35b8263b..d0fcbf9d 100644 --- a/supervise-uniapp/manifest.json +++ b/supervise-uniapp/manifest.json @@ -29,7 +29,8 @@ "Barcode" : {}, "Contacts" : {}, "Push" : {}, - "OAuth" : {} + "OAuth" : {}, + "Geolocation" : {} }, "distribute" : { "android" : { @@ -38,15 +39,20 @@ "", "", "", + "", + "", "", "", "", "", "", "", + "", "", "", + "", "", + "", "", "", "", @@ -68,10 +74,8 @@ "sdkConfigs" : { "ad" : {}, "geolocation" : { - "amap" : { - "__platform__" : [ "android" ], - "appkey_ios" : "", - "appkey_android" : "" + "system" : { + "__platform__" : [ "ios", "android" ] } }, "push" : {}, @@ -123,10 +127,10 @@ "mp-weixin" : { "appid" : "wx05604ce2a8bede05", "setting" : { - "urlCheck" : false, + "urlCheck" : true, "es6" : false, - "minified" : false, - "postcss" : false + "minified" : true, + "postcss" : true }, "optimization" : { "subPackages" : true diff --git a/supervise-uniapp/pages.json b/supervise-uniapp/pages.json index ae222a37..7ed45804 100644 --- a/supervise-uniapp/pages.json +++ b/supervise-uniapp/pages.json @@ -326,7 +326,7 @@ "selectedColor": "#41adf8", "backgroundColor": "#FFFFFF", "borderStyle": "black", - "iconWidth": "25px", // 字体大小 + "iconWidth": "13px", // 字体大小 "list": [{ "pagePath": "pages/home/WorkFragment", "iconPath": "static/bottom-icon/gongzuotai1.png", diff --git a/supervise-uniapp/pages/home/UserFragment.vue b/supervise-uniapp/pages/home/UserFragment.vue index aea7e9f4..31aa85a8 100644 --- a/supervise-uniapp/pages/home/UserFragment.vue +++ b/supervise-uniapp/pages/home/UserFragment.vue @@ -3,7 +3,7 @@ - + @@ -28,15 +28,15 @@ - + - - - + --> + @@ -98,8 +98,8 @@ console.log(">>>>>", username) console.log(">>>>>", orgNamePath) - this.name = username - this.orgName = orgNamePath==""?"暂无数据":orgNamePath + this.name = username==""?"用户名称":username + this.orgName = orgNamePath==""?"暂无部门信息":orgNamePath this.baseUrl = headImage==""?"https://supervise.yxtsoft.com/img/user/userImage.png":headImage diff --git a/supervise-uniapp/pages/home/WorkFragment.vue b/supervise-uniapp/pages/home/WorkFragment.vue index f1dd2ed0..acb57571 100644 --- a/supervise-uniapp/pages/home/WorkFragment.vue +++ b/supervise-uniapp/pages/home/WorkFragment.vue @@ -1,7 +1,7 @@