装备统计报表新增字段及其他bug修复

src/views/warehouse/equReserve/index.vue

@@ -68,7 +68,8 @@
       <el-table-column prop="name" label="品种名称" align="center"/>
       <el-table-column prop="zsCount" label="库存总数" align="center"/>
       <el-table-column prop="zkCount" label="在库数量" align="center"/>
-      <el-table-column prop="bfCount" label="报废数量" align="center"/>
+      <el-table-column prop="bfCount" label="报废数量" align="center" v-if="$store.state.user.user.baseJpOrganization.code !== '330200000000'"/>
+      <el-table-column prop="bfCount" label="销毁数量" align="center" v-if="$store.state.user.user.baseJpOrganization.code === '330200000000'"/>
       <el-table-column prop="price" label="单价" align="center"/>
       <el-table-column prop="sumPrice" label="总金额" align="center"/>
       <el-table-column prop="suplierName" label="供应商" align="center"/>

src/views/warehouse/equipmentall/index.vue

@@ -57,7 +57,10 @@
                 <el-table-column prop="zsCount" label="总数" sortable align="center"/>
                 <el-table-column prop="zkCount" label="在库数" sortable align="center"/>
                 <el-table-column prop="ckCount" label="出库数" sortable align="center"/>
-                <el-table-column prop="bfCount" label="报废数" sortable align="center"/>
+                <el-table-column prop="djgCount" label="单警柜在库数" sortable align="center"/>
+                <el-table-column prop="djgckCount" label="单警柜出库数" sortable align="center"/>
+                <el-table-column prop="bfCount" label="销毁数" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code === '330200000000'"/>
+                <el-table-column prop="bfCount" label="报废数" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code !== '330200000000'"/>
                 <el-table-column label="操作" width="80" align="center" fixed="right">
                   <template slot-scope="scope">
                     <el-button size="mini" type="primary" @click="show(scope.row.id, props.row.findCode, props.row.orgCode)">查看</el-button>
@@ -76,7 +79,10 @@
           <el-table-column prop="zsCount" label="总数" sortable align="center"/>
           <el-table-column prop="zkCount" label="在库数" sortable align="center"/>
           <el-table-column prop="ckCount" label="出库数" sortable align="center"/>
-          <el-table-column prop="bfCount" label="报废数" sortable align="center"/>
+          <el-table-column prop="djgCount" label="单警柜在库数" sortable align="center"/>
+          <el-table-column prop="djgckCount" label="单警柜出库数" sortable align="center"/>
+          <el-table-column prop="bfCount" label="销毁数" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code === '330200000000'"/>
+          <el-table-column prop="bfCount" label="报废数" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code !== '330200000000'"/>
       </el-table>
         <!--分页组件-->
         <el-pagination

src/views/warehouse/finance/index.vue

@@ -61,7 +61,8 @@
                 <el-table-column prop="yearEndCount" label="年末数量" sortable align="center"/>
                 <el-table-column prop="yearEndPrice" label="年末金额" sortable align="center"/>
                 <el-table-column prop="yearAddCount" label="本年度新增数量" sortable align="center"/>
-                <el-table-column prop="yearDelCount" label="本年度报废数量" sortable align="center"/>
+                <el-table-column prop="yearDelCount" label="本年度报废数量" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code !== '330200000000'"/>
+                <el-table-column prop="yearDelCount" label="本年度销毁数量" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code === '330200000000'"/>
               </el-table>
             </template>
           </el-table-column>
@@ -76,7 +77,8 @@
           <el-table-column prop="yearEndCount" label="年末数量" sortable align="center"/>
           <el-table-column prop="yearEndPrice" label="年末金额" sortable align="center"/>
           <el-table-column prop="yearAddCount" label="本年度新增数量" sortable align="center"/>
-          <el-table-column prop="yearDelCount" label="本年度报废数量" sortable align="center"/>
+          <el-table-column prop="yearDelCount" label="本年度报废数量" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code !== '330200000000'"/>
+          <el-table-column prop="yearDelCount" label="本年度销毁数量" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code === '330200000000'"/>
       </el-table>
         <!--分页组件-->
         <el-pagination