b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'websoft/master'

Browse Source
This commit is contained in:
b2894lxlx
2026-08-26 23:18:19 +08:00
parent b36aefc7c4 7f70052afd
commit 2c08d0c362
25 changed files with 629 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/business/components/business-crud-page.vue
+8 -8
View File
@@ -2072,6 +2072,12 @@
查看过程配置
</el-link>
</div>
<el-button
v-if="isStandaloneFormPage && !showTransportPlanCreateActions"
@click="closeCrudDialog"
>
关闭
</el-button>
<el-button
v-if="config.enableDraftSave && !dialogReadonly"
type="primary"
@@ -2106,12 +2112,6 @@
确认创建
</el-button>
</div>
<el-button
v-if="isStandaloneFormPage && !showTransportPlanCreateActions"
@click="closeCrudDialog"
>
关闭
</el-button>
</template>
<template #menu="{ row, index }">
@@ -13386,7 +13386,7 @@ export default {
&__dispatch-shipping-form {
:deep(.el-form-item) {
margin-bottom: 16px;
margin-bottom: 14px;
}
}
@@ -13900,7 +13900,7 @@ export default {
width: 100%;
:deep(.el-form-item) {
margin-bottom: 16px;
margin-bottom: 14px;
}
:deep(.el-select),
src/views/business/components/master-order-dispatch.vue
+1 -1
View File
@@ -704,7 +704,7 @@ export default {
.route-overview__line { flex: 0 1 56px; min-width: 24px; height: 32px; margin-top: 0; border-bottom: 6px solid #e4e7ed; }
.segment-header { min-height: 46px; padding: 0 20px; border-bottom: 1px solid #eff1f7; font-weight: 600; em { color: #409eff; font-style: normal; } }
.segment-content { padding: 16px 24px; }
.dispatch-form { :deep(.el-form-item) { margin-bottom: 16px; } :deep(.el-input), :deep(.el-select), :deep(.el-date-editor), :deep(.el-input-number) { width: 100%; } :deep(.el-input-group__append .el-select) { width: auto; } }
.dispatch-form { :deep(.el-form-item) { margin-bottom: 14px; } :deep(.el-input), :deep(.el-select), :deep(.el-date-editor), :deep(.el-input-number) { width: 100%; } :deep(.el-input-group__append .el-select) { width: auto; } }
.transport-type-field :deep(.el-input) { width: 240px; }
.goods-heading { display: flex; align-items: center; justify-content: space-between; margin: 0 -24px 12px; padding: 14px 24px; border-top: 1px solid #eff1f7; border-bottom: 1px solid #eff1f7; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } span { color: #909399; font-size: 13px; } }
.freight-heading { margin: 16px 0 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } }
src/views/business/components/master-order-editor.vue
+21 -6
View File
@@ -532,10 +532,10 @@
</template>
</el-dialog>
<footer>
<el-button @click="$emit('back')">返回</el-button
><el-button @click="saveDraft">暂存</el-button
><el-button type="primary" @click="confirmCreate">确认创建</el-button
><el-button type="primary" @click="createAndDispatch">创建并调度</el-button>
<el-button @click="$emit('back')">返回</el-button>
<el-button type="primary" plain @click="saveDraft">暂存</el-button>
<el-button type="primary" plain @click="confirmCreate">确认创建</el-button>
<el-button type="primary" @click="createAndDispatch">创建并调度</el-button>
</footer>
</div>
</template>
@@ -2050,7 +2050,22 @@ export default {
footer {
display: flex;
justify-content: flex-end;
gap: 8px;
padding: 16px 0;
gap: 12px;
padding: 12px 24px;
position: fixed;
right: 0;
left: 230px;
bottom: 0;
margin: 0;
z-index: 10;
background: #fff;
border-top: 1px solid #eff1f7;
box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.06);
}
:global(.avue--collapse footer) {
left: 60px;
}
:global(.avue-layout--horizontal footer) {
left: 0;
}
</style>
src/views/business/contract-manage.vue
+1 -1
View File
@@ -2271,7 +2271,7 @@ export default {
:deep(.el-form-item) {
align-items: center;
margin-bottom: 16px;
margin-bottom: 14px;
}
:deep(.el-form-item__label) {
src/views/business/loading-manage.vue
+1 -1
View File
@@ -2753,7 +2753,7 @@ export default {
}
:deep(.el-form-item) {
margin-bottom: 16px;
margin-bottom: 14px;
}
:deep(.el-form-item__label) {
src/views/business/project-apply.vue
+8 -11
View File
@@ -619,20 +619,22 @@
:class="{ 'project-apply-dialog__footer--change': isChangeDialog }"
>
<template v-if="isChangeDialog">
<el-button type="primary" :loading="submitLoading" @click="saveChangeProject">
<el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
<el-button v-if="isProjectFormPage" @click="closeProjectForm">返回</el-button>
<el-button type="primary" plain :loading="submitLoading" @click="saveChangeProject">
保存
</el-button>
<el-button type="primary" :loading="submitLoading" @click="submitChangeProject">
提交
</el-button>
<el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
<el-button v-if="isProjectFormPage" @click="closeProjectForm">返回</el-button>
</template>
<template v-else>
<el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
<el-button v-if="isProjectFormPage" @click="closeProjectForm">返回</el-button>
<el-button
v-if="!dialogReadonly"
type="primary"
plain
:loading="submitLoading"
@click="saveProject"
>
@@ -646,7 +648,6 @@
>
提交
</el-button>
<el-button v-if="isProjectFormPage" @click="closeProjectForm">返回</el-button>
</template>
</div>
</component>
@@ -2131,7 +2132,7 @@ export default {
}
:deep(.el-form-item) {
margin-bottom: 16px;
margin-bottom: 14px;
}
:deep(.el-form-item__label) {
@@ -2198,9 +2199,7 @@ export default {
padding: 12px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
:deep(.el-table__header th) {
background: #f5f7fa;
color: #303133;
:deep(.el-table__header th .cell) {
font-weight: 600;
}
@@ -2244,9 +2243,7 @@ export default {
width: 100%;
margin-bottom: 12px;
:deep(.el-table__header th) {
background: #f5f7fa;
color: #303133;
:deep(.el-table__header th .cell) {
font-weight: 600;
}
src/views/business/voucher-manage.vue
+3 -3
View File
@@ -99,7 +99,7 @@
width="120"
fixed="right"
align="center"
/><el-table-column label="操作" width="120" fixed="right" align="left"
/><el-table-column label="操作" width="160" fixed="right" align="left"
><template #default="{ row }"
><div class="voucher-manage-page__actions">
<el-link
@@ -423,7 +423,7 @@
></el-table-column
><el-table-column label="上传状态" width="120"
><template #default="{ row }">{{ taskStatusName(row.status) }}</template></el-table-column
><el-table-column label="操作" width="160" fixed="right"
><el-table-column label="操作" width="180" fixed="right"
><template #default="{ row }"
><el-link
v-if="row.status === 'paused' || row.status === 'failed'"
@@ -1019,7 +1019,7 @@ load();
display: none;
}
&__upload-form :deep(.el-form-item) {
margin-bottom: 16px;
margin-bottom: 14px;
}
&__upload-tip {
margin-left: 16px;