Merge branch 'master' into 测试

src/views/group/finance/purchase-warehousing/index.vue

@@ -178,43 +178,6 @@ const config = computed(() => {
         width: 120,
       },
     },
-    // {
-    //   attrs: {
-    //     label: "未税金额",
-    //     prop: "dimensionality",
-    //     width: 160,
-    //   },
-    //   render(val) {
-    //     return proxy.moneyFormat(val);
-    //   },
-    // },
-    // {
-    //   attrs: {
-    //     label: "税额",
-    //     prop: "dimensionality",
-    //     width: 160,
-    //   },
-    //   render(val) {
-    //     return proxy.moneyFormat(val);
-    //   },
-    // },
-    // {
-    //   attrs: {
-    //     label: "价税合计金额",
-    //     prop: "dimensionality",
-    //     width: 160,
-    //   },
-    //   render(val) {
-    //     return proxy.moneyFormat(val);
-    //   },
-    // },
-    // {
-    //   attrs: {
-    //     label: "税率",
-    //     prop: "dimensionality",
-    //     width: 160,
-    //   },
-    // },
   ];
 });
 const getList = async (req, status) => {

src/views/production/operation/batching/quick.vue

@@ -148,12 +148,20 @@ const clickCancel = () => {
 };
 onMounted(() => {
   proxy.post("/stockPreparation/outBomList", formData.data).then((res) => {
-    inOutStorageBomList.value = Object.freeze(res);
+    if (res && res.length > 0) {
+      inOutStorageBomList.value = Object.freeze(res.filter((item) => !["吊牌", "不干胶"].includes(item.classifyName)));
+    } else {
+      inOutStorageBomList.value = [];
+    }
   });
 });
 const changeDepartment = () => {
   proxy.post("/stockPreparation/outBomList", formData.data).then((res) => {
-    inOutStorageBomList.value = Object.freeze(res);
+    if (res && res.length > 0) {
+      inOutStorageBomList.value = Object.freeze(res.filter((item) => !["吊牌", "不干胶"].includes(item.classifyName)));
+    } else {
+      inOutStorageBomList.value = [];
+    }
   });
 };
 const statisticalQuantity = () => {