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/settlement/receivable-payable-detail.vue
This commit is contained in:
b2894lxlx
2026-08-31 19:30:16 +08:00
parent 449e4e1884 9b9e652afd
commit a9b4ab069b
25 changed files with 493 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/option/settlement/formalSettlementSearch.js
+1 -1
View File
@@ -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' },
src/option/settlement/preSettlementSearch.js
+1 -1
View File
@@ -10,7 +10,7 @@ export const preSettlementSearchFields = [
{ label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
{ label: '预付单号', prop: 'advanceNo', type: 'input' },
{ label: '项目名称', prop: 'projectName', type: 'input' },
{ label: '所属组织', prop: 'deptName', type: 'input' },
{ label: '所属组织', prop: 'deptName', type: 'cascader' },
{ label: '合同名称', prop: 'contractName', type: 'input' },
{ label: '合同编号', prop: 'contractNo', type: 'input' },
{ label: '收款方', prop: 'payeeName', type: 'input' },
src/option/settlement/receivable-payable-detail.js
+1 -1
View File
@@ -14,7 +14,7 @@ export const searchFields = [
{ label: '单据号', prop: 'documentNo', type: 'input' },
{ label: '生成日期', prop: 'generateDateRange', type: 'daterange' },
{ label: '客户名称', prop: 'customerName', type: 'input' },
{ label: '所属组织', prop: 'deptName', type: 'input' },
{ label: '所属组织', prop: 'deptName', type: 'cascader' },
{ label: '项目名称', prop: 'projectName', type: 'input' },
{ label: '货物类型', prop: 'cargoType', type: 'input' },
{ label: '货物名称', prop: 'cargoName', type: 'input' },
src/option/settlement/settlementAdjustmentSearch.js
+1 -1
View File
@@ -5,7 +5,7 @@ export const settlementAdjustmentSearchFields = [
{ label: '日期', prop: 'createDateRange', type: 'daterange' },
{ label: '客户名称', prop: 'customerName', type: 'input' },
{ label: '项目名称', prop: 'projectName', type: 'input' },
{ label: '所属组织', prop: 'deptName', type: 'input' },
{ label: '所属组织', prop: 'deptName', type: 'cascader' },
{ label: '关联结算单', prop: 'formalSettlementNo', type: 'input' },
{
label: '结算单类型',
src/option/settlement/transportReconciliationSearch.js
+1 -1
View File
@@ -15,7 +15,7 @@ export const transportReconciliationSearchFields = [
{ prop: 'reconciliationNo', label: '对账单号', type: 'input' },
{ prop: 'preSettlementNos', label: '预结算单号', type: 'input' },
{ prop: 'projectName', label: '项目', type: 'input' },
{ prop: 'deptName', label: '所属组织', type: 'input' },
{ prop: 'deptName', label: '所属组织', type: 'cascader' },
{ prop: 'contractNo', label: '合同编号', type: 'input' },
{ prop: 'payerName', label: '付款方', type: 'input' },
{ prop: 'payeeName', label: '收款方', type: 'input' },