Merge branch 'xf_dev' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into xf_dev

src/views/base/materials/components/choice-item-page.vue

@@ -33,6 +33,12 @@ const props = defineProps({
     default: () => {
       return '';
     }
+  },
+  enabled: {
+    type: String,
+    default: ()=>{
+      return '0'
+    }
   }
 })
 // 传入一个url，后面不带/
@@ -176,7 +182,7 @@ option.value = Object.assign(option.value, {
 
 onMounted(() => {
   search.value.prodtCode = props.materialCode
-  search.value.enabled = "0"
+  search.value.enabled = props.enabled
   dataList();
 });
 </script>

src/views/storage/alarm/index.vue

@@ -33,14 +33,13 @@
         width="950px"
         @close="dialog1.visible = false"
     >
-      <choice-item-page @materialInfo="materialInfo"/>
+      <choice-item-page enabled="" @materialInfo="materialInfo"/>
     </el-dialog>
   </div>
 </template>
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 
 import { useCommonStoreHook } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";