Merge remote-tracking branch 'origin/master'

doum

8 天以前 0d0e67818a45161af14114211f43aafd232a6da2

 admin/src/views/business/planGoods.vue

@@ -26,7 +26,7 @@
          ></el-option>
        </el-select>
      </el-form-item>
      

      <el-form-item label="上架状态" prop="status">
        <el-select
          v-model="searchForm.brandId"
@@ -89,7 +89,6 @@
        <el-table-column prop="labels" label="商品标签集合,多个用英文逗号隔开" min-width="100px"></el-table-column> -->
        <!-- v-if="containPermissions(['business:goods:update', 'business:goods:delete'])" -->
        <el-table-column
          
          label="操作"
          min-width="120"
          fixed="right"
@@ -98,7 +97,7 @@
            <template v-if="row.status==1">
              <el-button type="text" @click="$refs.operaGoodsWindow.open('编辑商品', row, 2)" v-permissions="['business:goods:update']">编辑</el-button>
              <el-button type="text" @click="$refs.operaPlatformGoodsSkuWindow.open('平台SKU', row)">SKU</el-button>
              <el-button type="text" @click="deleteById(row)" v-permissions="['business:goods:delete']">删除</el-button>
              <el-button type="text"  style="color: red;" @click="deleteById(row)" v-permissions="['business:goods:delete']">删除</el-button>
            </template>
            <template v-else>
              <el-button type="text" @click="$refs.operaGoodsDetailWindow.open('商品详情', row, 0)">查看详情</el-button>
@@ -163,7 +162,7 @@
        labels: ''
      },
      labels: [],
  

    }
  },
  provide() {
@@ -180,7 +179,7 @@
      'field.main': 'id'
    })
    this.search()
 

    labelList({
      capacity: 999,
      model: {
@@ -190,14 +189,14 @@
      .then(res => {
        this.labels = res.records
      })
    

  },
  methods: {
    handleClick(val) {

    },
    /**
     * 
     *
     * @param {上下状态} status 0上架 1下架
     */
    issued(status) {
@@ -211,7 +210,7 @@

        })
    },
    

    statusChange(row) {
      updateById(row)
        .then(() => {