yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

表单增加查询列

Browse Source
product
杨世强 2 years ago
parent 602483053d
commit f6c9a197b3
15 changed files with 149 additions and 6 deletions
Show Stats Download Patch File Download Diff File

1
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java
Unescape View File

@ -21,6 +21,7 @@ public class CollectionPagination extends Pagination {
private String contractNm; private String contractNm;
private String customerNm; private String customerNm;
private String status;
/** /**
* 添加权限 * 添加权限
*/ */

1
SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPagination.java
Unescape View File

@ -24,6 +24,7 @@ public class PaymentPagination extends Pagination {
private List<String> duedate; private List<String> duedate;
private String applicantName; private String applicantName;
private String paymentdocNum; private String paymentdocNum;
private String status;
private Date startDate; private Date startDate;
private Date endDate; private Date endDate;

2
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java
Unescape View File

@ -24,6 +24,8 @@ public class PaymentdocPagination extends Pagination {
private String ramount; private String ramount;
/** 结算重量*/ /** 结算重量*/
private String num; private String num;
/** 创建人*/
private String creatorUserName;
/** /**
* 菜单id * 菜单id
*/ */

4
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
Unescape View File

@ -183,6 +183,10 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
paymentdocNum++; paymentdocNum++;
paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getNum,paymentdocPagination.getNum()); paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getNum,paymentdocPagination.getNum());
} }
if(StringUtil.isNotEmpty(paymentdocPagination.getCreatorUserName())){
paymentdocNum++;
paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getCreatorUserName,paymentdocPagination.getCreatorUserName());
}
if(StringUtil.isNotEmpty(paymentdocPagination.getSupplierName())){ if(StringUtil.isNotEmpty(paymentdocPagination.getSupplierName())){
QueryWrapper<SupplierEntity> customerQueryWrapper =new QueryWrapper<>(); QueryWrapper<SupplierEntity> customerQueryWrapper =new QueryWrapper<>();
customerQueryWrapper.lambda().like(SupplierEntity::getSupplierName, paymentdocPagination.getSupplierName()); customerQueryWrapper.lambda().like(SupplierEntity::getSupplierName, paymentdocPagination.getSupplierName());

3
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java
Unescape View File

@ -26,6 +26,9 @@ public class PurchaseorderPagination extends Pagination {
private String status; private String status;
private Date startDate; private Date startDate;
private Date endDate; private Date endDate;
private String num;
private String amount;
private String creatorUserName;
/** /**

3
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java
Unescape View File

@ -25,6 +25,9 @@ public class SaleorderitemPagination extends Pagination {
private String status; private String status;
private String contractName; private String contractName;
private String num;
private String price;
private String creatorUserName;
private String customerName; private String customerName;
private Date startDate; private Date startDate;

3
SC-boot/linkage-scm/src/main/resources/mapper/PaymentMapper.xml
Unescape View File

@ -35,6 +35,9 @@
<if test="paymentPagination.paymentdocNum != null and paymentPagination.paymentdocNum != ''"> <if test="paymentPagination.paymentdocNum != null and paymentPagination.paymentdocNum != ''">
and a.paymentdoc_num LIKE CONCAT('%',#{paymentPagination.paymentdocNum},'%') and a.paymentdoc_num LIKE CONCAT('%',#{paymentPagination.paymentdocNum},'%')
</if> </if>
<if test="paymentPagination.status != null and paymentPagination.status != ''">
and a.status = #{paymentPagination.status}
</if>
<!-- <if test="paymentPagination.startDate != null and paymentPagination.endDate != null">--> <!-- <if test="paymentPagination.startDate != null and paymentPagination.endDate != null">-->
<!-- and a.duedate &gt; #{paymentPagination.startDate} AND a.duedate &lt;= #{paymentPagination.endDate}--> <!-- and a.duedate &gt; #{paymentPagination.startDate} AND a.duedate &lt;= #{paymentPagination.endDate}-->
<!-- </if>--> <!-- </if>-->

3
SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml
Unescape View File

@ -27,6 +27,9 @@
<if test="collectionPagination.customerNm != null and collectionPagination.customerNm != ''"> <if test="collectionPagination.customerNm != null and collectionPagination.customerNm != ''">
and b.supplier_nm LIKE CONCAT('%',#{collectionPagination.customerNm},'%') and b.supplier_nm LIKE CONCAT('%',#{collectionPagination.customerNm},'%')
</if> </if>
<if test="collectionPagination.status != null and collectionPagination.status != ''">
and a.status = #{collectionPagination.status}
</if>
<if test="collectionPagination.sidx != null and collectionPagination.sidx != ''"> <if test="collectionPagination.sidx != null and collectionPagination.sidx != ''">
ORDER BY ${collectionPagination.sidx} ${collectionPagination.sort} ORDER BY ${collectionPagination.sidx} ${collectionPagination.sort}
</if> </if>

9
SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
Unescape View File

@ -278,6 +278,15 @@
<if test="purchaseorderPagination.status != null and purchaseorderPagination.status != ''"> <if test="purchaseorderPagination.status != null and purchaseorderPagination.status != ''">
AND a.status = #{purchaseorderPagination.status} AND a.status = #{purchaseorderPagination.status}
</if> </if>
<if test="purchaseorderPagination.num != null and purchaseorderPagination.num != ''">
AND a.num LIKE CONCAT('%',#{purchaseorderPagination.num},'%')
</if>
<if test="purchaseorderPagination.amount != null and purchaseorderPagination.amount != ''">
AND a.amount LIKE CONCAT('%',#{purchaseorderPagination.amount},'%')
</if>
<if test="purchaseorderPagination.creatorUserName != null and purchaseorderPagination.creatorUserName != ''">
AND a.creator_user_name LIKE CONCAT('%',#{purchaseorderPagination.creatorUserName},'%')
</if>
<if test="purchaseorderPagination.sidx != null and purchaseorderPagination.sidx != ''"> <if test="purchaseorderPagination.sidx != null and purchaseorderPagination.sidx != ''">
ORDER BY ${purchaseorderPagination.sidx} ${purchaseorderPagination.sort} ORDER BY ${purchaseorderPagination.sidx} ${purchaseorderPagination.sort}
</if> </if>

11
SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml
Unescape View File

@ -16,7 +16,7 @@
and a.document_no LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%') and a.document_no LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%')
</if> </if>
<if test="saleorderitemPagination.status != null and saleorderitemPagination.status != ''"> <if test="saleorderitemPagination.status != null and saleorderitemPagination.status != ''">
and a.status LIKE CONCAT('%',#{saleorderitemPagination.status},'%') and a.status = #{saleorderitemPagination.status}
</if> </if>
<if test="saleorderitemPagination.contractName != null and saleorderitemPagination.contractName != ''"> <if test="saleorderitemPagination.contractName != null and saleorderitemPagination.contractName != ''">
and b.contract_name LIKE CONCAT('%',#{saleorderitemPagination.contractName},'%') and b.contract_name LIKE CONCAT('%',#{saleorderitemPagination.contractName},'%')
@ -24,6 +24,15 @@
<if test="saleorderitemPagination.customerName != null and saleorderitemPagination.customerName != ''"> <if test="saleorderitemPagination.customerName != null and saleorderitemPagination.customerName != ''">
and c.supplier_nm LIKE CONCAT('%',#{saleorderitemPagination.customerName},'%') and c.supplier_nm LIKE CONCAT('%',#{saleorderitemPagination.customerName},'%')
</if> </if>
<if test="saleorderitemPagination.num != null and saleorderitemPagination.num != ''">
and a.num LIKE CONCAT('%',#{saleorderitemPagination.num},'%')
</if>
<if test="saleorderitemPagination.price != null and saleorderitemPagination.price != ''">
and a.price LIKE CONCAT('%',#{saleorderitemPagination.price},'%')
</if>
<if test="saleorderitemPagination.creatorUserName != null and saleorderitemPagination.creatorUserName != ''">
and a.creator_user_name LIKE CONCAT('%',#{saleorderitemPagination.creatorUserName},'%')
</if>
<if test="saleorderitemPagination.startDate != null and saleorderitemPagination.endDate != null"> <if test="saleorderitemPagination.startDate != null and saleorderitemPagination.endDate != null">
and a.creator_time &gt; #{saleorderitemPagination.startDate} AND a.creator_time &lt;= #{saleorderitemPagination.endDate} and a.creator_time &gt; #{saleorderitemPagination.startDate} AND a.creator_time &lt;= #{saleorderitemPagination.endDate}
</if> </if>

27
SC-web/src/views/scm/basicInformation/collection/index.vue
Unescape View File

@ -13,6 +13,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="showAll">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="客户名称"> <el-form-item label="客户名称">
<el-input <el-input
@ -33,6 +34,24 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="单据状态">
<el-select
v-model="query.status"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in statusOptions"
:key="index"
:label="item.fullName"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
</template>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()" <el-button type="primary" icon="el-icon-search" @click="search()"
@ -41,6 +60,10 @@
<el-button icon="el-icon-refresh-right" @click="resetAll()" <el-button icon="el-icon-refresh-right" @click="resetAll()"
>重置</el-button >重置</el-button
> >
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">展开</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
收起</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@ -415,10 +438,6 @@ export default {
fullName: "已保存", fullName: "已保存",
id: "0", id: "0",
}, },
{
fullName: "已提交",
id: "1",
},
{ {
fullName: "已认款", fullName: "已认款",
id: "2", id: "2",

25
SC-web/src/views/scm/basicInformation/payment/index.vue
Unescape View File

@ -14,6 +14,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="showAll">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="来源单号"> <el-form-item label="来源单号">
<el-input <el-input
@ -57,7 +58,24 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="单据状态">
<el-select
v-model="query.status"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in statusOptions"
:key="index"
:label="item.fullName"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
</template>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()" <el-button type="primary" icon="el-icon-search" @click="search()"
@ -66,6 +84,10 @@
<el-button icon="el-icon-refresh-right" @click="resetAll()" <el-button icon="el-icon-refresh-right" @click="resetAll()"
>重置</el-button >重置</el-button
> >
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">展开</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
收起</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@ -357,6 +379,7 @@ export default {
}, },
data() { data() {
return { return {
showAll: false,
detailVisible: false, detailVisible: false,
query: { query: {
documentno: undefined, documentno: undefined,

9
SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
Unescape View File

@ -41,6 +41,15 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="创建人">
<el-input
v-model="query.creatorUserName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
</template> </template>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>

27
SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
Unescape View File

@ -32,6 +32,33 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="重量">
<el-input
v-model="query.num"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="金额">
<el-input
v-model="query.amount"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单人">
<el-input
v-model="query.creatorUserName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单日期"> <el-form-item label="制单日期">
<el-date-picker <el-date-picker

27
SC-web/src/views/scm/basicInformation/saleorder/index.vue
Unescape View File

@ -32,6 +32,33 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="重量">
<el-input
v-model="query.num"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="金额">
<el-input
v-model="query.price"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单人">
<el-input
v-model="query.creatorUserName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="单据状态 "> <el-form-item label="单据状态 ">
<el-select <el-select

Write Preview
Loading…
Cancel
Save