diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java index 925f8e53..c9c8d415 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java @@ -21,6 +21,7 @@ public class CollectionPagination extends Pagination { private String contractNm; private String customerNm; + private String status; /** * 添加权限 */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPagination.java index 1842d13a..c3dd8a54 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPagination.java @@ -24,6 +24,7 @@ public class PaymentPagination extends Pagination { private List duedate; private String applicantName; private String paymentdocNum; + private String status; private Date startDate; private Date endDate; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java index be77167c..adceb717 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java @@ -24,6 +24,8 @@ public class PaymentdocPagination extends Pagination { private String ramount; /** 结算重量*/ private String num; + /** 创建人*/ + private String creatorUserName; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java index bfcd258a..7c638a76 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java @@ -183,6 +183,10 @@ public class PaymentdocServiceImpl extends ServiceImpl customerQueryWrapper =new QueryWrapper<>(); customerQueryWrapper.lambda().like(SupplierEntity::getSupplierName, paymentdocPagination.getSupplierName()); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java index 24d86c25..0069995d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java @@ -26,6 +26,9 @@ public class PurchaseorderPagination extends Pagination { private String status; private Date startDate; private Date endDate; + private String num; + private String amount; + private String creatorUserName; /** diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java index 10331748..df94e134 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java @@ -25,6 +25,9 @@ public class SaleorderitemPagination extends Pagination { private String status; private String contractName; + private String num; + private String price; + private String creatorUserName; private String customerName; private Date startDate; diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/PaymentMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/PaymentMapper.xml index e3650b00..f11e5d75 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/PaymentMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/PaymentMapper.xml @@ -35,6 +35,9 @@ and a.paymentdoc_num LIKE CONCAT('%',#{paymentPagination.paymentdocNum},'%') + + and a.status = #{paymentPagination.status} + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml index aaca67d9..3f530e6c 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml @@ -27,6 +27,9 @@ and b.supplier_nm LIKE CONCAT('%',#{collectionPagination.customerNm},'%') + + and a.status = #{collectionPagination.status} + ORDER BY ${collectionPagination.sidx} ${collectionPagination.sort} diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml index 737d937f..14cfc005 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml @@ -278,6 +278,15 @@ AND a.status = #{purchaseorderPagination.status} + + AND a.num LIKE CONCAT('%',#{purchaseorderPagination.num},'%') + + + AND a.amount LIKE CONCAT('%',#{purchaseorderPagination.amount},'%') + + + AND a.creator_user_name LIKE CONCAT('%',#{purchaseorderPagination.creatorUserName},'%') + ORDER BY ${purchaseorderPagination.sidx} ${purchaseorderPagination.sort} diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml index 404d3e9c..0eca1966 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml @@ -16,7 +16,7 @@ and a.document_no LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%') - and a.status LIKE CONCAT('%',#{saleorderitemPagination.status},'%') + and a.status = #{saleorderitemPagination.status} and b.contract_name LIKE CONCAT('%',#{saleorderitemPagination.contractName},'%') @@ -24,6 +24,15 @@ and c.supplier_nm LIKE CONCAT('%',#{saleorderitemPagination.customerName},'%') + + and a.num LIKE CONCAT('%',#{saleorderitemPagination.num},'%') + + + and a.price LIKE CONCAT('%',#{saleorderitemPagination.price},'%') + + + and a.creator_user_name LIKE CONCAT('%',#{saleorderitemPagination.creatorUserName},'%') + and a.creator_time > #{saleorderitemPagination.startDate} AND a.creator_time <= #{saleorderitemPagination.endDate} diff --git a/SC-web/src/views/scm/basicInformation/collection/index.vue b/SC-web/src/views/scm/basicInformation/collection/index.vue index b23d46eb..241afe7c 100644 --- a/SC-web/src/views/scm/basicInformation/collection/index.vue +++ b/SC-web/src/views/scm/basicInformation/collection/index.vue @@ -13,6 +13,7 @@ + 重置 + 展开 + + 收起 @@ -415,10 +438,6 @@ export default { fullName: "已保存", id: "0", }, - { - fullName: "已提交", - id: "1", - }, { fullName: "已认款", id: "2", diff --git a/SC-web/src/views/scm/basicInformation/payment/index.vue b/SC-web/src/views/scm/basicInformation/payment/index.vue index c46c1678..f44e958a 100644 --- a/SC-web/src/views/scm/basicInformation/payment/index.vue +++ b/SC-web/src/views/scm/basicInformation/payment/index.vue @@ -14,6 +14,7 @@ + 重置 + 展开 + + 收起 @@ -357,6 +379,7 @@ export default { }, data() { return { + showAll: false, detailVisible: false, query: { documentno: undefined, diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue index a3d23ba2..fc24d39b 100644 --- a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue +++ b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue @@ -41,6 +41,15 @@ > + + + + + diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index b4c81fee..d769e0ee 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -32,6 +32,33 @@ > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +