合并

MrShi

18 小时以前 e4f9739d74323aacf09d139700f22a383910ee97

 admin/src/views/business/platformGoods.vue

@@ -3,16 +3,16 @@
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
      <el-form-item label="商品名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入商品名称" @keypress.enter.native="search"></el-input>
        <el-input v-model="searchForm.name" style="width: 150px;" placeholder="商品名称" clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="商品ID" prop="id">
        <el-input v-model="searchForm.id" placeholder="请输入商品ID" @keypress.enter.native="search"></el-input>
        <el-input v-model="searchForm.id" style="width: 150px;" placeholder="商品ID" clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="所属分类" prop="categoryId">
        <el-select
          v-model="searchForm.categoryId"
          style="width: 150px"
          placeholder="请选择所属分类"
          placeholder="所属分类"
          clearable
          @change="search"
        >
@@ -28,7 +28,7 @@
        <el-select
          v-model="searchForm.brandId"
          style="width: 150px"
          placeholder="请选择所属品牌"
          placeholder="所属品牌"
          clearable
          @change="search"
        >
@@ -43,8 +43,9 @@
      <el-form-item label="上架状态" prop="status">
        <el-select
          v-model="searchForm.status"
          placeholder="请选择上架状态"
          placeholder="上架状态"
          clearable
          style="width: 150px"
          @change="search"
        >
          <el-option :key="0" :value="0" label="上架"></el-option>
@@ -82,7 +83,11 @@
            <span class="blue" style="cursor: pointer" @click="$refs.OperaGoodsInfoWindow.open('商品详情', row, 0)">{{row.id}}</span>
          </template>
        </el-table-column>
        <el-table-column prop="name" label="商品名称" min-width="150px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="name" label="商品名称" min-width="150px" show-overflow-tooltip>
          <template slot-scope="{row}">
            <span class="blue" style="cursor: pointer" @click="$refs.OperaGoodsInfoWindow.open('商品详情', row, 0)">{{row.name}}</span>
          </template>
        </el-table-column>
        <el-table-column prop="categoryName" label="所属分类" min-width="120px"></el-table-column>
        <el-table-column prop="brandName" label="所属品牌" min-width="120px"></el-table-column>
        <el-table-column prop="showPrice" label="出厂价(元）" min-width="100px"></el-table-column>