优化商品管理

api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java

@@ -10,8 +10,10 @@ import cn.qihangerp.module.goods.service.OGoodsSkuService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -119,6 +121,18 @@ public class GoodsController extends BaseController
     @PutMapping("/sku")
     public AjaxResult editSku(@RequestBody OGoodsSku sku)
     {
+        String skuName="";
+        if(StringUtils.hasText(sku.getColorValue())){
+            skuName+=sku.getColorValue();
+        }
+        if(StringUtils.hasText(sku.getSizeValue())){
+            skuName+=" "+sku.getSizeValue();
+        }
+        if(StringUtils.hasText(sku.getStyleValue())){
+            skuName+=" "+sku.getStyleValue();
+        }
+        sku.setSkuName(skuName);
+        sku.setUpdateTime(new Date());
         return toAjax(skuService.updateById(sku));
     }
 

vue/src/views/goods/goods/goods.vue

@@ -115,13 +115,14 @@
 
     <el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="ID" align="center" prop="id" width="100"/>
-      <el-table-column label="商品名称" align="left" prop="name" width="300"/>
+      <el-table-column label="图片" align="center" prop="image" width="60">
-      <el-table-column label="商品图片" align="center" prop="image" width="100">
         <template slot-scope="scope">
           <image-preview :src="scope.row.image" :width="50" :height="50"/>
         </template>
       </el-table-column>
+      <el-table-column label="商品名称" align="left" prop="name" width="300"/>
+
       <el-table-column label="商品编号" align="center" prop="goodsNum" />
       <!-- <el-table-column label="单位名称" align="center" prop="unitName" /> -->
       <el-table-column label="商品分类" align="center" prop="categoryId" >
@@ -150,9 +151,9 @@
       <el-table-column label="重量" align="center" prop="weight" />
       <el-table-column label="0启用   1禁用" align="center" prop="disable" />
       <el-table-column label="保质期" align="center" prop="period" /> -->
-      <el-table-column label="预计采购价格" align="center" prop="purPrice" />
+      <el-table-column label="采购价" align="center" prop="purPrice" />
-      <el-table-column label="建议批发价" align="center" prop="wholePrice" />
+<!--      <el-table-column label="建议批发价" align="center" prop="wholePrice" />-->
-      <el-table-column label="建议零售价" align="center" prop="retailPrice" />
+      <el-table-column label="零售价" align="center" prop="retailPrice" />
       <!-- <el-table-column label="单位成本" align="center" prop="unitCost" /> -->
       <el-table-column label="供应商" align="center" prop="supplierId" >
         <template slot-scope="scope">
@@ -243,7 +244,7 @@
         <el-form-item label="商品名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入商品名称" />
         </el-form-item>
-        <el-form-item label="商品图片地址" prop="image">
+        <el-form-item label="商品图片" prop="image">
           <image-upload v-model="form.image"/>
         </el-form-item>
         <el-form-item label="商品编号" prop="number">
@@ -259,9 +260,7 @@
         <!--        <el-form-item label="条码" prop="barCode">-->
         <!--          <el-input v-model="form.barCode" placeholder="请输入条码" />-->
         <!--        </el-form-item>-->
-        <el-form-item label="备注" prop="remark">
+
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
         <!--        <el-form-item label="衣长/裙长/裤长" prop="length">-->
         <!--          <el-input v-model="form.length" placeholder="请输入衣长/裙长/裤长" />-->
         <!--        </el-form-item>-->
@@ -289,13 +288,13 @@
         <!--        <el-form-item label="保质期" prop="period">-->
         <!--          <el-input v-model="form.period" placeholder="请输入保质期" />-->
         <!--        </el-form-item>-->
-        <el-form-item label="预计采购价格" prop="purPrice">
+        <el-form-item label="采购价" prop="purPrice">
           <el-input v-model="form.purPrice" placeholder="请输入预计采购价格" />
         </el-form-item>
-        <el-form-item label="建议批发价" prop="wholePrice">
+<!--        <el-form-item label="建议批发价" prop="wholePrice">-->
-          <el-input v-model="form.wholePrice" placeholder="请输入建议批发价" />
+<!--          <el-input v-model="form.wholePrice" placeholder="请输入建议批发价" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="建议零售价" prop="retailPrice">
+        <el-form-item label="零售价" prop="retailPrice">
           <el-input v-model="form.retailPrice" placeholder="请输入建议零售价" />
         </el-form-item>
         <!--        <el-form-item label="单位成本" prop="unitCost">-->
@@ -308,6 +307,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status"   placeholder="状态">
             <el-option label="销售中" :value="1"></el-option>
