From 261185ee7aa4e481ef6d1041f9d398f7a43bba6e Mon Sep 17 00:00:00 2001
From: lccsw <1127794702@qq.com>
Date: Wed, 27 Oct 2021 14:41:48 +0800
Subject: [PATCH] edit-bill-status

---
 admin/controllers/receiver/Orders.php         |  5 +--
 admin/views/receiver/orders/get.php           | 35 ++++++++++++-------
 api/controllers/wxapp/licheb/Cusorder.php     |  2 +-
 api/controllers/wxapp/licheb/Idcard.php       |  5 +--
 .../order/Receiver_order_bills_model.php      |  2 +-
 .../receiver/order/Receiver_orders_model.php  |  2 +-
 6 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php
index 6bf58057..ac5dd1ad 100644
--- a/admin/controllers/receiver/Orders.php
+++ b/admin/controllers/receiver/Orders.php
@@ -338,7 +338,8 @@ class Orders extends HD_Controller
 
         $upd = array(
             'cardidA' => $cardidA,
-            'cardidB' => $cardidB
+            'cardidB' => $cardidB,
+            'status'  => 1
         );
         $result = $this->order_bills_model->update($upd, ['o_id' => $o_id]);
         if ($result) {
@@ -610,7 +611,7 @@ class Orders extends HD_Controller
         if (!$bill['cardidA'] && !$bill['business_licence']) {
             return $this->show_json(SYS_CODE_FAIL, '未上传用户身份证或营业执照!');
         }
-        $this->order_bills_model->update(['status' => 1], ['o_id' => $oid]);
+        $this->order_bills_model->update(['status' => 2], ['o_id' => $oid]);
         $this->orders_model->update(['status' => 4], ['id' => $bill['o_id']]);
         if (!$this->order_agents_model->get(['o_id' => $oid])) {
             $this->order_agents_model->add(['o_id' => $oid, 'c_time' => time]);
diff --git a/admin/views/receiver/orders/get.php b/admin/views/receiver/orders/get.php
index 3bc3773b..af09fefb 100644
--- a/admin/views/receiver/orders/get.php
+++ b/admin/views/receiver/orders/get.php
@@ -251,19 +251,30 @@
                         <label class="am-para-label label-width"><span class="span-bold">发票：</span></label>
                         <div class="am-para-input">
                             <div class="am-form-inline">
-                                <div class="am-form-group">
-                                    <label class="input-group-btn" style="width: 50px;">
-                                        <a href="javascript:;" :data-modal="'/receiver/orders/get_bill?oid='+info.id"
-                                           data-title="编辑发票信息" class="am-btn am-btn-default am-btn-sm">
-                                            上传文件
-                                        </a>
-                                    </label>
-                                </div>
-                                <div class="am-form-group" v-if="info.bill && info.bill.file">
-                                    <a :href="info.bill.file" target="_blank" class="mt5" style="width:100px;line-height:20px;">查看发票</a>
-                                </div>
+                                <template v-if="info.bill && info.bill.cardidA.src">
+                                    <div class="am-form-group">
+                                        <label class="input-group-btn" style="width: 50px;">
+                                            <a href="javascript:;" :data-modal="'/receiver/orders/get_bill?oid='+info.id"
+                                               data-title="编辑发票信息" class="am-btn am-btn-default am-btn-sm">
+                                                上传文件
+                                            </a>
+                                        </label>
+                                    </div>
+                                    <div class="am-form-group" v-if="info.bill && info.bill.file">
+                                        <a :href="info.bill.file" target="_blank" class="mt5" style="width:100px;line-height:20px;">查看发票</a>
+                                    </div>
+                                </template>
+                                <template v-else>
+                                    <div class="am-form-group">
+                                        <label class="input-group-btn" style="width: 50px;">
+                                            <a href="javascript:;" class="am-btn am-btn-danger am-btn-sm">
+                                                未上传身份证信息
+                                            </a>
+                                        </label>
+                                    </div>
+                                </template>
                                 <div class="am-form-group ml10">
-                                    <template v-if="info.status>=3">
+                                    <template v-if="info.status>=3 && info.bill && info.bill.cardidA.src">
                                         <a class='am-btn am-btn-primary am-btn-xs' v-if="info.status==3"
                                            data-ajax="post" data-action="/receiver/orders/edit_jk"
                                            :data-params-oid="info.id">
diff --git a/api/controllers/wxapp/licheb/Cusorder.php b/api/controllers/wxapp/licheb/Cusorder.php
index f3820aed..bdbfbb86 100644
--- a/api/controllers/wxapp/licheb/Cusorder.php
+++ b/api/controllers/wxapp/licheb/Cusorder.php
@@ -417,7 +417,7 @@ class Cusorder extends Wxapp{
                     'bill_img' => $bill['file'] ? build_qiniu_image_url($bill['file']) : ''
                 ];
             }
-            $bill_status = $bill['status'] ? 2 : 1;
+            $bill_status = $bill['status']==2 ? 2 : 1;
         }
         //确认车辆状态
         $delivery = $this->order_deliverys_model->get(['o_id'=>$row['id']],'status');
