dd

package-lock.json

+{
+  "lockfileVersion": 1
+}

xgg-admin/app/base/controller/impl/order/orderCtl.js

@@ -125,7 +125,7 @@ class OrderCtl extends CtlBase {
         id: pobj.id,
         currentPage: pobj.currentPage || 1,
         pageSize: pobj.pageSize || 1,
-        orderId: this.trim(pobj.orderId),
+        orderId: this.trim(pobj.orderId) || this.trim(pobj.orderNo),
         status: this.trim(pobj.status),
         deliverId: "", //  TODO 传入具体办理人
       }

xgg-admin/app/front/entry/public/apidoc/invoice/deliver.md

 <a name="menu">目录</a>
-1. [交付查看商审批列表](#delivererInvoices)
+1. [交付商查看发票列表](#delivererInvoices)
+1. [交付商查看发票审批列表](#apiDelivererApplyInvoices)
 1. [新建进度-已开具](#delivererAssignment)
 1. [提交审核](#delivererAssignment2)
 1. [新建进度-已邮寄](#delivererAssignment3)
@@ -96,6 +97,99 @@
 
 ```
 
+## **<a name="apiDelivererApplyInvoices"> 发票申请列表（交付商） </a>**　　　　　
+[返回到目录](#menu)　　　　　
+
+**接口方式** HTTP    
+**HTTP方法** POST    
+**URI路径** /web/invoice/invoiceCtl/apiDelivererApplyInvoices
+**参数验证** 否     
+**参数**    
+
+| 参数名|数据类型|必须|默认| 说明 |
+|---|:---:|:---:|:---:|---|
+
+| pageIndex | number | 否 | 1　| 当前页数 |
+| pageSize | number | 否 | 10　| 每页记录数 |
+| invoiceTime | string | 否 | 　| 开发票时间 |
+| startTime | string | 否 | 　| 开发票开始时间 |
+| endTime | string | 否 | 　| 开发票结束时间 |
+| applyNo | string | 否 | 　| 发票申请编号 |
+| inInvalid | string | 否 | 　| 是否完税 |
+| type | string | 否 | 　| 发票类型 |
+| status | string | 否 | 　| 发票状态 |
+
+
+**示例** 
+
+```
+{
+   "type":"10"
+}
+
+```
+
+**返回结果**   
+
+| 参数名|数据类型| 说明 |
+|---|:---:|---|
+| status | Number | 状态码 |
+| msg | String | 提示信息 |
+| data | JSON | 返回值 |
+
+**示例**
+```javascript
+{
+    "status":0,
+    "msg":"操作成功",
+    "data":{
+        "count":2,
+        "rows":[
+            {
+                "applyNo":"gongsibao-futong001",
+                "invoiceId":"11665448190004592",
+                "breakReason":null,
+                "apply":{
+                    "merchantId":"11064622752480055",
+                    "merchantName":"司机宝",
+                    "type":"增值税专用发票",
+                    "invoiceAmount":400000000,
+                    "invoiceTime":"2019-10-19",
+                    "businessName":"北京富通勤国际贸易有限责任公司（个体工商）"
+                },
+                "invoice":{
+                    "invoiceNo":"gongsibao4584585",
+                    "status":"1060",
+                    "statusName":"待审核"
+                }
+            },
+            {
+                "applyNo":"gongsibao-futong001",
+                "invoiceId":"11665448190004592",
+                "breakReason":"业务繁忙",
+                "apply":{
+                    "merchantId":"11064622752480055",
+                    "merchantName":"司机宝",
+                    "type":"增值税专用发票",
+                    "invoiceAmount":400000000,
+                    "invoiceTime":"2019-10-19",
+                    "businessName":"北京富通勤国际贸易有限责任公司（个体工商）"
+                },
+                "invoice":{
+                    "invoiceNo":"gongsibao4584585",
+                    "status":"1060",
+                    "statusName":"待审核"
+                }
+            }
+        ]
+    },
+    "bizmsg":"empty",
+    "requestid":"21da505b34d7423fbbb8865d64f652a5"
+}
+
+```
+
+
 
 ## **<a name="delivererAssignment"> 新建进度-已开具</a>**　　　　　
 [返回到目录](#menu)　　　　　

xgg-admin/app/front/entry/public/apidoc/invoice/invoice.md

@@ -11,8 +11,9 @@
 1. [发票验证&试算](#verificationAndCalculation)
 1. [计算增值税](#calculationValueAddedTax)
 1. [发票附加税](#calculationAdditionalTax)
-1. [发票申请列表（平台）](#queryInvoices)
-1. [交付查看商审批列表](#delivererInvoices)
+
+1. [发票列表（平台）](#queryInvoices)
+1. [发票列表（交付商）](#delivererInvoices)
 
 1. [发票平台审批](#platformAssignment)
 1. [发票交付商审批](#delivererAssignment)