chenrui 4 年之前
父节点
当前提交
8be21b1b81

+ 12 - 5
src/views/productManagement/priceChangeRecord/list.vue

@@ -79,7 +79,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 2140 }"
+      :scroll="{ x: 2140, y: tableHeight }"
       bordered>
       <!-- 产品分类 -->
       <template slot="productType" slot-scope="text, record">
@@ -127,6 +127,7 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
+      tableHeight: 0,
       queryParam: { //  查询条件
         name: '', //  产品名称
         code: '', //  产品编码
@@ -206,6 +207,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 430
+        }
         // 变更时间
         if (this.time && this.time.length > 0) {
           this.queryParam.beginDate = moment(this.time[0]).format(this.dateFormat)
@@ -235,13 +239,16 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.productCode = ''
-      this.queryParam.productName = ''
-      this.queryParam.productBrandSn = undefined
+      this.queryParam.code = ''
+      this.queryParam.name = ''
+      this.queryParam.brandSn = undefined
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
-      this.queryParam.enabledFlag = undefined
+      this.time = [
+        moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
+        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
+      ]
       this.$refs.table.refresh(true)
     },
     // 审核

+ 1 - 1
src/views/productManagement/productPricing/list.vue

@@ -72,7 +72,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 2110 }"
+      :scroll="{ x: 2110, y: tableHeight }"
       bordered>
       <!-- 产品分类 -->
       <template slot="productType" slot-scope="text, record">