Merge branch 'master' of http://152.136.206.27:3000/dongjh/ems_client

src/components/module_ems/UModal/UModal.vue

@@ -22,8 +22,7 @@
           <a-button class="ant-modal-close ant-modal-close-x" ghost type="link" :icon="fullscreenButtonIcon"/>
         </a-col> -->
         <a-col class="right-btn">
-          <a-icon type="menu-fold" />
-          <a-icon type="menu-unfold" />
+          <a-icon :type="isModalFull?'menu-unfold':'menu-fold'" @click="isModalFull = !isModalFull"/>
           <!-- <a-icon type="column-width" /> -->
           <a-icon :type="isContentFull?'pic-right':'pic-center'" @click="isContentFull = !isContentFull"/>
           <a-button type="primary" @click="handleOk">确定</a-button>
@@ -70,6 +69,11 @@ export default {
         type: Boolean,
         default: false
       },
+      // 全屏显示
+      modalFull: {
+        type: Boolean,
+        default: false
+      },
       title: {
         type: String,
         default: '内容'
@@ -107,7 +111,7 @@ export default {
         innerFullscreen: this.fullscreen,
         // 内容展现形式：居中活全屏
         isContentFull: null,
-        isSetWidthFull: true,
+        isModalFull: false,
       }
     },
     computed: {
@@ -126,6 +130,8 @@ export default {
           'fullscreen': this.innerFullscreen,
           // 'no-title': this.isNoTitle,
           'no-footer': this.isNoFooter,
+          'modalFullcss': this.isModalFull,
+          'modalMarginLeft': !this.isModalFull
         }
       },
       modalStyle() {
@@ -179,6 +185,13 @@ export default {
           this.isContentFull = newV
         },
         immediate: true
+      },
+      modalFull: {
+        handler(newV, oldV){
+          console.log(newV, oldV)
+          this.isModalFull = newV
+        },
+        immediate: true
       }
     },
     methods: {
@@ -233,10 +246,8 @@ export default {
   .u-modal-box {
     // 宽高
     .ant-modal{
-      width: calc(100vw - 208px) !important;
       height: 100vh !important;
       padding: 0 !important;
-      margin-left: 208px;
       margin-right: 0;
       top: 0;
       .ant-modal-content{
@@ -363,6 +374,19 @@ export default {
     // }
   }
 
+  .modalFullcss{
+    .ant-modal{
+      width: 100vw !important;
+      margin-left: 0;
+    }
+  }
+  .modalMarginLeft{
+    .ant-modal{
+      width: calc(100vw - 208px) !important;
+      margin-left: 208px;
+    }
+  }
+
   @media (max-width: 767px) {
     .u-modal-box.fullscreen {
       margin: 0;

src/views/module_cmms/inspectContent/modules/InspectContentForm.vue

@@ -58,7 +58,7 @@
           <!-- :loading="loading" -->
         </a-table>
       </a-form-model>
-      <inspect-content-modal-add ref="addItemRef" :equipmentId="model.equipmentid" :selectData="model.cmmsInspectContentItemList" @ok="handleItemOk"></inspect-content-modal-add>
+      <inspect-content-modal-add ref="addItemRef" :equipmentId="model.equipmentid" :selectData="model.cmmsInspectContentItemList" @ok="handleOk"></inspect-content-modal-add>
     </j-form-container>
   </a-spin>
 </template>
@@ -217,7 +217,7 @@
 
         })
       },
-      handleItemOk(data){
+      handleOk(data){
         console.log(data)
         this.model.cmmsInspectContentItemList = data;
       }

src/views/module_cmms/inspectSpot/modules/InspectSpotForm.vue

@@ -15,11 +15,6 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="选择设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipdefid">
-              <a-input v-model="model.equipdefid" placeholder="请输入设备类型"  ></a-input>
-            </a-form-model-item>
-          </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-form-model-item>
@@ -27,12 +22,11 @@
         </a-row>
         <div class="cmms-dialog-item-title u-flex-jab">
           <div>巡检项目设置</div>
-          <div @click="addInspectItem"><a-icon type="plus"/>巡检项目</div>
+          <div @click="addInspectContent"><a-icon type="plus"/>巡检项目</div>
         </div>
         <a-table
           ref="table"
           size="middle"
-          :scroll="{x:true}"
           bordered
           rowKey="id"
           :columns="columns"
@@ -40,8 +34,21 @@
           :pagination="false"
           class="j-table-force-nowrap">
           <!-- :loading="loading" -->
+          <div slot="expandedRowRender" slot-scope="record">
+            <a-table
+              ref="table"
+              size="middle"
+              bordered
+              rowKey="id"
+              :columns="innerColumns"
+              :dataSource="record.cmmsInspectContentItemList"
+              :pagination="false"
+              class="j-table-force-nowrap">
+            </a-table>
+          </div>
         </a-table>
       </a-form-model>
+      <inspect-spot-modal-add ref="addContentRef"  :selectData="model.inspectContentList" @ok="handleOk"></inspect-spot-modal-add>
     </j-form-container>
   </a-spin>
 </template>
@@ -50,10 +57,12 @@
 
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
+  import InspectSpotModalAdd from './InspectSpotModalAdd.vue'
 
   export default {
     name: 'InspectSpotForm',
     components: {
+        InspectSpotModalAdd
     },
     props: {
       //表单禁用
@@ -66,7 +75,8 @@
     data () {
       return {
         model:{
-         },
+          inspectContentList: []
+        },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -81,7 +91,7 @@
         url: {
           add: "/cmmsInspectSpot/cmmsInspectSpot/add",
           edit: "/cmmsInspectSpot/cmmsInspectSpot/edit",
-          queryById: "/cmmsInspectSpot/cmmsInspectSpot/queryById"
+          queryById: "/cmmsInspectSpot/cmmsInspectSpot/queryById",
         },
         columns: [
           // {
@@ -125,6 +135,38 @@
             dataIndex: 'remark'
           }
         ],
+        innerColumns: [
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          {
+            title:'点检项编号',
+            align:"center",
+            dataIndex: 'itemcode'
+          },
+          {
+            title:'点检项名称',
+            align:"center",
+            dataIndex: 'itemname'
+          },
+          {
+            title:'标准',
+            align:"center",
+            dataIndex: 'inspectionstandards',
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          }
+        ],
       }
     },
     computed: {
@@ -141,12 +183,17 @@
         this.visible = true;
         // this.edit(this.modelDefault);
       },
+      addInspectContent(){
+        this.$refs.addContentRef.add();
+        this.$refs.addContentRef.title = "选择巡检项目";
+      },
       edit (record) {
         this.visible = true;
         this.confirmLoading = true
         // this.model = Object.assign({}, record);
         getAction(this.url.queryById, {id: record.id}).then((res) => {
           this.model = res.result
+          console.log(res)
           this.confirmLoading = false
         })
       },
@@ -179,6 +226,12 @@
          
         })
       },
+      handleOk(data){
+        data.map(res=>{
+
+        })
+        this.model.inspectContentList = data;
+      },
     }
   }
 </script>

src/views/module_cmms/inspectSpot/modules/InspectSpotModalAdd.vue

@@ -0,0 +1,143 @@
+<template>
+  <j-modal
+  :title="title"
+  :width="width"
+  :visible="visible"
+  @ok="handleOk"
+  @cancel="handleCancel"
+  cancelText="关闭">
+    <a-table
+      ref="table"
+      size="middle"
+      :scroll="{x:true}"
+      bordered
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataSource"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      :pagination="false"
+      class="j-table-force-nowrap">
+    </a-table>
+  </j-modal>
+</template>
+
+<script>
+  import { httpAction, getAction } from '@/api/manage'
+  
+  export default {
+    name: 'SpotcheckContentModalAdd',
+    components: {
+        
+    },
+    props: {
+      //表单禁用
+      equipmentId: {
+        type: String,
+        default: ''
+      },
+      selectData: {
+        type: Array,
+        default: function(){
+          return [] // 使用工厂函数返回默认值
+        }
+      },
+    },
+    data () {
+      return {
+        title:'',
+        width: 1000,
+        visible: false,
+        /* table选中keys*/
+        selectedRowKeys: [],
+        /* table选中records*/
+        selectionRows: [],
+        columns: [
+          // {
+          //   title: '',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          {
+            title:'巡检项目编号',
+            align:"center",
+            dataIndex: 'contentcode'
+          },
+          {
+            title:'巡检项目名称',
+            align:"center",
+            dataIndex: 'contentname'
+          },
+          {
+            title:'设备',
+            align:"center",
+            dataIndex: 'equipmentid'
+          },
+          // {
+          //   title:'状态',
+          //   align:"center",
+          //   dataIndex: 'status'
+          // },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+        ],
+        dataSource: [],
+        url: {
+          getList: "/cmmsInspectItem/cmmsInspectItem/getItemByEqId",
+          contentList: "/cmmsInspectContent/cmmsInspectContent/listDetails",
+        },
+      }
+    },
+    methods: {
+      add () {
+        this.visible = true;
+        getAction(this.url.contentList, {status: '0'}).then((res) => {
+          this.dataSource = res.result.records
+        })
+        this.selectList()
+      },
+      // 将以选中的值重新在列表中选中
+      selectList() {
+        this.selectionRows = this.selectData
+        console.log(this.selectData)
+        this.selectedRowKeys = this.selectData.map((res) => {
+          return res.id
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+        this.onClearSelected()
+        this.selectionRows = this.selectData
+        this.selectedRowKeys = this.selectData.map((res) => {
+          return res.id
+        })
+        this.dataSource = []
+      },
+      handleOk () {
+        console.log(this.selectionRows)
+        this.$emit('ok', this.selectionRows);
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      },
+      onSelectChange(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        console.log(this.selectedRowKeys,this.selectionRows)
+      },
+      onClearSelected() {
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+      },
+    }
+  }
+</script>

src/views/module_cmms/spotcheck/modules/SpotcheckForm.vue

@@ -147,6 +147,8 @@
         model:{
           cmmsSpotcheckTitemList: []
         },
+        modelWX:{
+        },
         // 单个禁填
         disableds: false,
         // 点检结果(-1为报修，1为其他结果)
@@ -209,6 +211,9 @@
           result: [
             { required: true, message: '请输入点检结果!'},
           ],
+          description: [
+            { required: true, message: '请输入点检描述/故障描述!'},
+          ],
           spotcheckdate: [
             { required: true, message: '请选择点检时间!'},
           ],
@@ -221,6 +226,7 @@
         },
         url: {
           add: "/cmmsSpotcheck/cmmsSpotcheck/add",
+          add2: "/cmmsRepair/cmmsRepair/add",
           edit: "/cmmsSpotcheck/cmmsSpotcheck/edit",
           queryById: "/cmmsSpotcheck/cmmsSpotcheck/queryById"
         }
@@ -243,10 +249,14 @@
         // this.model = this.dataList
         // this.model.id = ""
       },
+      // 监听选择的设备
       handleChange(value){
         console.log(value)
         getAction(`/cmmsSpotcheck/cmmsSpotcheck/getInfoByEquipmentid/${value}`).then((res) => {
-          this.model = res.result
+          // this.model = res.result
+          this.model.contentname = res.result.contentname
+          this.model.spotcheckdate = res.result.spotcheckdate
+          this.model.cmmsSpotcheckTitemList = res.result.cmmsSpotcheckTitemList
           this.model.id = ""
         })
       },
@@ -270,10 +280,38 @@
           if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
+            let httpurl2 = '';
             let method = '';
             if(!this.model.id){
               httpurl+=this.url.add;
               method = 'post';
+              // 判断点检结果是否为报修
+              if (this.resultStatus == -1) {
+                console.log(99,this.model)
+                this.modelWX.equipmentid = this.model.equipmentid
+                // 下面两句：将带有时分秒的去掉，只传年月日
+                // const time = this.model.spotcheckdate
+                // this.modelWX.faultdate=time.replace(/ \d+(:\d+){2}/,'');
+                this.modelWX.faultdate = this.model.spotcheckdate
+                this.modelWX.faultdesc = this.model.description
+                this.modelWX.repairname = this.model.repairname
+                this.modelWX.priority = this.model.priority
+                const c  = this.model.files.split(',')
+                this.modelWX.files = c.map((res) => {
+                  return {
+                    url: res
+                  }
+                })
+                console.log("00",this.modelWX)
+                httpurl2+=this.url.add2;
+                httpAction(httpurl2,this.modelWX,method).then((res)=>{
+                  if(res.success){
+                    that.$message.success("维修工单新增成功！");
+                  }else{
+                    that.$message.warning(res.message);
+                  }
+                })
+              }
             }else{
               httpurl+=this.url.edit;
                method = 'put';

src/views/module_cmms/upkeepItem/UpkeepItemList.vue

@@ -0,0 +1,236 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <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 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="设备类型">
+              <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-input placeholder="请输入保养项编号" v-model="queryParam.itemcode"></a-input>
+            </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.itemcode"></a-input>
+              </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>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload> -->
+      <!-- 高级查询区域 -->
+      <!-- <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>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <upkeep-item-modal ref="modalForm" @ok="modalFormOk"></upkeep-item-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import UpkeepItemModal from './modules/UpkeepItemModal'
+
+  export default {
+    name: 'UpkeepItemList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      UpkeepItemModal
+    },
+    data () {
+      return {
+        description: '保养项管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'保养项名称',
+            align:"center",
+            dataIndex: 'itemname'
+          },
+          {
+            title:'设备类型',
+            align:"center",
+            dataIndex: 'equiptypeName'
+          },
+          {
+            title:'保养编号',
+            align:"center",
+            dataIndex: 'itemcode'
+          },
+          {
+            title:'保养标准',
+            align:"center",
+            dataIndex: 'itemcontent'
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cmmsUpkeepItem/cmmsUpkeepItem/list",
+          delete: "/cmmsUpkeepItem/cmmsUpkeepItem/delete",
+          deleteBatch: "/cmmsUpkeepItem/cmmsUpkeepItem/deleteBatch",
+          exportXlsUrl: "/cmmsUpkeepItem/cmmsUpkeepItem/exportXls",
+          importExcelUrl: "cmmsUpkeepItem/cmmsUpkeepItem/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        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:'itemcontent',text:'保养标准',dictCode:''})
+        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/module_cmms/upkeepItem/modules/UpkeepItemForm.vue

@@ -0,0 +1,141 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <!-- <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 :span="24">
+            <a-form-model-item label="保养项名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemname">
+              <a-input v-model="model.itemname" placeholder="请输入保养项名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipdefid">
+              <!-- <a-input v-model="model.equipdefid" placeholder="请输入设备类型ID（设备树，可单选可多选，多选设备类型用逗号连接）"  ></a-input> -->
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择设备类型"
+                multiple
+                v-model="model.equipdefid"
+                dict="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-form-model-item label="保养标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemcontent">
+              <a-input v-model="model.itemcontent" placeholder="请输入保养标准"  ></a-input>
+            </a-form-model-item>
+          </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-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'UpkeepItemForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+          itemname: [
+            { required: true, message: '请输入保养项名称!'},
+          ],
+          equipdefid: [
+            { required: true, message: '请选择设备类型!'},
+          ],
+        },
+        url: {
+          add: "/cmmsUpkeepItem/cmmsUpkeepItem/add",
+          edit: "/cmmsUpkeepItem/cmmsUpkeepItem/edit",
+          queryById: "/cmmsUpkeepItem/cmmsUpkeepItem/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

src/views/module_cmms/upkeepItem/modules/UpkeepItemModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <upkeep-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></upkeep-item-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import UpkeepItemForm from './UpkeepItemForm'
+
+  export default {
+    name: 'UpkeepItemModal',
+    components: {
+      UpkeepItemForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

src/views/module_cmms/upkeepItem/modules/UpkeepItemModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <upkeep-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></upkeep-item-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import UpkeepItemForm from './UpkeepItemForm'
+  export default {
+    name: 'UpkeepItemModal',
+    components: {
+      UpkeepItemForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/module_cmms/upkeepPlan/UpkeepPlanList.vue

@@ -0,0 +1,306 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload> -->
+      <!-- 高级查询区域 -->
+      <!-- <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>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <upkeep-plan-modal ref="modalForm" @ok="modalFormOk"></upkeep-plan-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import UpkeepPlanModal from './modules/UpkeepPlanModal'
+
+  export default {
+    name: 'UpkeepPlanList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      UpkeepPlanModal
+    },
+    data () {
+      return {
+        description: '保养计划管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'保养计划编号',
+            align:"center",
+            dataIndex: 'plancode'
+          },
+          {
+            title:'保养计划名称',
+            align:"center",
+            dataIndex: 'planname'
+          },
+          // {
+          //   title:'保养工作项目ID',
+          //   align:"center",
+          //   dataIndex: 'upkeepprojid'
+          // },
+          {
+            title:'工作项目名称',
+            align:"center",
+            dataIndex: 'projectname'
+          },
+          {
+            title:'地点',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'厂商名称',
+            align:"center",
+            dataIndex: 'supplier'
+          },
+          {
+            title:'厂商电话',
+            align:"center",
+            dataIndex: 'suppliertel'
+          },
+          {
+            title:'联系人',
+            align:"center",
+            dataIndex: 'linker'
+          },
+          {
+            title:'联系人电话',
+            align:"center",
+            dataIndex: 'linkertel'
+          },
+          {
+            title:'负责人',
+            align:"center",
+            dataIndex: 'chargeruser'
+          },
+          {
+            title:'描述',
+            align:"center",
+            dataIndex: 'plandesc'
+          },
+          {
+            title:'开始时间',
+            align:"center",
+            dataIndex: 'begintime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'重复',
+            align:"center",
+            dataIndex: 'repeatnum'
+          },
+          {
+            title:'重复类型：年、月、周、日、时、分',
+            align:"center",
+            dataIndex: 'repeattype'
+          },
+          {
+            title:'提前通知时间',
+            align:"center",
+            dataIndex: 'noticenum'
+          },
+          {
+            title:'提前通知类型：天、时、分',
+            align:"center",
+            dataIndex: 'noticetype'
+          },
+          {
+            title:'状态（0启用 1停用）',
+            align:"center",
+            dataIndex: 'status'
+          },
+          {
+            title:'下次执行时间',
+            align:"center",
+            dataIndex: 'nexttime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'下次通知时间',
+            align:"center",
+            dataIndex: 'noticetime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'是否已通知：是/否',
+            align:"center",
+            dataIndex: 'ifnotice'
+          },
+          {
+            title:'设备id（根据设备id查找保养项内容）',
+            align:"center",
+            dataIndex: 'equipmentid'
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cmmsUpkeepPlan/cmmsUpkeepPlan/list",
+          delete: "/cmmsUpkeepPlan/cmmsUpkeepPlan/delete",
+          deleteBatch: "/cmmsUpkeepPlan/cmmsUpkeepPlan/deleteBatch",
+          exportXlsUrl: "/cmmsUpkeepPlan/cmmsUpkeepPlan/exportXls",
+          importExcelUrl: "cmmsUpkeepPlan/cmmsUpkeepPlan/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
+        fieldList.push({type:'string',value:'plancode',text:'保养计划编号',dictCode:''})
+        fieldList.push({type:'string',value:'planname',text:'保养计划名称',dictCode:''})
+        fieldList.push({type:'string',value:'upkeepprojid',text:'保养工作项目ID',dictCode:''})
+        fieldList.push({type:'string',value:'projectname',text:'工作项目名称',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地点',dictCode:''})
+        fieldList.push({type:'string',value:'supplier',text:'厂商名称',dictCode:''})
+        fieldList.push({type:'string',value:'suppliertel',text:'厂商电话',dictCode:''})
+        fieldList.push({type:'string',value:'linker',text:'联系人',dictCode:''})
+        fieldList.push({type:'string',value:'linkertel',text:'联系人电话',dictCode:''})
+        fieldList.push({type:'string',value:'chargeruser',text:'负责人',dictCode:''})
+        fieldList.push({type:'string',value:'plandesc',text:'描述',dictCode:''})
+        fieldList.push({type:'date',value:'begintime',text:'开始时间'})
+        fieldList.push({type:'int',value:'repeatnum',text:'重复',dictCode:''})
+        fieldList.push({type:'string',value:'repeattype',text:'重复类型：年、月、周、日、时、分',dictCode:''})
+        fieldList.push({type:'int',value:'noticenum',text:'提前通知时间',dictCode:''})
+        fieldList.push({type:'string',value:'noticetype',text:'提前通知类型：天、时、分',dictCode:''})
+        fieldList.push({type:'string',value:'status',text:'状态（0启用 1停用）',dictCode:''})
+        fieldList.push({type:'date',value:'nexttime',text:'下次执行时间'})
+        fieldList.push({type:'date',value:'noticetime',text:'下次通知时间'})
+        fieldList.push({type:'string',value:'ifnotice',text:'是否已通知：是/否',dictCode:''})
+        fieldList.push({type:'string',value:'equipmentid',text:'设备id（根据设备id查找保养项内容）',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/module_cmms/upkeepPlan/modules/UpkeepPlanForm.vue

@@ -0,0 +1,209 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <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-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="保养计划编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="plancode">
+              <a-input v-model="model.plancode" placeholder="请输入保养计划编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="保养计划名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planname">
+              <a-input v-model="model.planname" placeholder="请输入保养计划名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="保养工作项目ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upkeepprojid">
+              <a-input v-model="model.upkeepprojid" placeholder="请输入保养工作项目ID"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工作项目名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectname">
+              <a-input v-model="model.projectname" placeholder="请输入工作项目名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地点"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="厂商名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplier">
+              <a-input v-model="model.supplier" placeholder="请输入厂商名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="厂商电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="suppliertel">
+              <a-input v-model="model.suppliertel" placeholder="请输入厂商电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="linker">
+              <a-input v-model="model.linker" placeholder="请输入联系人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="linkertel">
+              <a-input v-model="model.linkertel" placeholder="请输入联系人电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargeruser">
+              <a-input v-model="model.chargeruser" placeholder="请输入负责人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="plandesc">
+              <a-input v-model="model.plandesc" placeholder="请输入描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="begintime">
+              <j-date placeholder="请选择开始时间" v-model="model.begintime"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="重复" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repeatnum">
+              <a-input-number v-model="model.repeatnum" placeholder="请输入重复" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="重复类型：年、月、周、日、时、分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repeattype">
+              <a-input v-model="model.repeattype" placeholder="请输入重复类型：年、月、周、日、时、分"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="提前通知时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noticenum">
+              <a-input-number v-model="model.noticenum" placeholder="请输入提前通知时间" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="提前通知类型：天、时、分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noticetype">
+              <a-input v-model="model.noticetype" placeholder="请输入提前通知类型：天、时、分"  ></a-input>
+            </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>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="下次执行时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nexttime">
+              <j-date placeholder="请选择下次执行时间" v-model="model.nexttime"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="下次通知时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noticetime">
+              <j-date placeholder="请选择下次通知时间" v-model="model.noticetime"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否已通知：是/否" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifnotice">
+              <a-input v-model="model.ifnotice" placeholder="请输入是否已通知：是/否"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备id（根据设备id查找保养项内容）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
+              <a-input v-model="model.equipmentid" placeholder="请输入设备id（根据设备id查找保养项内容）"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'UpkeepPlanForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/cmmsUpkeepPlan/cmmsUpkeepPlan/add",
+          edit: "/cmmsUpkeepPlan/cmmsUpkeepPlan/edit",
+          queryById: "/cmmsUpkeepPlan/cmmsUpkeepPlan/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

src/views/module_cmms/upkeepPlan/modules/UpkeepPlanModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <upkeep-plan-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></upkeep-plan-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import UpkeepPlanForm from './UpkeepPlanForm'
+
+  export default {
+    name: 'UpkeepPlanModal',
+    components: {
+      UpkeepPlanForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

src/views/module_cmms/upkeepPlan/modules/UpkeepPlanModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <upkeep-plan-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></upkeep-plan-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import UpkeepPlanForm from './UpkeepPlanForm'
+  export default {
+    name: 'UpkeepPlanModal',
+    components: {
+      UpkeepPlanForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>