样品管理

src/views/data-fill/query.vue

@@ -8,13 +8,13 @@
                 <div class="hc-project-icon-box">
                     <HcIcon name="stack" />
                 </div>
-                <div class="ml-2 project-name-box">
+                <div class="project-name-box ml-2">
                     <div class="project-alias">{{ projectInfo.projectName }}</div>
                 </div>
             </div>
             <div class="hc-tree-box">
                 <div class="hc-search-tree-val">
-                    <el-input v-model="searchTreeVal" block clearable placeholder="请输入名称关键词检索" @keyup="searchTreeKeyUp">
+                    <el-input v-model="searchTreeVal" clearable block placeholder="请输入名称关键词检索" @keyup="searchTreeKeyUp">
                         <template #suffix>
                             <HcIcon name="search-2" ui="text-xl iscusor" @click="searchTreeClick" />
                         </template>
@@ -121,7 +121,7 @@
                                     />
                                 </el-select>
                             </div>
-                            <div class="w-40 ml-2">
+                            <div class="ml-2 w-40">
                                 <el-select v-model="searchForm.fileUserIdAndName" clearable placeholder="填报人">
                                     <el-option
                                         v-for="item in reportingPersonData" :key="item.value" :label="item.label"
@@ -129,7 +129,7 @@
                                     />
                                 </el-select>
                             </div>
-                            <div class="w-40 ml-2">
+                            <div class="ml-2 w-40">
                                 <el-select v-model="searchForm.sourceType" clearable placeholder="文件类型">
                                     <el-option
                                         v-for="item in fileTypeData" :key="item.value" :label="item.dictValue"
@@ -137,15 +137,15 @@
                                     />
                                 </el-select>
                             </div>
-                            <div class="w-32 ml-2">
+                            <div class="ml-2 w-32">
                                 <el-select v-model="searchForm.reportNumber" clearable placeholder="上报批次">
                                     <el-option v-for="item in reportBatchData" :key="item" :label="item" :value="item" />
                                 </el-select>
                             </div>
-                            <div class="w-64 ml-2">
+                            <div class="ml-2 w-64">
                                 <HcDatePicker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
                             </div>
-                            <div class="w-60 ml-2">
+                            <div class="ml-2 w-60">
                                 <el-input
                                     v-model="searchForm.queryValue" clearable placeholder="请输入名称关键词检索"
                                     @keyup="keyUpEvent"
@@ -208,7 +208,7 @@
             :node-id="primaryKeyId"
             :table-owner="contractTypeTabKey"
             :classify-type="classType"
-            :contract-id="contractId"
+            :contract-id="contractInfo?.contractType == 2 ? nodeDataInfo?.contractIdRelation : contractId"
             :datas="reportDatas"
             :project-id="projectId"
             :show="showReportModal"