巡检内容初步修改

src/views/module_ems/cmmsInspectContent/CmmsInspectContentList.vue

@@ -16,7 +16,7 @@
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="状态：启用：0、禁用:1">
+              <a-form-item label="状态">
                 <a-input placeholder="请输入状态：启用：0、禁用:1" v-model="queryParam.status"></a-input>
               </a-form-item>
             </a-col>

src/views/module_ems/cmmsInspectContent/modules/CmmsInspectContentForm.vue

@@ -3,24 +3,24 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="巡检内容编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contentcode">
               <a-input v-model="model.contentcode" 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="contentname">
               <a-input v-model="model.contentname" placeholder="请输入巡检内容名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="设备id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-              <a-input v-model="model.equipmentid" placeholder="请输入设备id"  ></a-input>
+            <a-form-model-item label="巡检设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
+              <j-search-select-tag v-model="model.equipmentid" dict="ems_tpm_equipment,equipmentname,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="状态：启用：0、禁用:1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <a-input v-model="model.status" placeholder="请输入状态：启用：0、禁用:1"  ></a-input>
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <j-dict-select-tag type="radio" v-model="model.status" dictCode="inspect_content_status" placeholder="请选择状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -28,6 +28,7 @@
               <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <!-- <j-popup v-model="formData.jPopup" code="demo" field="name" orgFields="name" destFields="name" :multi="true"/> -->
         </a-row>
       </a-form-model>
     </j-form-container>

src/views/module_ems/cmmsInspectContent/modules/CmmsInspectContentModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <j-modal
+  <u-modal
     :title="title"
     :width="width"
     :visible="visible"
@@ -9,7 +9,7 @@
     @cancel="handleCancel"
     cancelText="关闭">
     <cmms-inspect-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-inspect-content-form>
-  </j-modal>
+  </u-modal>
 </template>
 
 <script>

src/views/module_ems/cmmsInspectItem/CmmsInspectItemList.vue

@@ -87,6 +87,14 @@
           </a-button>
         </template>
 
+        <template slot="tooltip" slot-scope="text" >
+          <a-tooltip placement="top" :title="text" trigger="hover">
+            <div style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 80px;">
+              {{ text }}
+            </div>
+          </a-tooltip>
+        </template>
+
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
@@ -154,7 +162,7 @@
           {
             title:'设备类型',
             align:"center",
-            dataIndex: 'equipdefid'
+            dataIndex: 'equipdefname'
           },
           // {
           //   title:'条件(字典中定义)',
@@ -179,7 +187,14 @@
           {
             title:'巡检项类型',
             align:"center",
-            dataIndex: 'classification'
+            dataIndex: 'classification_dictText'
+          },
+          {
+            title:'备注',
+            align:"center",
+            width: 80,
+            dataIndex: 'remark',
+            scopedSlots: { customRender: 'tooltip' }
           },
           {
             title: '操作',
@@ -189,11 +204,6 @@
             width:147,
             scopedSlots: { customRender: 'action' }
           },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
-          },
         ],
         url: {
           list: "/cmmsInspectItem/cmmsInspectItem/list",