Browse Source

8.25

master
fengdong777 2 years ago
parent
commit
29403fe979
  1. 3
      supervise-enterprise-ui/src/views/NewList/needMoney.vue
  2. 10
      supervise-enterprise-ui/src/views/NewList/returnedMoney.vue
  3. 3
      supervise-organizational-ui/package.json
  4. 147
      supervise-organizational-ui/src/main.js
  5. 4
      supervise-organizational-ui/src/router/modules/codemenu.js
  6. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue

3
supervise-enterprise-ui/src/views/NewList/needMoney.vue

@ -33,6 +33,9 @@
</div>
</el-radio-group>
</div>
<div style="margin-top: 25px;">
<span>用款金额{{"\xa0\xa0\xa0"}}</span>
</div>
<div style="margin-top: 45px;margin-left: -10px;font-size: 14px;">
:客户发起发起申请首先监管审核再银行审核通过后客户在审核结果表里打印纸质申请表盖章并提交给监管银行各一份
</div>

10
supervise-enterprise-ui/src/views/NewList/returnedMoney.vue

@ -29,7 +29,15 @@
</div>
<div style="margin-top: 25px;">
<span>统计日期{{"\xa0\xa0\xa0"}}</span>
XXX至XXX
</div>
<div style="margin-top: 25px;">
<span>应收回款金额{{"\xa0\xa0\xa0"}}</span>
XXXX
</div>
<div style="margin-top: 25px;">
<span>回款凭证{{"\xa0\xa0\xa0"}}</span>
XXXX
</div>
<div style="margin-top: 45px;margin-left: -10px;font-size: 14px;">
:客户发起发起申请首先监管审核再银行审核通过后客户在审核结果表里打印纸质申请表盖章并提交给监管银行各一份

3
supervise-organizational-ui/package.json

@ -27,11 +27,14 @@
"path-to-regexp": "2.4.0",
"portfinder": "^1.0.21",
"qs": "^6.9.4",
"regenerator-runtime": "^0.14.0",
"sass-resources-loader": "^2.1.1",
"svg-baker-runtime": "^1.4.7",
"viewerjs": "^1.9.0",
"vue": "2.6.10",
"vue-amap": "^0.5.10",
"vue-router": "3.0.6",
"vue-style-loader": "^4.1.3",
"vuex": "3.1.0",
"vuex-persistedstate": "^4.0.0",
"xcrud": "^0.4.19"

147
supervise-organizational-ui/src/main.js

@ -43,14 +43,14 @@ VueAMap.initAMapApiLoader({
Vue.config.productionTip = false
let token = null
token = GetQueryString('token')
if (token) {
setStorage(token)
const href = window.location.href
// href = href.split(`token=${token}`)[0]
// window.location.href = href.slice(0, href.length - 1)
}
// let token = null
// token = GetQueryString('token')
// if (token) {
// setStorage(token)
// const href = window.location.href
// // 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,69 +62,78 @@ if (parseInt(one) > 18) {
setDefaultOrgPathName(obj.defaultOrgPathName)
}
}
// 获取登录用户信息
function getUserInfo() {
return request({
baseURL: '/api',
url: '/portal/v1/sysuser/loginDetails',
method: 'post',
headers: {
'Content-Type': 'application/json'
}
}).then(rep => {
const data = rep.data
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)
})
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
}
// // 获取登录用户信息
// function getUserInfo() {
// return request({
// baseURL: '/api',
// url: '/portal/v1/sysuser/loginDetails',
// method: 'post',
// headers: {
// 'Content-Type': 'application/json'
// }
// }).then(rep => {
// const data = rep.data
// 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
// }

4
supervise-organizational-ui/src/router/modules/codemenu.js

@ -37,14 +37,14 @@ const codemenu = [{
component: Layout,
redirect: '/zzgl/index',
meta: {
title: '组织管理'
title: '组织架构'
},
children: [{
path: '/zzgl/index',
component: () => import('@/views/organizational/zzgl.vue'),
name: 'ZzjgZzgl',
meta: {
title: '组织管理',
title: '组织架构',
noCache: true
}
}]

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue

@ -497,7 +497,7 @@
// component: "index",
// meta: {
// icon: "el-icon-help",
// title: "",
// title: "",
// },
// name: "/system/organizationManage",
// path: "/system/organizationManage",

Loading…
Cancel
Save