点检项优化

src/views/module_ems/cmmsSpotcheckItem/CmmsSpotcheckItemList.vue

@@ -10,8 +10,18 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="设备类型ID">
-              <j-search-select-tag placeholder="请选择设备类型ID" v-model="queryParam.equipmenttreeid" dict="ems_tpm_equipment_tree,name,id"/>
+            <a-form-item label="设备类型">
+              <!-- <j-search-select-tag placeholder="请选择设备类型" v-model="queryParam.equipmenttreeid" dict="ems_tpm_equipment_tree,name,id"/> -->
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择设备类型"
+                v-model="queryParam.equipmenttreeid"
+                dict="ems_tpm_equipment_tree,name,id"
+                pidField="parentid"
+                pidValue="0"
+                hasChildField="has_child"
+                >
+              </j-tree-select>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -44,12 +54,12 @@
     <!-- 操作按钮区域 -->
     <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>
+      </a-upload> -->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -160,7 +170,7 @@
             dataIndex: 'itemname'
           },
           {
-            title:'设备类型ID',
+            title:'设备类型',
             align:"center",
             dataIndex: 'equipmenttreeid_dictText'
           },

src/views/module_ems/cmmsSpotcheckItem/modules/CmmsSpotcheckItemForm.vue

@@ -5,19 +5,30 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemname">
-              <a-input v-model="model.itemname" placeholder="请输入名称"  ></a-input>
+              <a-input v-model="model.itemname" placeholder="请输入点检项名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="设备类型ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmenttreeid">
-              <j-search-select-tag v-model="model.equipmenttreeid" dict="ems_tpm_equipment_tree,name,id"  />
+            <a-form-model-item label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmenttreeid">
+              <!-- <j-search-select-tag v-model="model.equipmenttreeid" dict="ems_tpm_equipment_tree,name,id"  /> -->
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择设备类型"
+                multiple
+                v-model="model.equipmenttreeid"
+                dict="ems_tpm_equipment_tree,name,id"
+                pidField="parentid"
+                pidValue="0"
+                hasChildField="has_child"
+                >
+              </j-tree-select>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="点检项编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemcode">
               <a-input v-model="model.itemcode" placeholder="请输入点检项编号"  ></a-input>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-model-item label="标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditions">
               <a-input v-model="model.conditions" placeholder="请输入标准"  ></a-input>
@@ -35,7 +46,8 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+              <!-- <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input> -->
+              <a-textarea v-model="model.remark" placeholder="请输入备注" auto-size />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -75,6 +87,12 @@
         },
         confirmLoading: false,
         validatorRules: {
+          itemname: [
+            { required: true, message: '请输入点检项名称!'},
+          ],
+          equipmenttreeid: [
+            { required: true, message: '请选择设备类型!'},
+          ],
         },
         url: {
           add: "/cmmsSpotcheckItem/cmmsSpotcheckItem/add",