Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/paymentManagement.vue

@@ -111,7 +111,7 @@
       </el-table-column>
       <el-table-column class="table_td" prop="status" width="100" label="是否开票">
         <template scope="scope">
-          <span v-if="scope.row.approveStatus">未开票</span>
+          <span v-if="scope.row.invoicing=='0'">未开票</span>
           <span v-else>已开票</span>
         </template>
       </el-table-column>