lilei 2 years ago
parent
commit
65a32cf09c

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1677721112988
+  "version": 1677806531611
 }

+ 2 - 4
src/views/salesManagement/salesQueryNew/chooseShelfProduct.vue

@@ -250,6 +250,7 @@ export default {
             }
           }
           this.spinning = false
+          this.setTableH()
           return data
         })
       },
@@ -404,9 +405,7 @@ export default {
     },
     setTableH () {
       this.$nextTick(() => {
-        const searchBoxH = this.$refs.searchBox.offsetHeight
-        const searchBoxH1 = this.$refs.searchBox1.offsetHeight
-        this.tableHeight = window.innerHeight - (this.curTab == 1 ? searchBoxH : searchBoxH1) - 215
+        this.tableHeight = window.innerHeight - (this.curTab == 1 ? this.$refs.searchBox.offsetHeight : this.$refs.searchBox1.offsetHeight) - 255 
       })
     }
   },
@@ -425,7 +424,6 @@ export default {
       } else {
         this.$nextTick(() => {
           this.curTab = 1
-          this.setTableH()
         })
       }
     }

+ 2 - 2
src/views/salesManagement/salesQueryNew/edit.vue

@@ -28,8 +28,8 @@
             <a-button type="link" v-if="detailData&&detailData.totalCategory" @click="showSearch=!showSearch" :class="showSearch?'button-error':'button-default'"> <a-icon type="search" /> 筛选</a-button>
             <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
             <a-button v-if="detailData&&detailData.totalCategory" id="salesNewOrderEdit-add-btn" type="link" @click="openChooseProduct=true"><a-icon type="plus" />添加产品</a-button>
-            <a-divider type="vertical" />
-            <a-dropdown v-model="showCell" v-if="$hasPermissions('M_ShowAllCost')">
+            <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
+            <a-dropdown v-model="showCell" v-if="$hasPermissions('M_ShowAllCost')&&detailData&&detailData.totalCategory">
               <a-button type="link" class="button-default"> <a-icon type="setting" />  显示</a-button>
               <a-menu slot="overlay">
                 <a-menu-item>