@@ -407,6 +409,11 @@ export default {
       skuList: [],
       // 表单校验
       rules: {
+        name: [{ required: true, message: "不能为空", trigger: "blur" }],
+        number: [{ required: true, message: "不能为空", trigger: "blur" }],
+        supplierId: [{ required: true, message: "不能为空", trigger: "blur" }],
+        purPrice: [{ required: true, message: "不能为空", trigger: "blur" }],
+        retailPrice: [{ required: true, message: "不能为空", trigger: "blur" }],
         status: [
           { required: true, message: "状态1销售中2已下架不能为空", trigger: "change" }
         ],
@@ -428,9 +435,8 @@ export default {
         width3: [
           { required: true, message: "臀阔不能为空", trigger: "blur" }
         ],
-        weight: [
+        weight: [{ required: true, message: "重量不能为空", trigger: "blur" }],
-          { required: true, message: "重量不能为空", trigger: "blur" }
+
-        ],
       }
     };
   },

vue/src/views/goods/goods/goods_sku.vue

@@ -59,20 +59,22 @@
 
     <el-table v-loading="loading" :data="goodsSpecList" @selection-change="handleSelectionChange">
 <!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="SkuId" align="center" prop="id" />
+      <el-table-column label="SkuId" align="center" prop="id" width="100"/>
-      <el-table-column label="外部ErpSkuId" align="center" prop="outerErpSkuId" />
+      <el-table-column label="图片" align="center" prop="colorImage" width="60">
-      <el-table-column label="商品名" align="center" prop="goodsName" />
-      <el-table-column label="Sku名" align="center" prop="skuName" />
-      <el-table-column label="Sku编码" align="center" prop="skuCode" />
-      <el-table-column label="规格1" align="center" prop="colorValue" />
-      <el-table-column label="图片" align="center" prop="colorImage" width="100">
         <template slot-scope="scope">
           <image-preview :src="scope.row.colorImage" :width="50" :height="50"/>
         </template>
       </el-table-column>
+      <el-table-column label="商品名" align="left" prop="goodsName" width="300"/>
+<!--      <el-table-column label="Sku名" align="center" prop="skuName" width="200"/>-->
+      <el-table-column label="Sku编码" align="center" prop="skuCode" />
+      <el-table-column label="外部SkuId" align="center" prop="outerErpSkuId" />
+      <el-table-column label="规格1" align="center" prop="colorValue" />
+
       <el-table-column label="规格2" align="center" prop="sizeValue" />
       <el-table-column label="规格3" align="center" prop="styleValue" />
-      <el-table-column label="建议零售价" align="center" prop="retailPrice" :formatter="amountFormatter"/>
+      <el-table-column label="采购价" align="center" prop="purPrice" :formatter="amountFormatter"/>
+      <el-table-column label="零售价" align="center" prop="retailPrice" :formatter="amountFormatter"/>
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">
           <el-tag size="small" v-if="scope.row.status===1">销售中</el-tag>
@@ -104,12 +106,12 @@
     <!-- 添加或修改商品规格库存管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-<!--        <el-form-item label="商品名" prop="goodsName">-->
+        <el-form-item label="商品名" prop="goodsName">
-<!--          <el-input v-model="form.goodsName" placeholder="请输入商品名" />-->
+          <el-input v-model="form.goodsName" disabled placeholder="请输入商品名" />
-<!--        </el-form-item>-->
-        <el-form-item label="SKU名" prop="skuName">
-          <el-input v-model="form.skuName" placeholder="请输入SKU名" />
         </el-form-item>
+<!--        <el-form-item label="SKU名" prop="skuName">-->
+<!--          <el-input v-model="form.skuName" placeholder="请输入SKU名" />-->
+<!--        </el-form-item>-->
         <el-form-item label="SKU编码" prop="skuCode">
           <el-input v-model="form.skuCode" placeholder="请输入SKU编码" />
         </el-form-item>
@@ -118,24 +120,27 @@
 <!--          <image-upload v-model="form.colorImage" :limit="1" />-->
           <el-input v-model="form.colorImage" placeholder="图片URL" />
         </el-form-item>
-        <el-form-item label="售价" prop="retailPrice">
+        <el-form-item label="采购价" prop="purPrice">
-          <el-input type="number" v-model.number="form.retailPrice" placeholder="售价" />
+          <el-input type="number" v-model.number="form.purPrice" placeholder="采购价" />
+        </el-form-item>
+        <el-form-item label="零售价" prop="retailPrice">
+          <el-input type="number" v-model.number="form.retailPrice" placeholder="零售价" />
         </el-form-item>
 
