Merge branch 'sit'

src/views/serviceParam/storeSet/index.vue

@@ -149,6 +149,17 @@
             "
           ></el-tag>
         </template>
+         <template #wsmtype="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type=" ''"
+            v-text="
+              (options.find((item) => item.value == scope.row.wsmtype) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+        
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((item) => item == '007')"
@@ -252,6 +263,28 @@ export default {
   },
   data() {
     return {
+        options: [
+        // {
+        //   value: "1",
+        //   label: "系统仓",
+        // },
+        //   {
+        //   value: "2",
+        //   label: "虚拟仓",
+        // },
+        //     {
+        //   value: "3",
+        //   label: "自建仓",
+        // },
+        {
+          value: "5",
+          label: "销售仓",
+        },
+        {
+          value: "4",
+          label: "次品仓",
+        },
+      ],
       select: "1", //选择
       input: "",
       supplierNo: [], //供应商
@@ -298,6 +331,11 @@ export default {
         {
           prop: "name",
           label: "仓库名称",
+        },
+         {
+          prop: "wsmtype",
+          label: "仓库类型",
+          _slot_: "wsmtype",
         },
         {
           prop: "supplierNo",