付款申请增加查询列

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java

@@ -20,6 +20,10 @@ public class PaymentdocPagination extends Pagination {
     private String documentNo;
     /** 供应商 */
     private String supplierName;
+    /** 申请金额*/
+    private String ramount;
+    /** 结算重量*/
+    private String num;
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java

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

SC-web/src/views/scm/basicInformation/paymentdoc/index.vue

@@ -22,6 +22,26 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <template v-if="showAll">
+          <el-col :span="6">
+            <el-form-item label="申请金额">
+              <el-input
+                v-model="query.ramount"
+                placeholder="请输入"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </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>
+          </template>
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()"
@@ -30,6 +50,10 @@
               <el-button icon="el-icon-refresh-right" @click="resetAll()"
                 >重置</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-col>
         </el-form>
@@ -326,6 +350,7 @@ export default {
   },
   data() {
     return {
+      showAll: false,
       multipleSelection: [],
       multipleSelectionItem: [],
       formVisible: false,