Merge branch 'master' into 测试

src/views/production/warehouse/putInStorage/add.vue

@@ -280,7 +280,11 @@ const clickCancel = () => {
 const getType = () => {
   let list = [];
   if (proxy.useUserStore().allDict["put_stock_type"] && proxy.useUserStore().allDict["put_stock_type"].length > 0) {
-    list = proxy.useUserStore().allDict["put_stock_type"].filter((item) => item.dictKey == "1");
+    if (proxy.useUserStore().user.userId === "1") {
+      list = proxy.useUserStore().allDict["put_stock_type"];
+    } else {
+      list = proxy.useUserStore().allDict["put_stock_type"].filter((item) => item.dictKey == "1");
+    }
   }
   return list;
 };