优化送检工单信息反馈查询

src/views/module_cmms/submission/modulesFK/SubmissionEquipmentFormFK.vue

@@ -1,5 +1,35 @@
 <template>
   <div class="center">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="getSJSBOptions2">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="设备">
+              <j-search-select-tag placeholder="请选择设备" v-model="queryParam.equipmentid" dict="tpm_equipment,equipmentname,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="检定结果">
+              <j-dict-select-tag placeholder="请选择检定结果" v-model="queryParam.submissionResult" dictCode="device_verification_result"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="送检状态">
+              <j-dict-select-tag placeholder="请选择送检状态" v-model="queryParam.submissionStatus" dictCode="submission_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="getSJSBOptions2" icon="search">查询</a-button>
+              <a-button type="primary" @click="getSJSBOptions3" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
     <a-table
       ref="table"
       size="small"
@@ -11,7 +41,6 @@
       :pagination="false"
       class="j-table-force-nowrap">
     </a-table>
-
   </div>
 </template>
 
@@ -31,6 +60,8 @@ export default {
   },
   data () {
     return {
+      //送检工单id
+      csId: '',
       //送检工单设备查询参数
       queryParam: {},
       // 送检设备及相关数据
@@ -110,17 +141,26 @@ export default {
       },
     }
   },
-  // created() {
-  //   // 获取送检设备及相关数据
-  //   // const cmmsSubmissionId = { cmmsSubmissionId: '1752140648575492098' };
-  //   // this.getSJSBOptions(cmmsSubmissionId)
-  // },
   methods: {
     getSJSBOptions(cmmsSubmissionId) {
+      this.csId = cmmsSubmissionId
       getAction(this.url.list, {cmmsSubmissionId:cmmsSubmissionId}).then((res) => {
         this.sjsbdataPoint = res.result.records
       })
     },
+    getSJSBOptions2() {
+      this.queryParam.cmmsSubmissionId = this.csId
+      getAction(this.url.list, this.queryParam).then((res) => {
+        this.sjsbdataPoint = res.result.records
+      })
+    },
+    getSJSBOptions3() {
+      this.queryParam = {}
+      this.queryParam.cmmsSubmissionId = this.csId
+      getAction(this.url.list, this.queryParam).then((res) => {
+        this.sjsbdataPoint = res.result.records
+      })
+    },
   }
 }
 </script>

src/views/module_cmms/submissionEquipment/SubmissionEquipmentList.vue

@@ -4,6 +4,33 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="设备">
+              <j-search-select-tag placeholder="请选择设备" v-model="queryParam.equipmentid" dict="tpm_equipment,equipmentname,id"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="检定结果">
+                <j-dict-select-tag placeholder="请选择检定结果" v-model="queryParam.submissionResult" dictCode="device_verification_result"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="送检状态">
+                <j-dict-select-tag placeholder="请选择送检状态" v-model="queryParam.submissionStatus" dictCode="submission_status"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>