1

src/apis/service/goodStore/dealGoodsPool/index.js

@@ -5,6 +5,6 @@ export default {
   // 分页查询
   list: (data, params) => http(api + "zixunlist", data, "post", params),
   // 添加
-  online_add: (data, params) => http(api + "gooduponline", data, "post", params),
+  online_add: (data, params) => http(api + "gooduponlinezixun", data, "post", params),
 
 };

src/views/goodStore/dealGoodsPool/index.vue

@@ -296,16 +296,6 @@ export default {
         this.$message.warning("商品数量不能超过100！");
         return;
       }
-      let isok = true;
-      this.changeList.forEach((e) => {
-        if (e.status !== "1") {
-          isok = false;
-        }
-      });
-      if (!isok) {
-        this.$message.warning("只有审核通过的商品可以上线！");
-        return;
-      }
       this.showModel = true;
     },
     //选中触发函数

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1882,7 +1882,11 @@ export default {
             good_thumb_img: good_thumb_img || "",
             good_img: good_img ? (good_img || "").split(",") : [],
             good_info_img: good_info_img
-              ? (good_info_img || "").split(",")
+              ? (Object.prototype.toString.call(good_info_img) ===
+                "[object Array]"
+                  ? ""
+                  : good_info_img || ""
+                ).split(",")
               : [],
             //固定阶梯成本
             demo_fee: demo_fee || "",

src/views/goodStore/goodsCost/index.vue

@@ -229,7 +229,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((item) => item == '007')&&(scope.row.status !== '8')"
           effect="dark"
           content="详情"
           placement="top"
@@ -248,7 +248,9 @@
           v-if="
             (powers.some((item) => item == '005') &&
               scope.row.status === '7') ||
-            (powers.some((item) => item == '005') && scope.row.status === '6')
+            (powers.some((item) => item == '005') && scope.row.status === '6')||
+            (powers.some((item) => item == '005') && scope.row.status === '8')
+         
           "
           effect="dark"
           content="修改"

src/views/stock/check/components/resultUplod.vue

@@ -9,8 +9,8 @@
       style="width: 100%"
     >
       <el-table-column
-        prop="good_type_code"
-        label="商品属性编号"
+        prop="spuCode"
+        label="商品编号"
         min-width="130"
       />
       <el-table-column prop="good_name" label="商品名称" min-width="200" />

src/views/stock/check/components/resultUplodModel.vue

@@ -56,9 +56,9 @@
 </template>
 <script>
 import urlConfig from "@/apis/url-config";
-import { getToken } from "@/utils/auth";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/stock/check/detail";
+import { isnumber } from "@/utils/validate";
 export default {
   name: "resultUplodModel",
   props: ["showModel", "id"],
@@ -72,7 +72,7 @@ export default {
       isfile: false,
       head: [
         "商品编码",
-        "商品属性编码",
+        // "商品属性编码",
         "商品名称",
         "商品描述",
         "品牌",
@@ -118,7 +118,6 @@ export default {
     },
   },
   methods: {
-    
     async initForm() {
       this.loading = true;
       this.isfile = false;
@@ -178,9 +177,39 @@ export default {
     async submitForm() {
       if (!this.loading) {
         this.loading = true;
+        let isok = true,
+          isn = true,
+          list = [];
+        this.tableData.forEach((v) => {
+          if (v.value14 === "") {
+            isok = false;
+          }
+        });
+        if (!isok) {
+          this.$message.warning("盘点库存不能为空！");
+          this.loading = false;
+          return;
+        }
+        this.tableData.forEach((v) => {
+          list.push({
+            value0: v.value0,
+            value1: v.value1,
+            // value2: v.value2,
+            value14: v.value14+"",
+          });
+          if (!isnumber(v.value14)) {
+            isn = false;
+          }
+        });
+        if (!isn) {
+          this.$message.warning("盘点库存只能为正整数！");
+          this.loading = false;
+          return;
+        }
+
         let model = {
           id: this.id,
-          data: this.tableData,
+          data: list,
         };
         const res = await asyncRequest.checkimport(model);
         this.loading = false;