fix:样品视图

src/views/component/yangpinchuzhijianbi.vue

@@ -81,7 +81,7 @@
           </div>
         </div>
       </div>
-      <div class="body-content" v-if="viewShow" v-loading="loading">
+      <div class="body-content" v-if="viewShow" >
         <div class="right-view">
           <div class="goods-items">
             <div class="show-demo" v-for="(item, index) in listData" :key="index">
@@ -89,10 +89,7 @@
                 <div class="goods-level">
                   <div class="level-dsc">第{{ index }}层</div>
                   <div class="goods-list">
-                    <div class="goods-dsc" v-for="(it, ind) in listData[index]" :key="ind" :style="{
-                      background:
-                        it.yang_pin_bian_hao ? '#67c23a' : '',
-                    }">
+                    <div class="goods-dsc" v-for="(it, ind) in listData[index]" :key="ind" :style="{background: it.yang_pin_bian_hao ?  '#ff9900':'#67c23a' }">
                       <div class="top-dsc">
                         <div class="position">
                           <p v-if="it.wei_zhi_zhuang_ta == '空余'">位置状态：{{it.wei_zhi_zhuang_ta }}</p>
@@ -100,7 +97,7 @@
                           <p>样品编号：{{ it.yang_pin_bian_hao }}</p>
                           <p>存放位置：{{ it.wei_zhi_bian_hao_ }}</p>
                           <p>存储条件：{{ it.cun_chu_tiao_jian || it.cun_chu_yao_qiu_}}</p>
-                          <p>留样期限：{{ it.liu_yang_qi_xian_ }}</p>
+                          <p>入库时间：{{ it.ru_ku_shi_jian_}}</p>
                         </div>
                       </div>
                     </div>
@@ -145,12 +142,10 @@ export default {
       leixingcare: true,
       cenghao: [],
       warehouse: [],
-      loading: false,
       desString: "",
       placeValue: "点击选择位置",
       value:'',
       viewShow: false,
-      loading: true,
     };
   },
   filters: {
@@ -212,52 +207,75 @@ export default {
       }
       this.queryLoad(sql);
     },
