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 
# Conflicts:
#	src/views/business/components/waybill-import-dialog.vue
This commit is contained in:
b2894lxlx
2026-08-14 02:50:07 +08:00
parent 6e012d766c 3bb0fddcca
commit 6bc9981ffc
43 changed files with 140 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+1 -1
View File
@@ -84,7 +84,7 @@ app.use(Avue, {
crudOption: {
searchIcon: true,
searchIndex: 4,
searchLabelWidth: 160,
searchLabelWidth: 88,
searchMenuSpan: 24,
searchMenuPosition: 'right',
menuWidth: 180,
src/option/base/cargo-type.js
+2 -2
View File
@@ -35,8 +35,8 @@ export const getCargoTypeOption = ctx => ({
updateBtnText: '提交',
searchShow: true,
searchIcon: true,
searchLabelWidth: 50,
searchMenuSpan: 10,
searchLabelWidth: 88,
searchMenuSpan: 12,
searchIndex: 4,
searchMenuPosition: 'right',
border: true,
src/option/business/contract-manage.js
+1
View File
@@ -495,6 +495,7 @@ export const option = createCrudOption([
prop: 'remark',
type: 'textarea',
span: 24,
minRows: 2,
hide: true,
order: 40,
maxlength: 2000,
src/option/business/shipping-template.js
+2 -2
View File
@@ -120,7 +120,7 @@ export const option = {
label: '备注',
prop: 'remark',
type: 'textarea',
minRows: 3,
minRows: 2,
span: 24,
order: 360,
minWidth: 180,
@@ -175,7 +175,7 @@ export const option = {
label: '备注',
prop: 'basicRemark',
type: 'textarea',
minRows: 3,
minRows: 2,
span: 24,
order: 315,
minWidth: 180,
src/option/business/temporary-credit-limit.js
+2
View File
@@ -87,6 +87,7 @@ export const config = {
};
export const option = {
dialogCustomClass: 'temporary-credit-limit-dialog',
...createCrudOption([
{
label: '申请单号',
@@ -258,6 +259,7 @@ export const option = {
prop: 'remark',
type: 'textarea',
span: 24,
minRows: 2,
hide: true,
maxlength: 200,
showWordLimit: true,
src/option/business/transport-plan.js
+3 -3
View File
@@ -416,7 +416,7 @@ export const option = {
label: '备注',
prop: 'remark',
type: 'textarea',
minRows: 4,
minRows: 2,
span: 24,
order: 330,
minWidth: 180,
@@ -572,7 +572,7 @@ export const option = {
prop: 'goodsJson',
type: 'textarea',
formslot: true,
minRows: 5,
minRows: 2,
span: 24,
order: 270,
hide: true,
@@ -593,7 +593,7 @@ export const option = {
prop: 'attachmentsJson',
type: 'textarea',
formslot: true,
minRows: 3,
minRows: 2,
span: 24,
order: 260,
hide: true,
src/option/business/waybill-manage.js
+5 -5
View File
@@ -670,7 +670,7 @@ export const option = {
label: '备注',
prop: 'remark',
type: 'textarea',
minRows: 4,
minRows: 2,
span: 24,
order: 810,
minWidth: 180,
@@ -788,7 +788,7 @@ export const option = {
label: '货物信息',
prop: 'goodsJson',
type: 'textarea',
minRows: 5,
minRows: 2,
span: 24,
hide: true,
display: false,
@@ -800,7 +800,7 @@ export const option = {
label: '承运信息',
prop: 'carrierJson',
type: 'textarea',
minRows: 4,
minRows: 2,
span: 24,
hide: true,
display: false,
@@ -812,7 +812,7 @@ export const option = {
label: '过程配置',
prop: 'processJson',
type: 'textarea',
minRows: 4,
minRows: 2,
span: 24,
hide: true,
display: false,
@@ -824,7 +824,7 @@ export const option = {
label: '运费信息',
prop: 'freightJson',
type: 'textarea',
minRows: 4,
minRows: 2,
span: 24,
hide: true,
display: false,
src/option/system/user.js
+2 -2
View File
@@ -411,7 +411,7 @@ export const platformOption = {
label: '用户拓展',
prop: 'userExt',
type: 'textarea',
minRows: 8,
minRows: 2,
span: 24,
overHidden: true,
row: true,
@@ -500,7 +500,7 @@ export const platformFormOption = {
label: '用户拓展',
prop: 'userExt',
type: 'textarea',
minRows: 8,
minRows: 2,
span: 24,
},
],
src/option/tool/codesetting.js
+1 -1
View File
@@ -13,7 +13,7 @@ export default {
grid: true,
selection: true,
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
menuWidth: 180,
dialogClickModal: false,
column: [
src/option/tool/formsetting.js
+1 -1
View File
@@ -13,7 +13,7 @@ export default {
grid: true,
selection: true,
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
menuWidth: 180,
dialogWidth: 500,
dialogClickModal: false,
src/option/transportCapacity/transport-ship.js
+2 -2
View File
@@ -5,7 +5,7 @@ export const option = {
searchShow: true,
searchMenuSpan: 24,
searchIcon: true,
searchIndex: 4,
searchIndex: 6,
searchMenuPosition: 'right',
border: true,
index: true,
@@ -96,7 +96,7 @@ export const option = {
{
label: '',
prop: 'expireStatus',
search: true,
search: false,
searchOrder: 0,
searchSpan: 6,
hide: true,
src/option/transportCapacity/transport-vehicle.js
+2 -2
View File
@@ -5,7 +5,7 @@ export const option = {
searchShow: true,
searchMenuSpan: 24,
searchIcon: true,
searchIndex: 4,
searchIndex: 6,
searchMenuPosition: 'right',
border: true,
index: true,
@@ -149,7 +149,7 @@ export const option = {
{
label: '',
prop: 'expireStatus',
search: true,
search: false,
searchOrder: 0,
searchSpan: 6,
hide: true,
src/option/vehicle/accident-record.js
+1 -1
View File
@@ -36,7 +36,7 @@ export const option = {
dialogWidth: 960,
labelPosition: 'right',
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
tip: false,
searchBtnText: '查询',
emptyBtnText: '重置',
src/option/vehicle/annual-inspection-record.js
+1 -1
View File
@@ -35,7 +35,7 @@ export const option = {
dialogWidth: 960,
labelPosition: 'right',
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
tip: false,
searchBtnText: '查询',
emptyBtnText: '重置',
src/option/vehicle/equipment-ledger.js
+1 -1
View File
@@ -16,7 +16,7 @@ export const option = {
dialogWidth: 960,
labelPosition: 'right',
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
tip: false,
searchBtnText: '查询',
emptyBtnText: '重置',
src/option/vehicle/etc-record.js
+1 -1
View File
@@ -25,7 +25,7 @@ export const option = {
dialogWidth: 960,
labelPosition: 'right',
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
tip: false,
searchBtnText: '查询',
emptyBtnText: '重置',
src/option/vehicle/other-expense-record.js
+1 -1
View File
@@ -33,7 +33,7 @@ export const option = {
dialogWidth: 960,
labelPosition: 'right',
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
tip: false,
searchBtnText: '查询',
emptyBtnText: '重置',
src/option/vehicle/tire-replacement-record.js
+1 -1
View File
@@ -26,7 +26,7 @@ export const option = {
dialogWidth: 960,
labelPosition: 'right',
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
tip: false,
searchBtnText: '查询',
emptyBtnText: '重置',
src/option/vehicle/violation-record.js
+1 -1
View File
@@ -36,7 +36,7 @@ export const option = {
dialogWidth: 960,
labelPosition: 'right',
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
tip: false,
searchBtnText: '查询',
emptyBtnText: '重置',
src/styles/element-ui.scss
+21 -4
View File
@@ -131,8 +131,8 @@
}
.avue-crud__search .el-form-item__label {
min-width: 160px;
white-space: nowrap;
min-width: 88px;
//white-space: nowrap;
}
.avue-crud__search.el-card {
@@ -289,6 +289,22 @@
}
}
// 3d) 临时额度管理弹窗：label 固定 6 个汉字宽度，超长自动换行
.temporary-credit-limit-dialog {
.el-form-item__label {
flex: 0 0 calc(6em + 24px) !important;
width: calc(6em + 24px) !important;
white-space: normal !important;
word-break: break-all;
overflow-wrap: anywhere;
line-height: 18px;
}
.el-form-item {
align-items: center;
}
}
// 3) Avue 弹窗内分组（option.group）渲染为白卡，标题在卡内
.el-dialog .avue-form__group {
background: #fff;
@@ -314,7 +330,7 @@
background: #fff;
border-radius: 6px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
padding: 16px;
//padding: 16px;
margin-bottom: 16px;
.avue-form__group--title {
@@ -684,6 +700,7 @@
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
gap: 8px;
}
@@ -787,5 +804,5 @@
margin-top: -30px !important;
}
.el-form-item__label {
margin-left: 20px !important;
margin-left: 12px !important;
}
src/views/authority/apiscope.vue
+1 -1
View File
@@ -163,7 +163,7 @@ export default {
viewBtn: true,
selection: true,
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
menuWidth: 180,
dialogWidth: 900,
dialogClickModal: false,
src/views/authority/datascope.vue
+3 -3
View File
@@ -164,7 +164,7 @@ export default {
viewBtn: true,
selection: true,
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
menuWidth: 180,
dialogWidth: 900,
dialogClickModal: false,
@@ -277,7 +277,7 @@ export default {
label: '规则值',
prop: 'scopeValue',
span: 24,
minRows: 5,
minRows: 2,
type: 'textarea',
display: false,
hide: true,
@@ -488,7 +488,7 @@ export default {
label: '规则值',
prop: 'scopeValue',
span: 24,
minRows: 5,
minRows: 2,
type: 'textarea',
display: true,
hide: true,
src/views/authority/ratelimit.vue
+3 -3
View File
@@ -206,7 +206,7 @@ export default {
searchIndex: 8,
searchMenuPosition: 'right',
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
border: true,
index: true,
viewBtn: true,
@@ -270,7 +270,7 @@ export default {
label: '请求阈值',
prop: 'limitCount',
type: 'number',
minRows: 1,
minRows: 2,
value: 100,
hide: true,
labelTip: '单个时间窗口内允许通过的最大请求数，超出后触发限流并返回 429',
@@ -280,7 +280,7 @@ export default {
label: '时间窗口',
prop: 'limitPeriod',
type: 'number',
minRows: 1,
minRows: 2,
value: 1,
hide: true,
labelTip: '限流统计周期的数值，与时间单位组合使用，如时间窗口 1 + 时间单位分钟表示每分钟一个周期',
src/views/authority/role.vue
+1 -1
View File
@@ -249,7 +249,7 @@ export default {
selection: true,
viewBtn: true,
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
menuWidth: 240,
dialogWidth: 600,
dialogClickModal: false,
src/views/base/airport-master.vue
+1 -1
View File
@@ -239,7 +239,7 @@ export default {
tip: false,
searchShow: true,
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
searchMenuSpan: 24,
searchIcon: true,
searchIndex: 4,
src/views/base/port-terminal.vue
+1 -1
View File
@@ -397,7 +397,7 @@ export default {
labelWidth: '108px',
tip: false,
searchShow: true,
searchLabelWidth: 160,
searchLabelWidth: 88,
searchIcon: true,
searchIndex: 4,
searchMenuSpan: 24,
src/views/base/region.vue
+1 -1
View File
@@ -291,7 +291,7 @@ export default {
label: '区划备注',
prop: 'remark',
type: 'textarea',
minRows: 6,
minRows: 2,
span: 24,
},
],
src/views/business/contract-manage.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<business-crud-page :api="api" :config="config" :crud-option="option" :menu-width="245" />
<business-crud-page :api="api" :config="config" :crud-option="option" :menu-width="252" />
</template>
<script>
src/views/resource/oss.vue
+1 -1
View File
@@ -103,7 +103,7 @@ export default {
value: 1,
span: 24,
width: 120,
searchLabelWidth: 160,
searchLabelWidth: 88,
row: true,
dicUrl: '/blade-system/dict/dictionary?code=oss',
props: {
src/views/resource/sms.vue
+1 -1
View File
@@ -102,7 +102,7 @@ export default {
value: 1,
span: 24,
width: 100,
searchLabelWidth: 160,
searchLabelWidth: 88,
row: true,
dicUrl: '/blade-system/dict/dictionary?code=sms',
props: {
src/views/system/post.vue
+1 -1
View File
@@ -152,7 +152,7 @@ export default {
prop: 'remark',
type: 'textarea',
span: 24,
minRows: 6,
minRows: 2,
hide: true,
},
],
src/views/system/tenantdatasource.vue
+2 -2
View File
@@ -87,7 +87,7 @@ export default {
value: 1,
span: 24,
width: 120,
searchLabelWidth: 160,
searchLabelWidth: 88,
row: true,
gridRow: true,
dicUrl: '/blade-system/dict/dictionary?code=datasource_category',
@@ -110,7 +110,7 @@ export default {
label: 'YAML',
prop: 'shardingConfig',
span: 24,
minRows: 5,
minRows: 2,
hide: true,
display: false,
gridRow: true,
src/views/tool/datasource.vue
+2 -2
View File
@@ -89,7 +89,7 @@ export default {
value: 1,
span: 24,
width: 120,
searchLabelWidth: 160,
searchLabelWidth: 88,
row: true,
gridRow: true,
display: false,
@@ -113,7 +113,7 @@ export default {
label: 'YAML',
prop: 'shardingConfig',
span: 24,
minRows: 5,
minRows: 2,
hide: true,
display: false,
gridRow: true,
src/views/transportCapacity/driver.vue
+1 -1
View File
@@ -1350,7 +1350,7 @@ export default {
align-items: center;
gap: 8px;
order: -1;
margin-right: auto;
margin-right: 12px;
min-width: 0;
:deep(.el-check-tag) {
src/views/transportCapacity/ship.vue
+4 -2
View File
@@ -44,7 +44,7 @@
批量删除
</el-button>
</template>
<template #expireStatus-search>
<template #search-menu>
<div class="transport-ship-page__expiry-tags">
<el-check-tag
v-for="item in expiryTagOptions"
@@ -1051,7 +1051,9 @@ export default {
flex-wrap: wrap;
align-items: center;
gap: 8px;
width: 100%;
order: -1;
margin-right: 12px;
min-width: 0;
:deep(.el-check-tag) {
margin: 0;
src/views/transportCapacity/vehicle.vue
+4 -2
View File
@@ -41,7 +41,7 @@
>批量删除
</el-button>
</template>
<template #expireStatus-search>
<template #search-menu>
<div class="transport-vehicle-page__expiry-tags">
<el-check-tag
v-for="item in expiryTagOptions"
@@ -1195,7 +1195,9 @@ export default {
flex-wrap: wrap;
align-items: center;
gap: 8px;
width: 100%;
order: -1;
margin-right: 12px;
min-width: 0;
:deep(.el-check-tag) {
margin: 0;
src/views/util/form.vue
+1 -1
View File
@@ -41,7 +41,7 @@ export default {
label: '个性签名',
prop: 'textarea',
type: 'textarea',
minRows: 8,
minRows: 2,
row: true,
},
],
src/views/util/table.vue
+1 -1
View File
@@ -112,7 +112,7 @@ export default {
label: '个性签名',
prop: 'textarea',
type: 'textarea',
minRows: 8,
minRows: 2,
span: 24,
overHidden: true,
row: true,
src/views/vehicle/maintenance-plan.vue
+2 -2
View File
@@ -193,7 +193,7 @@ export default {
dialogWidth: 960,
labelPosition: 'right',
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
tip: false,
searchShow: true,
searchMenuSpan: 24,
@@ -346,7 +346,7 @@ export default {
label: '备注',
prop: 'remark',
type: 'textarea',
minRows: 5,
minRows: 2,
span: 24,
hide: true,
placeholder: '请输入',
src/views/vehicle/maintenance-record.vue
+2 -2
View File
@@ -180,7 +180,7 @@ export default {
dialogWidth: 960,
labelPosition: 'right',
labelWidth: 'auto',
searchLabelWidth: 160,
searchLabelWidth: 88,
tip: false,
searchShow: true,
searchMenuSpan: 24,
@@ -333,7 +333,7 @@ export default {
label: '备注',
prop: 'remark',
type: 'textarea',
minRows: 5,
minRows: 2,
span: 24,
hide: true,
placeholder: '请输入',