Browse Source

bug修复

chenrui 4 years ago
parent
commit
98896be13b

+ 5 - 1
src/views/allocationManagement/chainTransferIn/list.vue

@@ -83,7 +83,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1650 }"
+      :scroll="{ x: 1650, y: tableHeight }"
       bordered>
       <!-- 连锁调入单号 -->
       <template slot="allocationLinkagePutNo" slot-scope="text, record">
@@ -132,6 +132,7 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
+      tableHeight: 0,
       advanced: false, // 高级搜索 展开/关闭
       time: [
         moment(getDate.getCurrMonthDays().starttime, this.dateFormat),
@@ -162,6 +163,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 220
+        }
         // 入库时间
         if (this.time && this.time.length > 0) {
           this.queryParam.beginDate = moment(this.time[0]).format(this.dateFormat)

+ 5 - 1
src/views/allocationManagement/chainTransferOut/list.vue

@@ -88,7 +88,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1680 }"
+      :scroll="{ x: 1680, y: tableHeight }"
       bordered>
       <!-- 连锁调出单号 -->
       <template slot="allocationLinkageOutNo" slot-scope="text, record">
@@ -146,6 +146,7 @@ export default {
   components: { STable, VSelect, basicInfoModal },
   data () {
     return {
+      tableHeight: 0,
       advanced: false, // 高级搜索 展开/关闭
       createDate: [
         moment(getDate.getCurrMonthDays().starttime, this.dateFormat),
@@ -177,6 +178,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 275
+        }
         // 创建时间
         if (this.createDate && this.createDate.length > 0) {
           this.queryParam.beginDate = moment(this.createDate[0]).format(this.dateFormat)

+ 2 - 8
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -14,6 +14,7 @@
     </a-alert>
     <!-- 库存详情 -->
     <s-table
+      v-if="openModal"
       class="sTable"
       ref="table"
       size="small"
@@ -83,6 +84,7 @@ export default {
           this.disabled = false
           // 总计
           this.getTotal(Object.assign(parameter, { stockSn: this.itemId }))
+          console.log(data)
           return data
         })
       },
@@ -117,14 +119,6 @@ export default {
       if (!newValue) {
         this.$emit('close')
       }
-    },
-    itemId (newValue, oldValue) {
-      if (this.isShow && newValue) {
-        const _this = this
-        setTimeout(() => {
-          _this.$refs.table.refresh(true)
-        }, 300)
-      }
     }
   }
 }

+ 4 - 4
src/views/salesManagement/giftRecord/list.vue

@@ -66,7 +66,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1380, y: tableHeight }"
+      :scroll="{ x: 1620, y: tableHeight }"
       bordered>
     </s-table>
   </a-card>
@@ -95,11 +95,11 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 140, align: 'center' },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 220, align: 'center' },
         { title: '赠品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '赠送数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '关联销售单号', dataIndex: 'salesBillNo', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联销售单号', dataIndex: 'salesBillNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '赠送客户', dataIndex: 'customerName', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '成本价(¥)', dataIndex: 'cost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '成本小计(¥)', dataIndex: 'totalCost', width: 120, align: 'center' }