lilei 2 years ago
parent
commit
67f8a8f641

BIN
public/templ/散件退货产品导入模板.xlsx


+ 1 - 1
public/version.json

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

+ 9 - 1
src/views/numsGoodsShelves/shelfSet/set.vue

@@ -86,6 +86,7 @@
           class="sTable"
           class="sTable"
           ref="table"
           ref="table"
           size="small"
           size="small"
+          :scroll="{ y: tableHeight }"
           :rowKey="(record) => record.id"
           :rowKey="(record) => record.id"
           :columns="columns"
           :columns="columns"
           :data="loadData"
           :data="loadData"
@@ -98,7 +99,7 @@
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-error"
               class="button-error"
-              v-if="!(record.shelfProductApiEntity&&record.shelfProductApiEntity.qty)"
+              v-if="record.shelfProductApiEntity&&!(record.shelfProductApiEntity.qty)&&record.shelfProductApiEntity.productSn"
               @click="handleEnable(record)"
               @click="handleEnable(record)"
             >禁用</a-button>
             >禁用</a-button>
             <a-button
             <a-button
@@ -173,6 +174,7 @@ export default {
     return {
     return {
       spinning: false,
       spinning: false,
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
+      tableHeight: 400,
       queryParam: {
       queryParam: {
         shelfProductApiEntity: {
         shelfProductApiEntity: {
           productCode: '',
           productCode: '',
@@ -328,6 +330,10 @@ export default {
       this.queryParam.shelfProductApiEntity.productName = ''
       this.queryParam.shelfProductApiEntity.productName = ''
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 350
+    },
     //  返回列表
     //  返回列表
     handleBack () {
     handleBack () {
       this.$router.push({ path: '/numsGoodsShelves/shelfSet/list' })
       this.$router.push({ path: '/numsGoodsShelves/shelfSet/list' })
@@ -335,6 +341,7 @@ export default {
   },
   },
   mounted () {
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.setTableH()
       this.getDetail()
       this.getDetail()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
@@ -342,6 +349,7 @@ export default {
   activated () {
   activated () {
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.setTableH()
       this.getDetail()
       this.getDetail()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }