diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 67fe950..029888e 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -90,17 +90,22 @@ .el-dialog__title{ font-size: 16px; } - -// card样式修正 -.el-card__header { - padding: 12px 20px; - color: #000; +//当使用card时(class="box-card a")这样写class样式就对了 +.el-card{ + &:not(.a){ + // card样式修正 + .el-card__header { + padding: 12px 20px; + color: #000; + &::before{ + content: ''; + position: absolute; + left: 0; + height: 20px; + width: 6px; + background-color: #1890ff; + } + } + } } -.el-card__header::before{ - content: ''; - position: absolute; - left: 0; - height: 20px; - width: 6px; - background-color: #1890ff; -} \ No newline at end of file + diff --git a/src/views/xgf/flow/components/flowInfo.vue b/src/views/xgf/flow/components/flowInfo.vue new file mode 100644 index 0000000..7ffe2e4 --- /dev/null +++ b/src/views/xgf/flow/components/flowInfo.vue @@ -0,0 +1,83 @@ + + + diff --git a/src/views/xgf/flow/components/flowInfoList.vue b/src/views/xgf/flow/components/flowInfoList.vue new file mode 100644 index 0000000..981ccf5 --- /dev/null +++ b/src/views/xgf/flow/components/flowInfoList.vue @@ -0,0 +1,87 @@ + + + diff --git a/src/views/xgf/flow/components/flowStep.vue b/src/views/xgf/flow/components/flowStep.vue new file mode 100644 index 0000000..84f449a --- /dev/null +++ b/src/views/xgf/flow/components/flowStep.vue @@ -0,0 +1,108 @@ + + + diff --git a/src/views/xgf/peopleList/components/list.vue b/src/views/xgf/peopleList/components/list.vue index d882573..46aec29 100644 --- a/src/views/xgf/peopleList/components/list.vue +++ b/src/views/xgf/peopleList/components/list.vue @@ -42,6 +42,8 @@ @@ -71,9 +75,11 @@ import user from './user.vue' import SendUtil from './sendUtil.vue' import UserInfo from '../../flow_audit/userInfo.vue' import Entrust from './entrust.vue' +import FlowStep from '../../flow/components/flowStep.vue' +import FlowInfoList from '../../flow/components/flowInfoList.vue' export default { - components: { Entrust, UserInfo, SendUtil, Pagination, apply, vueQr, user }, + components: { FlowInfoList, FlowStep, Entrust, UserInfo, SendUtil, Pagination, apply, vueQr, user }, directives: { waves }, data() { return { @@ -163,6 +169,12 @@ export default { handleShow(row) { this.$refs.userInfos.init(row) }, + handleShowStep(row) { + this.$refs.step.init(row) + }, + handleShowFlow(row) { + this.$refs.flowInfoList.init(row) + }, approve(row) { this.$refs.sendUtil.init(row) },