合并

MrShi

7 小时以前 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c

 admin/src/components/business/OperaCouponGoodsWindow.vue

@@ -2,12 +2,13 @@
  <GlobalWindow
    :title="title"
    width="100%"
    :with-footer="false"
    :visible.sync="visible"
    @confirm="confirm"
  >
    <TableLayout>
      <!-- 搜索表单 -->
      <el-form ref="searchForm" slot="search-form" id="curSearchForm" :model="searchForm" label-width="100px" style="display: block;" >
      <el-form ref="searchForm" slot="search-form" id="curSearchForm" :model="searchForm" label-width="100px"  inline >
        <el-form-item label="" prop="name" label-width="5px" style="display: inline-block;margin-right: 30px;">
          <el-input v-model="searchForm.name" style="width: 150px;" placeholder="商品名称" clearable @keypress.enter.native="search"></el-input>
        </el-form-item>
@@ -24,6 +25,7 @@
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
          <el-button type="primary" style="margin-left: 30px;font-weight: bold"  @click="confirm">确认商品配置</el-button>
        </section>
      </el-form>
      <!-- 表格和分页 -->
@@ -102,12 +104,18 @@
    return {
      title: '',
      visible: false,
      selectGoods:[],
      // 搜索
      searchForm: {
        id: '',
        name:'',
        categoryId:'',
        brandId:'',
        bindShopId: ''
      },
      shops: []
      shops: [],
      brands:[],
      labels:[]
    }
  },
  created () {
@@ -246,9 +254,15 @@
  }
}
</script>
<style scoped>
<style lang="scss" scoped>
::v-deep .el-select {
  width: 100%;
  .el-input__inner {
    width: 100%;
  }
}
.table-pagination{
  position: fixed !important;
  bottom: 50px;
  bottom: 10px;
}
</style>