Commit 34874946 authored by caimeng's avatar caimeng
parent 6606584f
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="build:staging" type="js.build_tools.npm" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="build:staging" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
</component>
\ No newline at end of file
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="serve" type="js.build_tools.npm" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="serve" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
</component>
\ No newline at end of file
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
], ],
"homepage": "https://chu1204505056.gitee.io/vue-admin-beautiful-pro", "homepage": "https://chu1204505056.gitee.io/vue-admin-beautiful-pro",
"scripts": { "scripts": {
"preinstall": "npx npm-force-resolutions",
"serve": "vue-cli-service serve --fix", "serve": "vue-cli-service serve --fix",
"build:staging": "vue-cli-service build --mode staging", "build:staging": "vue-cli-service build --mode staging",
"build": "vue-cli-service build", "build": "vue-cli-service build",
...@@ -31,13 +32,15 @@ ...@@ -31,13 +32,15 @@
"type": "git", "type": "git",
"url": "git+https://github.com/vue-admin-beautiful/vue-admin-beautiful-pro.git" "url": "git+https://github.com/vue-admin-beautiful/vue-admin-beautiful-pro.git"
}, },
"lint-staged": { "lint-staged": {
"*.{js,jsx,vue}": [ "*.{js,jsx,vue}": [
"vue-cli-service lint", "vue-cli-service lint",
"git add" "git add"
] ]
}, },
"resolutions": {
"sass": "1.32.12"
},
"dependencies": { "dependencies": {
"ali-oss": "^6.17.1", "ali-oss": "^6.17.1",
"axios": "^0.20.0", "axios": "^0.20.0",
...@@ -57,6 +60,7 @@ ...@@ -57,6 +60,7 @@
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"qs": "^6.9.4", "qs": "^6.9.4",
"remixicon": "^2.5.0", "remixicon": "^2.5.0",
"sass": "^1.68.0",
"screenfull": "^5.0.2", "screenfull": "^5.0.2",
"vue": "^2.6.12", "vue": "^2.6.12",
"vue-echarts": "^4.1.0", "vue-echarts": "^4.1.0",
...@@ -92,7 +96,6 @@ ...@@ -92,7 +96,6 @@
"plop": "^2.7.4", "plop": "^2.7.4",
"prettier": "^2.1.2", "prettier": "^2.1.2",
"raw-loader": "^4.0.1", "raw-loader": "^4.0.1",
"sass": "^1.32.12",
"sass-loader": "^10.0.2", "sass-loader": "^10.0.2",
"stylelint": "^13.7.2", "stylelint": "^13.7.2",
"stylelint-config-prettier": "^8.0.2", "stylelint-config-prettier": "^8.0.2",
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<script src="./jQuery.1.9.1.min.js"></script> <script src="./jQuery.1.9.1.min.js"></script>
<script src="./tdReport.1.2.min.js" charset='utf-8'></script> <script src="./tdReport.1.2.min.js" charset='utf-8'></script>
<link href="<%= BASE_URL %>favicon.png" rel="icon" type="image/png" /> <link href="<%= BASE_URL %>favicon.png" rel="icon" type="image/png" />
<link href="//vjs.zencdn.net/7.10.2/video-js.min.css" rel="stylesheet"> <link href="./video.min.css" rel="stylesheet">
<title><%= VUE_APP_TITLE %></title> <title><%= VUE_APP_TITLE %></title>
<meta <meta
content="vab,vab官网,后台管理框架,vue后台管理框架,vue-admin-beautiful,vue-admin-beautiful-pro,vue-admin-beautiful官网,vue-admin-beautiful文档,vue-element-admin,vue-element-admin官网,vue-element-admin文档,vue-admin,vue-admin官网,vue-admin文档" content="vab,vab官网,后台管理框架,vue后台管理框架,vue-admin-beautiful,vue-admin-beautiful-pro,vue-admin-beautiful官网,vue-admin-beautiful文档,vue-element-admin,vue-element-admin官网,vue-element-admin文档,vue-admin,vue-admin官网,vue-admin文档"
...@@ -24,6 +24,6 @@ ...@@ -24,6 +24,6 @@
<body> <body>
<div id="root"></div> <div id="root"></div>
<script src="//vjs.zencdn.net/7.10.2/video.min.js"></script> <script src="./video.min.js"></script>
</body> </body>
</html> </html>
This diff is collapsed.
This diff is collapsed.
<!-- 预授信申述 -->
<template>
<el-dialog
:visible.sync='ContactVisible'
:before-close='handleClose'
:destroy-on-close='true'
width='800px'
title='通讯录列表'>
<el-table
ref='tableSort'
border
:data='list'
height="500px"
style='width: 100%'
>
<el-table-column
v-for='(item, index) in finallyColumns'
:key='index'
align='center'
:label='item.label'
:sortable='item.sortable'
:width='item.width'
:fixed='!!item.fixed'
:show-overflow-tooltip='!!item.overflow'
>
<template #default='{ row }'>
<span>{{ row[item.prop] }}</span>
</template>
</el-table-column>
</el-table>
</el-dialog>
</template>
<script>
import API from '@/server/api'
import _ from 'lodash'
export default {
name: 'Contacts',
props: {
ContactVisible: {
type: Boolean,
required: false
},
CreditNo: {
type: String,
required: true
},
},
data() {
return {
creditNo: '',
creditType: '',
title: '通讯录',
detail: null,
list: [],
listLoading: true,
checkList: ['姓名', '号码'],
columns: [
{
order: 1,
label: '姓名',
prop: 'name'
},
{
order: 2,
label: '号码',
prop: 'phone'
}
]
}
},
computed: {
finallyColumns() {
let finallyArray = []
this.checkList.forEach((checkItem) => {
finallyArray.push(
this.columns.filter((item) => item.label === checkItem)[0]
)
})
return _.sortBy(finallyArray, (item) => item.order)
}
},
created() {
this.init()
},
methods: {
async init() {
try{
const creditNo = this.CreditNo
const result = await API.LocalContact({
creditNo
})
this.list = result.result
}catch (err){
console.log('获取通讯录失败')
}
},
handleClose() {
this.$emit('handleClose')
}
}
}
</script>
<style scoped lang='scss'>
.com-approval {
//position: relative;
margin-top: 15px;
}
</style>
<!-- 操作日志 -->
<template>
<div>
<!--表格-->
<el-table
ref='tableSort'
border
:data='list'
style='width: 100%; margin-bottom: 20px'
>
<el-table-column
v-for='(item, index) in finallyColumns'
:key='index'
align='center'
:label='item.label'
:sortable='item.sortable'
:width='item.width'
:fixed='!!item.fixed'
:show-overflow-tooltip='!!item.overflow'
>
<template #default='{ row }'>
<template v-if='item.label==="审批建议"'>
<el-tag v-if='row.ruleResult==="REJECT"' size='mini' type='danger'>{{row.ruleResultStr}}</el-tag>
<el-tag v-else-if='row.ruleResult==="RETRIAL"' size='mini' type='warning'>{{row.ruleResultStr}}</el-tag>
<el-tag v-else-if='row.ruleResult==="PASS"' size='mini' type='success'>{{row.ruleResultStr}}</el-tag>
<el-tag v-else size='mini'>{{row.ruleResultStr}}</el-tag>
</template>
<span v-else>{{ row[item.prop] }}</span>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
import _ from 'lodash'
import API from '@/server/api'
export default {
name: 'PreOperationLog',
props: {
report: {
type: Array,
require: true
}
},
data() {
return {
checkList: ['规则名', '规则名称', '数值', '审批建议'],
columns: [
{
order: 1,
label: '规则名',
prop: 'ruleCode'
},
{
order: 2,
label: '规则名称',
prop: 'ruleName'
},
{
order: 3,
label: '数值',
prop: 'ruleValue'
},
{
order: 4,
label: '审批建议',
prop: 'ruleResultStr'
}
],
list: []
}
},
computed: {
finallyColumns() {
let finallyArray = []
this.checkList.forEach((checkItem) => {
finallyArray.push(
this.columns.filter((item) => item.label === checkItem)[0]
)
})
return _.sortBy(finallyArray, (item) => item.order)
}
},
created() {
if (this.report) {
this.list = this.report
}
}
}
</script>
<!-- 用户基础信息 --> <!-- 用户基础信息 -->
<template> <template>
<div class='com'> <div class='com'>
<block-header title='基础信息' /> <block-header title='基础信息'/>
<el-descriptions style='margin-bottom: 20px;' border size='small' :column='3'> <el-descriptions style='margin-bottom: 20px;' border size='small' :column='3'>
<el-descriptions-item label-class-name='labelCls' label='申请时间'>{{ baseInfo.applyDate }}</el-descriptions-item> <el-descriptions-item label-class-name='labelCls' label='申请时间'>{{ baseInfo.applyDate }}</el-descriptions-item>
<el-descriptions-item label-class-name='labelCls' label='申请金额'>{{ baseInfo.applyAmount }}</el-descriptions-item> <el-descriptions-item label-class-name='labelCls' label='申请金额'>{{ baseInfo.applyAmount }}</el-descriptions-item>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<el-descriptions-item label-class-name='labelCls' label='紧急联系人姓名'> <el-descriptions-item label-class-name='labelCls' label='紧急联系人姓名'>
<span>{{ baseInfo.firstName }}</span> <span>{{ baseInfo.firstName }}</span>
<el-button size='mini' v-if='!page' @click='handleContact' style='margin-left: 10px' type='text'>查看更多</el-button> <el-button size='mini' @click='handleContact' style='margin-left: 10px' type='text'>查看更多</el-button>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label-class-name='labelCls' label='紧急联系人关系'>{{ baseInfo.firstRelationStr }} <el-descriptions-item label-class-name='labelCls' label='紧急联系人关系'>{{ baseInfo.firstRelationStr }}
</el-descriptions-item> </el-descriptions-item>
...@@ -45,7 +45,10 @@ ...@@ -45,7 +45,10 @@
<el-descriptions-item label-class-name='labelCls' label='工作地址'> <el-descriptions-item label-class-name='labelCls' label='工作地址'>
{{ baseInfo.companyAddress }}{{ baseInfo.companyAddressDetail }} {{ baseInfo.companyAddress }}{{ baseInfo.companyAddressDetail }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label-class-name='labelCls' label='合同展示地址'>{{ baseInfo.address }}</el-descriptions-item> <el-descriptions-item label-class-name='labelCls' label='合同展示地址'>{{
baseInfo.contractAddress
}}
</el-descriptions-item>
<el-descriptions-item label-class-name='labelCls' label='月收入'>{{ baseInfo.selfMonthIncomeStr }} <el-descriptions-item label-class-name='labelCls' label='月收入'>{{ baseInfo.selfMonthIncomeStr }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label-class-name='labelCls' label='客户GPS'>{{ baseInfo.lat }},{{ baseInfo.lng }} <el-descriptions-item label-class-name='labelCls' label='客户GPS'>{{ baseInfo.lat }},{{ baseInfo.lng }}
...@@ -62,69 +65,68 @@ ...@@ -62,69 +65,68 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </template>
<script> <script>
export default {
name: 'UserBaseInfo',
props: {
baseInfo: {
type: Object,
require: true
},
page: {
type: String,
require: false
},
isLoan: {
type: Boolean,
require: false
}
},
methods: {
handleContact() {
const { creditNo, creditType } = this.baseInfo
let routeUrl = this.$router.resolve({
path: '/contact',
query: {
creditNo,
creditType
}
})
window.open(routeUrl.href, '_blank')
//this.$router.push({ export default {
// path: '/credit/contact', name: 'UserBaseInfo',
// query: { props: {
// creditNo, baseInfo: {
// creditType type: Object,
// } require: true
//}); },
contacts: {
type: Array,
} require: false
},
page: {
type: String,
require: false
},
isLoan: {
type: Boolean,
require: false
}
},
data() {
return {
contactVisible: false
}
},
methods: {
handleContact() {
const {creditNo, creditType} = this.baseInfo
let routeUrl = this.$router.resolve({
path: '/contact',
query: {
creditNo,
creditType
}
})
window.open(routeUrl.href, '_blank')
} }
} }
}
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>
.page-fence { .page-fence {
::v-deep { ::v-deep {
i { i {
cursor: pointer; cursor: pointer;
}
} }
box-sizing: border-box;
padding: 20px;
} }
box-sizing: border-box;
padding: 20px;
}
</style> </style>
<style lang='scss'> <style lang='scss'>
.action-bar { .action-bar {
margin-bottom: 15px; margin-bottom: 15px;
} }
</style> </style>
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
:before-close='handleClose'> :before-close='handleClose'>
<div class='data-table'> <div class='data-table'>
<el-collapse v-model="activeNames" @change="handleChange"> <el-collapse v-model="activeNames">
<template v-for='(item,index) in jsonObject'> <template v-for='(item,index) in jsonObject'>
<el-collapse-item :title='item.key' :key="index" :name="index+1"> <el-collapse-item :title='item.key' :key="index" :name="index+1">
<div class='box' :key='index'> <div class='box' :key='index'>
...@@ -351,7 +351,7 @@ export default { ...@@ -351,7 +351,7 @@ export default {
.custom-table-checkbox { .custom-table-checkbox {
.el-checkbox { .el-checkbox {
display: block !important; display: block !important;
margin: 0 0 $base-padding/4 0; margin: 0 0 calc($base-padding/4) 0;
} }
} }
......
...@@ -87,7 +87,7 @@ export const asyncRoutes = [ ...@@ -87,7 +87,7 @@ export const asyncRoutes = [
}, },
{ {
path: '/editPwd', path: '/editPwd',
name: 'Index', name: 'editPwd',
component: () => import('@/views/password/edit'), component: () => import('@/views/password/edit'),
meta: { meta: {
noKeepAlive: true, noKeepAlive: true,
...@@ -167,7 +167,7 @@ export const asyncRoutes = [ ...@@ -167,7 +167,7 @@ export const asyncRoutes = [
}, },
{ {
path: 'contact', path: 'contact',
name: 'contact', name: 'creditContact',
component: () => import('@/views/contact/contacts'), component: () => import('@/views/contact/contacts'),
meta: { meta: {
noKeepAlive: true, noKeepAlive: true,
...@@ -439,7 +439,7 @@ export const asyncRoutes = [ ...@@ -439,7 +439,7 @@ export const asyncRoutes = [
children: [ children: [
{ {
path: 'list', path: 'list',
name: 'merchantList', name: 'localList',
component: () => import('@/views/local/list'), component: () => import('@/views/local/list'),
meta: { meta: {
noKeepAlive: true, noKeepAlive: true,
...@@ -448,13 +448,13 @@ export const asyncRoutes = [ ...@@ -448,13 +448,13 @@ export const asyncRoutes = [
}, },
{ {
path: 'detail', path: 'detail',
name: 'merchantDetail', name: 'localDetail',
component: () => import('@/views/local/detail'), component: () => import('@/views/local/detail'),
hidden: true, hidden: true,
meta: { meta: {
noKeepAlive: true, noKeepAlive: true,
title: '人审详情', title: '人审详情',
tagHidden: true tagHidden: false
} }
}, },
{ {
......
...@@ -23,7 +23,6 @@ const mutations = { ...@@ -23,7 +23,6 @@ const mutations = {
const actions = { const actions = {
async setRoutes({ commit }, mode) { async setRoutes({ commit }, mode) {
let routes = asyncRoutes let routes = asyncRoutes
console.log(process.env.NODE_ENV,'环境')
if (mode === 'all' && process.env.NODE_ENV !== 'development') { if (mode === 'all' && process.env.NODE_ENV !== 'development') {
console.log('wori') console.log('wori')
let { result } = await API.userInfo() let { result } = await API.userInfo()
...@@ -34,8 +33,6 @@ const actions = { ...@@ -34,8 +33,6 @@ const actions = {
routes = convertRouter(data) routes = convertRouter(data)
} }
console.log('哈哈哈')
const finallyRoutes = filterRoutes([...constantRoutes, ...routes]) const finallyRoutes = filterRoutes([...constantRoutes, ...routes])
commit('setRoutes', finallyRoutes) commit('setRoutes', finallyRoutes)
return [...routes] return [...routes]
......
...@@ -61,9 +61,6 @@ const actions = { ...@@ -61,9 +61,6 @@ const actions = {
// 设置token // 设置token
const accessToken = Cookies.get('x-token') const accessToken = Cookies.get('x-token')
console.log(accessToken,'能拿到');
if (accessToken) { if (accessToken) {
commit('setAccessToken', accessToken) commit('setAccessToken', accessToken)
} }
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
} }
}, },
created() { created() {
console.log(this.routes,'菜单') // console.log(this.routes,'菜单')
}, },
computed: { computed: {
...mapGetters({ ...mapGetters({
......
...@@ -122,14 +122,17 @@ ...@@ -122,14 +122,17 @@
return tag.meta && tag.meta.affix return tag.meta && tag.meta.affix
}, },
handleTabClick(tab) { handleTabClick(tab) {
console.log(tab,'tab')
const route = this.visitedRoutes[tab.index] const route = this.visitedRoutes[tab.index]
if (this.$route.fullPath !== route.fullPath) this.$router.push(route) if (this.$route.fullPath !== route.fullPath) this.$router.push(route)
}, },
async handleTabRemove(fullPath) { async handleTabRemove(fullPath) {
console.log(fullPath,'remove')
const view = this.visitedRoutes.find( const view = this.visitedRoutes.find(
(item) => fullPath === item.fullPath (item) => fullPath === item.fullPath
) )
await this.delVisitedRoute(view) await this.delVisitedRoute(view)
console.log(view,'del')
if (this.isActive(view)) this.toLastTab() if (this.isActive(view)) this.toLastTab()
}, },
handleCommand(command) { handleCommand(command) {
......
...@@ -98,9 +98,9 @@ ...@@ -98,9 +98,9 @@
.el-menu-item, .el-menu-item,
.el-submenu__title { .el-submenu__title {
height: $base-top-bar-height/1.3; height: calc($base-top-bar-height/1.3);
padding: 0 $base-padding; padding: 0 $base-padding;
line-height: $base-top-bar-height/1.3; line-height: calc($base-top-bar-height/1.3);
} }
> .el-menu-item, > .el-menu-item,
......
...@@ -18,19 +18,19 @@ ...@@ -18,19 +18,19 @@
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
min-height: $base-input-height; min-height: $base-input-height;
margin: 0 0 $base-padding/2 0; margin: 0 0 calc($base-padding/2) 0;
> .el-button { > .el-button {
margin: 0 10px $base-padding/2 0px !important; margin: 0 10px calc($base-padding/2) 0px !important;
} }
} }
.vab-query-form { .vab-query-form {
::v-deep { ::v-deep {
.el-form-item:first-child { .el-form-item:first-child {
margin: 0 0 $base-padding/2 0 !important; margin: 0 0 calc($base-padding/2) 0 !important;
} }
.el-form-item + .el-form-item { .el-form-item + .el-form-item {
margin: 0 0 $base-padding/2 10px !important; margin: 0 0 calc($base-padding/2) 10px !important;
} }
.top-panel { .top-panel {
......
...@@ -40,9 +40,11 @@ router.beforeEach(async (to, from, next) => { ...@@ -40,9 +40,11 @@ router.beforeEach(async (to, from, next) => {
//根据路由模式添加路由 //根据路由模式添加路由
router.addRoutes( const r = await store.dispatch('routes/setRoutes', authentication)
await store.dispatch('routes/setRoutes', authentication) r.forEach(item=>{
) router.addRoute(item)
})
next({ ...to, replace: true }) next({ ...to, replace: true })
} catch (err) { } catch (err) {
console.log(err, '啥错误') console.log(err, '啥错误')
......
...@@ -499,7 +499,7 @@ $--cascader-tag-background: #f0f2f5; ...@@ -499,7 +499,7 @@ $--cascader-tag-background: #f0f2f5;
/* Group /* Group
-------------------------- */ -------------------------- */
$--group-option-flex: 0 0 (1/5) * 100%; $--group-option-flex: 0 0 calc(1/5) * 100%;
$--group-option-offset-bottom: 12px; $--group-option-offset-bottom: 12px;
$--group-option-fill-hover: rgba($--color-black, 0.06); $--group-option-fill-hover: rgba($--color-black, 0.06);
$--group-title-color: $--color-black; $--group-title-color: $--color-black;
......
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
.custom-table-checkbox { .custom-table-checkbox {
.el-checkbox { .el-checkbox {
display: block !important; display: block !important;
margin: 0 0 $base-padding/4 0; margin: 0 0 calc($base-padding/4) 0;
} }
} }
......
...@@ -224,7 +224,7 @@ export default { ...@@ -224,7 +224,7 @@ export default {
.custom-table-checkbox { .custom-table-checkbox {
.el-checkbox { .el-checkbox {
display: block !important; display: block !important;
margin: 0 0 $base-padding/4 0; margin: 0 0 calc($base-padding/4) 0;
} }
} }
......
...@@ -139,7 +139,7 @@ export default { ...@@ -139,7 +139,7 @@ export default {
.custom-table-checkbox { .custom-table-checkbox {
.el-checkbox { .el-checkbox {
display: block !important; display: block !important;
margin: 0 0 $base-padding/4 0; margin: 0 0 calc($base-padding/4) 0;
} }
} }
......
...@@ -277,7 +277,7 @@ export default { ...@@ -277,7 +277,7 @@ export default {
.custom-table-checkbox { .custom-table-checkbox {
.el-checkbox { .el-checkbox {
display: block !important; display: block !important;
margin: 0 0 $base-padding/4 0; margin: 0 0 calc($base-padding/4) 0;
} }
} }
......
...@@ -319,7 +319,7 @@ export default { ...@@ -319,7 +319,7 @@ export default {
.custom-table-checkbox { .custom-table-checkbox {
.el-checkbox { .el-checkbox {
display: block !important; display: block !important;
margin: 0 0 $base-padding/4 0; margin: 0 0 calc($base-padding/4) 0;
} }
} }
......
...@@ -76,8 +76,12 @@ ...@@ -76,8 +76,12 @@
const { query } = this.$route const { query } = this.$route
if (query && query.creditNo) { if (query && query.creditNo) {
this.creditNo = query.creditNo this.creditNo = query.creditNo
this.creditType = query.creditType if(query.creditType){
await this.init() this.creditType = query.creditType
await this.init()
}else {
await this.init2()
}
} }
}, },
methods: { methods: {
...@@ -92,6 +96,16 @@ ...@@ -92,6 +96,16 @@
const { linkPhoneList, clientDetail } = result.result const { linkPhoneList, clientDetail } = result.result
this.list = linkPhoneList this.list = linkPhoneList
this.title = '客户『' + clientDetail.realName + '』的通讯录列表' this.title = '客户『' + clientDetail.realName + '』的通讯录列表'
},
async init2() {
const creditNo = this.creditNo
const result = await API.localCreditDetail({
creditNo
})
this.detail = result.result
const { linkPhoneList, clientDetail } = result.result
this.list = linkPhoneList
this.title = '客户『' + clientDetail.realName + '』的通讯录列表'
} }
} }
} }
......
...@@ -315,7 +315,7 @@ export default { ...@@ -315,7 +315,7 @@ export default {
.custom-table-checkbox { .custom-table-checkbox {
.el-checkbox { .el-checkbox {
display: block !important; display: block !important;
margin: 0 0 $base-padding/4 0; margin: 0 0 calc($base-padding/4) 0;
} }
} }
......
...@@ -312,7 +312,7 @@ export default { ...@@ -312,7 +312,7 @@ export default {
.custom-table-checkbox { .custom-table-checkbox {
.el-checkbox { .el-checkbox {
display: block !important; display: block !important;
margin: 0 0 $base-padding/4 0; margin: 0 0 calc($base-padding/4) 0;
} }
} }
......
...@@ -9,6 +9,12 @@ ...@@ -9,6 +9,12 @@
<!--其它信息--> <!--其它信息-->
<user-local-info :info='detail'/> <user-local-info :info='detail'/>
<!--机审报告-->
<block-header title="命中规则报告"></block-header>
<template v-if="detail && detail.thirdPartyReport">
<local-machine-report :report="detail.thirdPartyReport"></local-machine-report>
</template>
<no-data v-else />
<!-- 审批操作 --> <!-- 审批操作 -->
<template v-if='visible'> <template v-if='visible'>
...@@ -20,9 +26,13 @@ ...@@ -20,9 +26,13 @@
<script> <script>
import API from '@/server/api' import API from '@/server/api'
import LocalMachineReport from '@/components/local-machine-report'
export default { export default {
name: 'ApprovalDetail', name: 'LocalDetail',
components: {
LocalMachineReport
},
data() { data() {
return { return {
visible: false, visible: false,
......
...@@ -729,8 +729,6 @@ ...@@ -729,8 +729,6 @@
item.imgData = imgData item.imgData = imgData
}) })
console.log(annexResponseList, '哈哈哈')
this.form.annexRequestList = annexResponseList this.form.annexRequestList = annexResponseList
this.annexRequestList = annexResponseList this.annexRequestList = annexResponseList
......
...@@ -276,7 +276,6 @@ ...@@ -276,7 +276,6 @@
.custom-table-checkbox { .custom-table-checkbox {
.el-checkbox { .el-checkbox {
display: block !important; display: block !important;
//margin: 0 0 $base-padding/4 0;
} }
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment