Merge remote-tracking branch 'origin/master'

src/views/module_ems/cmmsSpotcheckContent/CmmsSpotcheckContentList.vue

@@ -4,6 +4,17 @@
     <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="点检内容名称">
+              <a-input v-model="queryParam.contentname" placeholder="请输入点检内容名称"></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>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -12,12 +23,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>
@@ -47,6 +58,15 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
+        <template slot="status"  slot-scope="text, record">
+          <!-- {{ record.status }} -->
+          <!-- <a-popconfirm title="确定删除吗?" @confirm="() => statusChange(record)">
+            <a-switch :default-checked= "record.status == 0 ? true : false" @change="statusChange(record,$event)" />
+          </a-popconfirm> -->
+          <a-switch :default-checked= "record.status == 0 ? true : false" @click="statusChange(record,$event)" />
+          <!-- <a-switch checkedChildren="禁用" unCheckedChildren="启用" :default-checked= "record.status == 0 ? true : false" @change="statusChange(record,$event)" /> -->
+        </template>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -133,14 +153,15 @@
             dataIndex: 'contentname'
           },
           {
-            title:'设备id',
+            title:'设备',
             align:"center",
             dataIndex: 'equipmentid_dictText'
           },
           {
-            title:'状态：启用：0、禁用:1',
+            title:'状态',
             align:"center",
-            dataIndex: 'status_dictText'
+            dataIndex: 'status_dictText',
+            scopedSlots: { customRender: 'status' }
           },
           {
             title: '操作',
@@ -161,6 +182,7 @@
         },
         dictOptions:{},
         superFieldList:[],
+        model: {}
       }
     },
     created() {
@@ -181,6 +203,9 @@
         fieldList.push({type:'sel_search',value:'equipmentid',text:'设备id',dictTable:"ems_tpm_equipment", dictText:'equipmentname', dictCode:'id'})
         fieldList.push({type:'string',value:'status',text:'状态：启用：0、禁用:1',dictCode:'spotcheck_content_status'})
         this.superFieldList = fieldList
+      },
+      statusChange(record,$event){
+        console.log(record.status,$event)
       }
     }
   }

src/views/module_ems/cmmsSpotcheckContent/index.vue

@@ -0,0 +1,43 @@
+<template>
+    <div class="all">
+        <div class="left">
+        </div>
+        <div class="right">
+            <cmms-spotcheck-content-list></cmms-spotcheck-content-list>
+        </div>
+    </div>
+</template>
+
+<script>
+import CmmsSpotcheckContentList from './CmmsSpotcheckContentList.vue';
+
+    export default({
+        components: {
+            CmmsSpotcheckContentList
+        },
+        data () {
+            return {
+            }
+        }
+    })
+</script>
+
+<style scoped>
+.all{
+    height: calc(100vh - 135px);
+    width: 100%;
+    display: flex;
+}
+.left{
+    height: 100%;
+    width: 20%;
+    /* border: 2px solid red; */
+    margin-right: 10px;
+    margin-left: 5px;
+}
+.right{
+    height: 100%;
+    width: 80%;
+    /* border: 2px solid red; */
+}
+</style>

src/views/module_ems/cmmsSpotcheckItem/CmmsSpotcheckItemList.vue

@@ -5,13 +5,23 @@
       <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.itemname"></a-input>
+            <a-form-item label="点检项名称">
+              <a-input placeholder="请输入点检项名称" v-model="queryParam.itemname"></a-input>
             </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>
@@ -155,12 +165,12 @@
             }
           },
           {
-            title:'名称',
+            title:'点检项名称',
             align:"center",
             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",

src/views/module_ems/tpmTag/index.vue

@@ -10,8 +10,8 @@
 </template>
 
 <script>
-import TpmTagList from '../tpmTag/TpmTagList.vue';
-import TpmDeviceList from '../tpmTag/TpmDeviceList.vue';
+import TpmTagList from './TpmTagList.vue';
+import TpmDeviceList from './TpmDeviceList.vue';
 
     export default({
         components: {