zhangjingyuan 3 лет назад
Родитель
Сommit
5df32315de
2 измененных файлов с 20 добавлено и 17 удалено
  1. 15 11
      src/views/component/fwposition.vue
  2. 5 6
      src/views/component/zhuposition.vue

+ 15 - 11
src/views/component/fwposition.vue

@@ -209,9 +209,7 @@ export default {
     },
   },
   mounted() {
-    this.loadQueryData();
-    this.firstLoadViewData();
-    this.firstLoadQuyu("次级仓库");
+
     // let dom = document.getElementsByClassName("el-tooltip__popper");
     // console.log(dom, dom[0].innerHTML, "dom");
     // dom[0].remove();
@@ -221,8 +219,11 @@ export default {
       this.ifshow = !this.ifshow;
     },
     clickBtn() {
-
+      
       this.ifshow = !this.ifshow;
+      this.loadQueryData();
+      this.firstLoadViewData();
+      this.firstLoadQuyu("次级仓库");
       // let dom = document.getElementsByClassName("el-tooltip__popper");
       // if (dom[0]) {
       //   dom[0].innerHTML = "";
@@ -316,6 +317,8 @@ export default {
       this.quyuShow = value;
     },
     queryLoad(sql, py) {
+      console.log(122)
+      let this_ =this;
       var datas = [];
       this.cenghao = [];
       const labelsMap = {}; // map存储
@@ -347,7 +350,7 @@ export default {
                 }
               });
             }
-            this.listData = labelsMap;
+            this_.listData = labelsMap;           
             return;
           }
           datas.forEach((item) => {
@@ -363,13 +366,10 @@ export default {
                     //组件以货架分层的数据: {1:[],2:[],3:[],4:[],5:[],6}
                     let num = item.wei_zhi_.split("-")[1];
                     if (num == prop) {
-                      labelsMap[prop].push({
-                        cun_fang_wei_zhi_: item.wei_zhi_,
-                      });
+                      labelsMap[prop].push({cun_fang_wei_zhi_: item.wei_zhi_,});
                       labelsMap[prop].push({ zhuangtai: "空" });
                     }
                   });
-                  // labelsMap[prop].push({ cun_fang_wei_zhi_: "空" });
                 }
               }
             }
@@ -378,14 +378,17 @@ export default {
           for (var prop in labelsMap) {
             if (labelsMap.hasOwnProperty(prop)) {
               if (labelsMap[prop].length > 1) {
-                var item = labelsMap[prop].slice(1);
+                var item =[]
+                console.log(labelsMap[prop])
+                item.push(labelsMap[prop][0]);
                 newarr.push(item);
               } else {
                 newarr.push(labelsMap[prop]);
               }
             }
           }
-          this.listData = newarr;
+          this_.listData = newarr;
+          console.log(this_.listData)
         });
       });
     },
@@ -406,6 +409,7 @@ export default {
     },
     blackEvent() {
       this.desShow = true;
+      this_.listData =[];
     },
   },
   watch: {

+ 5 - 6
src/views/component/zhuposition.vue

@@ -127,9 +127,9 @@
                   </div>
                 </div>
               </div>
-              <div class="goodshelf-name" v-if="index == 1">
+              <!-- <div class="goodshelf-name" v-if="index == 1">
                 {{ desString }}
-              </div>
+              </div> -->
             </div>
           </div>
         </div>
@@ -225,7 +225,7 @@ export default {
       let dom  = document.getElementById("el-tooltip-2390");
       console.log(dom,"dom")
       const name = "cunFangWeiZhi"; //其他字段属性
-      this.$emit("change-data", name, value.cun_fang_wei_zhi_);s
+      this.$emit("change-data", name, value.cun_fang_wei_zhi_);
       const name2 = "cangKuMingCheng"; //其他字段属性
       const value2 = this.formInline.cang_ku_ming_chen_value; //字段的值
       // this.showValue = value2;
@@ -375,11 +375,10 @@ export default {
           for (var prop in labelsMap) {
             if (labelsMap.hasOwnProperty(prop)) {
               if (labelsMap[prop].length > 1) {
-                var item = labelsMap[prop].slice(1);
-                console.log(item);
+                var item  =[];
+                item.push(labelsMap[prop][0]);
                 newarr.push(item);
               } else {
-                console.log(labelsMap[prop]);
                 newarr.push(labelsMap[prop]);
               }
             }