变更签证,bug修改

src/views/changeSignature/changeSignatrue.data.ts

@@ -83,6 +83,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'companyName',
     label: '',
     component: 'Select',
+    required: false,
     componentProps: {
       options: [
         { label: '公司名称1', value: '1' },

src/views/changeSignature/index.vue

@@ -8,14 +8,14 @@
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'status'">
-          <Tag color="warning" v-if="record.status == '0'"> 未审核</Tag>
+          <Tag color="warning" v-if="record.status === '0'"> 未审核</Tag>
         </template>
         <template v-if="column.key === 'status'">
-          <Tag color="success" v-if="record.status == '1'"> 已审核</Tag>
+          <Tag color="success" v-if="record.status === '1'"> 已审核</Tag>
         </template>
-        <template v-if="column.key === 'action'" >
+        <template v-if="column.key === 'action'">
           <TableAction
-            v-if="record.status == '0'"
+            v-if="record.status === '0'"
             :actions="[
               {
                 label: '修改',
@@ -70,24 +70,18 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { operateType, addItemApi, addItemData } from '@/api/operations/operations';
-  import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { useModal } from '@/components/Modal';
-  import yearModal from '@/components/yearModal/yearModal.vue';
-  import {
-    getSettlementManageList,
-    auditItem,
-    deleteList,
-    checkQuarter,
-  } from '@/api/changeSignatrue/changeSignatrue';
-  import { columns, searchFormSchema } from '@/views/changeSignature/changeSignatrue.data';
-  import { Tag } from 'ant-design-vue';
-  import { useRouter } from 'vue-router';
-  import { onMounted } from 'vue';
-  import { getDepartmentList } from '@/api/project/settlementManage';
-  import { useMessage } from '@/hooks/web/useMessage';
+import {addItemApi, addItemData, operateType} from '@/api/operations/operations';
+import {BasicTable, TableAction, useTable} from '@/components/Table';
+import {useModal} from '@/components/Modal';
+import {auditItem, checkQuarter, deleteList, getSettlementManageList,} from '@/api/changeSignatrue/changeSignatrue';
+import {columns, searchFormSchema} from '@/views/changeSignature/changeSignatrue.data';
+import {Tag} from 'ant-design-vue';
+import {useRouter} from 'vue-router';
+import {onMounted} from 'vue';
+import {getDepartmentList} from '@/api/project/settlementManage';
+import {useMessage} from '@/hooks/web/useMessage';
 
-  const { createMessage } = useMessage();
+const { createMessage } = useMessage();
   const { push } = useRouter();
   const [register, { openModal: openModal, closeModal: closeModal }] = useModal();
 
@@ -113,13 +107,14 @@
 
   onMounted(async () => {
     const data = await getDepartmentList();
-    searchFormSchema[2].componentProps.options = data;
-    console.log(searchFormSchema[2].componentProps.options, '数据仓库');
+    searchFormSchema[2].componentProps.options = data.map(item => ({
+      key: item.value,
+      value: item.label,
+      label: item.label
+    }));
   });
 
   async function handleDelete(record: Recordable) {
-    console.log(record);
-    console.log(record);
     let id = record.id;
     await deleteList({ id });
     reload();

src/views/safetyEducation/index.vue

@@ -56,8 +56,10 @@
   import { useUserStore } from '@/store/modules/user';
   import { getDepartmentList } from '@/api/project/settlementManage';
   import { downloadByData } from '@/utils/file/download';
+  import {dataStyleTask} from "echarts/types/src/visual/style";
 
   const deptId = useUserStore().userInfo.deptId;
+  // const deptId = "764";
   const APopconfirm = Popconfirm;
   const userStore = useUserStore();
   const getUserInfo = computed(() => {
@@ -294,7 +296,13 @@
     } else {
       columns.value = columns2;
     }
-    searchForm.value[2].componentProps.options = await getDepartmentList();
+    const data = await getDepartmentList();
+    // console.log(data);
+    searchForm.value[2].componentProps.options = data.map((item) => ({
+      key: item.value,
+      value: item.label,
+      label: item.label,
+    }));
     getStatisticList();
   });