Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

fe/PC/src/components/StepsCountPlanForm/index.vue

@@ -412,6 +412,15 @@ export default {
     //确定筛选
     advancedFilter(url, list, TotalCount, data, oldSkipCount) {
       return () => {
+        // 盘点库存 过滤线边仓数据 20230417
+        if (data == 'locationData') {
+          list.condition.filters.push({
+            action: "!=",
+            column: "type",
+            logic: "And",
+            value: "5"
+          })
+        }
         list.SkipCount = (oldSkipCount - 1) * list.MaxResultCount;
         this.tableLoading = true;
         getPageList(list, url)

fe/PC/src/components/commonTabel-drawer/index.vue

@@ -183,17 +183,6 @@ export default {
     currenTabs,
     currenTable,
   },
-  
-  watch: {
-    propsData(newVal, oldVal){
-      // newVal是新值，oldVal是旧值
-      
-      // if (newVal != oldVal) {
-      //   this.$parent.firstTabs = 'xq'
-      // }
-      // this.firstTabs = 'xq'
-    },
-  },
   props: {
     title: {
       type: Array,

fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue

@@ -117,6 +117,7 @@ export default {
     },
     //点击Table行内名称
     inlineDialog(val) {
+      this.firstTabs = 'xq'
       //打开抽屉
       this.Loading.DrawerLoading = true
       this.displayDialog.detailsDialog = true;