冲突

Your Name

2022-10-13 902a537974ce0374d68d9e717febab7157a69286

 src/views/specialWorkSystem/workTicket/myApproval/index.vue

@@ -85,13 +85,13 @@
                            <div class="stepCard">
                                <el-card class="box-card" shadow="always">
                                    <div class="text">
                                        审批结果：<span>{{ item.approvalResultDesc }}</span>
                                        审批结果：<span class="bold-text">{{ item.approvalResultDesc }}</span>
                                    </div>
                                    <div class="text">
                                        审批层级：<span>{{ item.typeDesc }}</span>
                                        审批层级：<span class="bold-text">{{ item.typeDesc }}</span>
                                    </div>
                                    <div class="text" v-if="item.auditTypeDesc">
                                        审批类型：<span>{{ item.auditTypeDesc }}</span>
                                        审批类型：<span class="bold-text">{{ item.auditTypeDesc }}</span>
                                    </div>
                                    <div class="text" v-show="item.startApprovalTime != null">
                                        开始时间：<span>{{ item.startApprovalTime }}</span>
@@ -301,7 +301,7 @@
        // 填写表单
        const toApply = () => {
            router.push({
                path: 'workApply'
                path: 'apply'
            });
        };

@@ -638,10 +638,13 @@
                    padding-left: 10px;

                    span {
                        font-weight: bolder;
                        color: #409eff;
                    }

                    .bold-text{
                        font-weight: bolder;
                    }

                    &:last-of-type {
                        margin-bottom: 0;
                    }