feat(data-fill): 试验文件查询增加报告编号和所属方筛选

src/views/data-fill/collapse-form/test-file-cy.vue

@@ -25,6 +25,18 @@
                 <div class="ml-2 w-64">
                     <HcDatePicker :dates="filebetweenTime" clearable @change="filebetweenTimeUpdate" />
                 </div>
+                <div class="ml-2 w-60">
+                    <el-input
+                        v-model="filesearchFormPage.reportNo" clearable placeholder="请输入报告编号"
+                    />
+                </div>
+                <div class="ml-2 w-40">
+                    <el-select v-model="filesearchFormPage.reportType" placeholder="请选择所属方" clearable>
+                        <el-option label="施工" :value="1" />
+                        <el-option label="监理" :value="2" />
+                        <el-option label="业主" :value="3" />
+                    </el-select>
+                </div>
                 <div class="ml-2">
                     <el-button type="primary" @click="filesearchClick">
                         <HcIcon name="search-2" />
@@ -158,7 +170,7 @@ const fileModalElTreeClick = async ({ data, node }) => {
 
 const filebetweenTime = ref([])
 const filesearchFormPage = ref({
-    startTime: null, lastTime: null, wbsId: null, current: 1, size: 20, total: 0,
+    startTime: null, lastTime: null, wbsId: null, current: 1, size: 20, total: 0, reportNo:'', reportType:'',
 })
 const filesearchFormPageChange = ({ current, size }) => {
     filesearchFormPage.value.current = current
@@ -218,6 +230,8 @@ const getfileNodeData = async () => {
             startTime: filesearchFormPage.value.startTime,
             endTime: filesearchFormPage.value.lastTime,
             qualityTestPKeyId: isPrimaryKeyId.value,
+            reportNo: filesearchFormPage.value.reportNo,
+            reportType:filesearchFormPage.value.reportType,
         })
     } else {
         // 调用第三方报告接口
@@ -230,6 +244,8 @@ const getfileNodeData = async () => {
             endTime: filesearchFormPage.value.lastTime,
             type: fileModalradio.value,
             qualityTestPKeyId: isPrimaryKeyId.value,
+            reportType:filesearchFormPage.value.reportType,
+             reportNo: filesearchFormPage.value.reportNo,
 
         })
     }

src/views/data-fill/collapse-form/test-file.vue

@@ -32,6 +32,18 @@
                 <div class="ml-2 w-64">
                     <HcDatePicker :dates="filebetweenTime" clearable @change="filebetweenTimeUpdate" />
                 </div>
+                <div class="ml-2 w-60">
+                    <el-input
+                        v-model="filesearchFormPage.reportNo" clearable placeholder="请输入报告编号"
+                    />
+                </div>
+                <div class="ml-2 w-40">
+                    <el-select v-model="filesearchFormPage.reportType" placeholder="请选择所属方" clearable>
+                        <el-option label="施工" :value="1" />
+                        <el-option label="监理" :value="2" />
+                        <el-option label="业主" :value="3" />
+                    </el-select>
+                </div>
                 <div class="ml-2">
                     <el-button type="primary" @click="filesearchClick">
                         <HcIcon name="search-2" />
@@ -144,18 +156,12 @@ const radioChange = (val) => {
     }
 }
 //获取试验文件树树数据
-const fileModaltreeDatas = ref([])
+
 //节点被点击
 //节点被点击
 const filenodeItemInfo = ref({})
 const filenodeDataInfo = ref({})
-const fileTableData1 = ref([])
-const fileTableColumn = ref([
-    { key: 'recordNo', name: '报告编号' },
-    { key: 'reportDate', name: '报告日期' },
-    { key: 'projectPositionName', name: '工程用途及部位' },
-    { key: 'detectionResultName', name: '检测结果' },
-])
+
 
 const fileModalElTreeClick = async ({ data, node }) => {
     filenodeItemInfo.value = node
@@ -205,6 +211,9 @@ const getthirdTreetavleDatas = async () => {
         startTime: filesearchFormPage.value.startTime,
         endTime: filesearchFormPage.value.lastTime,
         qualityTestPKeyId: isPrimaryKeyId.value,
+        reportNo: filesearchFormPage.value.reportNo,
+        reportType:filesearchFormPage.value.reportType,
+
 
 
     })
@@ -220,11 +229,7 @@ const getthirdTreetavleDatas = async () => {
                     defaultarr.push(item)
 
                 }
-                if (fileModalradio.value === 2) {
-                    outtabtoggleSelection(defaultarr)
-                } else {
-                    thirdtabtoggleSelection(defaultarr)
-                }
+             
 
             })
         }
@@ -243,7 +248,7 @@ const thirdtreeDatasElTreeClick = (data, node) => {
 
 const filebetweenTime = ref([])
 const filesearchFormPage = ref({
-    startTime: null, lastTime: null, wbsId: null, current: 1, size: 20, total: 0,
+    startTime: null, lastTime: null, wbsId: null, current: 1, size: 20, total: 0, reportType:'', reportNo:'',
 })
 const filesearchFormPageChange = ({ current, size }) => {
     filesearchFormPage.value.current = current
@@ -303,6 +308,8 @@ const getfileNodeData = async () => {
         startTime: filesearchFormPage.value.startTime,
         endTime: filesearchFormPage.value.lastTime,
         qualityTestPKeyId: isPrimaryKeyId.value,
+        reportNo: filesearchFormPage.value.reportNo,
+        reportType:filesearchFormPage.value.reportType,
     })
     //处理数据
     if (!error && code === 200) {