Merge branch 'xggsve-invoice-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-invoice-dev

xggsve-invoice/app/base/db/impl/invoice/iinvoicedeliverDao.js

@@ -42,8 +42,12 @@ class IinvoicedeliverDao extends Dao {
     sql.push("SELECT");
     sql.push("t1.`product_id`, t1.`id`,");
     sql.push("t1.`apply_no`, t1.`invoice_type`, t1.`invoice_amount`, ");
-    sql.push("t1.`apply_time`, t1.invoice_time, t1.`created_at`, t1.`status`, ");
-    sql.push("t1.`merchant_name`, t1.businessmen_name");
+    sql.push("t1.`apply_time`, t1.invoice_no, t1.invoice_time, t1.invoice_number, ");
+    sql.push("t1.businessmen_name, t1.businessmen_credit_code, t1.businessmen_addr, ");
+    sql.push("t1.businessmen_mobile, t1.businessmen_bank, t1.businessmen_account,");
+    sql.push("t1.merchant_name, t1.merchant_credit_code, t1.merchant_addr,");
+    sql.push("t1.merchant_mobile, t1.merchant_bank, t1.merchant_account,");
+    sql.push("t1.`created_at`, t1.`status`");
     sql.push("FROM i_invoice_deliver t2");
     sql.push("INNER JOIN i_invoice t1 on t1.id = t2.invoice_id");
     sql.push("WHERE 1 = 1 ");
@@ -61,6 +65,12 @@ class IinvoicedeliverDao extends Dao {
     if (params.apply_no) {
       sql.push("AND t1.`apply_no` = :apply_no");
     }
+    if (params.invoice_no) {
+      sql.push("AND t1.`invoice_no` = :invoice_no");
+    }
+    if (params.invoice_number) {
+      sql.push("AND t1.`invoice_number` = :invoice_number");
+    }
     if (params.status) {
       sql.push("AND t1.`status` = :status");
     }

xggsve-invoice/app/base/service/impl/invoice/iinvoicedeliverSve.js

@@ -33,8 +33,9 @@ class IinvoicedeliverService extends ServiceBase {
     let list = await this.dao.pageByParams(params);
     if (list) {
       for (var item of list) {
+        item.red_status_name = "未红冲";
         this.handleDate(item, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
-        this.handleDate(item, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
+        this.handleDate(item, ['invoice_time', 'apply_time'], 'YYYY-MM-DD');
       }
       await this.setStatus(list);
       await this.setProduct(list);