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

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/engineeringProject/engineeringEdit/engineeringEdit.vue

@@ -24,7 +24,7 @@
           danger
           v-if="!disabled"
           @click="deleteItem(index)"
-        />
+        >删除项目</a-button>
       </template>
       <BasicForm :loading="loading" @register="item.Form[0]" />
       <div style="width: 500px">
@@ -92,7 +92,6 @@
   let show = ref<Recordable[]>([]);
 
   function beforeEditSubmit(item, index) {
-    console.log('beforeEditSubmit', item, index);
     let { getDataSource } = item.table[1];
     const res = getDataSource();
     const totalNo = res.reduce((prev, next) => {
@@ -103,21 +102,16 @@
       summaryData: [
         {
           year: '合计',
-          // _row: '合计',
-          // _index: '合计',
           amount: totalNo,
         },
       ],
     });
-    console.log('totalNo', totalNo);
-    console.log(tabsFormSchema);
     return true;
   }
   const [registerDrawer, { openDrawer: openDrawer }] = useDrawer();
   const [registerDrawer2, { openDrawer: openDrawer2 }] = useDrawer();
   const [register, { openModal: openModal }] = useModal();
   const { createMessage } = useMessage();
-  getTitle.value = '新增工程项目投资计划' + planType.value;
   const isUpdate = ref(false);
   const loading = ref(false);
   const formData = ref<editModel>({});
@@ -133,12 +127,13 @@
       historyData.value = false;
       formData.value.investmentPlan = [];
       isUpdate.value = false;
+      getTitle.value = '新增' + year.value + '年工程项目投资计划' + '(' + planType.value + ')';
     } else {
       disabled.value = route.query.disabled == '0' ? false : true;
       if (disabled.value) {
-        getTitle.value = '查看工程项目投资计划' + planType.value;
+        getTitle.value = '查看' + route.query.filingCycle + '年工程项目投资计划' + '(' + route.query.planType + ')';
       } else {
-        getTitle.value = '编辑工程项目投资计划' + planType.value;
+        getTitle.value = '编辑' + route.query.filingCycle + '年工程项目投资计划' + '(' + route.query.planType + ')';
       }
       engineerId.value = id;
       isUpdate.value = true;
@@ -163,15 +158,11 @@
           ),
           table: useTable({
             title: '表尾行合计示例',
-            // api: demoListApi,
-            // rowSelection: { type: 'checkbox' },
             columns: disabled.value == 1 ? basicColumnsDisabled() : getBasicColumns(),
             showSummary: true,
             summaryData: [
               {
                 year: '合计',
-                // _row: '合计',
-                // _index: '合计',
                 amount: num,
               },
             ],
@@ -179,9 +170,6 @@
             maxWidth: 200,
             showIndexColumn: false,
             pagination: false,
-            // scroll: { x: 2000 },
-            // canResize: false,
-            // showSelectionBar: true, // 显示多选状态栏
           }),
         };
         const { setFieldsValue } = item.Form[1];
@@ -189,6 +177,7 @@
         const info = res[i];
         info.time = [info.beginTime, info.endTime];
         const data = {
+          proId: info.proId,
           id: info.id,
           investmentId: info.investmentId,
         };
@@ -254,8 +243,6 @@
       sumData: [
         {
           year: '合计',
-          // _row: '合计',
-          // _index: '合计',
           amount: 0,
         },
       ],
@@ -269,8 +256,6 @@
     };
     item.table = useTable({
       title: '表尾行合计示例',
-      // api: demoListApi,
-      // rowSelection: { type: 'checkbox' },
       columns: getBasicColumns(),
       showSummary: true,
       summaryData: item.sumData,
@@ -278,9 +263,6 @@
       maxWidth: 200,
       showIndexColumn: false,
       pagination: false,
-      // scroll: { x: 2000 },
-      // canResize: false,
-      // showSelectionBar: true, // 显示多选状态栏
     });
     const { setTableData } = item.table[1];
 