-<!--        <el-form-item label="规格1" prop="colorValue">-->
+        <el-form-item label="规格1" prop="colorValue">
-<!--          <el-input v-model="form.colorValue" placeholder="请输入规格1" />-->
+          <el-input v-model="form.colorValue" placeholder="请输入规格1" />
-<!--        </el-form-item>-->
-<!--        <el-form-item label="规格2" prop="sizeValue">-->
-<!--          <el-input v-model="form.sizeValue" placeholder="请输入规格2" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="规格3" prop="styleValue">-->
-<!--          <el-input v-model="form.styleValue" placeholder="请输入规格3" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="ERP商品ID" prop="outerErpGoodsId">
-          <el-input type="number" v-model.number="form.outerErpGoodsId" placeholder="请输入ERP商品ID" />
         </el-form-item>
-        <el-form-item label="ERP商品SkuID" prop="outerErpSkuId">
+        <el-form-item label="规格2" prop="sizeValue">
-          <el-input type="number" v-model.number="form.outerErpSkuId" placeholder="请输入ERP商品SkuID" />
+          <el-input v-model="form.sizeValue" placeholder="请输入规格2" />
+        </el-form-item>
+        <el-form-item label="规格3" prop="styleValue">
+          <el-input v-model="form.styleValue" placeholder="请输入规格3" />
+        </el-form-item>
+<!--        <el-form-item label="外部SkuID" prop="outerErpGoodsId">-->
+<!--          <el-input type="number" v-model.number="form.outerErpGoodsId" placeholder="请输入ERP商品ID" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="外部SkuID" prop="outerErpSkuId">
+          <el-input type="number" v-model.number="form.outerErpSkuId" placeholder="请输入外部SkuID" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" filterable  placeholder="状态">
@@ -207,10 +212,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        goodsName: [{ required: true, message: "不能为空", trigger: "blur" }],
+        // goodsName: [{ required: true, message: "不能为空", trigger: "blur" }],
-        skuName: [{ required: true, message: "不能为空", trigger: "blur" }],
+        // skuName: [{ required: true, message: "不能为空", trigger: "blur" }],
         skuCode: [{ required: true, message: "SKU不能为空", trigger: "blur" }],
+        purPrice: [{ required: true, message: "不能为空", trigger: "blur" }],
         retailPrice: [{ required: true, message: "不能为空", trigger: "blur" }],
+        status: [{ required: true, message: "不能为空", trigger: "blur" }],
 
       }
     };

vue/src/views/goods/spec/index.vue

