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

src/api/chemicalManage/index.js

@@ -1,5 +1,71 @@
 import request from '@/utils/request'
 
+//首页-化学品柜统计数据
+export function chemicalIndexTypeGroup(query) {
+  return request({
+    url: '/chemical/index/typeGroup',
+    method: 'get',
+    params: query
+  })
+}
+//首页-类别占比
+export function chemicalIndexChemicalGroup(query) {
+  return request({
+    url: '/chemical/index/chemicalGroup',
+    method: 'get',
+    params: query
+  })
+}
+//首页-使用统计
+export function chemicalIndexUseCount(query) {
+  return request({
+    url: '/chemical/index/useCount',
+    method: 'get',
+    params: query
+  })
+}
+//首页-库存统计
+export function chemicalIndexStockCount(query) {
+  return request({
+    url: '/chemical/index/stockCount',
+    method: 'get',
+    params: query
+  })
+}
+//首页-使用量top6
+export function chemicalIndexUseTotalCount(query) {
+  return request({
+    url: '/chemical/index/useTotalCount ',
+    method: 'get',
+    params: query
+  })
+}
+//首页-报警统计
+export function chemicalIndexWarnCount(query) {
+  return request({
+    url: '/chemical/index/warnCount',
+    method: 'get',
+    params: query
+  })
+}
+//首页-厂家模糊查询
+export function chemicalAioSearchProducer(query) {
+  return request({
+    url: '/chemical/aio/searchProducer',
+    method: 'get',
+    params: query
+  })
+}
+
+//首页-管控级别
+export function chemicalIndexManageLevel(query) {
+  return request({
+    url: '/chemical/index/manageLevel ',
+    method: 'get',
+    params: query
+  })
+}
+
 //msds-列表
 export function chemicalMsdsList(data) {
   return request({

src/views/chemicalManage/chemicalsStatistics/alarmStatistics.vue

@@ -17,20 +17,32 @@
   </div>
 </template>
 <script>
+import { chemicalIndexChemicalGroup, chemicalIndexWarnCount } from '@/api/chemicalManage'
+
   export default {
     name: 'alarmStatistics',
     data () {
       return {
         dataType:false,
+        dataX:[],
+        dataY:[],
       }
     },
     created(){
-
+      this.chemicalIndexWarnCount();
     },
     mounted(){
       this.getInfo();
     },
     methods:{
+      chemicalIndexWarnCount(){
+        let self=this;
+        chemicalIndexWarnCount().then(response => {
+           this.$set(this, 'dataX',response.data.dictName)
+           this.$set(this, 'dataY',response.data.dictValue)
+          this.getInfo();
+        });
+      },
       //获取数据
       getInfo(){
         this.$set(this,'dataType',true);
@@ -39,8 +51,8 @@
       //eCharts绘制
       eChartsDraw(){
         let myChart = this.$echarts.init(document.getElementById('eCharts-alarm'));
-        let dataValue = [20, 30, 60, 40];
-        let dataName = ['即将过期', '已过期', '超时未归还', '违规带离'];
+        let dataValue = this.dataY;
+        let dataName = this.dataX;
         let option = {
           grid: {
             left: '8%',

src/views/chemicalManage/chemicalsStatistics/categoryStatistics.vue

@@ -13,7 +13,7 @@
     <img class="null-data-img" v-show="!dataType" src="@/assets/ZDimages/basicsModules/null-data-1.png">
     <div id="eCharts-category" v-show="dataType"></div>
     <div class="position-max-box" v-show="dataType">
-      <div class="position-for-box" v-for="(item,index) in data1" :key="index">
+      <div class="position-for-box" v-for="(item,index) in newData" :key="index">
         <p :style="'background:'+eChartsListColor[index]+';'"></p>
         <p>{{item.classifyAttribute}}</p>
         <p>{{item.chemicalMix}}</p>
@@ -22,64 +22,68 @@
   </div>
 </template>
 <script>
+import { chemicalIndexChemicalGroup, chemicalIndexTypeGroup } from '@/api/chemicalManage'
+
   export default {
     name: 'categoryStatistics',
     data () {
       return {
         dataType:false,
         eChartsListColor : ["#009DFF","#0045AF","#FFA200", "#FF2A00", "#A069FF", "#63FFE5", "#C4C4C4"],
-        maxNum:234,
-        data1:[
-          {
-            name:"易燃气体",
-            value:"4",
-            classifyAttribute: "易燃气体",
-            chemicalMix: "4%"
-          },
-          {
-            name:"易燃液体",
-            value:"4",
-            classifyAttribute: "易燃液体",
-            chemicalMix: "4%"
-          },
-          {
-            name:"爆炸品",
-            value:"32",
-            classifyAttribute: "爆炸品",
-            chemicalMix: "32%"
-          },
-          {
-            name:"有毒品",
-            value:"21",
-            classifyAttribute: "有毒品",
-            chemicalMix: "21%"
-          },
-          {
-            name:"压缩气体或液化气体",
-            value:"15",
-            classifyAttribute: "压缩气体或液化气体",
-            chemicalMix: "15%"
-          },
-          {
-            name:"易挥发",
-            value:"14",
-            classifyAttribute: "易挥发",
-            chemicalMix: "14%"
-          },
-          {
-            name:"其他",
-            value:"10",
-            classifyAttribute: "其他",
-            chemicalMix: "10%"
-          }
-        ],
+        maxNum:0,
+        // data1:[
+        //   {
+        //     name:"易燃气体",
+        //     value:"4",
+        //     classifyAttribute: "易燃气体",
+        //     chemicalMix: "4%"
+        //   },
+        //   {
+        //     name:"易燃液体",
+        //     value:"4",
+        //     classifyAttribute: "易燃液体",
+        //     chemicalMix: "4%"
+        //   },
+        //   {
+        //     name:"爆炸品",
+        //     value:"32",
+        //     classifyAttribute: "爆炸品",
+        //     chemicalMix: "32%"
+        //   },
+        //   {
+        //     name:"有毒品",
+        //     value:"21",
+        //     classifyAttribute: "有毒品",
+        //     chemicalMix: "21%"
+        //   },
+        //   {
+        //     name:"压缩气体或液化气体",
+        //     value:"15",
+        //     classifyAttribute: "压缩气体或液化气体",
+        //     chemicalMix: "15%"
+        //   },
+        //   {
+        //     name:"易挥发",
+        //     value:"14",
+        //     classifyAttribute: "易挥发",
+        //     chemicalMix: "14%"
+        //   },
+        //   {
+        //     name:"其他",
+        //     value:"10",
+        //     classifyAttribute: "其他",
+        //     chemicalMix: "10%"
+        //   }
+        // ],
+        newData:[],
       }
     },
     created(){
-
+      this.chemicalIndexChemicalGroup();
     },
     mounted(){
-      this.getInfo();
+
+
     },
     methods:{
       //获取数据
@@ -87,12 +91,24 @@
         this.$set(this,'dataType',true);
         this.eChartsDraw();
       },
+      chemicalIndexChemicalGroup(){
+        let self=this;
+        let list=[];
+        chemicalIndexChemicalGroup().then(response => {
+          self.maxNum=response.data.count;
+          response.data.list.forEach(function(item,index) {
+            list.push({name:item.name,value:item.number,classifyAttribute:item.name,chemicalMix:item.ratio})
+          })
+          this.$set(this, 'newData',list)
+          this.getInfo();
+        });
+      },
       //eCharts绘制
       eChartsDraw(){
         let myChart = this.$echarts.init(document.getElementById('eCharts-category'));
         let bgColor = "#fff";
         let title = "化学品总数";
-        let echartData = this.data1;
+        let echartData = this.newData;
         let formatNumber = function (num) {
           let reg = /(?=(\B)(\d{3})+$)/g;
           return num.toString().replace(reg, ",");

src/views/chemicalManage/chemicalsStatistics/controlStatistics.vue

@@ -4,7 +4,7 @@
     <div class="title-box-max-box">
       <div class="title-left-box">
         <p></p>
-        <p>类别占比</p>
+        <p>管控级别</p>
       </div>
       <div class="title-right-box">
 
@@ -17,21 +17,34 @@
   </div>
 </template>
 <script>
+import { chemicalIndexChemicalGroup, chemicalIndexManageLevel } from '@/api/chemicalManage'
+
   export default {
     name: 'controlStatistics',
     data () {
       return {
         dataType:false,
+        newData:[],
       }
     },
     created(){
-
+      this.chemicalIndexManageLevel();
     },
     mounted(){
-      this.getInfo();
     },
     methods:{
-
+      chemicalIndexManageLevel(){
+        let self=this;
+        let list=[];
+        chemicalIndexManageLevel().then(response => {
+          self.maxNum=response.data.count;
+          response.data.forEach(function(item,index) {
+            list.push({name:item.name,value:item.number})
+          })
+          this.$set(this, 'newData',list)
+          this.getInfo();
+        });
+      },
       //获取数据
       getInfo(){
         this.$set(this,'dataType',true);
@@ -40,14 +53,7 @@
       //eCharts绘制
       eChartsDraw(){
         let myChart = this.$echarts.init(document.getElementById('eCharts-control'));
-        var data = [{
-          value: 60,
-          name: '管控',
-        }, {
-          value: 25,
-          name: '非管控',
-        }
-        ];
+        var data =this.newData;
         let myColor = ["#FFA200", "#0084FF"];
         let option = {
           title: {

src/views/chemicalManage/chemicalsStatistics/dosageStatistics.vue

@@ -13,14 +13,16 @@
     <div id="eCharts-dosage">
       <div class="for-dosage-box" v-for="(item,index) in dataList" :key="index">
         <p>{{index+1}}</p>
-        <p>{{item.data1}}</p>
-        <p :class="item.data2 == 1?'borderColorA':'borderColorB'">{{item.data2 == 1?'非管控':'管控'}}</p>
-        <p>{{item.data3}}</p>
+        <p>{{item.name}}-{{item.describe}}</p>
+        <p :class="item.control == 2?'borderColorA':'borderColorB'">{{item.control == 2?'非管控':'管控'}}</p>
+        <p>{{item.category}}</p>
       </div>
     </div>
   </div>
 </template>
 <script>
+import { chemicalIndexChemicalGroup, chemicalIndexUseTotalCount } from '@/api/chemicalManage'
+
   export default {
     name: 'dosageStatistics',
     data () {
@@ -36,13 +38,19 @@
       }
     },
     created(){
-
+        this.chemicalIndexUseTotalCount();
     },
     mounted(){
 
     },
     methods:{
-
+      chemicalIndexUseTotalCount(){
+        let self=this;
+        let list=[];
+        chemicalIndexUseTotalCount().then(response => {
+           this.$set(this, 'dataList',response.data)
+        });
+      },
     },
   }
 </script>

src/views/chemicalManage/chemicalsStatistics/index.vue

@@ -6,7 +6,7 @@
         <img src="@/assets/ZDimages/chemicalManage/icon_sy_hxpg.png">
         <div>
           <p>化学品柜</p>
-          <p class="colorA">{{inventoryData.data1}}</p>
+          <p class="colorA">{{inventoryData.cabinetNum}}</p>
         </div>
       </div>
       <p class="null-p"></p>
@@ -14,7 +14,7 @@
         <img src="@/assets/ZDimages/chemicalManage/icon_sy_hxpkysl.png">
         <div>
           <p>待入库</p>
-          <p class="colorB">{{inventoryData.data2}}</p>
+          <p class="colorB">{{inventoryData.stockWaitNum}}</p>
         </div>
       </div>
       <p class="null-p"></p>
@@ -22,7 +22,7 @@
         <img src="@/assets/ZDimages/chemicalManage/icon_sy_hxpyjsl.png">
         <div>
           <p>待归还</p>
-          <p class="colorC">{{inventoryData.data3}}</p>
+          <p class="colorC">{{inventoryData.giveBackNum}}</p>
         </div>
       </div>
     </div>
@@ -47,6 +47,8 @@
   import dosageStatistics from "./dosageStatistics.vue"
   import alarmStatistics from "./alarmStatistics.vue"
   import controlStatistics from "./controlStatistics.vue"
+  import { chemicalIndexTypeGroup } from '@/api/chemicalManage'
+  import { getDicts } from '@/api/commonality/noPermission'
   export default {
     name: 'chemicalsStatistics',
     components: {
@@ -60,9 +62,7 @@
     data () {
       return {
         inventoryData:{
-          data1:10,
-          data2:30,
-          data3:30,
+
         },
       }
     },
@@ -70,10 +70,14 @@
 
     },
     mounted(){
-
+      this.chemicalIndexTypeGroup();
     },
     methods:{
-
+      chemicalIndexTypeGroup(){
+        chemicalIndexTypeGroup().then(response => {
+          this.$set(this,'inventoryData',response.data);
+        });
+      },
     },
   }
 </script>

src/views/chemicalManage/chemicalsStatistics/inventoryStatistics.vue

@@ -17,21 +17,34 @@
   </div>
 </template>
 <script>
+import { chemicalIndexChemicalGroup, chemicalIndexStockCount } from '@/api/chemicalManage'
+
   export default {
     name: 'inventoryStatistics',
     data () {
       return {
         dataType:false,
+        newData:[],
       }
     },
     created(){
-
+      this.chemicalIndexStockCount();
     },
     mounted(){
       this.getInfo();
     },
     methods:{
-
+      chemicalIndexStockCount(){
+        let self=this;
+        let list=[];
+        chemicalIndexStockCount().then(response => {
+          response.data.forEach(function(item,index) {
+            list.push({name:item.name,value:item.number})
+          })
+          this.$set(this, 'newData',list)
+          this.getInfo();
+        });
+      },
       //获取数据
       getInfo(){
         this.$set(this,'dataType',true);
@@ -40,14 +53,7 @@
       //eCharts绘制
       eChartsDraw(){
         let myChart = this.$echarts.init(document.getElementById('eCharts-inventory'));
-        var data = [{
-          value: 60,
-          name: '液体(ml)',
-        }, {
-          value: 25,
-          name: '固体(g)',
-        }
-        ];
+        var data = this.newData;
         let myColor = ["#FFA200", "#0084FF"];
         let option = {
           title: {

src/views/chemicalManage/chemicalsStatistics/useStatistics.vue

@@ -7,9 +7,9 @@
         <p>使用统计</p>
       </div>
       <div class="title-right-box">
-        <p :class="checkType == 1?'leftCheck':''" @click="checkButton(1)">全部</p>
-        <p :class="checkType == 2?'centerCheck':''" @click="checkButton(2)">今日</p>
-        <p :class="checkType == 3?'rightCheck':''" @click="checkButton(3)">近一个月</p>
+        <p :class="checkType == -1?'leftCheck':''" @click="checkButton(-1)">全部</p>
+        <p :class="checkType == 0?'centerCheck':''" @click="checkButton(0)">今日</p>
+        <p :class="checkType == 1?'rightCheck':''" @click="checkButton(1)">近一个月</p>
       </div>
     </div>
     <img class="null-data-img" v-show="!dataType" src="@/assets/ZDimages/basicsModules/null-data-1.png">
@@ -19,25 +19,43 @@
   </div>
 </template>
 <script>
+import { chemicalIndexUseCount } from '@/api/chemicalManage'
+
   export default {
     name: 'useStatistics',
     data () {
       return {
         dataType:false,
-        checkType:1,
+        checkType:-1,
+        dataX:[],
+        dataY:[],
       }
     },
     created(){
-
+        this.chemicalIndexUseCount();
     },
     mounted(){
-      this.getInfo();
     },
     methods:{
+      chemicalIndexUseCount(){
+        let self=this;
+        let list1=[];
+        let list2=[];
+        chemicalIndexUseCount({months:this.checkType}).then(response => {
+          response.data.forEach(function(item,index) {
+            list1.push(item.name)
+            list2.push(item.number)
+          })
+          this.$set(this,'dataX',list1)
+          this.$set(this,'dataY',list2)
+          this.getInfo();
+        });
+      },
       checkButton(type){
         if(this.checkType != type){
           this.$set(this,'checkType',type);
         }
+        this.chemicalIndexUseCount();
       },
       //获取数据
       getInfo(){
@@ -47,8 +65,8 @@
       //eCharts绘制
       eChartsDraw(){
         let myChart = this.$echarts.init(document.getElementById('eCharts-use'));
-        let dataName = ["入库", "领用", "归还", "空瓶", "废弃"];
-        let dataValue = [41, 32, 28, 29, 33];
+        let dataName = this.dataX;
+        let dataValue = this.dataY;
         let myColor = [
           "#0072DD",
           "#8EACFF",

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

@@ -7,8 +7,8 @@
     <div class="content-box">
       <div class="content-box-left scrollbar-box">
         <li class="chemical-name">{{newData.stock.chemicalName}}<p class="chemical-state">{{newData.stock.status==1?'未出库':'出库'}}</p></li>
-        <li>{{newData.data3}}</li>
-        <li>类别：{{newData.stock.chemicalCategory}}<p class="control-state">{{newData.stock.chemicalLevel?'管控':'非管控'}}</p></li>
+        <li>{{newData.stock.chemicalShape==1?'固体':'液体'}}/{{newData.stock.chemicalPurity}}/{{newData.stock.casNum}}</li>
+        <li>类别：{{newData.stock.chemicalCategoryName}}<p class="control-state">{{newData.stock.chemicalLevel?'管控':'非管控'}}</p></li>
         <li>编码：{{newData.stock.tagCode}}</li>
         <li>RFID标签：{{newData.stock.rfidCode}}</li>
         <li>规格：{{newData.stock.specNum}}{{newData.stock.specUnit}}{{newData.stock.packUnit}}</li>
@@ -29,10 +29,11 @@
             </div>
             <div class="record-li-m">
               <p>操作时间</p>
-              <p v-if="item.useStatus==1 || item.useStatus==2 || item.useStatus==3|| item.useStatus==4|| item.useStatus==5">领用量</p>
-              <p v-if="item.useStatus==0 || item.useStatus==3 || item.useStatus==4|| item.useStatus==5">使用量</p>
-              <p v-if="item.useStatus==0">余量</p>
-              <p v-if="item.useStatus==1 || item.useStatus==2|| item.useStatus==3">是否整瓶领用</p>
+              <p v-if="item.status==1 || item.status==3 || item.status==5">领用量</p>
+              <p v-if="item.status==0 || item.status==3">使用量</p>
+              <p v-if="item.status==0">余量</p>
+              <p v-if="item.status==4">作废量</p>
+              <p>是否整瓶领用</p>
               <p>称重方式</p>
               <p>双人认证</p>
               <p>操作人</p>
@@ -40,24 +41,23 @@
             <!-- useStatus 0已归还，1使用中，2超时未归还，3用结出库，4作废出库，5整瓶领用-->
             <div class="record-li-b">
               <!--操作时间-->
-              <p v-if="item.useStatus==1 || item.useStatus==2 || item.useStatus==3 || item.useStatus==4 || item.useStatus==5">{{parseTime(item.collectTime,"{y}-{m}-{d} {h}:{i}")}}</p>
-              <p v-if="item.useStatus==0">{{parseTime(item.returnTime,"{y}-{m}-{d} {h}:{i}")}}</p>
+              <p>{{parseTime(item.operateTime,"{y}-{m}-{d} {h}:{i}")}}</p>
               <!--领用量-->
-              <p v-if="item.useStatus==1 || item.useStatus==2 || item.useStatus==3 || item.useStatus==4|| item.useStatus==5">{{item.collectNowNum}}</p>
+              <p v-if="item.status==1 || item.status==3 || item.status==5">{{item.receiveAmount}}{{item.specUnit}}</p>
               <!--使用量-->
-              <p v-if="item.useStatus==0 || item.useStatus==3 || item.useStatus==4|| item.useStatus==5">{{item.useAmount}}</p>
+              <p  v-if="item.status==0 || item.status==3">{{item.useAmount}}{{item.specUnit}}</p>
               <!--余量-->
-              <p v-if="item.useStatus==0">{{item.returnStockNum}}</p>
+              <p  v-if="item.status==0">{{item.amount}}{{item.specUnit}}</p>
+              <!--作废量-->
+              <p v-if="item.status==4">{{item.receiveAmount}}{{item.specUnit}}</p>
               <!--是否整瓶领用-->
-              <p v-if="item.useStatus==1 || item.useStatus==2 || item.useStatus==3">{{item.isBottle?'是':'否'}}</p>
+              <p>{{item.isBottle?'是':'否'}}</p>
               <!--称重方式-->
-              <p>{{item.outType==1?'自动':'手工'}}</p>
+              <p>{{item.weighType}}</p>
               <!--双人认证-->
-              <p v-if="item.useStatus==1 || item.useStatus==2 || item.useStatus==3 || item.useStatus==4 || item.useStatus==5">{{item.outOneUserName}} {{item.outTwoUserName}}</p>
-              <p v-if="item.useStatus==0">{{item.backOneUserName}} {{item.backTwoUserName}}</p>
+              <p>{{item.doubleAuth}}</p>
               <!--操作人-->
-              <p v-if="item.useStatus==1 || item.useStatus==2 || item.useStatus==3 || item.useStatus==4 || item.useStatus==5">{{item.createByName}}</p>
-              <p v-if="item.useStatus==0">{{item.backUser}}</p>
+              <p>{{item.operateName}}</p>
             </div>
           </div>
         </div>

src/views/chemicalManage/inventoryManagement/savePending/addPage.vue

@@ -107,13 +107,23 @@
             <el-table-column label="纯度" prop="chemicalPurity" width="150" show-overflow-tooltip/>
             <el-table-column label="厂家" prop="factory" width="210" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-input
+                <el-select
                   class="table-date"
+                  style="width:186px;"
                   v-model="scope.row.factory"
-                  placeholder="请输入厂家名称"
-                  maxLength="30"
-                  style="width:186px;">
-                </el-input>
+                  filterable
+                  remote
+                  reserve-keyword
+                  @change="factoryChange"
+                  placeholder="请搜索选择厂家"
+                  :remote-method="factorySelectList">
+                  <el-option
+                    v-for="item in factoryOptions"
+                    :key="item.id"
+                    :label="item.producerName"
+                    :value="item.producerName">
+                  </el-option>
+                </el-select>
               </template>
             </el-table-column>
             <el-table-column label="过期时间" prop="expireTime" width="170" show-overflow-tooltip>
@@ -241,6 +251,7 @@
   import addChemicals from "@/views/chemicalManage/components/addChemicals.vue";
   import { getDicts, systemSubjectGetList } from '@/api/commonality/noPermission'
   import {
+    chemicalAioSearchProducer,
     chemicalApplyAdd, chemicalApplyGetUserInfo,
     chemicalApplyUpdate, chemicalChemicalGetList, chemicalStockGetStockBysubId,
     chemicalStockWaitAdd, chemicalStockWaitUpdate,
@@ -268,6 +279,7 @@
             { required: true, message: "请搜索选择化学品", validator: this.spaceJudgment, trigger: "blur" }
           ],
         },
+        factoryOptions:[],
         // 化学品列表
         chemicalsOptions:[],
         // 化学品列表临时存储
@@ -578,6 +590,29 @@
           this.$set(this,'subOptions',[]);
         }
       },
+      //选中厂家
+      factoryChange(val){
+        let self = this;
+        // for(let i=0;i<self.subOptions.length;i++){
+        //   if(self.subOptions[i].subId == val){
+        //     this.$set(this.newData,'subId',self.subOptions[i].subId);
+        //     this.$set(this.newData,'subName',self.subOptions[i].subName);
+        //     this.$set(this.newData,'roomNum',self.subOptions[i].roomNum);
+        //   }
+        // }
+      },
+      //搜索厂家
+      factorySelectList(query){
+        if (query !== '' && query.length>1) {
+          chemicalAioSearchProducer({"name":query,}).then(response => {
+            this.$set(this,'factoryOptions',response.data);
+          });
+        } else {
+          this.$set(this,'factoryOptions',[]);
+        }
+      },
+
+
       //实验室-固体液体液体已存储量
       chemicalStockGetStockBysubId(subId){
         chemicalStockGetStockBysubId({"subId":subId}).then(response => {

src/views/chemicalManage/useLedger/infoPage.vue

@@ -7,7 +7,7 @@
     <div class="content-box">
         <div class="content-box-left scrollbar-box">
             <li class="chemical-name">{{newData.chemicalDetail.chemicalName}}<p class="chemical-state">{{newData.chemicalDetail.status==1?'未出库':'出库'}}</p></li>
-            <li>{{newData.data3}}</li>
+            <li>{{newData.chemicalDetail.chemicalShape==1?'固体':'液体'}}/{{newData.chemicalDetail.chemicalPurity}}/{{newData.chemicalDetail.casNum}}</li>
             <li>类别：{{newData.chemicalDetail.chemicalCategory}}<p class="control-state">{{newData.chemicalDetail.chemicalLevel?'管控':'非管控'}}</p></li>
             <li>编码：{{newData.chemicalDetail.tagCode}}</li>
             <li>RFID标签：{{newData.chemicalDetail.rfidCode}}</li>
@@ -44,9 +44,9 @@
                   <!-- 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}}</p>
-                      <p v-if="item.tagCode==0 || item.tagCode==3">{{item.useAmount}}</p>
-                      <p v-if="item.tagCode==0">{{item.returnStockNum}}</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>{{item.outType}}</p>
                       <p>{{item.doubleAuthen}}</p>