修复bug

src/api/dataFilling/fileManagement.ts

@@ -3,8 +3,8 @@ import request from '@/utils/request';
 export function fillList(data) {
   return request({
     url: '/api/dataFilling/reports_by_creator',
-    method: 'post',
-    data: data
+    method: 'get',
+    params: data
   });
 }
 // 查询详情

src/components/DataImport/DataImportDetail.vue

@@ -12,7 +12,7 @@
       </el-table-column>
       <el-table-column label="备注" align="center" prop="event_title">
         <template #default="scope">
-          <el-text v-if="scope.row.remark.length !== 0" class="common-btn-text-primary" @click="handleShowDetails(scope.row.remark)">详情</el-text>
+          <el-text v-if="scope.row.remark !== null && scope.row.remark.length !== 0" class="common-btn-text-primary" @click="handleShowDetails(scope.row.remark)">详情</el-text>
         </template>
       </el-table-column>
     </el-table>

src/types/components.d.ts

@@ -24,8 +24,6 @@ declare module 'vue' {
     DistributionMap: typeof import('./../components/Map/YztMap/DistributionMap.vue')['default']
     DrawMap: typeof import('./../components/Map/YztMap/DrawMap.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
-    ElAnchor: typeof import('element-plus/es')['ElAnchor']
-    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
@@ -51,8 +49,6 @@ declare module 'vue' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -62,7 +58,6 @@ declare module 'vue' {
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElStep: typeof import('element-plus/es')['ElStep']
@@ -91,9 +86,6 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
-    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

src/views/comprehensiveGuarantee/MaterialReserveManagement/TypesMaterialsManagement.vue

@@ -1,7 +1,7 @@
 <!--物资种类管理-->
 <template>
   <div>
-    <div v-show="!addTypesMaterialsState.show && !impotTypesMaterialsState.show && !TypesMaterialsDetailsState.show" class="app-container">
+    <div v-show="!addTypesMaterialsState.show && !TypesMaterialsDetailsState.show" class="app-container">
       <div>
         <transition name="fade">
           <el-row :gutter="30" style="height: 50px">

src/views/comprehensiveGuarantee/MaterialReserveManagement/impotTypesMaterials.vue

@@ -1,32 +1,4 @@
 <template>
-  <div class="ya_bar">
-<!--    <h3>请导入物资类别</h3>-->
-    <el-button type="primary" @click="importDoc()"> 数据导入 </el-button>
-  </div>
-  <el-card shadow="hover" v-show="doc_items.length > 0">
-    <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick2">
-      <el-tab-pane :label="item.title" :name="item.id" v-for="(item, index) in doc_items" :key="index">
-        <div>
-          <el-row>
-            <el-col :span="4">
-              <el-anchor container="`containerRef${index}`" direction="vertical" type="default" :offset="30" @click="handleClick1">
-                <el-anchor-link :href="sub_item.href" :title="sub_item.title"  :name="sub_item.id" v-for="(sub_item, index2) in item.items" :key="index2"/>
-              </el-anchor>
-            </el-col>
-            <el-col :span="20">
-              <div ref="`containerRef${index}`" style="height: 400px; overflow-y: auto">
-                <div :id="sub_item.id" style="height: auto; margin-top: 15px; font-size: 14px" v-for="(sub_item, index3) in item.items" :key="index3">
-                  <h3 style="font-weight: 600">{{ sub_item.title }}</h3>
-                  <span v-html="sub_item.value"></span>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-  </el-card>
-
   <el-dialog ref="formDialogRef" v-model="showImportDlg"  title="导入结构化文档" width="500px" append-to-body>
     <el-form ref="formRef" :model="form" :rules="rules">
       <FileUpload v-model="form.filename" :file-type="['xls', 'xlsx']" :limit="1" />
@@ -85,11 +57,10 @@ const getData = () => {
     })
 }
 
-const showImportDlg = ref(false);
+const showImportDlg = ref(true);
 const formDialogRef = ref(null);
 const formRef = ref<ElFormInstance>();
 const buttonLoading = ref(false);
-
 const form = ref({
   filename: ''
 });
@@ -99,8 +70,8 @@ const rules = reactive({
 });
 
 const importDoc = () => {
-  resetForm();
-  showImportDlg.value = true;
+
+
 }
 
 const resetForm = () => {
@@ -110,7 +81,7 @@ const resetForm = () => {
   formRef.value?.resetFields();
   formRef.value?.clearValidate();
 }
-
+resetForm();
 /**提交按钮 */
 const submitForm = () => {
   formRef.value?.validate(async (valid) => {

src/views/dataFilling/fileManagement.vue

@@ -12,8 +12,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-button type="primary" @click="handleQuery">查询</el-button>
-                  <el-button @click="resetQuery">重置</el-button>
+                  <el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
                 </el-col>
               </el-row>
             </el-form>
@@ -21,7 +21,7 @@
         </transition>
         <!-- 表格组件 -->
         <el-table ref="multipleTable" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
-          <el-table-column label="序号" align="center" prop="report_id" />
+          <el-table-column type="index" label="序号" align="center" width="50px" />
           <el-table-column label="表格名称" align="center" prop="table_name" />
           <el-table-column label="收取时间" align="center" prop="collection_time" />
           <el-table-column label="收取状态" align="center" prop="collection_status">
@@ -38,7 +38,14 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="tableData" />
+<!--        <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="fetchFillList" />-->
+        <pagination
+          v-show="total > 0"
+          v-model:page="queryParams.page"
+          v-model:limit="queryParams.pageSize"
+          :total="total"
+          @pagination="fetchFillList"
+        />
       </div>
     </div>
     <!--  <WriteForm v-if="writeFormState.show" :event-id="writeFormState.eventId" @close="handleCancel" />-->

src/views/dataFilling/fillingAdd.vue

@@ -179,7 +179,7 @@ const form = ref({
   issued_status: "",
   period_type: "",
   creator_name: "",
-  creator_phone: "13423232323",
+  creator_phone: "",
   field_names: [],
   user_ids: []
 })

src/views/dataFilling/fillingManage.vue

@@ -70,19 +70,19 @@
                   </el-form-item>
                 </el-col>
                 <!-- 操作按钮 -->
-                <el-col :span="6">
-                  <el-button type="primary" @click="handleQuery">查询</el-button>
-                  <el-button type="primary" @click="resetQuery">重置</el-button>
-                  <el-button type="primary" @click="exportTableData()">导出</el-button>
-                  <el-button type="primary" @click="handleAdd">新增</el-button>
+                <el-col :span="12">
+                  <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button>
+                  <el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                  <el-button type="warning" plain icon="Download" @click="exportTableData()">导出</el-button>
                 </el-col>
               </el-row>
             </el-form>
           </div>
         </transition>
         <!-- 表格组件 -->
-        <el-table ref="multipleTable" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
-          <el-table-column label="序号" align="center" prop="id" />
+        <el-table ref="multipleTable" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange" style="margin-top: 10px">
+          <el-table-column label="序号" align="center" type="index" width="50px" />
           <el-table-column label="表格名称" align="center" prop="table_name" />
           <el-table-column label="发布日期" align="center" prop="start_time" />
           <el-table-column label="发布状态" align="center" prop="issued_status">

src/views/dataFilling/myFilling.vue

@@ -35,8 +35,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-button type="primary" @click="handleQuery">查询</el-button>
-                  <el-button @click="resetQuery">重置</el-button>
+                  <el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
                 </el-col>
               </el-row>
             </el-form>
@@ -178,7 +178,7 @@ const handleQuery = () => {
 };
 
 const resetQuery = () => {
-  queryParams.value = { page: 1, pageSize: 10, table_name: '', submission_status: [] };
+  queryParams.value = { page: 1, pageSize: 10, table_name: '', submission_status: '' };
   handleQuery();
 };
 

src/views/setting/PreventionResponsible/index.vue

@@ -24,10 +24,10 @@
                 <h1>茂名市责任人列表</h1>
                 <el-form ref="queryFormRef" :model="queryParams" :inline="true">
                   <el-form-item>
-                    <el-button type="primary">批量导出</el-button>
-                    <el-button type="primary" @click="handleUpload">批量导入</el-button>
-                    <el-button type="primary" @click="handleAdd">新建责任人</el-button>
-                    <el-button type="primary" @click="handleShowUploadDetails">查看导入情况</el-button>
+                    <el-button type="primary" icon="Plus" @click="handleAdd">新建责任人</el-button>
+                    <el-button type="warning" plain icon="Download">批量导出</el-button>
+                    <el-button plain icon="Upload" @click="handleUpload">批量导入</el-button>
+                    <el-button type="primary" icon="View" @click="handleShowUploadDetails">查看导入情况</el-button>
                   </el-form-item>
                   <el-form-item label="姓名：" prop="Name" label-width="auto">
                     <el-input v-model="queryParams.Name" placeholder="请输入联系人" clearable @keyup.enter="handleQuery" />
@@ -120,6 +120,7 @@ import add from '@/views/setting/PreventionResponsible/add.vue';
 import Edit from '@/views/setting/PreventionResponsible/Edit.vue';
 import { reactive, ref } from 'vue';
 import { deleteMaterialRoot } from '@/api/comprehensiveGuarantee/materialReserveManagement/warehouseManagement';
+import { ElButton } from 'element-plus';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;

src/views/system/menu/index.vue

@@ -29,7 +29,7 @@
         </div>
       </transition>
 
-      <el-row :gutter="10" class="mb8">
+      <el-row :gutter="10" class="mb8" style="margin-bottom: 10px">
         <el-col :span="1.5">
           <el-button v-hasPermi="['system:menu:add']" icon="Plus" type="primary" @click="handleAdd()">新增 </el-button>
         </el-col>