1.试剂管理列表没有展示效期列

2.试剂管理里面有管理分类，入库时没有这个字段
3.称重设置空瓶时余量要变为0，并且设置空瓶时也要弹出用量，提示的用量保留两位小数，现在会出现很长一串数字的情况
4.普通危化品领用时会弹出一个用量事由框，这个弹出条件要判断一下，如果当前显示的就是这瓶试剂那就不用弹了，不然称重时也在弹会出现无法称重的情况
5.库存报表里面消耗数量一直为0，并且出现了好几个报表按照时间范围筛选无效的情况

src/components/ReagentForm/index.vue

@@ -95,6 +95,11 @@
             <el-input v-model="formData.standard_code" placeholder="请输入批号" clearable :style="{ width: '100%' }" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="分类" prop="category">
+            <el-input v-model="formData.category" placeholder="请输入分类" clearable :style="{ width: '100%' }" />
+          </el-form-item>
+        </el-col>
         <el-col v-for="item in extra_form" :key="item.id" :span="12">
           <el-form-item :label="item.name" :prop="item.name">
             <el-input v-model="formData[item.name]" :placeholder="'请输入' + item.name" clearable
@@ -191,6 +196,7 @@ export default {
           message: '请填写批号',
           trigger: 'blur'
         }],
+        category:[],
       },
       extra_form: []
     }

src/views/reagent/management/data/index.vue

@@ -80,6 +80,11 @@
         label="危化品批号"
         align="center"
       />
+      <el-table-column
+        prop="remark12"
+        label="编号"
+        align="center"
+      />
       <el-table-column
         prop="bar_code"
         label="试剂编码"
@@ -162,6 +167,12 @@
         align="center"
         width="150"
       />
+      <el-table-column
+        prop="expiration_date"
+        label="有效期"
+        align="center"
+        width="150"
+      />
       <!--      <el-table-column-->
       <!--        prop="is_supervise"-->
       <!--        label="是否监管"-->
@@ -249,6 +260,7 @@
       >
         <el-table-column align="center" type="index" width="50" label="序号" />
         <el-table-column align="center" property="name" label="试剂名称" />
+        <el-table-column align="center" property="remark12" label="编号" width="100" show-overflow-tooltip />
         <el-table-column align="center" property="bar_code" label="试剂编码" width="100" show-overflow-tooltip />
         <el-table-column align="center" property="cas_number" label="CAS码" />
         <el-table-column align="center" property="purity" label="纯度" width="100" show-overflow-tooltip />

src/views/reagent/receivingandreturn/index.vue

@@ -217,6 +217,9 @@ export default {
     getCode(code) {
       var that =this
       if (that.is_wait){
+        if (this.infoData.bar_code == code) {
+          return
+        }
         this.barCode = code
         if (this.$store.state.app.title=='危化品'){
           this.is_wait =false
@@ -231,7 +234,7 @@ export default {
               if(value){
                   // 领用先进先出判断
                 get_check_last_drug(stringify(this.infoData)).then(res_is_last => {
-                  this.check_last_medicament(res_is_last).then((check_res) => {
+                  this.check_last_medicament(res_is_last.data).then((check_res) => {
                     // 继续领用当前试剂
                     if (check_res) {
                       use(stringify({ 'bar_code': this.barCode,notes: value})).then(res => {
@@ -360,6 +363,22 @@ export default {
         }
         set_drug_empty_bottle(stringify(data)).then(res => {
           this.$message.success(res.msg)
+          // 归还弹框提示用量
+          if (this.$route.name === 'standardSendBack'){
+            const h = this.$createElement;
+            var msg = ""
+            if (res.data.is_liquid){
+              msg += `用量：${res.data.use_quality},  液体 体积用量：${res.data.use_volum} ${res.data.net_weight_unit}`
+            } else {
+              msg += `当次用量：${res.data.use_quality} ${res.data.net_weight_unit}`
+            }
+            
+            this.$notify({
+              title: '本次使用用量',
+              message: h('i', { style: 'color: teal'}, msg)
+            });
+          }
+
         })
       } else {
         this.$message.warning('请选择试剂！')
@@ -384,12 +403,12 @@ export default {
             this.getList()
             this.dialogVisible = false
             this.$message.success('归还成功！')
-            // 危化品归还弹框提示用量
+            // 归还弹框提示用量
             if (this.$route.name === 'standardSendBack'){
               const h = this.$createElement;
               var msg = ""
               if (res.data.is_liquid){
-                msg += `液体, 体积用量：${res.data.use_volum} ${res.data.net_weight_unit}`
+                msg += `用量：${res.data.use_quality},  液体 体积用量：${res.data.use_volum} ${res.data.net_weight_unit}`
               } else {
                 msg += `当次用量：${res.data.use_quality} ${res.data.net_weight_unit}`
               }

src/views/reagent/report/record/index.vue

@@ -68,8 +68,8 @@
       <el-table-column align="center" property="bar_code" label="试剂编码" />
       <el-table-column align="center" property="purity" label="纯度" width="100" show-overflow-tooltip />
       <el-table-column align="center" property="cas_number" label="CAS码" />
-      <el-table-column align="center" property="use_quantity" label="用量(g)" />
-      <el-table-column align="center" property="use_volume" label="液体用量(ml)" />
+      <el-table-column align="center" property="use_quantity" label="用量(g)"  v-if=" this.record_type[this.$route.params.t] == '3'"/>
+      <el-table-column align="center" property="use_volume" label="液体用量(ml)"  v-if=" this.record_type[this.$route.params.t] == '3'"/>
 
       <el-table-column align="center" property="status" label="状态">
         <template slot-scope="scope">

src/views/reagent/warehousing/index.vue

@@ -428,6 +428,11 @@
             sortable
             align="center"
           />
+          <el-table-column
+            prop="standard_codes"
+            label="批号"
+            align="center"
+          />
           <el-table-column
             prop="client_name"
             label="所处位置"