diff --git a/api/controllers/wxapp/licheb/Idcard.php b/api/controllers/wxapp/licheb/Idcard.php
index a95adce4..748d2de4 100644
--- a/api/controllers/wxapp/licheb/Idcard.php
+++ b/api/controllers/wxapp/licheb/Idcard.php
@@ -56,7 +56,7 @@ class Idcard extends Wxapp{
         $update = [
             'cardidA' => $cardidA,
             'cardidB' => $cardidB,
-            'c_time' => time()
+            'status' => 1
         ];
         $jsondata && $update['jsondata'] = json_encode($jsondata,JSON_UNESCAPED_UNICODE);
         $result = $this->order_bills_model->update($update,['id'=>$row['id']]);
@@ -104,7 +104,8 @@ class Idcard extends Wxapp{
             'o_id' => $oid,
             'cardidA' => $cardidA,
             'cardidB' => $cardidB,
-            'c_time' => time()
+            'c_time' => time(),
+            'status' => 1
         ];
         $jsondata && $update['jsondata'] = json_encode($jsondata,JSON_UNESCAPED_UNICODE);
         $l_id = $this->order_bills_model->add($add_data);
diff --git a/common/models/receiver/order/Receiver_order_bills_model.php b/common/models/receiver/order/Receiver_order_bills_model.php
index db4d2fbf..8f34ba27 100644
--- a/common/models/receiver/order/Receiver_order_bills_model.php
+++ b/common/models/receiver/order/Receiver_order_bills_model.php
@@ -11,7 +11,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 class Receiver_order_bills_model extends HD_Model
 {
     private $table_name = 'lc_receiver_order_bills';
-    private $status_arr = [ 0 => '未开票', 1 => '已开票'];
+    private $status_arr = [ 0 => '待申请', 1 => ' 已开票', 2 => '已开票'];
 
     public function __construct()
     {
diff --git a/common/models/receiver/order/Receiver_orders_model.php b/common/models/receiver/order/Receiver_orders_model.php
index bfcb7c3a..94098d47 100644
--- a/common/models/receiver/order/Receiver_orders_model.php
+++ b/common/models/receiver/order/Receiver_orders_model.php
@@ -34,7 +34,7 @@ class Receiver_orders_model extends HD_Model
             'menu_list' => array(0 => '审核中', 1 => '已通过', 2 => '等待放款', 3 => '按揭完成'), 'menu_default' => 0);
         $status_ary[2] = array('name' => '车辆分配', 'show' => true, 'list' => array(0 => '车辆分配中', 1 => '用户未签名', 2 => '尾款未支付', 3 => '已确定'),
             'menu_list' => array(0 => '车辆分配中', 1 => '用户未签名', 2 => '尾款未支付'), 'menu_default' => 0);
-        $status_ary[3] = array('name' => '开票相关', 'show' => true, 'list' => array(0 => '未开票', 1 => '已开票'),
+        $status_ary[3] = array('name' => '开票相关', 'show' => true, 'list' => array(1 => '待开票', 2 => '已开票'),
             'menu_list' => array(0 => '未开票'), 'menu_default' => 0);
         $status_ary[4] = array('name' => '代办服务', 'show' => true, 'list' => array(0 => '代办中', 1 => '已完成代办'),
             'menu_list' => array(0 => '代办中'), 'menu_default' => 0);