fix:环境监控。入库单出库单

src/views/huanjingjiankong/huanjingjiankong.vue

@@ -397,7 +397,6 @@ export default {
       //   width: that.$refs.wrap.offsetWidth,
       //   height: that.$refs.wrap.offsetHeight,
       // });
-      // console.log(that.domsize, "domsizethat");
       window.onresize = () => {
         return (() => {
           window.fullHeight = document.documentElement.clientHeight;
@@ -457,13 +456,13 @@ export default {
     },
     returnifShow(t, h, p, qiya) {
       let ifshow = "";
-      if (t == 999 && h === 999) {
-        ifshow = "true";
-        return ifshow;
-      }
+      // if (t == 999 && h === 999&&p==999) {
+      //   ifshow = "true";
+      //   return ifshow;
+      // }
       let temp = t.toFixed(2); //温度
       let humidness = h.toFixed(2); //湿度
-      let airPressure =Math.abs(p.toFixed(2)) ; //气压
+      let airPressure =Number(p.toFixed(2)) ; //气压
       // let ifshow = "";
 
       if (temp > 999 || temp <= 0) {
@@ -479,15 +478,22 @@ export default {
       } else {
         ifshow = "false";
       }
-      
-      if (airPressure > 999) {
+      console.log(airPressure > qiya,airPressure ,qiya,"数据")
+      if(qiya ==-10){
+        if(airPressure > -30 && airPressure < qiya){
+          ifshow = "true";
+        }
+        
+      }else{
+        if (airPressure > 999) {
         //不给予赋值
-      } else if (airPressure >= qiya) {
-        console.log(airPressure > qiya,Math.abs(airPressure),airPressure ,qiya,"数据")
-        ifshow = "true";
-      } else {
-        ifshow = "false";
+        } else if (airPressure >= qiya) {
+          ifshow = "true";
+        } else {
+          ifshow = "false";
+        }
       }
+
       return ifshow;
     },
 
@@ -495,8 +501,7 @@ export default {
       // 大屏数据列表赋值
       let this_ = this;
       let zhi_wu_yi_run='';
-      let sql =
-        "select * FROM DATA WHERE deviceName = 'HAU01'  ORDER BY saveTime DESC LIMIT 1";//细胞的退更缓冲区域
+      let sql ="select * FROM DATA WHERE deviceName = 'HAU01'  ORDER BY saveTime DESC LIMIT 1";//细胞的退更缓冲区域
     await  curdPost("sql", sql).then((res) => {
         let data = res.variables.data;
         this_.newweizhi[0].temp = data[0].t1;
@@ -577,19 +582,19 @@ export default {
           10
         );
         this_.newweizhi[17].run = data[0].run;
-        this_.newweizhi[18].airPressure = data[0].p1; //p1; //p1 万
+        this_.newweizhi[18].airPressure = data[0].p1; //万级洁净走廊
         this_.newweizhi[18].ifshow = this_.returnifShow(
           999,
           999,
           data[0].p1,
-          10
+          5
         );
         this_.newweizhi[18].run = data[0].run;
       });
       let sql1 ="select * FROM DATA WHERE deviceName ='HAU02'  ORDER BY saveTime DESC LIMIT 1";
     await  curdPost("sql", sql1).then((res) => {
         let data = res.variables.data;
-        this_.newweizhi[4].temp = data[0].t1;
+        this_.newweizhi[4].temp = data[0].t1; //分练区1
         this_.newweizhi[4].humidness = data[0].h1;
         this_.newweizhi[4].airPressure = data[0].p1;
         this_.newweizhi[4].run = data[0].run;
@@ -599,7 +604,7 @@ export default {
           data[0].p1,
           5
         );
-        this_.newweizhi[5].temp = data[0].t2;
+        this_.newweizhi[5].temp = data[0].t2;//分练区2
         this_.newweizhi[5].humidness = data[0].h2;
         this_.newweizhi[5].airPressure = data[0].p2;
         this_.newweizhi[5].run = data[0].run;
@@ -638,8 +643,7 @@ export default {
         this_.newweizhi[21].run = data[0].run;
         
       });
-      let sql2 =
-        "select * FROM DATA WHERE deviceName ='HAU03' ORDER BY saveTime DESC LIMIT 1"; //支原体室
+      let sql2 ="select * FROM DATA WHERE deviceName ='HAU03' ORDER BY saveTime DESC LIMIT 1"; //支原体室
       await curdPost("sql", sql2).then((res) => {
         let data = res.variables.data;
         this_.newweizhi[6].temp = data[0].t1;
@@ -657,7 +661,7 @@ export default {
           999,
           999,
           data[0].p2,
-          5
+          10
         );
         this_.newweizhi[22].run = data[0].run;
         
@@ -670,16 +674,16 @@ export default {
           data[0].p3,
           10
         );
-        this_.newweizhi[23].run = data[0].run;
+        this_.newweizhi[23].run = data[0].run;//二更
         
-        this_.newweizhi[24].airPressure = data[0].p4;
+        this_.newweizhi[24].airPressure =data[0].p4;
         this_.newweizhi[24].ifshow = this_.returnifShow(
           999,
           999,
           data[0].p4,
-          10
+          5
         );
-        this_.newweizhi[24].run = data[0].run;
+        this_.newweizhi[24].run = data[0].run; //缓冲
         
         // this_.newweizhi[25].airPressure = data[0].p3; //无菌二更
         // this_.newweizhi[25].ifshow = this_.returnifShow(
@@ -694,7 +698,7 @@ export default {
       let sql3 ="select * FROM DATA WHERE deviceName ='HAU04'  ORDER BY saveTime DESC LIMIT 1";
       await curdPost("sql", sql3).then((res) => {
         let data = res.variables.data;
-        this_.newweizhi[7].temp = data[0].t1;
+        this_.newweizhi[7].temp = data[0].t1; //无菌检测室
         this_.newweizhi[7].humidness = data[0].h1;
         this_.newweizhi[7].airPressure = data[0].p1;
         this_.newweizhi[7].run = data[0].run;       
@@ -709,7 +713,7 @@ export default {
           999,
           999,
           data[0].p4,
-          5
+          10
         );
         zhi_wu_yi_run !=1?this_.newweizhi[22].run = data[0].run:'';
         
@@ -718,9 +722,9 @@ export default {
           999,
           999,
           data[0].p2,
-          5
+          10
         );
-        this_.newweizhi[25].run = data[0].run;
+        this_.newweizhi[25].run = data[0].run; //二更
         
 
         this_.newweizhi[26].airPressure = data[0].p3;
@@ -728,15 +732,11 @@ export default {
           999,
           999,
           data[0].p3,
-          10
+          5
         );
         this_.newweizhi[26].run = data[0].run;
-        
-
-        
       });
-      let sql4 =
-        "select * FROM DATA WHERE deviceName ='PAU01'  ORDER BY saveTime DESC LIMIT 1";
+      let sql4 ="select * FROM DATA WHERE deviceName ='PAU01'  ORDER BY saveTime DESC LIMIT 1";
       await curdPost("sql", sql4).then((res) => {
         let data = res.variables.data;
         this_.newweizhi[8].temp = data[0].t1;
@@ -758,7 +758,7 @@ export default {
           data[0].t2,
           data[0].h2,
           data[0].p2,
-          -25
+          -10
         );
 
         this_.newweizhi[10].temp = data[0].t3;
@@ -831,20 +831,21 @@ export default {
         this_.newweizhi[27].run = data[0].run;
         
       });
-      let sql5 =
-        "select * FROM DATA WHERE deviceName ='PAU02'  ORDER BY saveTime DESC LIMIT 1";
+      let sql5 ="select * FROM DATA WHERE deviceName ='PAU02'  ORDER BY saveTime DESC LIMIT 1";
+      // console.log()
       await curdPost("sql", sql5).then((res) => {
         let data = res.variables.data;
-        this_.newweizhi[12].temp = data[0].t1;
+        this_.newweizhi[12].temp = data[0].t1;//无菌阳性制备室
         this_.newweizhi[12].humidness = data[0].h1;
         this_.newweizhi[12].airPressure = data[0].p2;
         this_.newweizhi[12].run = data[0].run;
         this_.newweizhi[12].ifshow = this_.returnifShow(
           data[0].t1,
           data[0].h1,
-          data[0].p2
+          data[0].p2,
+          -10
         );
-        this_.newweizhi[13].temp = data[0].t2;
+        this_.newweizhi[13].temp = data[0].t2;//支原体阳性制备室
         this_.newweizhi[13].humidness = data[0].h2;
         this_.newweizhi[13].airPressure = data[0].p1;
         this_.newweizhi[13].run = data[0].run;
@@ -852,38 +853,31 @@ export default {
         this_.newweizhi[13].ifshow = this_.returnifShow(
           data[0].t2,
           data[0].h2,
-          data[0].p1
+          data[0].p1,
+          -10
         );
-
-
         
-        this_.newweizhi[33].airPressure = data[0].p1;
-        this_.newweizhi[33].ifshow = this_.returnifShow(999, 999, data[0].p5);
-        this_.newweizhi[33].run = data[0].run;
+        this_.newweizhi[33].airPressure = data[0].p5;
+        this_.newweizhi[33].ifshow = this_.returnifShow(999, 999, data[0].p5,5);
+        this_.newweizhi[33].run = data[0].run; //无菌阳性二更
         
         
-        this_.newweizhi[34].airPressure = data[0].p5;//无菌阳性二更
-        this_.newweizhi[34].ifshow = this_.returnifShow(999, 999, data[0].p5);
+        this_.newweizhi[34].airPressure = data[0].p7;//无菌阳性缓冲
+        this_.newweizhi[34].ifshow = this_.returnifShow(999, 999, data[0].p7,5);
         this_.newweizhi[34].run = data[0].run;
        
 
         this_.newweizhi[35].airPressure = data[0].p4; //支原体二更
-        this_.newweizhi[35].ifshow = this_.returnifShow(999, 999, data[0].p4);
+        this_.newweizhi[35].ifshow = this_.returnifShow(999, 999, data[0].p4,5);
         this_.newweizhi[35].run = data[0].run;
-        
-
-        this_.newweizhi[37].airPressure = data[0].p3; //一更
-        this_.newweizhi[37].ifshow = this_.returnifShow(999, 999, data[0].p3);
+  
+        this_.newweizhi[37].airPressure = data[0].p3; //无菌阳性 支原体 一更
+        this_.newweizhi[37].ifshow = this_.returnifShow(999, 999, data[0].p3,15);
         this_.newweizhi[37].run = data[0].run;
         
-        
-        this_.newweizhi[36].airPressure = data[0].p6;
-        this_.newweizhi[36].ifshow = this_.returnifShow(999, 999, data[0].p6);
+        this_.newweizhi[36].airPressure = data[0].p6; //支原体性缓冲
+        this_.newweizhi[36].ifshow = this_.returnifShow(999, 999, data[0].p6,5);
         this_.newweizhi[36].run = data[0].run;
-       
-        // this_.newweizhi[37].airPressure = data[0].p1;
-        // this_.newweizhi[31].ifshow = this_.returnifShow(999,999,data[0].p5);
-        // this_.newweizhi[37].run = data[0].run;
 
       });
     },
@@ -1146,14 +1140,14 @@ li {
         color: black;
         z-index: 99;
       }
-      .envir-conditoin {
+     /deep/ .envir-conditoin {
         text-align: left;
         width: 80px;
         white-space: nowrap;
         height: 20px;
         line-height: 20px;
         overflow: hidden;
-        z-index: 99;
+        z-index: 999;
       }
       .content {
         position: absolute;
@@ -1161,6 +1155,8 @@ li {
         width: 90px;
         left: 0px;
         top: 0px;
+        padding-top: 15px;
+        height: 17px;
         color: black;
         opacity: 0;
         padding-left: 20px;

src/views/system/jbdScan/goods/bwlingliaodan.vue

@@ -57,7 +57,7 @@
                               </div>
                           </div>
                           <div style="text-align: left;">
-                            <div style=" margin-left: 20px;  margin-right: 5px; font-size: 10px;" >
+                            <div style=" margin-left: 20px;  margin-right: 5px; font-size: 10px;padding-right: 10px;" >
                               领料单编号：
                               <span style="margin-left: 10px">{{item1.ling_liao_dan_bia}}</span>
                             </div>

src/views/system/jbdScan/goods/caigourukudan.vue

@@ -8,7 +8,7 @@
       :visible.sync="scanVisible"
     >
       <!-- 表单是否显示 -->
-      <div style="height: 500px; width: 90%; margin: 0 auto" v-if="scanVisible">
+      <div style="height: 500px; width: 95%; margin: 0 auto" v-if="scanVisible">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
             <div
@@ -17,7 +17,7 @@
               style="margin-bottom: 30px"
             >
               <div style="page-break-after: always">
-                <div class="word-title">
+                <!-- <div class="word-title">
                   <h4>采购入库单</h4>
                 </div>
                 <div class="tagBox">
@@ -33,20 +33,44 @@
                       }}</span>
                     </div>
                   </div>
-                  <div>
-                    <div style="margin-left: 20px;margin-right: 5px;font-size: 10px;">
-                      采购订单编号:<span style="margin-left: 10px">
-                        {{ item1[0].cai_gou_ding_dan_ }}</span
-                      >
+                  <div style="text-align: left;">
+                    <div style="font-size: 10px;padding-right: 20px;">
+                      采购订单编号:<span>
+                        {{ item1[0].cai_gou_ding_dan_ }}</span>
                     </div>
-                    <div style=" margin-left: 20px; margin-right: 5px; font-size: 10px;">
-                      日期:<span style="margin-left: 10px">{{item1[0].dao_ku_ri_qi_}}</span>
+                    <div style="font-size: 10px;">
+                      日期:<span>{{item1[0].dao_ku_ri_qi_}}</span>
                     </div>
                   </div>
-                </div>
+                </div> -->
                 <div>
                   <table :border="1">
                     <thead>
+                      <tr class="title">
+                        <th colspan="15">
+                          <div class="word-title" style="background:#fff;">
+                            <h4>采购入库单</h4>
+                          </div>
+                          <div class="tagBox">
+                            <div>
+                              <div style="font-size: 10px;text-align: left;">申购部门:
+                                <span style="margin-left: 10px">{{item1[0].shen_gou_bu_men_ | bumenfilters(bumenList)}}</span>
+                              </div>
+                              <div style="font-size: 10px">供应商:
+                              <span style="margin-left: 10px">{{item1[0].gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>
+                            </div>
+                          </div>
+                          <div style="text-align: left;">
+                            <div style="font-size: 10px; padding-right: 20px;">采购订单编号:
+                              <span >{{item1[0].cai_gou_ding_dan_}}</span>
+                            </div>
+                            <div style="font-size: 10px; ">日期 :
+                              <span >{{item1[0].dao_ku_ri_qi_}}</span>
+                            </div>
+                          </div>
+                        </div>
+                        </th>
+                      </tr>
                       <tr>
                         <th style="width: 40px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
@@ -69,8 +93,7 @@
                       <tr v-for="(item, index) in item1" :key="index">
                         <td style="width: 30px">{{ index+1 }}</td>
                         <td style="width: 70px">{{ item.wu_liao_dai_ma_ }}</td>
-                        <td style="width: 120px">{{ item.wu_liao_ming_chen }}
-                        </td>
+                        <td style="width: 120px">{{ item.wu_liao_ming_chen }}</td>
                         <td style="width: 60px">{{ item.huo_hao_ }}</td>
                         <td style="width: 60px">{{ item.pi_hao_ }}</td>
                         <td style="width: 80px">{{ item.gui_ge_ }}</td>
@@ -104,20 +127,28 @@
                         <td style="width: 60px">{{ item1.addhanshuiheji }}</td>
                       </tr>
                     </tbody>
+                    <tfoot class="bottom">             
+                      <tr>
+                        <td colspan="6" style="text-align:left">
+                          <div style="margin-top:10px">仓管员:{{ item1.name2 }}</div>
+                        </td>
+                        <td colspan="1" class="footer-row">
+                          <div style="margin-top:10px" ref="innerRef"></div>
+                        </td>
+                        <td colspan="9" style="text-align:right">
+                          <div style="margin-top:10px">审核人:{{ item1.name3 }} </div>
+                        </td>
+                      </tr>
+                    </tfoot>
                   </table>
                 </div>
-                <div class="bottom">
+                <!-- <div class="bottom">
                   <div>仓管员:{{ item1.name2 }} 
-                    <!-- /{{ item1.time2 }} -->
-
                   </div>
                   <div>
                     审核人:{{ item1.name3 }}
-                     <!-- /{{
-                      item1.time3
-                    }} -->
                   </div>
-                </div>
+                </div> -->
               </div>
             </div>
           </vue-easy-print>
@@ -324,11 +355,16 @@ export default {
 <style lang="scss" scoped>
 .bottom {
   margin-top: 15px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  font-size: 10px;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #fff;
+  border-right: 1px solid #fff;
 }
+.title{
+  border-top: 1px solid #fff;
+  border-left: 1px solid #fff;
+  border-right: 1px solid #fff;
+}
+
 .word-title {
   display: flex;
   justify-content: center;

src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -37,7 +37,7 @@
                             </div>
                           </div>
                           <div style="text-align: left;">
-                            <div style="font-size: 10px; ">采购订单编号:
+                            <div style="font-size: 10px; padding-right: 20px;">采购订单编号:
                               <span >{{item1.cai_gou_ding_dan_}}</span>
                             </div>
                             <div style="font-size: 10px; ">日期 :

src/views/system/jbdScan/goods/lingliaodan.vue

@@ -32,7 +32,7 @@
                               </div>
                           </div>
                           <div style="text-align: left;">
-                            <div style=" margin-left: 20px;  margin-right: 5px; font-size: 10px;" >
+                            <div style=" margin-left: 20px;  margin-right: 5px; font-size: 10px;padding-right: 10px;" >
                               领料单编号：
                               <span style="margin-left: 10px">{{  item1.ling_liao_chu_ku_ }}</span>
                             </div>

src/views/system/jbdScan/wuliao/bwlingliaodan.vue

@@ -30,7 +30,7 @@
                   </div>
                   <div>
                     <div
-                      style="margin-left: 20px;margin-right: 5px;font-size: 10px;">
+                      style="margin-left: 20px;margin-right: 5px;font-size: 10px;padding-right: 10px;">
                       领料单编号：<span style="margin-left: 10px">{{
                         item1.ling_liao_dan_bia
                       }}</span>

src/views/system/jbdScan/wuliao/caigourukudan.vue

@@ -34,8 +34,8 @@
                     </div>
                   </div>
                   <div>
-                    <div style="margin-left: 20px;margin-right: 5px;font-size: 10px;">
-                      采购订单编号:<span style="margin-left: 10px">
+                    <div style="margin-left: 20px;margin-right: 5px;font-size: 10px;padding-right: 20px;">
+                      采购订单编号:<span style="margin-left: 10px;">
                         {{ item1[0].cai_gou_ding_dan_ }}</span
                       >
                     </div>

src/views/system/jbdScan/wuliao/chnangguirukudan.vue

@@ -36,7 +36,7 @@
                             </div>
                           </div>
                           <div style="text-align: left;">
-                            <div style="font-size: 10px; ">采购订单编号:
+                            <div style="font-size: 10px; padding-right: 20px;">采购订单编号:
                               <span >{{item1.cai_gou_ding_dan_}}</span>
                             </div>
                             <div style="font-size: 10px; ">日期 :

src/views/system/jbdScan/wuliao/lingliaodan.vue

@@ -29,7 +29,7 @@
                     </div>
                   </div>
                   <div>
-                    <div style=" margin-left: 20px;  margin-right: 5px; font-size: 10px;" >
+                    <div style=" margin-left: 20px;  margin-right: 5px; font-size: 10px;padding-right: 10px;" >
                       领料单编号：
                       <span style="margin-left: 10px">{{  item1.ling_liao_chu_ku_ }}</span>
                     </div>