songqq/contract-manager
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

refactor(controller): 移除冗余的service注入，使用BeanContext统一管理

Browse Source 
feat(sales-order): 补充SalesOrderVo缺失字段并完善相关功能
feat(sales-order): 添加客户、税率等字段到销售订单界面
refactor(tab-skin): 重构TabSkin基类，统一bean获取方式
fix(fxml): 修正controller包路径和字段绑定
feat(repository): 添加findAllByOrder方法优化查询
This commit is contained in:
宋其青
2025-10-15 00:40:02 +08:00
parent 1c1ff678a5
commit d2e0dc4555
25 changed files with 485 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/resources/ui/contract/contract-tab-purchase-orders.fxml
View File

@@ -5,7 +5,7 @@
<?import javafx.scene.layout.*?>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="400.0" prefWidth="600.0"
xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.tab.ContractTabSkinPurchaseOrders"
fx:controller="com.ecep.contract.controller.contract.ContractTabSkinPurchaseOrders"
>
<children>
<HBox spacing="3.0">

13
client/src/main/resources/ui/contract/contract-tab-sale-orders.fxml
View File

@@ -5,7 +5,7 @@
<?import javafx.scene.layout.*?>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0"
xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.tab.ContractTabSkinSaleOrders"
fx:controller="com.ecep.contract.controller.contract.ContractTabSkinSaleOrders"
>
<children>
<HBox spacing="3.0">
@@ -23,12 +23,19 @@
<columns>
<TableColumn fx:id="idColumn" prefWidth="75.0" text="ID"/>
<TableColumn fx:id="codeColumn" prefWidth="120" text="编号"/>
<TableColumn fx:id="employeeColumn" prefWidth="120" text="编号"/>
<TableColumn fx:id="customerColumn" prefWidth="100.0" text="客户"/>
<TableColumn fx:id="customerAddressColumn" prefWidth="150.0" text="客户地址"/>
<TableColumn fx:id="taxRateColumn" prefWidth="60.0" text="税率"/>
<TableColumn fx:id="refIdColumn" prefWidth="60.0" text="RefID"/>
<TableColumn fx:id="employeeColumn" prefWidth="120" text="业务员"/>
<TableColumn fx:id="makerColumn" prefWidth="90.0" text="制单人" />
<TableColumn fx:id="makerDateColumn" prefWidth="130.0" text="制单日期"/>
<TableColumn fx:id="verifierColumn" prefWidth="70.0" text="审核人"/>
<TableColumn fx:id="verifierDateColumn" prefWidth="130.0" text="审核日期"/>
<TableColumn fx:id="modifierColumn" prefWidth="90.0" text="修改人"/>
<TableColumn fx:id="modifierDateColumn" prefWidth="130.0" text="修改日期"/>
<TableColumn fx:id="closerColumn" prefWidth="90.0" text="关闭人"/>
<TableColumn fx:id="closerDateColumn" prefWidth="130.0" text="关闭日期"/>
<TableColumn fx:id="descriptionColumn" prefWidth="180.0" text="备注"/>
</columns>
<contextMenu>

4
client/src/main/resources/ui/contract/contract-tab-sub-contract.fxml
View File

@@ -3,6 +3,8 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.control.cell.PropertyValueFactory?>
<?import com.ecep.contract.controller.table.cell.CompanyTableCell?>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0"
xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.tab.ContractTabSkinSubContract"
@@ -24,6 +26,8 @@
<TableColumn fx:id="subContractTable_idColumn" prefWidth="75.0" text="ID"/>
<TableColumn fx:id="subContractTable_codeColumn" prefWidth="120" text="合同编号" sortType="DESCENDING"/>
<TableColumn fx:id="subContractTable_nameColumn" prefWidth="250" text="合同名称"/>
<TableColumn fx:id="subContractTable_companyColumn" prefWidth="250" text="公司">
</TableColumn>
<TableColumn fx:id="subContractTable_setupDateColumn" prefWidth="75.0" text="提交日期"/>
<TableColumn fx:id="subContractTable_inureDateColumn" prefWidth="75.0" text="生效日期"/>
<TableColumn fx:id="subContractTable_orderDateColumn" prefWidth="75.0" text="签订日期"/>

59
client/src/main/resources/ui/contract/sale-orders.fxml
View File