@@ -1,313 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
-
-      <el-form-item label="ERP商品SKUID" prop="outerErpSkuId">
-        <el-input
-          v-model="queryParams.outerErpSkuId"
-          placeholder="请输入ERP商品SKUID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="SKU编码" prop="skuCode">
-        <el-input
-          v-model="queryParams.skuCode"
-          placeholder="请输入SKU编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="disable">
-        <el-select v-model="queryParams.status" filterable  placeholder="状态">
-          <el-option label="销售中" value="1"></el-option>
-          <el-option label="已下架" value="2"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-
-      <el-col :span="1.5">
-<!--        <el-col :span="1.5">-->
-<!--          <el-button-->
-<!--            type="primary"-->
-<!--            plain-->
-<!--            icon="el-icon-plus"-->
-<!--            size="mini"-->
-<!--            @click="handleAdd"-->
-<!--            v-hasPermi="['goods:goods:add']"-->
-<!--          >添加商品SKU</el-button>-->
-<!--        </el-col>-->
-<!--        <el-col :span="1.5">-->
-<!--          <el-button-->
-<!--            type="success"-->
-<!--            plain-->
-<!--            icon="el-icon-edit"-->
-<!--            size="mini"-->
-<!--            @click="handleImport"-->
-<!--            v-hasPermi="['goods:goods:edit']"-->
-<!--          >导入商品SKU</el-button>-->
-<!--        </el-col>-->
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="goodsSpecList" @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="SkuId" align="center" prop="id"  width="80" />
-      <el-table-column label="图片" align="center" prop="colorImage" width="100">
-        <template slot-scope="scope">
-          <image-preview :src="scope.row.colorImage" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="商品名" align="left" prop="goodsName" />
-      <el-table-column label="外部ErpSkuId" align="center" prop="outerErpSkuId" />
-
-<!--      <el-table-column label="Sku名" align="center" prop="skuName" />-->
-      <el-table-column label="Sku编码" align="center" prop="skuCode" />
-      <el-table-column label="规格1" align="center" prop="colorValue" />
-
-      <el-table-column label="规格2" align="center" prop="sizeValue" />
-      <el-table-column label="规格3" align="center" prop="styleValue" />
-      <el-table-column label="建议零售价" align="center" prop="retailPrice" :formatter="amountFormatter"/>
-      <el-table-column label="状态" align="center" prop="status" >
-        <template slot-scope="scope">
-          <el-tag size="small" v-if="scope.row.status===1">销售中</el-tag>
-          <el-tag size="small" v-if="scope.row.status===2">已下架</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['api:goodsSpec:edit']"
-          >修改</el-button>
-
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改商品规格库存管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-<!--        <el-form-item label="商品名" prop="goodsName">-->
-<!--          <el-input v-model="form.goodsName" placeholder="请输入商品名" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="SKU名" prop="skuName">
-          <el-input v-model="form.skuName" placeholder="请输入SKU名" />
-        </el-form-item>
-        <el-form-item label="SKU编码" prop="skuCode">
-          <el-input v-model="form.skuCode" placeholder="请输入SKU编码" />
-        </el-form-item>
-
-        <el-form-item label="图片URL" prop="colorImage">
-<!--          <image-upload v-model="form.colorImage" :limit="1" />-->
-          <el-input v-model="form.colorImage" placeholder="图片URL" />
-        </el-form-item>
-        <el-form-item label="售价" prop="retailPrice">
-          <el-input type="number" v-model.number="form.retailPrice" placeholder="售价" />
-        </el-form-item>
-
-<!--        <el-form-item label="规格1" prop="colorValue">-->
-<!--          <el-input v-model="form.colorValue" placeholder="请输入规格1" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="规格2" prop="sizeValue">-->
-<!--          <el-input v-model="form.sizeValue" placeholder="请输入规格2" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="规格3" prop="styleValue">-->
-<!--          <el-input v-model="form.styleValue" placeholder="请输入规格3" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="ERP商品ID" prop="outerErpGoodsId">
-          <el-input type="number" v-model.number="form.outerErpGoodsId" placeholder="请输入ERP商品ID" />
-        </el-form-item>
-        <el-form-item label="ERP商品SkuID" prop="outerErpSkuId">
-          <el-input type="number" v-model.number="form.outerErpSkuId" placeholder="请输入ERP商品SkuID" />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="form.status" filterable  placeholder="状态">
-            <el-option label="销售中" :value="1"></el-option>
-            <el-option label="已下架" :value="2"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 导入ERP商品sku -->
-    <el-dialog title="导入商品SKU" :visible.sync="importOpen" width="400px" append-to-body>
-      <el-upload
-        class="upload-demo"
-        :headers="headers"
-        drag
-        action="/dev-api/api/erp-api/goods/goods_sku_import"
-        accept="xlsx"
-        multiple >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
-      </el-upload>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {listGoodsSpec, getGoodsSpec, updateGoodsSpec, addGoodsSpec} from "@/api/goods/goodsSpec";
-import {getToken} from "@/utils/auth";
-
-export default {
-  name: "GoodsSpec",
-  data() {
-    return {
-      importOpen:false,
-      headers: { 'Authorization': 'Bearer ' + getToken() },
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 商品规格库存管理表格数据
-      goodsSpecList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        erpGoodsId: null,
-        erpSkuId: null,
-        skuName: null,
-        skuNum: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        goodsName: [{ required: true, message: "不能为空", trigger: "blur" }],
-        skuName: [{ required: true, message: "不能为空", trigger: "blur" }],
-        skuCode: [{ required: true, message: "SKU不能为空", trigger: "blur" }],
-        retailPrice: [{ required: true, message: "不能为空", trigger: "blur" }],
-
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    amountFormatter(row, column, cellValue, index) {
-      return '￥' + parseFloat(cellValue).toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,');
-    },
-    /** 查询商品规格库存管理列表 */
-    getList() {
-      this.loading = true;
-      listGoodsSpec(this.queryParams).then(response => {
-        this.goodsSpecList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        goodsId: null,
-        skuName: null,
-        skuNum: null,
-        colorValue: null,
-        colorImage: null,
-        sizeValue: null,
-        styleValue: null,
-        erpGoodsId: null,
-        erpSkuId: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getGoodsSpec(id).then(response => {
-        this.form = response.data;
-        this.form.disable = response.data.disable+''
-        this.open = true;
-        this.title = "修改商品规格库存管理";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateGoodsSpec(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          }else{
-            addGoodsSpec(this.form).then(response => {
-              this.$modal.msgSuccess("添加成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    handleAdd(){
-      this.open = true
-    },
-    handleImport(){
-      this.importOpen = true
-    }
-  }
-};
-</script>