Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue

@@ -164,25 +164,27 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
-          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票金额" align="center">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.oneBillMoney" @keyup.native="UpNumber" clearable placeholder=""/>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-show="formobj.finBillTrailers !== null">
+            <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
+            <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票金额" align="center">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.oneBillMoney" @keyup.native="UpNumber" clearable placeholder=""/>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <div class="title">证件(营业执照或身份证)</div>
           <el-row>
             <el-col :span="24">

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue

@@ -123,25 +123,27 @@
             <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
         </el-row>
-        <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
+        <div v-show="formobj.finBillTrailers !== null">
+          <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
         <div class="title">证件(营业执照或身份证)</div>
         <el-row>
           <el-col :span="24">