1

src/views/goodStore/goodsRepertory/columns.js

@@ -49,8 +49,8 @@ const options8 = [
 
 //是否库存品
 const options9 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
+  { id: "0", name: "非库存品" },
+  { id: "1", name: "库存品" },
 ]
 const listCol = [
   {
@@ -99,6 +99,12 @@ const listCol = [
     _slot_: "good_type",
     width: "70px",
   },
+  {
+    prop: "is_stock",
+    label: "库存类型",
+    _slot_: "is_stock",
+    width: "70px",
+  },
   {
     prop: "brand_name",
     label: "品牌",
@@ -111,8 +117,8 @@ const listCol = [
   },
   {
     prop: "moq",
-    label: "起订量",
-    width: "70px",
+    label: "最小起订量",
+    width: "85px",
   },
   {
     prop: "market_price",

src/views/goodStore/goodsRepertory/index.vue

@@ -236,26 +236,22 @@
           "
         ></el-tag>
       </template>
+      <template #is_stock="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="scope.row.is_stock == '0' ? 'warning' : ''"
+          v-text="
+            (options9.find((item) => item.id == scope.row.is_stock) || {})
+              .name || '--'
+          "
+        ></el-tag>
+      </template>
 
       <template #operation="{ scope }">
         <!-- v-if="powers.some((item) => item == '007')" -->
         <el-tooltip effect="dark" content="详情" placement="top">
           <i class="el-icon-view tb-icon" @click="openDilog(scope.row)"></i>
         </el-tooltip>
-        <!-- <el-tooltip
-          v-if="
-            powers.some((item) => item == '078') &&
-            (scope.row.status === '7' || scope.row.status === '8')
-          "
-          effect="dark"
-          content="重新发起上线流程"
-          placement="top"
-        >
-          <i
-            class="el-icon-upload tb-icon"
-            @click="get_againonline(scope.row.skuCode)"
-          ></i>
-        </el-tooltip> -->
       </template>
     </ex-table>
     <no-auth v-else></no-auth>
@@ -276,11 +272,14 @@ import asyncRequest from "@/apis/service/goodStore/goodsRepertory";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
-import { listCol, options1, options4, options8 } from "./columns";
-import {} from "@/components/show-goods-data-table-modal";
+import { listCol, options1, options4, options8, options9 } from "./columns";
+import { showGoodsDataTableModal } from "@/components/show-goods-data-table-modal";
 export default {
   name: "goodsRepertory",
   mixins: [mixinPage, resToken],
+  components: {
+    showGoodsDataTableModal,
+  },
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -303,6 +302,7 @@ export default {
       options1: options1,
       options4: options4,
       options8: options8,
+      options9: options9,
       loading: false,
       parmValue: {
         good_name: "", //商品名称
@@ -358,6 +358,8 @@ export default {
     openDilog(row) {
       this.row = row;
       this.visible = true;
+      console.log(this.row);
+      console.log(this.visible);
     },
 
     restSearch() {