Merge branch 'hotfix/update_compony_bind' of wmtx/platform into release

修改发票类型

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) {//上游

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) {//上游

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>

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>

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}

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>