@@ -28,6 +28,16 @@
minWidth="50.0" prefWidth="180.0"/>
</columnConstraints>
<rowConstraints>
<RowConstraints fillHeight="false" minHeight="30.0" prefHeight="30.0"
vgrow="NEVER"/>
<RowConstraints fillHeight="false" minHeight="30.0" prefHeight="30.0"
vgrow="NEVER"/>
<RowConstraints fillHeight="false" minHeight="30.0" prefHeight="30.0"
vgrow="NEVER"/>
<RowConstraints fillHeight="false" minHeight="30.0" prefHeight="30.0"
vgrow="NEVER"/>
<RowConstraints fillHeight="false" minHeight="30.0" prefHeight="30.0"
vgrow="NEVER"/>
<RowConstraints fillHeight="false" minHeight="30.0" prefHeight="30.0"
vgrow="NEVER"/>
<RowConstraints fillHeight="false" minHeight="30.0" prefHeight="30.0"
@@ -45,33 +55,50 @@
<Label text="订单号#"/>
<TextField fx:id="codeField" GridPane.columnIndex="1"/>
<Label text="业务员" GridPane.rowIndex="1"/>
<TextField fx:id="createdField" disable="true" promptText="yyyy-MM-dd"
GridPane.columnIndex="1" GridPane.rowIndex="3"/>
<Label text="引用ID" GridPane.columnIndex="2" GridPane.rowIndex="0"/>
<TextField fx:id="refIdField" GridPane.columnIndex="3" GridPane.rowIndex="0"/>
<Label text="合同" GridPane.rowIndex="9"/>
<TextField fx:id="contractField" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
<TextField fx:id="employeeField" GridPane.columnIndex="1"
GridPane.rowIndex="1"/>
<Label text="税率" GridPane.columnIndex="2" GridPane.rowIndex="1"/>
<TextField fx:id="taxRateField" GridPane.columnIndex="3" GridPane.rowIndex="1"/>
<Label text="制单人" GridPane.rowIndex="2"/>
<Label text="制单日期" GridPane.columnIndex="2" GridPane.rowIndex="2"/>
<Label text="审核人" GridPane.rowIndex="3"/>
<Label text="审核日期" GridPane.columnIndex="2" GridPane.rowIndex="3"/>
<TextField fx:id="makerField" GridPane.columnIndex="1"
GridPane.rowIndex="2"/>
<TextField fx:id="makeDateField" GridPane.columnIndex="3"
GridPane.rowIndex="2"/>
<Label text="客户" GridPane.columnIndex="2" GridPane.rowIndex="2"/>
<TextField fx:id="customerField" GridPane.columnIndex="3" GridPane.rowIndex="2"/>
<Label text="制单日期" GridPane.rowIndex="3"/>
<TextField fx:id="makeDateField" GridPane.columnIndex="1"
GridPane.rowIndex="3"/>
<Label text="客户地址" GridPane.columnIndex="2" GridPane.rowIndex="3"/>
<TextField fx:id="customerAddressField" GridPane.columnIndex="3" GridPane.rowIndex="3"/>
<Label text="审核人" GridPane.rowIndex="4"/>
<TextField fx:id="verifierField" GridPane.columnIndex="1"
GridPane.rowIndex="3"/>
<TextField fx:id="verifierDateField" GridPane.columnIndex="3"
GridPane.rowIndex="3"/>
<Label layoutX="20.0" layoutY="28.0" text="备注" GridPane.rowIndex="4"/>
GridPane.rowIndex="4"/>
<Label text="修改人" GridPane.columnIndex="2" GridPane.rowIndex="4"/>
<TextField fx:id="modifierField" GridPane.columnIndex="3" GridPane.rowIndex="4"/>
<Label text="审核日期" GridPane.rowIndex="5"/>
<TextField fx:id="verifierDateField" GridPane.columnIndex="1"
GridPane.rowIndex="5"/>
<Label text="修改日期" GridPane.columnIndex="2" GridPane.rowIndex="5"/>
<TextField fx:id="modifierDateField" GridPane.columnIndex="3" GridPane.rowIndex="5"/>
<Label text="关闭人" GridPane.rowIndex="6"/>
<TextField fx:id="closerField" GridPane.columnIndex="1"
GridPane.rowIndex="6"/>
<Label text="关闭日期" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
<TextField fx:id="closerDateField" GridPane.columnIndex="3" GridPane.rowIndex="6"/>
<Label layoutX="20.0" layoutY="28.0" text="备注" GridPane.rowIndex="7"/>
<TextArea fx:id="descriptionField" GridPane.columnIndex="1"
GridPane.columnSpan="3" GridPane.rowIndex="4"/>
GridPane.columnSpan="3" GridPane.rowIndex="7"/>
<HBox alignment="CENTER_RIGHT" spacing="5.0" GridPane.columnIndex="1"
GridPane.columnSpan="3" GridPane.rowIndex="5">
GridPane.columnSpan="3" GridPane.rowIndex="8">
<children>
<Button fx:id="saveBtn" disable="true" mnemonicParsing="false"
text="保存"/>
</children>
</HBox>
<Label fx:id="versionLabel" text="\@Version" GridPane.rowIndex="5"/>
<TextField fx:id="employeeField" GridPane.columnIndex="1"
GridPane.rowIndex="1"/>
<Label fx:id="versionLabel" text="\@Version" GridPane.rowIndex="8"/>
</children>
<VBox.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>