Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui

src/views/material/cost/component/applyDetail.vue

@@ -52,7 +52,7 @@
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
                     <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                        <template slot-scope="scope" v-if="scope.row.num">
                             {{ scope.row.leasePrice.toFixed(2) }}
                         </template>
                     </el-table-column>
@@ -65,12 +65,12 @@
                     <!-- <el-table-column label="归还数量" align="center" prop="" :show-overflow-tooltip="true" /> -->
                     <el-table-column label="归还日期 " align="center" prop="endTime" :show-overflow-tooltip="true"/>
                     <el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                        <template slot-scope="scope" v-if="scope.row.num">
                             {{ Number(scope.row.leaseDays).toFixed(2) }}
                         </template>
                     </el-table-column>
                     <el-table-column label="租赁费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                        <template slot-scope="scope" v-if="scope.row.costs">
                             {{ scope.row.costs.toFixed(2) }}
                         </template>
                     </el-table-column>
@@ -93,13 +93,13 @@
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
                     <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="维修数量" align="center" prop="num" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                        <template slot-scope="scope" v-if="scope.row.num" >
                             {{ scope.row.num.toFixed(2) }}
                         </template>
                     </el-table-column>
                     <el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
                     <el-table-column label="维修费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                        <template slot-scope="scope" v-if="scope.row.costs" >
                             {{ scope.row.costs.toFixed(2) }}
                         </template>
                     </el-table-column>
@@ -121,13 +121,13 @@
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
                     <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                        <template slot-scope="scope" v-if="scope.row.num">
                             {{ scope.row.num.toFixed(2) }}
                         </template>
                     </el-table-column>
                     <el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
                     <el-table-column label="报废费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                        <template slot-scope="scope" v-if="scope.row.costs">
                             {{ scope.row.costs.toFixed(2) }}
                         </template>
                     </el-table-column>
@@ -149,12 +149,12 @@
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
                     <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                        <template slot-scope="scope" v-if="scope.row.num">
                             {{ scope.row.num.toFixed(2) }}
                         </template>
                     </el-table-column>
                     <el-table-column label="丢失费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                        <template slot-scope="scope" v-if="scope.row.costs">
                             {{ scope.row.costs.toFixed(2) }}
                         </template>
                     </el-table-column>