浏览代码

部分搜索修改

yuhan 1 年之前
父节点
当前提交
93d43fe7c8

+ 22 - 3
src/views/module_cmms/inspectContent/InspectContentList.vue

@@ -13,14 +13,33 @@
             <a-form-item label="设备id">
               <a-input placeholder="请输入设备id" v-model="queryParam.equipmentid"></a-input>
             </a-form-item>
+          </a-col> -->
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="设备类型">
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择设备类型"
+                v-model="queryParam.equipdefid"
+                dict="tpm_equipment_tree,name,id"
+                pidField="parentid"
+                pidValue="0"
+                hasChildField="has_child"
+                >
+              </j-tree-select>
+            </a-form-item>
+          </a-col> -->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="巡检项目类型">
+              <j-dict-select-tag type="list" v-model="queryParam.classification" dictCode="inspect_item_type" placeholder="请选择巡检项目类型" />
+            </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="状态">
-                <a-input placeholder="请选择状态" v-model="queryParam.status"></a-input>
+                <j-dict-select-tag v-model="queryParam.status" dictCode="inspect_content_status" placeholder="请选择状态" />
               </a-form-item>
             </a-col>
-          </template> -->
+          </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>
@@ -164,7 +183,7 @@
             dataIndex: 'contentname'
           },
           {
-            title:'巡检项目名称',
+            title:'巡检项目类型',
             align:"center",
             dataIndex: 'classification_dictText'
           },

+ 19 - 9
src/views/module_cmms/inspectItem/InspectItemList.vue

@@ -11,11 +11,21 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="设备类型">
-              <a-input placeholder="请输入设备类型" v-model="queryParam.equipdefid"></a-input>
+              <!-- <a-input placeholder="请输入设备类型" v-model="queryParam.equipdefid"></a-input> -->
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择设备类型"
+                v-model="queryParam.equipdefid"
+                dict="tpm_equipment_tree,name,id"
+                pidField="parentid"
+                pidValue="0"
+                hasChildField="has_child"
+                >
+              </j-tree-select>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="巡检项类型">
+            <a-form-item label="巡检标准类型">
               <j-dict-select-tag type="list" v-model="queryParam.classification" dictCode="inspect_item_type" placeholder="请选择巡检类型" />
             </a-form-item>
           </a-col>
@@ -23,10 +33,10 @@
             <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">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>
@@ -37,7 +47,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('巡检')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('巡检标准')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -141,7 +151,7 @@
     },
     data () {
       return {
-        description: '巡检管理页面',
+        description: '巡检标准管理页面',
         // 表头
         columns: [
           {
@@ -155,7 +165,7 @@
             }
           },
           {
-            title:'巡检编号',
+            title:'巡检标准编号',
             align:"center",
             dataIndex: 'itemcode'
           },
@@ -190,7 +200,7 @@
             dataIndex: 'inspectionstandards'
           },
           {
-            title:'巡检类型',
+            title:'巡检标准类型',
             align:"center",
             dataIndex: 'classification_dictText'
           },
@@ -236,7 +246,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
-        fieldList.push({type:'string',value:'itemcode',text:'巡检编号',dictCode:''})
+        fieldList.push({type:'string',value:'itemcode',text:'巡检标准编号',dictCode:''})
         fieldList.push({type:'string',value:'itemname',text:'名称',dictCode:''})
         fieldList.push({type:'string',value:'equipdefid',text:'设备类型ID(设备定义)',dictCode:''})
         fieldList.push({type:'string',value:'conditions',text:'条件(字典中定义)',dictCode:''})

+ 4 - 4
src/views/module_cmms/inspectLine/InspectLineList.vue

@@ -5,18 +5,18 @@
       <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="巡检计划名称">
-              <a-input placeholder="请输入巡检计划名称" v-model="queryParam.planname"></a-input>
+            <a-form-item label="巡检路线名称">
+              <a-input placeholder="请输入巡检路线名称" v-model="queryParam.linename"></a-input>
             </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="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">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>

+ 4 - 4
src/views/module_cmms/inspectSpot/InspectSpotList.vue

@@ -5,18 +5,18 @@
       <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="巡检计划名称">
-              <a-input placeholder="请输入巡检计划名称" v-model="queryParam.planname"></a-input>
+            <a-form-item label="巡检名称">
+              <a-input placeholder="请输入巡检点名称" v-model="queryParam.contentname"></a-input>
             </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="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">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>