报表管理页面调整及接口传参bug修改-提交

src/views/vent/reportManager/comment/DeviceModal.vue

@@ -15,12 +15,12 @@
     <!-- 报表新增 -->
     <div v-if="addOredit == 'add'">
       <a-form :model="formState" :label-col="{ style: { width: '130px' } }" :wrapper-col="{ span: 14 }">
-        <a-form-item label="报表版本:">
+        <a-form-item label="报表类型:">
           <JDictSelectTag v-model:value="formState.reportType" placeholder="请选择报表类型..." dictCode="reportType" />
         </a-form-item>
-        <a-form-item label="报表类型:">
+        <!-- <a-form-item label="报表类型:">
           <JDictSelectTag v-model:value="formState.reportVersion" placeholder="请选择报表版本..." dictCode="reportVersion" />
-        </a-form-item>
+        </a-form-item> -->
         <div class="footer">
           <a-button type="primary" style="margin-right: 20px" @click="save">保存</a-button>
           <a-button type="primar" @click="closeModalFn">取消</a-button>
@@ -29,7 +29,7 @@
     </div>
     <!--历史记录 -->
     <div v-else-if="addOredit=='hisRecord'">
-      <NormalHisTable  :columns="columnsHis" 
+      <NormalHisTable  :columns="columnsHis" :reportIds="reportId"
                  :downLoad="hisdownload" :list="hisList" designScope="device-tabel" title="报表历史记录管理"
                 :showTab="false"/>
     </div>
@@ -64,6 +64,10 @@
     reportLogHis:{
       type:String,
       default:''
+    },
+    reportId:{
+      type:String,
+      default:''
     }
   });
 
@@ -75,7 +79,7 @@
 
   let formState = reactive({
     reportType: '',
-    reportVersion: '',
+    // reportVersion: '',
   });
 
   //设置标题
@@ -159,7 +163,7 @@
   //点击图标关闭弹框
   const closeModalFn = () => {
     formState.reportType = '';
-    formState.reportVersion = '';
+    // formState.reportVersion = '';
     closeModal();
     // emit('closeModal')
   };
@@ -176,6 +180,9 @@
     margin-left: 5px;
     color: #fff;
   }
+  ::v-deep .zxm-form{
+    padding-top: 40px;
+  }
 
   .footer {
     width: 100%;

src/views/vent/reportManager/comment/NormalHisTable.vue

@@ -44,6 +44,10 @@ const props = defineProps({
     title: {
         type: String,
     },
+    reportIds:{
+        type:String,
+        default:''
+    }
 });
 
 //区分打开编辑或新增弹窗
@@ -90,7 +94,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls, doRequest } = useList
             width: 180,
         },
         beforeFetch: (params) => {
-            return Object.assign(params, { column: 'createTime', });
+            return Object.assign(params, { column: 'createTime',reportId:props.reportIds });
         },
     },
 });

src/views/vent/reportManager/comment/NormalTable.vue

@@ -20,7 +20,7 @@
           <slot name="filterCell" v-bind="{ column, record }"></slot>
         </template>
       </BasicTable>
-      <DeviceModal  :editID="editID" :reportLogHis="reportLogHis" :fileType="fileType"  @register="registerModal" :addOredit="addOredit" @saveOrUpdate="saveOrUpdate" />
+      <DeviceModal  :editID="editID" :reportId="reportId" :reportLogHis="reportLogHis" :fileType="fileType"  @register="registerModal" :addOredit="addOredit" @saveOrUpdate="saveOrUpdate" />
    
      
     </div>
@@ -77,6 +77,7 @@ let addOredit=ref('')
 let editID = ref(0); 
 let fileType = ref(''); //文件类型
 let  reportLogHis=ref('')//是否为报表记录编辑
+let reportId=ref('')//历史记录列表传参
 
   const emit = defineEmits(['saveAdd']);
   
@@ -172,6 +173,8 @@ let  reportLogHis=ref('')//是否为报表记录编辑
   function handleHisrecord(data){
     addOredit.value='hisRecord'
     Object.assign(record, toRaw(data));
+    reportId.value=record.reportId
+  console.log(  reportId.value,'历史记录列表传参---00000000')
     openModal(true, {
       record,
     });

src/views/vent/reportManager/reportManager.data.ts

@@ -1,5 +1,6 @@
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
+import { render } from '/@/utils/common/renderUtils';
 
 export const columns: BasicColumn[] = [
     {
@@ -23,32 +24,36 @@ export const columns: BasicColumn[] = [
       dataIndex: 'fileName',
       width: 160,
     },
-    {
-      title: '文件路径',
-      dataIndex: 'filePath',
-      width: 160,
-    },
+    // {
+    //   title: '文件路径',
+    //   dataIndex: 'filePath',
+    //   width: 160,
+    // },
    
-    {
-      title: '所属部门',
-      dataIndex: 'orgCode',
-      width: 160,
-    },
+    // {
+    //   title: '所属部门',
+    //   dataIndex: 'orgCode',
+    //   width: 160,
+    // },
     {
       title: '报表类型',
       dataIndex: 'reportType',
-      width: 100,
+      width: 160,
+      customRender: ({ text }) => {
+        return render.renderDict(text, 'reportType');
+      },
     },
+    
     {
       title: '报表版本',
       dataIndex: 'reportVersion',
       width: 100,
     },
-    {
-      title: '所属矿编号',
-      dataIndex: 'sysOrgCode',
-      width: 100,
-    },
+    // {
+    //   title: '所属矿编号',
+    //   dataIndex: 'sysOrgCode',
+    //   width: 100,
+    // },
   ];
 
   export const searchFormSchema: FormSchema[] = [
@@ -64,16 +69,16 @@ export const columns: BasicColumn[] = [
         colProps: { span: 6 },
       },
 
-      {
-        label: '报表版本',
-        field: 'reportVersion',
-        component: 'JDictSelectTag',
-        componentProps: {
-          dictCode: 'reportVersion',
-          placeholder: '请选择报表版本',
-        },
-        colProps: { span: 6 },
-      },
+      // {
+      //   label: '报表版本',
+      //   field: 'reportVersion',
+      //   component: 'JDictSelectTag',
+      //   componentProps: {
+      //     dictCode: 'reportVersion',
+      //     placeholder: '请选择报表版本',
+      //   },
+      //   colProps: { span: 6 },
+      // },
   ];
 //报表历史记录
   export const columnsHis: BasicColumn[] = [
@@ -98,11 +103,11 @@ export const columns: BasicColumn[] = [
       dataIndex: 'fileName',
       width: 160,
     },
-    {
-      title: '文件路径',
-      dataIndex: 'filePath',
-      width: 160,
-    },
+    // {
+    //   title: '文件路径',
+    //   dataIndex: 'filePath',
+    //   width: 160,
+    // },
     {
       title: '报表类型',
       dataIndex: 'reportType',