Просмотр исходного кода

[update] task-1186 检测档案增加送检单位查询条件

cfort 2 лет назад
Родитель
Сommit
9430cc2dd0

+ 16 - 6
src/views/platform/bpmn/bpmInstHis/record/component/testingRecord.vue

@@ -2,7 +2,7 @@
     <div class="content">
         <div class="header">{{ info.title }}</div>
         <div class="search-box">
-            <template v-for="(item, index) in searchList">
+            <div v-for="(item, index) in searchList">
                 <span class="label">{{ item.label }}</span>
                 <el-input
                     v-if="item.value !== 'sampleTime'"
@@ -27,7 +27,7 @@
                     style="width: 220px"
                     @change="search"
                 />
-            </template>
+            </div>
             <el-button class="btn" type="primary" @click="search"> <i class="ibps-icon-search"></i>查询 </el-button>
         </div>
         <div class="table-container">
@@ -175,6 +175,10 @@ const searchList = [
     {
         label: '送检日期',
         value: 'sampleTime'
+    },
+    {
+        label: '送检单位',
+        value: 'sampleUnit'
     }
 ]
 const reportList = [
@@ -260,7 +264,8 @@ export default {
                 sampleId: '',
                 sampleName: '',
                 projectName: '',
-                sampleTime: ''
+                sampleTime: '',
+                sampleUnit: ''
             },
             tableData: [],
             testingList: [],
@@ -301,6 +306,7 @@ export default {
                 yang_pin_bian_hao: this.searchParam.sampleId ? `%${this.searchParam.sampleId}%` : null,
                 yang_pin_ming_che: this.searchParam.sampleName ? `%${this.searchParam.sampleName}%` : null,
                 gai_zhang_jian_pd: this.searchParam.projectName ? `%${this.searchParam.projectName}%` : null,
+                song_jian_: this.searchParam.sampleUnit ? `%${this.searchParam.sampleUnit}%` : null,
                 start_: this.searchParam.sampleTime ? this.searchParam.sampleTime[0] : '',
                 end_: this.searchParam.sampleTime ? this.searchParam.sampleTime[1] : '',
                 sort: this.prop,
@@ -469,8 +475,12 @@ export default {
             font-size: 18px;
         }
         .search-box {
-            height: 30px;
-            margin-bottom: 20px;
+            min-height: 30px;
+            margin-bottom: 10px;
+            > div {
+                display: inline-block;
+                margin-bottom: 10px;
+            }
             .label {
                 margin: 0 6px 0 6px;
                 color: #000;
@@ -494,7 +504,7 @@ export default {
         }
         .table-container {
             width: 100%;
-            height: calc(100vh - 220px);
+            height: calc(100vh - 300px);
             // ::v-deep .el-table__header .table-header {
             //     color: #000;
             //     font-size: 12px;