Merge branch 'sit'

src/layout/components/Sidebar/Logo.vue

@@ -47,7 +47,7 @@ export default {
   width: 100%;
   height: 80px;
   line-height: 88px;
-  background:  #63cbe7;
+  // background:  #63cbe7;
   text-align: center;
   overflow: hidden;
   z-index: 2;;
@@ -68,7 +68,8 @@ export default {
       display: inline-block;
       margin: 0;
       vertical-align: top;
-      color: #000;
+      // color: #000;
+      color: #fff;
       font-weight: 600;
       line-height: 88px;
       height: 80px;;

src/styles/element-variables.scss

@@ -4,17 +4,11 @@
 **/
 
 /* theme color */
-// $--color-primary: #1890ff;
-// $--color-success: #13ce66;
-// $--color-warning: #ffba00;
-// $--color-danger: #ff4949;
-// $--color-primary: #38c1e7;
-$--color-primary: #63cbe7;
-
-$--color-success: #7dd7c5;
-$--color-warning: #ffb05b;
-$--color-danger: #ff8888;
-$--color-info: rgb(192, 196, 204);
+$--color-primary: #1890ff;
+$--color-success: #13ce66;
+$--color-warning: #ffba00;
+$--color-danger: #ff4949;
+// $--color-info: #1E1E1E;
 
 $--button-font-weight: 400;
 

src/styles/variables.scss

@@ -1,25 +1,23 @@
 // base color
-$blue: #324157;
-$light-blue: #3a71a8;
-$red: #c03639;
-$pink: #e65d6e;
-$green: #30b08f;
-$tiffany: #4ab7bd;
-$yellow: #fec171;
-$panGreen: #30b08f;
-
-$menuText: #f0ffff;
-$menuActiveText: #076c87;
-$subMenuActiveText: #076c87; // https://github.com/ElemeFE/element/issues/12951
-
-$menuBg: #63cbe7;
-$menuHover: #63cbe7;
-
-$subMenuBg: #7ad3eb;
-$subMenuHover: #7ad3eb;
-
-
-
+$blue:#324157;
+$light-blue:#3A71A8;
+$red:#C03639;
+$pink: #E65D6E;
+$green: #30B08F;
+$tiffany: #4AB7BD;
+$yellow:#FEC171;
+$panGreen: #30B08F;
+
+// sidebar
+$menuText:#bfcbd9;
+$menuActiveText:#409EFF;
+$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
+
+$menuBg:#304156;
+$menuHover:#263445;
+
+$subMenuBg:#1f2d3d;
+$subMenuHover:#001528;
 
 $sideBarWidth: 210px;
 

src/views/stock/goodsRepertory/columns.js

@@ -55,9 +55,15 @@ const options9 = [
 const listCol = [
   {
     prop: "skuCode",
-    label: "编号",
+    label: "商品上线编号",
     fixed: "left",
-    width: "160px",
+    width: "155px",
+  },
+  {
+    prop: "spuCode",
+    label: "商品成本编号",
+    fixed: "left",
+    width: "158px",
   },
   {
     prop: "platform_name",

src/views/stock/goodsRepertory/index.vue

@@ -176,7 +176,8 @@
                   placeholder="关键字类型"
                 >
                   <el-option label="商品名称" value="1" />
-                  <el-option label="商品编号" value="2" />
+                  <el-option label="商品上线编号" value="2" />
+                  <el-option label="商品成本编号" value="8" />
                   <!-- <el-option label="平台编号" value="3" /> -->
                   <!-- <el-option label="供应商编号" value="4" /> -->
                   <el-option label="业务企业编号" value="5" />
@@ -306,6 +307,7 @@ export default {
       loading: false,
       parmValue: {
         good_name: "", //商品名称
+        skucode:"",
         spucode: "", //商品编号
         cat_id: "", //商品分类
         start: "", //开始日期
@@ -373,6 +375,7 @@ export default {
       };
       this.parmValue = {
         good_name: "", //商品名称
+        skucode:"",
         spucode: "", //商品编号
         cat_id: "", //商品分类
         start: "", //开始日期
@@ -578,7 +581,8 @@ export default {
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.good_name = this.select === "1" ? this.sinput : ""; //商品名称
-      model.spucode = this.select === "2" ? this.sinput : ""; //商品编号
+       model.skucode = this.select === "2" ? this.sinput : ""; //商品编号
+      model.spucode = this.select === "8" ? this.sinput : ""; //商品编号
       // model.platform_code = this.select === "1" ? this.sinput : ""; //平台编码
       // model.supplierNo = this.select === "1" ? this.sinput : ""; //供应商编号
       model.companyNo = this.select === "5" ? this.sinput : ""; //业务企业编号