@@ -319,7 +301,6 @@
     });
   }
   async function deleteItem(index: any) {
-    tabsFormSchema[index].show = false;
     console.log('点击删除时改变当前卡片的显示状态', tabsFormSchema);
     tabsFormSchema.splice(index, 1);
     formData.value.investmentPlan.splice(index, 1);
@@ -332,15 +313,22 @@
   async function handleSuccess(params: any) {
     handleNew(params);
   }
+  async function getFormData(form: any) {
+    const { validate, getFieldsValue } = form;
+    await validate();
+    let res = getFieldsValue();
+    return res;
+  }
   async function handleSubmit(isSubmit) {
     console.log(tabsFormSchema);
     loading.value = true;
     try {
       for (let i = 0; i < tabsFormSchema.length; i++) {
         let item = tabsFormSchema[i];
-        console.log('1212',formData.value)
+        let res = await getFormData(item.Form[1]);
+        console.log('1212', res );
         if (item.show) {
-          console.log('5656',formData.value)
+          console.log('5656', formData.value);
           const { validate, getFieldsValue } = item.Form[1];
           const { getDataSource } = item.table[1];
           await validate();
@@ -371,22 +359,21 @@
         addItemData.operateType = operateType.update;
         addItemData.businessId = routeId.value;
         addItemData.businessType = '工程项目投资计划';
-        console.log('addItemData', addItemData);
         await addItemApi(addItemData);
       } else if (!isUpdate.value) {
         const res = await addItem(unref(formData));
         addItemData.operateType = operateType.add;
         addItemData.businessId = res;
         addItemData.businessType = '工程项目投资计划';
-        const showDatem = await addItemApi(addItemData);
-        console.log(showDatem, '记录添加成功');
+        await addItemApi(addItemData);
+        // router.back();
       }
       // let res = isUpdate.value ? await updateItem(unref(formData)) : await addItem(unref(formData));
       loading.value = true;
       createMessage.success('提交成功!');
-      router.back();
     } catch (e) {
-      console.log('12166762',formData.value)
+      createMessage.error('请将表单填写完整!');
+      console.log(e);
     } finally {
       loading.value = false;
     }

src/views/engineeringProject/index.vue

@@ -104,7 +104,7 @@
     bordered: true,
     showIndexColumn: false,
     actionColumn: {
-      width: 160,
+      width: 200,
       title: '操作',
       dataIndex: 'action',
       // slots: { customRender: 'action' },

src/views/engineeringProject/statisticEngineering/index.vue

@@ -74,7 +74,7 @@
     loadingRef.value = true;
     let data = await getStatisticEngineProject(params.value);
     // dataSource.value = data;
-    let propsList = ['companyName'];
+    let propsList = ['company'];
     propsList.map((item) => {
       changeData(data, item);
     });
@@ -108,7 +108,7 @@
   }
   async function exportCount() {
     const data = await exportStatisticEngine(params.value);
-    downloadByData(data, '月度统计报表' + '.xlsx');
+    downloadByData(data, '投资计划' + '.xlsx');
   }
 </script>
 <style scoped lang="less">

src/views/engineeringProject/statisticEngineering/statisticData.ts

@@ -58,7 +58,7 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
           fixed: 'left',
           width: 250,
           customCell: (_, any) => ({
-            rowSpan: _.companyNamerowSpan,
+            rowSpan: _.companyrowSpan,
           }),
         },
         {

src/views/monthlyPlan/monthlyPlanEdit/monthlyPlanEdit.vue

@@ -453,7 +453,7 @@
       //   router.back();
       // }
     } catch (e) {
-      createMessage.error('表单校验未通过!');
+      createMessage.error('请将表单填写完整!');
       // 验证失败或出错，切换到对应标签页
       console.log(e);
     } finally {

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();
 });
 // 导出

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();
   });