Merge remote-tracking branch 'websoft/master'

# Conflicts: # src/views/settlement/receivable-payable-detail.vue
2026-08-31 19:30:16 +08:00
parent 449e4e1884 9b9e652afd
commit a9b4ab069b
25 changed files with 493 additions and 187 deletions
@@ -38,7 +38,7 @@ export const formalSettlementSearchFields = [
  { label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
  { label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
  { label: '项目', prop: 'projectName', type: 'input' },
-  { label: '所属组织', prop: 'deptName', type: 'input' },
+  { label: '所属组织', prop: 'deptName', type: 'cascader' },
  { label: '合同编号', prop: 'contractNo', type: 'input' },
  { label: '付款方', prop: 'payerName', type: 'input' },
  { label: '收款方', prop: 'payeeName', type: 'input' },