Merge remote-tracking branch 'websoft/master'

This commit is contained in:
2026-08-26 23:18:19 +08:00
25 changed files with 629 additions and 100 deletions
+17 -17
View File
@@ -809,12 +809,12 @@
</el-dialog>
<div class="archive-form__footer">
<el-button v-if="!isArchivePage || readonly" @click="closeArchive">
{{ isArchivePage ? '返回' : readonly ? '关闭' : '取消' }}
</el-button>
<el-button type="primary" v-if="!readonly" @click="saveArchive">保存</el-button>
<el-button type="success" v-if="!readonly" @click="saveAndSubmitArchive">提交</el-button>
<el-button v-if="!readonly && !isArchivePage" @click="closeArchive">返回</el-button>
<!-- 次要:独立页返回 / 只读关闭 / 弹窗取消 -->
<el-button @click="closeArchive">{{
readonly ? '关闭' : isArchivePage ? '返回' : '取消'
}}</el-button>
<el-button type="primary" plain v-if="!readonly" @click="saveArchive">保存</el-button>
<el-button type="primary" v-if="!readonly" @click="saveAndSubmitArchive">提交</el-button>
</div>
</component>
@@ -875,8 +875,8 @@
</section-card>
<template #footer>
<div class="contact-dialog__footer-actions">
<el-button type="primary" @click="saveContact">保存</el-button>
<el-button @click="contactBox = false">返回</el-button>
<el-button type="primary" plain @click="saveContact">保存</el-button>
</div>
</template>
</el-dialog>
@@ -973,8 +973,8 @@
</section-card>
<template #footer>
<div class="receipt-dialog__footer-actions">
<el-button type="primary" @click="saveReceipt">保存</el-button>
<el-button @click="receiptBox = false">返回</el-button>
<el-button type="primary" plain @click="saveReceipt">保存</el-button>
</div>
</template>
</el-dialog>
@@ -1093,8 +1093,8 @@
</el-form>
<template #footer>
<div class="invoice-dialog__footer-actions">
<el-button type="primary" @click="saveInvoice">保存</el-button>
<el-button @click="invoiceBox = false">返回</el-button>
<el-button type="primary" plain @click="saveInvoice">保存</el-button>
</div>
</template>
</el-dialog>
@@ -1239,7 +1239,7 @@
</el-input>
</template>
<template v-else>
<div class="score-standard-cell__label">请选择:</div>
<!-- <div class="score-standard-cell__label">请选择:</div>-->
<el-select
v-model="detail.selectedOption"
filterable
@@ -1356,7 +1356,8 @@
<span>自评:{{ formatScoreValue(currentScore.selfScore) }}分</span>
<span>复评:{{ formatScoreValue(currentScore.reviewScore) }}分</span>
</div>
<el-button type="primary" v-if="!readonly" @click="saveScoreDetail">保存</el-button>
<el-button @click="scoreBox = false">返回</el-button>
<el-button type="primary" plain v-if="!readonly" @click="saveScoreDetail">保存</el-button>
<el-button
v-if="!readonly && hasPermission('customer_type_re_cert')"
type="primary"
@@ -1364,7 +1365,6 @@
>
复评确认
</el-button>
<el-button @click="scoreBox = false">返回</el-button>
</div>
</template>
</el-dialog>
@@ -4875,7 +4875,7 @@ export default {
display: flex;
flex-direction: column;
justify-content: center;
min-height: 104px;
//min-height: 104px;
padding: 8px 24px;
}
@@ -4895,7 +4895,7 @@ export default {
}
:deep(.el-table__body td) {
min-height: 112px;
//min-height: 112px;
color: #303133;
}
@@ -4958,7 +4958,7 @@ export default {
.contact-dialog__footer-actions {
display: flex;
justify-content: center;
justify-content: flex-end;
gap: 12px;
}
@@ -4971,13 +4971,13 @@ export default {
.receipt-dialog__footer-actions {
display: flex;
justify-content: center;
justify-content: flex-end;
gap: 12px;
}
.invoice-dialog__footer-actions {
display: flex;
justify-content: center;
justify-content: flex-end;
gap: 12px;
}