From c87b61d94b7faec70adbc10f3eb25534a432778b Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Fri, 10 Jul 2020 15:11:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=A5=A8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/CompanyStatementController.class.php   |  6 ++++--
 .../Admin/Controller/VerifyBillController.class.php   |  6 ++++--
 .../Admin/View/CompanyRelation/addRelation.html       |  2 +-
 .../View/CompanyStatementPool/editCpStatement.html    |  1 +
 .../View/CompanyStatementPool/editPcStatement.html    | 11 ++++++++++-
 .../View/CompanyStatementPool/viewPcStatement.html    |  1 +
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php
index 67e945a4d..0743c12af 100644
--- a/Application/Admin/Controller/CompanyStatementController.class.php
+++ b/Application/Admin/Controller/CompanyStatementController.class.php
@@ -383,9 +383,11 @@ class CompanyStatementController extends ThinkController
             $data['receive_company'] = $data['first_party_info'];
             $data['pay_company'] = $data['second_party_info'];
         }
-        if($data['receive_company']['invoice_type'] == 1){
+        if($data['receive_company']['invoice_type'] == 0){
+            $data['receive_company']['invoice_type']="无";
+        } elseif($data['receive_company']['invoice_type'] == 1){
             $data['receive_company']['invoice_type']="专票";
-        }else{
+         } else{
             $data['receive_company']['invoice_type']="普票";
         }
         if ($data['company_belong'] == 9) {//上游
diff --git a/Application/Admin/Controller/VerifyBillController.class.php b/Application/Admin/Controller/VerifyBillController.class.php
index 62d4a925d..5d77a29af 100644
--- a/Application/Admin/Controller/VerifyBillController.class.php
+++ b/Application/Admin/Controller/VerifyBillController.class.php
@@ -157,9 +157,11 @@ class VerifyBillController extends Controller {
             $data['receive_company'] = $data['first_party_info'];
             $data['pay_company'] = $data['second_party_info'];
         }
-        if($data['receive_company']['invoice_type'] == 1){
+        if($data['receive_company']['invoice_type'] == 0){
+            $data['receive_company']['invoice_type']="无";
+        } elseif ($data['receive_company']['invoice_type'] == 1) {
             $data['receive_company']['invoice_type']="专票";
-        }else{
+        } else {
             $data['receive_company']['invoice_type']="普票";
         }
         if ($data['company_belong'] == 9) {//上游
diff --git a/Application/Admin/View/CompanyRelation/addRelation.html b/Application/Admin/View/CompanyRelation/addRelation.html
index 869d5fad4..d4263aaf8 100644
--- a/Application/Admin/View/CompanyRelation/addRelation.html
+++ b/Application/Admin/View/CompanyRelation/addRelation.html
@@ -186,7 +186,7 @@
                 <td class="l"><i class="mustmark">*</i>开票类型:</td>
                 <td class="r">
                   <select name="invoice_type" id="invoice_type" class="select_gallery">
-                      <option  value="" selected>无</option>
+                      <option  value="0" selected>无</option>
                       <option  value="1">专票</option>
                       <option  value="2">普票</option>
                   </select>
diff --git a/Application/Admin/View/CompanyStatementPool/editCpStatement.html b/Application/Admin/View/CompanyStatementPool/editCpStatement.html
index 6755de89a..23efb5ce8 100644
--- a/Application/Admin/View/CompanyStatementPool/editCpStatement.html
+++ b/Application/Admin/View/CompanyStatementPool/editCpStatement.html
@@ -274,6 +274,7 @@
                             <td class="r">
                                 <div class="input-list input-list-game search_label_rehab">
                                     <select id="invoice_type" name="invoice_type" class="select_gallery" disabled>
+                                        <option value="0" <if condition="$data['payinfo']['invoice_type'] eq 0">selected</if>>无</option>
                                         <option value="1" <if condition="$data['payinfo']['invoice_type'] eq 1">selected</if>>专票</option>
                                         <option value="2" <if condition="$data['payinfo']['invoice_type'] eq 2">selected</if>>普票</option>
                                     </select>
diff --git a/Application/Admin/View/CompanyStatementPool/editPcStatement.html b/Application/Admin/View/CompanyStatementPool/editPcStatement.html
index 9d2f3547f..d030fc6b8 100644
--- a/Application/Admin/View/CompanyStatementPool/editPcStatement.html
+++ b/Application/Admin/View/CompanyStatementPool/editPcStatement.html
@@ -269,6 +269,7 @@
                             <td class="r">
                                 <div class="input-list input-list-game search_label_rehab">
                                     <select id="invoice_type" name="invoice_type" class="select_gallery" disabled>
+                                        <option value="0" <if condition="$data['payinfo']['invoice_type'] eq 0">selected</if>>无</option>
                                         <option value="1" <if condition="$data['payinfo']['invoice_type'] eq 1">selected</if>>专票</option>
                                         <option value="2" <if condition="$data['payinfo']['invoice_type'] eq 2">selected</if>>普票</option>
                                     </select>
@@ -351,10 +352,18 @@
                     <td class="r">
                         <div class="input-list input-list-game search_label_rehab">
                             <select id="invoice_type" name="invoice_type" data-change="${type}.invoice_type" class="select_gallery">
+                                {@if party_info.invoice_type==0}
+                                <option value="0" selected>无</option>
+                                <option value="1">专票</option>
+                                <option value="2">普票</option>
+                                {@/if}
                                 {@if party_info.invoice_type==1}
+                                <option value="0">无</option>
                                 <option value="1" selected>专票</option>
                                 <option value="2">普票</option>
-                                {@else}
+                                {@/if}
+                                {@if party_info.invoice_type==2}
+                                <option value="0">无</option>
                                 <option value="1">专票</option>
                                 <option value="2" selected>普票</option>
                                 {@/if}
diff --git a/Application/Admin/View/CompanyStatementPool/viewPcStatement.html b/Application/Admin/View/CompanyStatementPool/viewPcStatement.html
index b5c0b65a3..9765e8d35 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPcStatement.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPcStatement.html
@@ -289,6 +289,7 @@
                             <td class="r">
                                 <div class="input-list input-list-game search_label_rehab">
                                     <select id="invoice_type" name="invoice_type" class="select_gallery" disabled>
+                                        <option value="0" <if condition="$data['payinfo']['invoice_type'] eq 0">selected</if>>无</option>
                                         <option value="1" <if condition="$data['payinfo']['invoice_type'] eq 1">selected</if>>专票</option>
                                         <option value="2" <if condition="$data['payinfo']['invoice_type'] eq 2">selected</if>>普票</option>
                                     </select>