-    queryLoad(sql) {
+    async queryLoad(sql) {
       //根据样品信息货位查询相对应的样品登记表
       var datas = [];
       var labelsMap = {}; // map存储
       var this_ = this;
       this_.listData = [];
-      curdPost("sql", sql).then((res) => {
-        datas = res.variables.data;
-        datas.forEach((item) => {
-          if (!labelsMap[item.ceng_hao_]) {
-            //没有就创建
+      await curdPost("sql", sql).then((res) => {
+        datas = res.variables.data;   
+      });
+      datas.forEach(item=>{
+          if (!labelsMap[item.ceng_hao_]) { 
             labelsMap[item.ceng_hao_] = [];
           }
-          // 通过样品货位配置的id外键 查询样品登记表
-          console.log(this_.formInline.fang_jian_hao_value);
-          let yangpingSql = "";
-          if (this_.formInline.fang_jian_hao_value == "样品间") {
-            yangpingSql =
-              "select * from t_mjypdjb WHERE shou_yang_wei_zhi = '" +
-              item.id_ +
-              "'";
-          } else {
-            yangpingSql =
-              "select * from t_mjypdjb WHERE liu_yang_wei_zhi_ = '" +
-              item.id_ +
-              "'";
+      })
+      for(let i=0;i<datas.length;i++){
+        for(let k in labelsMap){
+          if(k == datas[i].ceng_hao_){
+            labelsMap[k].push(datas[i]);
           }
-
-          curdPost("sql", yangpingSql).then((res) => {
-            var resData = res.variables.data;
-            if (resData.length > 0) {
-              resData.forEach((it) => {
-                it.wei_zhi_bian_hao_ = item.wei_zhi_bian_hao_;
-                labelsMap[item.ceng_hao_].push(it);
-              });
-            } else {
-              labelsMap[item.ceng_hao_].push(item);
-            }
-          });
-        });
-        this_.listData = labelsMap;
-        this.$nextTick(() => {
-          this.loading = false;
-        });
-      });
+        }
+      }
+      this_.listData = labelsMap;
     },
+    // queryLoad(sql) {
+    //   //根据样品信息货位查询相对应的样品登记表
+    //   var datas = [];
+    //   var labelsMap = {}; // map存储
+    //   var this_ = this;
+    //   this_.listData = [];
+    //   curdPost("sql", sql).then((res) => {
+    //     datas = res.variables.data;
+    //     datas.forEach((item) => {
+    //       if (!labelsMap[item.ceng_hao_]) {
+    //         //没有就创建
+    //         labelsMap[item.ceng_hao_] = [];
+    //       }
+    //       // 通过样品货位配置的id外键 查询样品登记表
+    //       console.log(this_.formInline.fang_jian_hao_value);
+    //       let yangpingSql = "";
+    //       if (this_.formInline.fang_jian_hao_value == "样品间") {
+    //         yangpingSql =
+    //           "select * from t_mjypdjb WHERE shou_yang_wei_zhi = '" +
+    //           item.id_ +
+    //           "'";
+    //       } else {
+    //         yangpingSql =
+    //           "select * from t_mjypdjb WHERE liu_yang_wei_zhi_ = '" +
+    //           item.id_ +
+    //           "'";
+    //       }
+
+    //       curdPost("sql", yangpingSql).then((res) => {
+    //         var resData = res.variables.data;
+    //         if (resData.length > 0) {
+    //           resData.forEach((it) => {
+    //             it.wei_zhi_bian_hao_ = item.wei_zhi_bian_hao_;
+    //             labelsMap[item.ceng_hao_].push(it);
+    //           });
+    //         } else {
+    //           labelsMap[item.ceng_hao_].push(item);
+    //         }
+    //       });
+    //     });
+    //     this_.listData = labelsMap;
+    //     this.$nextTick(() => {
+    //       this.loading = false;
+    //     });
+    //   });
+    // },
     qu_yu_Event(e) {
       //区间 留样 样品间 点击事件 查询相应的货架号->冰箱 赋值 huo_jia_hao_
       this.huo_jia_arrEvent(e.target.innerText);
@@ -513,7 +531,7 @@ p {
               cursor: pointer;
               padding: 2px 6px;
               border-radius: 5px;
-              background: #e6a23c;
+              // background: #e6a23c;
               margin-left: 12px;
               margin-top: 6px;
               // box-sizing: border-box;

src/views/component/yangpinchuzhiliuyang.vue

@@ -72,7 +72,7 @@
                           <p>样品编号：{{ it.yang_pin_bian_hao }}</p>
                           <p>存放位置：{{ it.wei_zhi_bian_hao_ }}</p>
                           <p>存储条件：{{ it.cun_chu_tiao_jian || it.cun_chu_yao_qiu_}}</p>
-                          <p>留样期限：{{ it.liu_yang_qi_xian_ }}</p>
+                          <p>入库时间：{{ it.ru_ku_shi_jian_}}</p>
                         </div>
                       </div>
                     </div>
@@ -185,58 +185,81 @@ export default {
       }
       this.queryLoad(sql);
     },
-    queryLoad(sql) {
+    async queryLoad(sql) {
       //根据样品信息货位查询相对应的样品登记表
       var datas = [];
       var labelsMap = {}; // map存储
       var this_ = this;
       this_.listData = [];
-      curdPost("sql", sql).then((res) => {
-        datas = res.variables.data;
-        datas.forEach((item) => {
-          let yangpingSql;
-          if (this_.formInline.fang_jian_hao_value == "样品间") {
-            yangpingSql =
-              "select * from t_mjypdjb WHERE shou_yang_wei_zhi = '" +
-              item.id_ +
-              "'";
-          } else {
-            yangpingSql =
-              "select * from t_mjypdjb WHERE liu_yang_wei_zhi_ = '" +
-              item.id_ +
-              "'";
-          }
-          yangpingSql =
-            "select * from t_mjypdjb WHERE yang_pin_bian_hao = '" +
-            item.yang_pin_bian_hao +
-            "'";
-          if (!labelsMap[item.ceng_hao_]) {
-            //没有就创建
+      await curdPost("sql", sql).then((res) => {
+        datas = res.variables.data;   
+      });
+      datas.forEach(item=>{
+          if (!labelsMap[item.ceng_hao_]) { 
             labelsMap[item.ceng_hao_] = [];
-            curdPost("sql", yangpingSql).then((res) => {
-              if (res.variables.data.length > 0) {
-                let data = res.variables.data;
-                item["yang_pin_ming_che"] = data[0].yang_pin_ming_che;
-                labelsMap[item.ceng_hao_].push(item);
-              } else {
-                labelsMap[item.ceng_hao_].push(item);
-              }
-            });
-          } else {
-            curdPost("sql", yangpingSql).then((res) => {
-              if (res.variables.data.length > 0) {
-                let data = res.variables.data;
-                item["yang_pin_ming_che"] = data[0].yang_pin_ming_che;
-                labelsMap[item.ceng_hao_].push(item);
-              } else {
-                labelsMap[item.ceng_hao_].push(item);
-              }
-            });
           }
-        });
-        this_.listData = labelsMap;
-      });
+      })
+      for(let i=0;i<datas.length;i++){
+        for(let k in labelsMap){
+          if(k == datas[i].ceng_hao_){
+            labelsMap[k].push(datas[i]);
+          }
+        }
+      }
+      this_.listData = labelsMap;
     },
+    // queryLoad(sql) {
+    //   //根据样品信息货位查询相对应的样品登记表
+    //   var datas = [];
+    //   var labelsMap = {}; // map存储
+    //   var this_ = this;
+    //   this_.listData = [];
+    //   curdPost("sql", sql).then((res) => {
+    //     datas = res.variables.data;
+    //     datas.forEach((item) => {
+    //       let yangpingSql;
+    //       if (this_.formInline.fang_jian_hao_value == "样品间") {
+    //         yangpingSql =
+    //           "select * from t_mjypdjb WHERE shou_yang_wei_zhi = '" +
+    //           item.id_ +
+    //           "'";
+    //       } else {
+    //         yangpingSql =
+    //           "select * from t_mjypdjb WHERE liu_yang_wei_zhi_ = '" +
+    //           item.id_ +
+    //           "'";
+    //       }
+    //       yangpingSql =
+    //         "select * from t_mjypdjb WHERE yang_pin_bian_hao = '" +
+    //         item.yang_pin_bian_hao +
+    //         "'";
+    //       if (!labelsMap[item.ceng_hao_]) {
+    //         //没有就创建
+    //         labelsMap[item.ceng_hao_] = [];
+    //         curdPost("sql", yangpingSql).then((res) => {
+    //           if (res.variables.data.length > 0) {
+    //             let data = res.variables.data;
+    //             item["yang_pin_ming_che"] = data[0].yang_pin_ming_che;
+    //             labelsMap[item.ceng_hao_].push(item);
+    //           } else {
+    //             labelsMap[item.ceng_hao_].push(item);
+    //           }
+    //         });
+    //       } else {
+    //         curdPost("sql", yangpingSql).then((res) => {
+    //           if (res.variables.data.length > 0) {
+    //             let data = res.variables.data;
+    //             item["yang_pin_ming_che"] = data[0].yang_pin_ming_che;
+    //             labelsMap[item.ceng_hao_].push(item);
+    //           } else {
+    //             labelsMap[item.ceng_hao_].push(item);
+    //           }
+    //         });
+    //       }
+    //     });
+    //     this_.listData = labelsMap;
+    //   });
+    // },
     qu_yu_Event(e) {
       //区间 留样 样品间 点击事件 查询相应的货架号->冰箱 赋值 huo_jia_hao_
       this.huo_jia_arrEvent(e.target.innerText);

src/views/sample/reservedSample.vue

@@ -106,12 +106,7 @@
             <li
               class="list-item huojia-item"
               :style="{
-                background:
-                  huojiashow ==
-                  item.huo_jia_hao_ + '号' + item.huo_jia_lei_xing_
-                    ? '#ff9900'
-                    : '#0099cc',
-              }"
+                background:huojiashow ==item.huo_jia_hao_ + '号' + item.huo_jia_lei_xing_? '#ff9900': '#0099cc',}"
               @click="huo_jia_hao_Event"
               v-for="(item, index) in huo_jia_arr"
               :key="index"
@@ -155,10 +150,7 @@
                     class="goods-dsc"
                     v-for="(it, ind) in listData[index]"
                     :key="ind"
-                    :style="{
-                      background:
-                        it.yang_pin_bian_hao ? '#67c23a' : '',
-                    }"
+                    :style="{background: it.wei_zhi_zhuang_ta == '空余' ? '#67c23a' : '#ff9900',}"
                   >
                     <div class="top-dsc">
                       <div class="position">
@@ -167,20 +159,8 @@
                         <p>样品编号：{{ it.yang_pin_bian_hao }}</p>
                         <p>存放位置：{{ it.wei_zhi_bian_hao_ }}</p>
                         <p>存储条件：{{ it.cun_chu_tiao_jian || it.cun_chu_yao_qiu_}}</p>
-                        <p>留样期限：{{ it.liu_yang_qi_xian_ }}</p>
+                        <p>入库时间：{{ it.ru_ku_shi_jian_}}</p>
                       </div>
-                      <!-- <div class="right-content" v-if="false">
-                        <p v-if="false">编号:{{ it.liu_yang_qi_xian_ }}</p>
-                        <p>
-                          {{ it.wei_zhi_zhuang_ta || it.yang_pin_ming_che }}
-                        </p>
-                        <p>{{ it.yang_pin_ming_che|| it.wei_zhi_zhuang_ta  }}</p>
-                      </div> -->
-                      <!-- <div class="right-content">
-                        <p>
-                          {{ it.yang_pin_ming_che|| it.wei_zhi_zhuang_ta  }}
-                        </p>
-                      </div> -->
                     </div>
                   </div>
                 </div>
@@ -286,42 +266,65 @@ export default {
       }
       this.queryLoad(sql);
     },
-    queryLoad(sql) {
+    async queryLoad(sql) {
       //根据样品信息货位查询相对应的样品登记表
       var datas = [];
       var labelsMap = {}; // map存储
       var this_ = this;
       this_.listData = [];
-      curdPost("sql", sql).then((res) => {
-        datas = res.variables.data;
-        datas.forEach((item) => {
-          if (!labelsMap[item.ceng_hao_]) { //没有就创建           
+      await curdPost("sql", sql).then((res) => {
+        datas = res.variables.data;   
+      });
+      datas.forEach(item=>{
+          if (!labelsMap[item.ceng_hao_]) { 
             labelsMap[item.ceng_hao_] = [];
           }
-          // 通过样品货位配置的id外键 查询样品登记表
-          console.log(this_.formInline.fang_jian_hao_value)
-          let yangpingSql ="";
-          if(this_.formInline.fang_jian_hao_value == "样品间"){
-            yangpingSql ="select * from t_mjypdjb WHERE shou_yang_wei_zhi = '" +item.id_ +"'";
-          }else{
-            yangpingSql ="select * from t_mjypdjb WHERE liu_yang_wei_zhi_ = '" +item.id_ +"'";
+      })
+      for(let i=0;i<datas.length;i++){
+        for(let k in labelsMap){
+          if(k == datas[i].ceng_hao_){
+            labelsMap[k].push(datas[i]);
           }
-          curdPost("sql", yangpingSql).then((res) => {
-            var resData = res.variables.data;
-            if (resData.length > 0) {
-              resData.forEach((it) => {
-                it.wei_zhi_bian_hao_ = item.wei_zhi_bian_hao_;
-                labelsMap[item.ceng_hao_].push(it);
-              });
-            } else {
-              labelsMap[item.ceng_hao_].push(item);
-            }
-          });
-        });
-        this_.listData = labelsMap;
-        console.log(this_.listData)
-      });
+        }
+      }
+      this_.listData = labelsMap;
     },
+    // queryLoad(sql) {
+    //   //根据样品信息货位查询相对应的样品登记表
+    //   var datas = [];
+    //   var labelsMap = {}; // map存储
+    //   var this_ = this;
+    //   this_.listData = [];
+    //   curdPost("sql", sql).then((res) => {
+    //     datas = res.variables.data;
+    //     datas.forEach((item) => {
+    //       if (!labelsMap[item.ceng_hao_]) { //没有就创建           
+    //         labelsMap[item.ceng_hao_] = [];
+    //       }
+    //       // 通过样品货位配置的id外键 查询样品登记表
+    //       console.log(this_.formInline.fang_jian_hao_value)
+    //       let yangpingSql ="";
+    //       if(this_.formInline.fang_jian_hao_value == "样品间"){
+    //         yangpingSql ="select * from t_mjypdjb WHERE shou_yang_wei_zhi = '" +item.id_ +"'";
+    //       }else{
+    //         yangpingSql ="select * from t_mjypdjb WHERE liu_yang_wei_zhi_ = '" +item.id_ +"'";
+    //       }
+    //       curdPost("sql", yangpingSql).then((res) => {
+    //         var resData = res.variables.data;
+    //         if (resData.length > 0) {
+    //           resData.forEach((it) => {
+    //             it.wei_zhi_bian_hao_ = item.wei_zhi_bian_hao_;
+    //             labelsMap[item.ceng_hao_].push(it);
+    //           });
+    //         } else {
+    //           labelsMap[item.ceng_hao_].push(item);
+    //         }
+    //       });
+    //     });
+    //     this_.listData = labelsMap;
+    //     console.log(this_.listData)
+    //   });
+    // },
     qu_yu_Event(e) {
       //区间 留样 样品间 点击事件 查询相应的货架号->冰箱 赋值 huo_jia_hao_
       this.huo_jia_arrEvent(e.target.innerText);
@@ -523,7 +526,7 @@ p {
               cursor: pointer;
               padding: 2px 6px;
               border-radius: 5px;
-              background: #67c23a;
+              // background: #67c23a;
               margin-left: 12px;
               margin-top: 6px;
               box-sizing: border-box;

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

@@ -87,17 +87,14 @@
                       class="goods-dsc"
                       v-for="(it, ind) in listData[index]"
                       :key="ind"
-                      :style="{
-                        background:
-                          it.wei_zhi_zhuang_ta == '空余' ? '#67c23a' : '',
-                      }"
+                      :style="{background: it.wei_zhi_zhuang_ta == '空余' ? '#67c23a' : '',}"
                     >
                       <div class="top-dsc">
                         <div class="position">
                           <p>样品名称：{{ it.yang_pin_ming_che }}</p>
                           <p>样品编号：{{ it.yang_pin_bian_hao }}</p>
                           <p>位置编号：{{ it.wei_zhi_bian_hao_ }}</p>
-                          <p>留样期限：{{ it.liu_yang_qi_xian_ }}</p>
+                          <!-- <p>入库时间：{{ it.ru_ku_shi_jian_}}</p> -->
                           <p>位置状态：{{ it.wei_zhi_zhuang_ta }}</p>
                           <p>存储条件：{{ it.cun_chu_tiao_jian }}</p>
                         </div>
@@ -226,36 +223,7 @@ export default {
       var this_ = this;
       this_.listData = [];
       await curdPost("sql", sql).then((res) => {
-        datas = res.variables.data;
-        // datas.forEach((item) => {
-        //   let yangpingSql =
-        //     "select * from t_mjypdjb WHERE yang_pin_bian_hao = '" +
-        //     item.yang_pin_bian_hao +
-        //     "'";
-        //   if (!labelsMap[item.ceng_hao_]) {
-        //     //没有就创建
-        //     labelsMap[item.ceng_hao_] = [];
-        //     curdPost("sql", yangpingSql).then((res) => {
-        //       if (res.variables.data.length > 0) {
-        //         let data = res.variables.data;
-        //         item["yang_pin_ming_che"] = data[0].yang_pin_ming_che;
-        //         labelsMap[item.ceng_hao_].push(item);
-        //       } else {
-        //         labelsMap[item.ceng_hao_].push(item);
-        //       }
-        //     });
-        //   } else {
-        //     curdPost("sql", yangpingSql).then((res) => {
-        //       if (res.variables.data.length > 0) {
-        //         let data = res.variables.data;
-        //         item["yang_pin_ming_che"] = data[0].yang_pin_ming_che;
-        //         labelsMap[item.ceng_hao_].push(item);
-        //       } else {
-        //         labelsMap[item.ceng_hao_].push(item);
-        //       }
-        //     });
-        //   }
-        // });    
+        datas = res.variables.data;   
       });
       datas.forEach(item=>{
           if (!labelsMap[item.ceng_hao_]) {