Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/settlement/transport-reconciliation.vue
This commit is contained in:
2026-08-21 00:18:28 +08:00
36 changed files with 517 additions and 336 deletions
+3 -1
View File
@@ -251,12 +251,14 @@ export const option = createCrudOption([
{
label: '合同名称',
prop: 'contractName',
align: 'left',
headerAlign: 'left',
search: true,
searchOrder: 7,
searchPlaceholder: '请输入',
order: 180,
slot: true,
minWidth: 180,
minWidth: 240,
rules: textRule('合同名称', 100, true),
},
{