Merge branch 'company' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into company

src/assets/js/statusList.js

@@ -44,6 +44,12 @@ const has_account_list = [
   { code: "1", type: "", name: "已开通" },
   { code: "0", type: "info", name: "未开通" },
 ];
+
+export const isStockOptions = [
+  { value: '0', label: '非库存品' },
+  { value: '1', label: '库存品' }
+]
+
 const accountLevels = {
   super: "1",
   business: "2",

src/views/goodStore/goodsCost/index.vue

@@ -213,6 +213,16 @@
                 </el-select></el-input
               >
             </el-col>
+ 
+            <el-col :span="4" style="margin-top:10px; margin-left:10px">
+              <el-select v-model="parmValue.is_stock" size="mini" placeholder="商品类型" clearable  @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                ">
+                <el-option v-for="opt in isStockOptions" :key="opt.value" :value="opt.value" :label="opt.label" />
+              </el-select>
+            </el-col>
           </el-row>
         </div></template
       >
@@ -432,13 +442,12 @@
 <script>
 import asyncRequest from "@/apis/service/goodStore/goodsCost";
 import { listCol, options1, options4 } from "./columns";
-import { has_account_list } from "@/assets/js/statusList";
+import { has_account_list, isStockOptions } from "@/assets/js/statusList";
 import mixinPage from "@/mixins/elPaginationHandle";
 import companyHelper from "@/mixins/companyHelper";
 import addEdit from "./components/addEdit";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
-
 export default {
   name: "goodsCost",
   mixins: [mixinPage, resToken, companyHelper],
@@ -474,6 +483,7 @@ export default {
       dialogFormVisible: false,
       has_account_list,
       donline_formStOps: [],
+      isStockOptions,
       donline_form: {
         offline_reason: "",
         offline_remark: "",
@@ -542,6 +552,7 @@ export default {
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
+        is_stock: "",
         start: "",
         end: "",
         status: "",

src/views/goodStore/goodsOnline/columns.js

@@ -36,11 +36,11 @@ const options7 = [
   { id: '1', name: '是' }
 ]
 const options8 = [
-    { id: "1", name: "待完善成本",type:"info" },
-    { id: "2", name: "待产品审核",type:"warning" },
-    { id: "3", name: "上线已成功",type:"success" },
-    { id: "4", name: "上线已驳回",type:"danger" },
-    { id: "5", name: "商品已下线" ,type:"info"},
+  { id: '1', name: '待完善成本', type: 'info' },
+  { id: '2', name: '待产品审核', type: 'warning' },
+  { id: '3', name: '上线已成功', type: 'success' },
+  { id: '4', name: '上线已驳回', type: 'danger' },
+  { id: '5', name: '商品已下线', type: 'info' }
 ]
 const listCol = [
   {
@@ -81,6 +81,12 @@ const listCol = [
     width: '100px'
   },
 
+  {
+    prop: 'is_stock',
+    label: '商品类型',
+    _slot_: 'is_stock'
+  },
+
   {
     prop: 'status',
     label: '状态',

src/views/goodStore/goodsOnline/index.vue

@@ -161,6 +161,17 @@
                   <el-option label="上线创建人部门" value="9" /> </el-select
               ></el-input>
             </el-col>
+
+            <el-col :span="4" style="margin-left:10px">
+              <el-select v-model="parmValue.is_stock" size="mini" placeholder="商品类型" clearable  @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                ">
+                <el-option v-for="opt in isStockOptions" :key="opt.value" :value="opt.value" :label="opt.label" />
+              </el-select>
+            </el-col>
+
             <el-col
               :span="3"
               class="fr"
@@ -209,6 +220,10 @@
           />
         </div>
       </template>
+      <template #is_stock="{ scope }">
+        <el-tag size="mini">{{ (isStockOptions.find(({value}) => value === String(scope.row.is_stock)) || {}).label}}</el-tag>
+      </template>
+
       <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"
@@ -380,6 +395,7 @@ import urlConfig from "@/apis/url-config";
 import resToken from "@/mixins/resToken";
 import { listCol, options1, options8 } from "./columns";
 import companyHelper from "@/mixins/companyHelper";
+import { isStockOptions } from "@/assets/js/statusList";
 
 export default {
   name: "goodsOnline",
@@ -403,6 +419,7 @@ export default {
       }
     };
     return {
+      isStockOptions,
       dialogFormVisible: false,
       donline_formStOps: [],
       donline_form: {
@@ -439,6 +456,7 @@ export default {
       options8: options8,
       loading: false,
       parmValue: {
+        is_stock: "",
         good_name: "", //商品名称
         spucode: "", //商品编号
         skucode: "", //商品编号

src/views/serviceParam/storeSet/addEdit.vue

@@ -331,14 +331,14 @@ export default {
             trigger: 'change'
           }
         ],
-        supplierNo: [
-          {
-            // type: 'array',
-            required: true,
-            message: '供应商公司',
-            trigger: 'change'
-          }
-        ],
+        // supplierNo: [
+        //   {
+        //     // type: 'array',
+        //     required: true,
+        //     message: '供应商公司',
+        //     trigger: 'change'
+        //   }
+        // ],
         addr_code: [
           {
             type: 'array',