Merge remote-tracking branch 'origin/develop' into develop

src/views/potentialSafety/index.vue

@@ -113,13 +113,7 @@ const formSchema = ref([
       ifShow: deptId === '100',
       componentProps: {
         placeholder: '公司名称',
-        options: [
-          {
-            label: '公司名称',
-            value: '公司名称',
-            key: '公司名称',
-          },
-        ],
+        options: [],
       },
       colProps: { span: 4 },
     },
@@ -146,6 +140,12 @@ const { push } = useRouter();
 onMounted(async () => {
   columns.value = columnsDate
   formSchema.value[2].componentProps.options = await getDepartmentList();
+  formSchema.value[2].componentProps.options = formSchema.value[2].componentProps.options.map(item => ({
+    key: item.value,
+    value: item.label,
+    label: item.label
+  }));
+  console.log('====-----',formSchema.value[2])
   getStatisticList();
 });
 // 导出