fix:样品间可视化

src/views/sample/sampleView.vue

@@ -121,7 +121,7 @@
           </ul>
         </div>
       </div>
-      <div class="huojia">
+      <!-- <div class="huojia">
         <div class="test-list" v-show="!leixingcare">
           <ul class="list-items">
             <li
@@ -140,7 +140,7 @@
             </li>
           </ul>
         </div>
-      </div>
+      </div> -->
     </div>
     <div class="body-content">
       <div class="left-table" v-if="false"></div>
@@ -463,7 +463,7 @@ export default {
         this.gua_jia_arr = [];
         return;
       }
-      let sqlString = `select distinct gua_jia_hao_ from t_mjypcfwz where fang_jian_lei_xin = '留样间' and huo_jia_lei_xing_ = '${huojialeixing}' and huo_jia_hao_ = '${huojiaNum}'   order by gua_jia_hao_`;
+      let sqlString = `select distinct huo_jia_hao_ from t_ypcfwz where fang_jian_lei_xin = '样品间' and huo_jia_lei_xing_ = '${huojialeixing}' and huo_jia_hao_ = '${huojiaNum}'   order by huo_jia_hao_`;
       var this_ = this;
       curdPost("sql", sqlString).then((response) => {
         this_.gua_jia_arr = response.variables.data;

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

@@ -6,7 +6,7 @@
       <input type="text" v-model="value" style="opacity: 0; position: fixed" />
     </div>
     <div class="viewArea" v-if="viewShow">
-      <h2 class="title">留样间样品存放位置可视图</h2>
+      <h2 class="title">样品间样品存放位置可视图</h2>
       <div class="close" @click="positionBtn">
         <i class="el-icon-circle-close"></i>
       </div>
@@ -14,16 +14,15 @@
         <div class="test-quyu" v-if="leixingcare">
           <div class="test-list">
             <ul class="list-items">
-              <li 
-                v-show="item.qu_yu_ =='留样区'"
+              <li
+                v-show="item.qu_yu_ !='留样区'"
                 class="list-item quyu-item"
                 :style="{
-                  background: quyuShows == item.qu_yu_ ? '#FF9900' : '#0099CC',
+                  background: quyuShows == item.qu_yu_+'' ? '#FF9900' : '#0099CC',
                 }"
                 @click="qu_yu_Event"
                 v-for="item in quyu_arr"
                 :key="item.qu_yu_"
-                
               >
                 {{ item.qu_yu_ }}
               </li>
@@ -170,8 +169,8 @@ export default {
       gua_jia_arr: [],
       firstLoadActive: true,
       qu_yu_value: "",
-      quyuShow: "",
-      quyuShow: "留样区",
+      quyuShow: "待检区",
+      quyuShows: "",
       huojiashow: "",
       guajiashow: "",
       leixingcare: true,
@@ -201,29 +200,31 @@ export default {
       this.loadQueryData();
       this.firstLoadViewData();
       this.viewShow = !this.viewShow;
+      // console.log(this.viewShow);
     },
     positionClick(values) {
       this.viewShow = !this.viewShow;
       this.placeValue = values[0].wei_zhi_bian_hao_;
-      let id = values[0].id_
-      console.log(id,"id");
       let this_ = this;
+      let id = values[0].id_;
+      console.log(id,"组件传值id")
       this_.$emit("input", id); //传导
     },
 
     firstLoadViewData() {
       var this_ = this;
-      var sqlString = `select * from t_ypcfwz where fang_jian_lei_xin = '样品间' and qu_yu_ ='留样区' and huo_jia_hao_ = '5T' and huo_jia_lei_xing_ = '医用冷藏冷冻箱'`;
-      this.huojiashow = "5T号医用冷藏冷冻箱";
-      this.quyuShows = "留样区";
-      this.desString = "样品间" + "留样区医用冷藏冷冻箱";
+      var sqlString = `select * from t_ypcfwz where fang_jian_lei_xin = '样品间' and qu_yu_ ='待检区' and huo_jia_hao_ = '4' and huo_jia_lei_xing_ = '医用冷藏箱'`;
+      this.huojiashow = "4号医用冷藏箱";
+      this.quyuShows = "待检区";
+      this.desString = "样品间" + "待检区医用冷藏箱";
       this.queryLoad(sqlString);
       this.formInline.fang_jian_hao_value = "样品间";
-      this.formInline.qu_yu_value = "留样区";
-      this.formInline.huo_jia_value = "5T号医用冷藏冷冻箱";
-      let sql = `select distinct huo_jia_hao_,huo_jia_lei_xing_ from t_ypcfwz  where fang_jian_lei_xin = '样品间' and qu_yu_ ='留样区'  order by huo_jia_hao_ asc `;
+      this.formInline.qu_yu_value = "待检区";
+      this.formInline.huo_jia_value = "4号医用冷藏箱";
+      let sql = `select distinct huo_jia_hao_,huo_jia_lei_xing_ from t_ypcfwz  where fang_jian_lei_xin = '样品间' and qu_yu_ ='待检区'  order by huo_jia_hao_ asc `;
       curdPost("sql", sql).then((response) => {
         this_.huo_jia_arr = response.variables.data;
+        // console.log(this_.huo_jia_arr, "首次加载货架信息");
       });
     },
     loadQueryData() {
@@ -234,6 +235,7 @@ export default {
       curdPost("sql", sqlString)
         .then((response) => {
           this_.sampleOption = response.variables.data;
+          // console.log(this_.sampleOption, "this_.sampleOption");
         })
         .catch((err) => {
           console.log(err, "err------>");
@@ -253,6 +255,7 @@ export default {
       let huo_jia_lei_xing_ = this.formInline.huo_jia_value.split("号")[1];
       var gua_jia_hao = this.formInline.gua_jia_value.substr(0, 1);
       var sql = `select * from t_ypcfwz where fang_jian_lei_xin = '${fang_jian_}' and qu_yu_ ='${qu_yu}' and huo_jia_lei_xing_ = '${huo_jia_lei_xing_}' and huo_jia_hao_ = '${huo_jia_hao_}'`;
+      // console.log(sql);
       this.describeFn();
       this.queryLoad(sql);
     },
@@ -306,10 +309,9 @@ export default {
     //   this_.listData = [];
     //   curdPost("sql", sql).then((res) => {
     //     datas = res.variables.data;
-    //     // console.log(datas, "2222222222 ");
     //     datas.forEach((item) => {
-    //       if (!labelsMap[item.ceng_hao_]) {  //没有就创建
-          
+    //       if (!labelsMap[item.ceng_hao_]) {
+    //         //没有就创建
     //         labelsMap[item.ceng_hao_] = [];
     //       }
     //       // 通过样品货位配置的id外键 查询样品登记表
@@ -323,6 +325,7 @@ export default {
 
     //         if (resData.length > 0) {
     //           resData.forEach((it) => {
+    //             // console.log(yangpingSql, item, "样品扽飞机表");
     //             it.wei_zhi_bian_hao_ = item.wei_zhi_bian_hao_;
     //             labelsMap[item.ceng_hao_].push(it);
     //           });
@@ -332,7 +335,8 @@ export default {
     //       });
     //       // console.log(labelsMap, "3333333333");
     //     });
-
+    //     // this.loading = true;
+    //     console.log(labelsMap, "22222222")
     //     this_.listData = labelsMap;
     //   });
     // },
@@ -403,7 +407,7 @@ export default {
         this.gua_jia_arr = [];
         return;
       }
-      let sqlString = `select distinct gua_jia_hao_ from t_mjypcfwz where fang_jian_lei_xin = '留样间' and huo_jia_lei_xing_ = '${huojialeixing}' and huo_jia_hao_ = '${huojiaNum}'   order by gua_jia_hao_`;
+      let sqlString = `select distinct huo_jia_hao_ from t_ypcfwz where fang_jian_lei_xin = '样品间' and huo_jia_lei_xing_ = '${huojialeixing}' and huo_jia_hao_ = '${huojiaNum}'   order by huo_jia_hao_`;
       var this_ = this;
       curdPost("sql", sqlString).then((response) => {
         this_.gua_jia_arr = response.variables.data;
@@ -458,7 +462,7 @@ export default {
       let sqlString = `select distinct huo_jia_hao_,huo_jia_lei_xing_ from t_ypcfwz where fang_jian_lei_xin = '${this.formInline.fang_jian_hao_value}' and qu_yu_ = '${newdata}' order by huo_jia_hao_ asc`;
       var this_ = this;
       this.qu_yu_value = newdata;
-      // this.quyuShow = olddata;
+      this.quyuShow = olddata;
       // console.log(sqlString, "货架变化");
       curdPost("sql", sqlString)
         .then((response) => {

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

@@ -407,7 +407,7 @@ export default {
         this.gua_jia_arr = [];
         return;
       }
-      let sqlString = `select distinct gua_jia_hao_ from t_mjypcfwz where fang_jian_lei_xin = '留样间' and huo_jia_lei_xing_ = '${huojialeixing}' and huo_jia_hao_ = '${huojiaNum}'   order by gua_jia_hao_`;
+      let sqlString = `select distinct huo_jia_hao_ from t_ypcfwz where fang_jian_lei_xin = '样品间' and huo_jia_lei_xing_ = '${huojialeixing}' and huo_jia_hao_ = '${huojiaNum}'   order by huo_jia_hao_`;
       var this_ = this;
       curdPost("sql", sqlString).then((response) => {
         this_.gua_jia_arr = response.variables.data;