Skip to content

R
rbc-demo
Commit 3564c808 by yangchen
Options

拉去develop分支

parents a58b4e61 283c60a7
Showing with 275 additions and 88 deletions
develop/@gms/gms-plugin-billexpand/.eslintrc.js 0 → 100644
module.exports = {
root: true,
env: {
node: true
},
'extends': [
'plugin:vue/essential',
'eslint:recommended'
],
parserOptions: {
parser: 'babel-eslint'
},
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-unused-vars': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'vue/no-unused-components': 'off',
'vue/no-side-effects-in-computed-properties': 'off',
// 'vue/require-v-for-key': 'off',
'vue/no-unused-vars': 'off',
'no-prototype-builtins': 'off',
'no-extra-semi': 'off',
}
}
develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
......@@ -155,6 +155,14 @@ export default {
? bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
: '';
if (!comments) {
comments = '同意'
bill.setGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT, {
taskId,
suggestions: comments
})
}
const fn = () => {
saveBill(bill, param).then(() => {
GMS.$http.post('/rbc/workflow/approve/completed/' + taskId + '?result=1&comments=' + comments).then(
......
develop/@gms/gms-plugin-billexpand/src/actions/rejectAction.js
......@@ -51,10 +51,22 @@ export default {
}
},
approval: function(bill, param){
if (!bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT) || !bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId) {
if (
!bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT)
|| !bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId
) {
GMS.$hideContainer.$Message.error('请配置审批轨迹')
return
}
if (
!bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT)
|| !bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
) {
GMS.$hideContainer.$Message.error('请输入审批意见')
bill.setControlsSate(param["_control_name_"], "enable", true)
return
}
let taskId = bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId;
let comments =
bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
......
develop/@gms/gms-plugin-billexpand/src/actions/util/index.js
......@@ -52,7 +52,7 @@ export const showSignModal = (bill, param, nodeName) => {
const approvalComment =
bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT)
&& bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
|| ''
|| '提交'
const subDataObj = bill.getSubData(SIGNATURE_TABLE_NAME)
const tableLength = subDataObj.length || 0
const subDataIndex = tableLength - 1
......
develop/@gms/gms-plugin-billexpand/src/control/workflow-track.vue
......@@ -57,7 +57,10 @@
</div>
</div>
<div v-if="isCurrentStep(step, k) || step.state == 2">{{formatStepTime(step)}}</div>
<div v-if="step.comments">审批意见：{{step.comments}}</div>
<div class="comment" v-if="step.comments">
<div class="label">审批意见：</div>
<div class="text">{{step.comments}}</div>
</div>
<div v-if="step.title" :class="isRejectStep(step) ? 'text-error' : 'text-main'">环节名称: {{step.title}}</div>
</div>
</div>
......@@ -172,6 +175,7 @@ export default {
if (step.subTasks && step.subTasks.length) {
let participants = []
let actualOwnerList = []
let commentList = []
let resultFlag = 0
let rejectFlag = false
for (let task of step.subTasks) {
......@@ -190,6 +194,9 @@ export default {
actualOwnerList.push(task.actualOwner)
}
}
if (task.comments) {
commentList.push(task.comments)
}
const curResult = task.result || 0
resultFlag |= 1 << curResult
}
......@@ -202,6 +209,7 @@ export default {
: 1
rejectFlag && (step.state = 2)
step.comments = commentList.join(';\n')
step.participants = participants
step.actualOwner = actualOwnerList.join('、')
}
......@@ -376,6 +384,12 @@ export default {
font-size: 14px;
line-height: 20px;
}
.comment {
display: flex;
.text {
white-space: pre-line;
}
}
}
}
}
......
develop/@gms/gms-plugin-billexpand/src/emcon.js
......@@ -134,7 +134,7 @@ export default {
]
},
"value": "userSelectControl",
"path": "资产/通用"
"path": "报销/通用"
},
{
"title": "整数输入",
......@@ -161,7 +161,7 @@ export default {
]
},
"value": "integerControl",
"path": "资产/通用"
"path": "报销/通用"
},
{
"title": "功能文本框",
......@@ -185,7 +185,7 @@ export default {
]
},
"value": "IntroduceInputControl",
"path": "资产/通用"
"path": "报销/通用"
},
{
"value": "InputModalControl",
......@@ -193,7 +193,7 @@ export default {
"description": "",
"discard": false,
"dynamicComponent": 'billForm',
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"config": [
{
......@@ -329,7 +329,7 @@ export default {
{
"value": "ButtonControl",
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"initParam": ["config"],
"config": [
......@@ -449,7 +449,7 @@ export default {
"title": "审批意见",
"description": "",
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"config": [
{
......@@ -1384,7 +1384,7 @@ export default {
billAction: [
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
{
......@@ -1423,7 +1423,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [{
"title": "选择单据",
......@@ -1456,7 +1456,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
{
......@@ -1481,7 +1481,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
{
......@@ -1606,7 +1606,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [{
"key": "detailTableName"
......@@ -1618,7 +1618,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [{
"key": "detailTableName"
......@@ -1636,7 +1636,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [{
"key": "detailTableName"
......@@ -1659,7 +1659,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [{
"isRequired": false,
......@@ -1691,7 +1691,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [{
"isRequired": false,
......@@ -1723,7 +1723,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": []
},
......@@ -1732,7 +1732,7 @@ export default {
"value": "editAction"
}, {
"discard": false,
"path": "单据/草稿",
"path": "报销/通用",
"extends": {
"param": [
{
......@@ -1749,7 +1749,7 @@ export default {
"btnDisable": "false"
}, {
"discard": false,
"path": "单据/草稿",
"path": "报销/通用",
"extends": {
"param": []
},
......@@ -1760,7 +1760,7 @@ export default {
},
{
"discard": false,
"path": "单据/草稿",
"path": "报销/通用",
"extends": {
"param": [
]
......@@ -1771,7 +1771,7 @@ export default {
"btnDisable": "billReadOnly;1;90;91;92"
}, {
"discard": false,
"path": "单据/复制单据",
"path": "报销/通用",
"extends": {
"param": [
{
......@@ -1859,7 +1859,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [{
"key": "detailTableName"
......@@ -1914,7 +1914,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
{
......@@ -1938,7 +1938,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
]
......@@ -1950,7 +1950,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
]
......@@ -1962,7 +1962,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
......@@ -1975,7 +1975,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
......@@ -1988,7 +1988,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
{
......@@ -2005,7 +2005,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
......@@ -2018,7 +2018,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": []
},
......@@ -2029,15 +2029,9 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
// {
// "ref": "bill",
// "type": "metaData",
// "title": "成功跳转页面",
// "key": "viewName"
// },
{
"clearable": true,
"ref": "gams2.bill",
......@@ -2055,7 +2049,27 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/工会",
"extends": {
"param": [
{
"clearable": true,
"ref": "gams2.bill",
"type": "select",
"title": "执行动作",
"key": "actions",
"innerRef": "actions"
},
]
},
"description": "",
"title": "财务_同意[GH_agreeAction]",
"value": "GH_agreeAction",
"btnDisable": "billEdit"
},
{
"discard": false,
"path": "报销/通用",
"extends": {
"param": [
]
......@@ -2067,7 +2081,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
{
......@@ -2089,7 +2103,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
......@@ -2102,7 +2116,7 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"extends": {
"param": [
// {
......@@ -2128,7 +2142,33 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/工会",
"extends": {
"param": [
// {
// "ref": "bill",
// "type": "metaData",
// "title": "成功跳转页面",
// "key": "viewName"
// },
{
"clearable": true,
"ref": "gams2.bill",
"type": "select",
"title": "执行动作",
"key": "actions",
"innerRef": "actions"
},
]
},
"description": "",
"title": "财务_驳回[GH_rejectAction]",
"value": "GH_rejectAction",
"btnDisable": "billEdit"
},
{
"discard": false,
"path": "报销/通用",
"extends": {
"param": [
{
......@@ -2152,7 +2192,31 @@ export default {
},
{
"discard": false,
"path": "资产/通用",
"path": "报销/工会",
"extends": {
"param": [
{
"budgetcontrol": false,
"type": "Boolean",
"title": "启用预算控制",
"key": "budgetcontrol"
},
{
"useSignature": false,
"type": "Boolean",
"title": "电子签章",
"key": "useSignature"
}
]
},
"description": "",
"title": "财务_提交[GH_submitAction]",
"value": "GH_submitAction",
"btnDisable": "billEdit;1;90;92"
},
{
"discard": false,
"path": "报销/通用",
"extends": {
"param": [
]
......@@ -2164,7 +2228,7 @@ export default {
},
{
"discard": false,
"path": "财务/通用",
"path": "报销/通用",
"extends": {
"param": []
},
......@@ -2175,7 +2239,7 @@ export default {
},
{
"discard": false,
"path": "财务/通用",
"path": "报销/通用",
"extends": {
"param": []
},
......@@ -2186,7 +2250,7 @@ export default {
},
{
"discard": false,
"path": "财务/通用",
"path": "报销/通用",
"extends": {
"param": []
},
......@@ -2197,7 +2261,7 @@ export default {
},
{
"discard": false,
"path": "财务/通用",
"path": "报销/通用",
"extends": {
"param": []
},
......@@ -5053,7 +5117,7 @@ export default {
"title": "rbc查询日期组件",
"type": "RANGE",
"discard": false,
"path": "资产/通用",
"path": "报销/通用",
"description": "在高级查询条件中配置的查询日期组件",
"extends": {
"config": {
......
develop/@gms/gms-plugin-billexpand/src/mcon.js
......@@ -42,9 +42,9 @@ import saveActionBXD from './actions/saveActionBXD';
import lincaoAddView from './actions/lincaoAddView';
import CW_verifySignature from './actions/verifySignature';
import lincaoReadView from './actions/lincaoReadView';
import GH_agreeAction from './actions/labourUnion/gh_agreeAction';
import GH_rejectAction from './actions/labourUnion/gh_rejectAction';
import GH_submitAction from './actions/labourUnion/gh_submitAction';
import GH_agreeAction from './actions/labourUnion/gh_agreeAction.js';
import GH_rejectAction from './actions/labourUnion/gh_rejectAction.js';
import GH_submitAction from './actions/labourUnion/gh_submitAction.js';
//queryAction
import leafletGenerationAction from './query-actions/leafletGenerationAction.js'
......
develop/@gms/gms-plugin-billexpand/src/utils.js
......@@ -102,3 +102,18 @@ export const loadScript = (url) => {
document.head.appendChild(scriptElement)
})
}
export const formatCurrency = (number) => {
const rawNumber = number
try {
number = Number(number).toFixed(2)
return isNaN(number)
? rawNumber
: (number + '').replace(/\d{1,3}(?=(\d{3})+(\.))/g, (match) => {
return match + ',';
})
} catch (error) {
return rawNumber
}
}
develop/@rbc/invoice/src/components/buttons/delete-button.vue
......@@ -20,9 +20,14 @@ export default {
`/yxgl/deleteImage`,
[...this.selectedRows],
).then((res) => {
if (res.data && res.data.code != 0) {
if (res.data) {
if (res.data.code != 0) {
this.$Message.error(res.data.msg)
}
else {
this.$Message.success('删除成功')
}
}
}).catch(() => {
this.$Message.warning('删除失败');
}).finally(() => {
......
develop/@rbc/invoice/src/components/buttons/ocr-button.vue
......@@ -28,9 +28,14 @@ export default {
`/yxgl/ocr`,
{ ...this.selectedRows[0] }
).then((res) => {
if (res.data && res.data.code != 0) {
if (res.data) {
if (res.data.code != 0) {
this.$Message.error(res.data.msg)
}
else {
this.$Message.success(res.data.msg)
}
}
}).finally(() => {
this.$emit('after-click')
})
......
develop/@rbc/invoice/src/components/buttons/upload-button.vue
......@@ -4,6 +4,7 @@
:on-change="handleFileChange"
:http-request="handleClick"
:show-file-list="false"
:multiple="true"
>
<Button size="small" type="text" @click="handleClick">票据导入</Button>
</el-upload>
......@@ -24,9 +25,6 @@ export default {
}
},
computed: {
baseUrl() {
return'http://10.2.9.28:8091'
}
},
methods: {
handleFileChange(file) {
......
develop/@rbc/invoice/src/components/image-info-panel.vue
......@@ -54,6 +54,7 @@
size="small"
v-model="imageInfo[item.key]"
></Input>
<span v-else-if="item.type == 'currency'">{{ formatCurrency(imageInfo[item.key]) }}</span>
<span v-else>{{ imageInfo[item.key] }}</span>
</div>
......@@ -66,6 +67,8 @@
<script>
import moment from 'moment'
import { formatCurrency } from '../../../../@gms/gms-plugin-billexpand/src/utils'
export default {
props: {
isInfoEdit: {
......@@ -166,14 +169,17 @@ export default {
noTaxMoney: {
label: '金额',
key: 'noTaxMoney',
type: 'currency',
},
taxMoney: {
label: '税额',
key: 'taxMoney',
type: 'currency',
},
totalMoney: {
label: '价税合计',
key: 'totalMoney',
type: 'currency',
},
invoiceCheckCode: {
label: '校验码',
......@@ -217,6 +223,7 @@ export default {
trainMoney: {
label: '火车票总金额',
key: 'trainMoney',
type: 'currency',
},
seatType: {
label: '坐位类别',
......@@ -250,11 +257,12 @@ export default {
fareMoney: {
label: '票价',
key: 'fareMoney',
type: 'money',
type: 'currency',
},
fuelsurCharge: {
label: '燃油附加费',
key: 'fuelsurCharge',
type: 'currency',
},
caacDevelopmentFund: {
label: '民航发展基金',
......@@ -263,6 +271,7 @@ export default {
insurance: {
label: '保险费',
key: 'insurance',
type: 'currency',
},
},
itemTypeMap: {
......@@ -409,6 +418,9 @@ export default {
}
},
methods: {
formatCurrency(number) {
return formatCurrency(number)
},
formatDate(date) {
return moment(date).format('YYYY-MM-DD')
},
......@@ -423,7 +435,6 @@ export default {
.invoice-image-info-content {
position: relative;
overflow: hidden;
height: 265px;
overflow-y: scroll;
form {
.ivu-row {
......
develop/@rbc/invoice/src/components/image-info.vue
......@@ -69,11 +69,16 @@ export default {
`/yxgl/verification`,
{ ...this.imageInfo }
).then((res) => {
if (res.data && res.data.code != 0) {
if (res.data) {
if (res.data.code != 0) {
this.$Message.error(res.data.msg)
}
else {
this.$Message.success(res.data.msg)
}
}
}).finally(() => {
this.queryImageInfo()
this.queryImageInfo(this.tabKey)
})
},
handleSave() {
......@@ -85,7 +90,7 @@ export default {
this.queryImageInfo()
})
},
queryImageInfo() {
queryImageInfo(tabKey = 0) {
this.loading = true
window.GMS.$http.post(
`/yxgl/selectDetails`,
......@@ -97,7 +102,7 @@ export default {
label: `发票${index + 1}`,
value: index,
}))
this.tabKey = 0
this.tabKey = tabKey
this.imageInfo = { ...(res?.data?.rows?.[this.tabKey] || {}) }
this.$emit('load-info', this.imageInfoList)
})
......@@ -124,7 +129,7 @@ export default {
content: "";
width: 3px;
height: 16px;
background: #4bc0c6;
background: #005791;
}
.title {
margin-left: 12px;
......
develop/@rbc/invoice/src/components/image-tab.vue
......@@ -57,7 +57,7 @@ export default {
font-weight: 400;
line-height: 20px;
font-weight: 500;
color: #03A4AD;
color: #005791;
}
}
}
......
develop/@rbc/invoice/src/components/image-table.vue
......@@ -17,7 +17,18 @@
{{row.sourceType == 1 ? '移动端' : 'PC端'}}
</template>
<template slot-scope="{ row }" slot="taskType">
{{row.taskType == 0 ? '识别失败' : row.taskType == 1 ? '识别成功' : '未识别'}}
{{
row.taskType == 0
? '识别失败'
: row.taskType == 1
? '识别成功'
: row.taskType == 2
? '无需识别'
: '未识别'
}}
</template>
<template slot-scope="{ row }" slot="createTime">
{{formatTime(row.createTime)}}
</template>
</Table>
<div class="pagination">
......@@ -51,6 +62,7 @@
</template>
<script>
import moment from 'moment'
import ImageTab from './image-tab.vue'
import ImageInfo from './image-info.vue'
import { getImgUrl, verificationTypeList } from '../utils'
......@@ -113,11 +125,11 @@ export default {
},
{
title: '文件名称',
key: 'imageFileName',
key: 'customName',
},
{
title: '上传时间',
key: 'createTime',
slot: 'createTime',
}
],
tableData: [
......@@ -160,6 +172,9 @@ export default {
}
},
methods: {
formatTime(str) {
return moment(str).format('YYYY-MM-DD HH:mm:ss')
},
viewImage() {
const imageId = this.currentSelection[0].id
const yearFlag = this.currentSelection[0].yearFlag
......
develop/@rbc/invoice/src/components/invoice-list.vue
<template>
<div class="main">
<Toolbar>
<UploadButton @after-click="queryImageInfo" />
<DeleteButton :selectedRows="currentSelection" @after-click="queryImageInfo" />
<EditDescriptionButton v-if="mode == 0" :selectedRows="currentSelection" @after-click="queryImageInfo" />
......@@ -9,7 +8,7 @@
<TransmitButton v-if="mode == 0" :selectedRows="currentSelection" @after-click="queryImageInfo" />
<TransmitTrackButton v-if="mode == 0" :selectedRows="currentSelection" />
</Toolbar>
<SearchBar @search="handleSearch" />
<SearchBar style="margin-top: 32px" @search="handleSearch" />
<div class="image-table-wrapper">
<ImageTable :mode="mode" :searchParams="searchParams" ref="imageTable" @selectionChange="handleSelectionChange" />
</div>
......@@ -75,14 +74,12 @@ export default {
<style lang="less" scoped>
.main {
width: 100%;
height: 100%;
background-color: white;
display: flex;
flex-direction: column;
position: relative;
.image-table-wrapper {
flex: 1;
width: 100%;
height: 850px;
padding: 12px;
background-color: #F8F8F8;
}
......
develop/@rbc/invoice/src/components/search-bar.vue
......@@ -7,14 +7,20 @@
:value="dateRange"
@on-change="dateRange = $event"
></DatePicker>
<div class="margin-left-5"></div>
<span class="search-bar-label">数据来源：</span>
<Select v-model="searchParam.sourceType" style="width:200px" clearable>
<Option v-for="item in sourceTypeOptions" :value="item.value" :key="item.value">{{ item.label }}</Option>
</Select>
<div class="margin-left-5"></div>
<span class="search-bar-label">识别任务状态：</span>
<Select v-model="searchParam.taskType" style="width:200px" clearable>
<Option v-for="item in taskTypeOptions" :value="item.value" :key="item.value">{{ item.label }}</Option>
</Select>
<div class="margin-left-5"></div>
<Button size="small" ghost type="primary" @click="handleSearch">查询</Button>
<Button size="small" @click="resetSearch">重置</Button>
</div>
......@@ -46,8 +52,8 @@ export default {
label: '识别成功',
},
{
value: 2,
label: '不识别',
value: 3,
label: '未识别',
},
],
searchParam: {},
......@@ -85,6 +91,9 @@ export default {
button {
margin-right: 10px;
}
.margin-left-5 {
margin-left: 10px;
}
.search-bar-label {
height: 17px;
font-size: 12px;
......@@ -92,15 +101,5 @@ export default {
color: #888888;
line-height: 17px;
}
.ivu-date-picker {
input {
border: none;
}
}
.ivu-select {
.ivu-select-selection {
border: none;
}
}
}
</style>
\ No newline at end of file
develop/@rbc/invoice/src/components/tool-bar.vue
......@@ -12,7 +12,11 @@ export default {
}
return h(
'div',
{ attrs: { class: 'toolbar-wrapper' } },
{
attrs: {
class: `toolbar-wrapper ${'toolbar-wrapper-fixed'}`
}
},
children,
)
},
......@@ -23,9 +27,12 @@ export default {
.toolbar-wrapper {
padding: 0 16px;
height: 32px;
width: 100%;
background-color: white;
border-bottom: 1px solid #DDD;
display: flex;
align-items: center;
z-index: 999;
.divider {
margin: 0 16px;
width: 1px;
......@@ -34,4 +41,8 @@ export default {
}
}
.toolbar-wrapper-fixed {
position: fixed;
}
</style>
\ No newline at end of file
develop/@rbc/invoice/src/utils.js
......@@ -11,6 +11,7 @@ export const verificationTypeList = [
'00103',
'002',
'00104',
'008',
]
export const getImgUrl = (objId, yearFlag) => {
......
develop/@rbc/rbc-login/src/views/login/index.vue
......@@ -253,12 +253,14 @@ export default {
bgImgCode
? this.getImgUrl(bgImgCode).then((url) => {
this.loginImageBg = url
}).finally(() => {
this.imgLoading -= 1
})
: this.imgLoading -= 1
iconCode
? this.getImgUrl(iconCode).then((url) => {
this.loginIcon = url
}).finally(() => {
this.imgLoading -= 1
})
: this.imgLoading -= 1
......@@ -267,6 +269,7 @@ export default {
boxImgCode
? this.getImgUrl(boxImgCode).then((url) => {
this.boxImgUrl = url
}).finally(() => {
this.imgLoading -= 1
})
: this.imgLoading -= 1
......
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