Merge branch 'sit' into dev

src/views/goodStore/goodsCost/index.vue

@@ -276,7 +276,14 @@
         >
           <i
             class="el-icon-c-scale-to-original tb-icon"
-            @click="wantto(scope.row.spuCode, scope.row.status, '2')"
+            @click="
+              wantto(
+                scope.row.is_online,
+                scope.row.spuCode,
+                scope.row.status,
+                '2'
+              )
+            "
           ></i>
         </el-tooltip>
         <el-tooltip
@@ -291,7 +298,14 @@
         >
           <i
             class="el-icon-coin tb-icon"
-            @click="wantto(scope.row.spuCode, scope.row.status, '3')"
+            @click="
+              wantto(
+                scope.row.is_online,
+                scope.row.spuCode,
+                scope.row.status,
+                '3'
+              )
+            "
           ></i>
         </el-tooltip>
         <el-tooltip
@@ -403,7 +417,7 @@ export default {
           name: "复制商品待编辑",
           type: "info",
         },
-         {
+        {
           code: "8",
           name: "咨询商品待编辑",
           type: "info",
@@ -489,7 +503,12 @@ export default {
       };
       this.searchList();
     },
-    wantto(code, ntype, wtype) {
+    wantto(isonline, code, ntype, wtype) {
+      console.log(isonline);
+      if (isonline + "" === "1") {
+        this.$message.warning("已上线的商品需要下线才能修改！");
+        return;
+      }
       if (ntype === "0") {
         this.$message.warning("新建商品成正在审核中,请审核结束后再修改！");
         return;

src/views/goodStore/goodsRepertory/columns.js

@@ -97,37 +97,33 @@ const listCol = [
     prop: "good_type",
     label: "定制",
     _slot_: "good_type",
-    width: "50px",
+    width: "70px",
   },
   {
     prop: "brand_name",
     label: "品牌",
   },
-  {
-    prop: "companyNo",
-    label: "业务公司编号",
-    width: "155px",
-  },
-  {
-    prop: "company",
-    label: "业务公司名称",
-    width: "150px",
-  },
+
   {
     prop: "plat_code",
     label: "平台商品编号",
     width: "100px",
   },
   {
-    prop: "plat_code",
+    prop: "moq",
     label: "起订量",
     width: "70px",
   },
   {
-    prop: "plat_code",
+    prop: "market_price",
     label: "售价",
     width: "70px",
   },
+  {
+    prop: "stock_total",
+    label: "可用库存",
+    width: "70px",
+  },
   {
     prop: "purchase",
     label: "采购员",
@@ -139,10 +135,20 @@ const listCol = [
     width: "70px",
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-    width: "140px",
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "155px",
   },
+  {
+    prop: "company",
+    label: "业务公司名称",
+    width: "150px",
+  },
+  // {
+  //   prop: "addtime",
+  //   label: "创建时间",
+  //   width: "140px",
+  // },
   {
     prop: "",
     label: "操作",

src/views/goodStore/goodsRepertory/index.vue

@@ -321,7 +321,7 @@ export default {
         good_type: "", //是否定制
         brand_id: "", //品牌
         companyNo: "", //业务企业编号
-        exam_status: "6", //审核状态
+        // exam_status: "6", //审核状态
         plat_code: "", //平台商品编号
         creater: "", //
       },
@@ -386,7 +386,7 @@ export default {
         good_type: "", //是否定制
         brand_id: "", //品牌
         companyNo: "", //业务企业编号
-        exam_status: "6", //审核状态
+        // exam_status: "6", //审核状态
         plat_code: "", //平台商品编号
         creater: "", //
       };

src/views/sellOut/project/columns.js

@@ -11,6 +11,13 @@ export default [
     label: "项目名称",
     'min-width': "120px",
   },
+  {
+    prop: "low_rate",
+    label: "项目毛利率",
+    _slot_: "low_rate",
+    'width': "85px",
+  },
+  
   {
     prop: "status",
     label: "状态",

src/views/sellOut/project/index.vue

@@ -139,6 +139,14 @@
             </el-row>
           </div>
         </template>
+        <template #low_rate="{ scope }">
+          <el-tag
+            v-if="scope.row"
+            :type="parseInt(scope.row.low_rate) == 0 ? 'danger' : ''"
+            :size="tablebtnSize"
+            v-text="parseInt(scope.row.low_rate) == 0 ? '未设置' : '已设置'"
+          ></el-tag>
+        </template>
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -170,7 +170,7 @@
       :id="modelId"
       :sitem="modelItem"
       @refresh="refresh"
-      @closeModel="modelShowModel = false"
+      @cancel="closeModel"
     />
     <in-addr-model
       :show-model="addrmodel"