heyang 11 months ago
parent
commit
ae017aac2e

+ 1 - 1
src/views/chemicalManage/inventoryManagement/inventoryStatistics/collectList.vue

@@ -62,7 +62,7 @@
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
-              placeholder="化学品名/CAS/编码/实验室/房间号/姓名/联系方式"
+              placeholder="化学品名/CAS/编码/实验室/房间号"
               style="width: 340px"
             />
           </el-form-item>

+ 2 - 2
src/views/chemicalManage/inventoryManagement/inventoryStatistics/infoPage.vue

@@ -17,7 +17,7 @@
         <li>领用时效:{{newData.stock.usageDuration}}小时</li>
         <li>实验室:{{newData.stock.subName}}({{newData.stock.subRoom}})</li>
         <li>安全员:{{newData.stock.safeUser}}</li>
-        <li>位置:{{newData.stock.cabinetName}}-{{newData.stock.doorName}}-{{newData.stock.layers}}</li>
+        <li>位置:{{newData.stock.position}}</li>
         <li>归属人:{{newData.stock.belongName}}</li>
       </div>
       <div class="lines"></div>
@@ -51,7 +51,7 @@
               <!--作废量-->
               <p v-if="item.status==4">{{item.receiveAmount}}{{item.specUnit}}</p>
               <!--是否整瓶领用-->
-              <p>{{item.isBottle?(item.isBottle?'是':'否'):''}}</p>
+              <p>{{item.isBottle?item.isBottle:''}}</p>
               <!--称重方式-->
               <p>{{item.weighType}}</p>
               <!--双人认证-->

+ 1 - 1
src/views/chemicalManage/inventoryManagement/inventoryStatistics/inventoryList.vue

@@ -73,7 +73,7 @@
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
-              placeholder="化学品名/CAS/编码/实验室/房间号/姓名/联系方式"
+              placeholder="化学品名/CAS/编码/实验室/房间号"
               style="width: 340px"
             />
           </el-form-item>

+ 1 - 1
src/views/chemicalManage/useLedger/infoPage.vue

@@ -47,7 +47,7 @@
                       <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 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>