Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-web

src/views/chemicalManage/inventoryManagement/inventoryStatistics/infoPage.vue

@@ -51,7 +51,7 @@
               <!--作废量-->
               <p v-if="item.status==4">{{item.receiveAmount}}{{item.specUnit}}</p>
               <!--是否整瓶领用-->
-              <p>{{item.isBottle?'是':'否'}}</p>
+              <p>{{item.isBottle?(item.isBottle?'是':'否'):''}}</p>
               <!--称重方式-->
               <p>{{item.weighType}}</p>
               <!--双人认证-->

src/views/chemicalManage/useLedger/index.vue

@@ -134,7 +134,7 @@
           </el-table-column>
           <el-table-column label="领用量" align="left" width="100" prop="name">
             <template slot-scope="scope">
-              <span>{{scope.row.collectStockNum}}{{scope.row.specUnit}}</span>
+              <span>{{scope.row.collectStockNum}}{{scope.row.collectStockNum?scope.row.specUnit:''}}</span>
             </template>
           </el-table-column>
           <el-table-column label="归还时间" align="left" width="200" prop="name">
@@ -142,7 +142,7 @@
               <span>{{ parseTime(scope.row.returnTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作人" align="left" width="100" prop="name" />
+          <el-table-column label="操作人" align="left" width="100" prop="createByName" />
           <el-table-column label="操作" align="left" width="100" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <div class="table-button-box">

src/views/chemicalManage/useLedger/infoPage.vue

@@ -44,10 +44,10 @@
                   <!-- tagCode 1领用，0是归还，3是空瓶出库-->
                   <div class="record-li-b">
                       <p>{{parseTime(item.collectTime,"{y}-{m}-{d} {h}:{i}")}}</p>
-                      <p v-if="item.tagCode==1 || item.tagCode==3">{{item.collectNowNum}}{{item.specUnit}}</p>
-                      <p v-if="item.tagCode==0 || item.tagCode==3">{{item.useAmount}}{{item.specUnit}}</p>
-                      <p v-if="item.tagCode==0">{{item.returnStockNum}}{{item.specUnit}}</p>
-                      <p v-if="item.tagCode==1 || item.tagCode==3">{{item.isBottle?'是':'否'}}</p>
+                      <p v-if="item.tagCode==1 || item.tagCode==3">{{item.collectNowNum}}{{item.collectNowNum?item.specUnit:''}}</p>
+                      <p v-if="item.tagCode==0 || item.tagCode==3">{{item.useAmount}}{{item.useAmount?item.specUnit:''}}</p>
+                      <p v-if="item.tagCode==0">{{item.returnStockNum}}{{item.returnStockNum?item.specUnit:''}}</p>
+                      <p v-if="item.tagCode==1 || item.tagCode==3">{{item.isBottle?(item.isBottle?'是':'否'):''}}</p>
                       <p>{{item.outType}}</p>
                       <p>{{item.doubleAuthen}}</p>
                       <p>{{item.userName}}</p>