Merge remote-tracking branch 'origin/master'

src/views/module_ems/cmmsRepairManage/CmmsRepairManageList.vue

@@ -0,0 +1,367 @@
+<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.equipmentname"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="优先级">
+              <j-dict-select-tag  v-model="queryParam.priority"  placeholder="请输入优先级" dictCode="repair_priority"/>
+            </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.repairuser"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="维修状态">
+                <j-dict-select-tag  v-model="queryParam.status"  placeholder="请选择维修状态" dictCode="repair_handle_status"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="工单状态">
+                <j-dict-select-tag  v-model="queryParam.repairstatus"  placeholder="请选择工单状态" dictCode="repair_order_status"/>
+              </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 cmms-table"
+        @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="priority" slot-scope="text, record">
+          <a-tag v-if="record.priority === '0'">{{ text }}</a-tag>
+          <a-tag v-if="record.priority === '1'" color="orange">{{ text }}</a-tag>
+          <a-tag v-if="record.priority === '2'" color="red">{{ text }}</a-tag>
+        </span>
+
+        <span slot="status" slot-scope="text, record">
+          <a-tag v-if="record.status === '0'" color="orange">{{ text }}</a-tag>
+          <a-tag v-if="record.status === '1' || record.priority === '2'" color="blue">{{ text }}</a-tag>
+          <a-tag v-if="record.status === '3'">{{ text }}</a-tag>
+        </span>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a @click="handleDisptch(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 @click="handleFreeze(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>
+
+    <cmms-repair-manage-modal ref="modalForm" @ok="modalFormOk"></cmms-repair-manage-modal>
+    <!-- 派单 -->
+    <cmms-repair-dispatch ref="dispatchForm"></cmms-repair-dispatch>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CmmsRepairManageModal from './modules/CmmsRepairManageModal'
+import CmmsRepairDispatch from './modules/CmmsRepairDispatch.vue'
+
+  export default {
+    name: 'CmmsRepairManageList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CmmsRepairManageModal,
+      CmmsRepairDispatch
+    },
+    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: 'priority_dictText',
+            scopedSlots: { customRender: 'priority' }
+          },
+          {
+            title:'维修工单编号',
+            align:"center",
+            dataIndex: 'repaircode'
+          },
+          {
+            title:'工单名称',
+            align:"center",
+            dataIndex: 'repairname'
+          },
+          {
+            title:'维修时间',
+            align:"center",
+            dataIndex: 'repairdate',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          // {
+          //   title:'设备ID',
+          //   align:"center",
+          //   dataIndex: 'equipmentid'
+          // },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'equipmentname'
+          },
+          {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'equipmentcode'
+          },
+          {
+            title:'故障日期',
+            align:"center",
+            dataIndex: 'faultdate',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'故障描述',
+            align:"center",
+            dataIndex: 'faultdesc'
+          },
+          {
+            title:'录入人',
+            align:"center",
+            dataIndex: 'createBy'
+          },
+          {
+            title:'待办人',
+            align:"center",
+            dataIndex: 'repairuser'
+          },
+          {
+            title:'维修时间',
+            align:"center",
+            dataIndex: ''
+          },
+          {
+            title:'维修反馈',
+            align:"center",
+            dataIndex: 'feedback'
+          },
+          // {
+          //   title:'维修结果',
+          //   align:"center",
+          //   dataIndex: 'result'
+          // },
+          // {
+            //   title:'关联ID',
+            //   align:"center",
+            //   dataIndex: 'relid'
+            // },
+            {
+              title:'创建时间',
+            align:"center",
+            dataIndex: 'createTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          // {
+          //   title:'备注',
+          //   align:"center",
+          //   dataIndex: 'remark'
+          // },
+          {
+            title:'工单状态',
+            align:"center",
+            dataIndex: 'repairstatus_dictText'
+          },
+          {
+            title:'维修状态',
+            align:"center",
+            fixed:"right",
+            width:80,
+            dataIndex: 'status_dictText',
+            scopedSlots: { customRender: 'status' }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:152,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cmmsRepair/cmmsRepair/list",
+          delete: "/cmmsRepair/cmmsRepair/delete",
+          deleteBatch: "/cmmsRepair/cmmsRepair/deleteBatch",
+          exportXlsUrl: "/cmmsRepair/cmmsRepair/exportXls",
+          importExcelUrl: "cmmsRepair/cmmsRepair/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      // 派单
+      handleEdit: function (record) {
+        this.$refs.dispatchForm.dispatch(record);
+        this.$refs.dispatchForm.title = "派单";
+        this.$refs.dispatchForm.disableSubmit = false;
+      },
+      // 冻结
+      handleFreeze(record){
+        
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'id',text:'维修工单ID',dictCode:''})
+        fieldList.push({type:'string',value:'createBy',text:'创建者',dictCode:''})
+        fieldList.push({type:'date',value:'createTime',text:'创建时间'})
+        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
+        fieldList.push({type:'string',value:'repaircode',text:'维修工单编号',dictCode:''})
+        fieldList.push({type:'string',value:'repairname',text:'工单名称',dictCode:''})
+        fieldList.push({type:'string',value:'equipmentid',text:'设备ID',dictCode:''})
+        fieldList.push({type:'string',value:'equipmentcode',text:'设备编号',dictCode:''})
+        fieldList.push({type:'string',value:'equipmentname',text:'设备名称',dictCode:''})
+        fieldList.push({type:'string',value:'priority',text:'优先级：0普通，1紧急，2特急',dictCode:''})
+        fieldList.push({type:'date',value:'faultdate',text:'故障日期'})
+        fieldList.push({type:'string',value:'faultdesc',text:'故障描述',dictCode:''})
+        fieldList.push({type:'string',value:'repairuser',text:'待办人',dictCode:''})
+        fieldList.push({type:'date',value:'repairdate',text:'维修时间'})
+        fieldList.push({type:'string',value:'feedback',text:'维修反馈',dictCode:''})
+        fieldList.push({type:'string',value:'result',text:'维修结果',dictCode:''})
+        fieldList.push({type:'string',value:'status',text:'状态：0待处理，1维修检查，2设备维修，3维修结束',dictCode:''})
+        fieldList.push({type:'string',value:'relid',text:'关联ID：巡检、点检、保养的ID',dictCode:''})
+        fieldList.push({type:'string',value:'repairstatus',text:'维修工单状态: 0正常、1冻结、2拒绝',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
+<style lang="less" scoped>
+  .cmms-table{
+    /deep/ .ant-table-tbody tr:nth-child(2n){
+      background-color: #fafafa;
+    }
+  }
+</style>

src/views/module_ems/cmmsRepairManage/modules/CmmsRepairDispatch.vue

@@ -0,0 +1,142 @@
+<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="repairname">
+              <a-input v-model="model.repairname" placeholder="请输入维修工单编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工单名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairname">
+              <a-input v-model="model.repairname" placeholder="请输入工单名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentcode">
+              <a-input v-model="model.equipmentcode" placeholder="请输入设备编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentname">
+              <a-input v-model="model.equipmentname" placeholder="请输入设备名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <!-- <a-col :span="24">
+            <a-form-model-item label="优先级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="priority">
+              <j-dict-select-tag  v-model="model.priority"  placeholder="请输入优先级" :type="'radio'" dictCode="repair_priority"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="故障日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultdate">
+              <j-date placeholder="请选择故障日期" v-model="model.faultdate"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col> -->
+          <a-col :span="24">
+            <a-form-model-item label="故障描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultdesc">
+              <a-input v-model="model.faultdesc" placeholder="请输入故障描述"></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="待办人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairuser">
+              <a-input v-model="model.repairuser" 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: 'CmmsRepairManageForm',
+    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: {
+           repairuser: [
+              { required: true, message: '请输入待办人!'},
+           ],
+        },
+        url: {
+          add: "/cmmsRepairManage/cmmsRepairManage/add",
+          edit: "/cmmsRepairManage/cmmsRepairManage/edit",
+          queryById: "/cmmsRepairManage/cmmsRepairManage/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_ems/cmmsRepairManage/modules/CmmsRepairManageForm.vue

@@ -0,0 +1,165 @@
+<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="repairname">
+              <a-input v-model="model.repairname" 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>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentcode">
+              <a-input v-model="model.equipmentcode" placeholder="请输入设备编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentname">
+              <a-input v-model="model.equipmentname" placeholder="请输入设备名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="优先级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="priority">
+              <j-dict-select-tag  v-model="model.priority"  placeholder="请输入优先级" :type="'radio'" dictCode="repair_priority"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="故障日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultdate">
+              <j-date placeholder="请选择故障日期" v-model="model.faultdate"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="故障描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultdesc">
+              <a-input v-model="model.faultdesc" placeholder="请输入故障描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <!-- <a-col :span="24">
+            <a-form-model-item label="待办人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairuser">
+              <a-input v-model="model.repairuser" 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: 'CmmsRepairManageForm',
+    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: {
+           repairname: [
+              { required: true, message: '请输入工单名称!'},
+           ],
+           faultdate: [
+              { required: true, message: '请输入故障日期!'},
+           ],
+           faultdesc: [
+              { required: true, message: '请输入故障描述!'},
+           ],
+           repairuser: [
+              { required: true, message: '请输入待办人!'},
+           ],
+           repairdate: [
+              { required: true, message: '请输入维修时间!'},
+           ],
+           feedback: [
+              { required: true, message: '请输入维修反馈!'},
+           ],
+           result: [
+              { required: true, message: '请输入维修结果!'},
+           ],
+        },
+        url: {
+          add: "/cmmsRepairManage/cmmsRepairManage/add",
+          edit: "/cmmsRepairManage/cmmsRepairManage/edit",
+          queryById: "/cmmsRepairManage/cmmsRepairManage/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_ems/cmmsRepairManage/modules/CmmsRepairManageModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <cmms-repair-manage-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-repair-manage-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 CmmsRepairManageForm from './CmmsRepairManageForm'
+
+  export default {
+    name: 'CmmsRepairManageModal',
+    components: {
+      CmmsRepairManageForm
+    },
+    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_ems/cmmsRepairManage/modules/CmmsRepairManageModal.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="关闭">
+    <cmms-repair-manage-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-repair-manage-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CmmsRepairManageForm from './CmmsRepairManageForm'
+  export default {
+    name: 'CmmsRepairManageModal',
+    components: {
+      CmmsRepairManageForm
+    },
+    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_ems/cmmsRepair/CmmsRepairList.vue

@@ -4,6 +4,43 @@
     <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.equipmentname"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="优先级">
+              <j-dict-select-tag  v-model="queryParam.priority"  placeholder="请输入优先级" dictCode="repair_priority"/>
+            </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.repairuser"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="维修状态">
+                <j-dict-select-tag  v-model="queryParam.status"  placeholder="请选择维修状态" dictCode="repair_handle_status"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="工单状态">
+                <j-dict-select-tag  v-model="queryParam.repairstatus"  placeholder="请选择工单状态" dictCode="repair_order_status"/>
+              </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>
@@ -11,19 +48,19 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <!-- <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-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>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
+      <!-- <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>
+      </a-dropdown> -->
     </div>
 
     <!-- table区域-begin -->
@@ -43,9 +80,9 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
+        <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
 
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
@@ -89,7 +126,7 @@
       </a-table>
     </div>
 
-    <cmms-repair-modal ref="modalForm" @ok="modalFormOk"></cmms-repair-modal>
+    <cmms-repair-my-modal ref="modalForm" @ok="modalFormOk"></cmms-repair-my-modal>
   </a-card>
 </template>
 
@@ -98,13 +135,13 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CmmsRepairModal from './modules/CmmsRepairModal'
+  import CmmsRepairMyModal from './modules/CmmsRepairMyModal'
 
   export default {
-    name: 'CmmsRepairList',
+    name: 'CmmsRepairMyList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CmmsRepairModal
+      CmmsRepairMyModal
     },
     data () {
       return {
@@ -112,7 +149,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -122,9 +159,17 @@
             }
           },
           {
-            title:'维修工单ID',
+            title:'创建者',
             align:"center",
-            dataIndex: 'repairid'
+            dataIndex: 'createBy'
+          },
+          {
+            title:'创建时间',
+            align:"center",
+            dataIndex: 'createTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
           },
           {
             title:'备注',
@@ -222,11 +267,11 @@
           }
         ],
         url: {
-          list: "/cmmsRepair/cmmsRepair/list",
-          delete: "/cmmsRepair/cmmsRepair/delete",
-          deleteBatch: "/cmmsRepair/cmmsRepair/deleteBatch",
-          exportXlsUrl: "/cmmsRepair/cmmsRepair/exportXls",
-          importExcelUrl: "cmmsRepair/cmmsRepair/importExcel",
+          list: "/cmmsRepairMy/cmmsRepairMy/list",
+          delete: "/cmmsRepairMy/cmmsRepairMy/delete",
+          deleteBatch: "/cmmsRepairMy/cmmsRepairMy/deleteBatch",
+          exportXlsUrl: "/cmmsRepairMy/cmmsRepairMy/exportXls",
+          importExcelUrl: "cmmsRepairMy/cmmsRepairMy/importExcel",
           
         },
         dictOptions:{},
@@ -246,7 +291,9 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'repairid',text:'维修工单ID',dictCode:''})
+        fieldList.push({type:'string',value:'id',text:'维修工单ID',dictCode:''})
+        fieldList.push({type:'string',value:'createBy',text:'创建者',dictCode:''})
+        fieldList.push({type:'date',value:'createTime',text:'创建时间'})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         fieldList.push({type:'string',value:'repaircode',text:'维修工单编号',dictCode:''})
         fieldList.push({type:'string',value:'repairname',text:'工单名称',dictCode:''})

src/views/module_ems/cmmsRepair/modules/CmmsRepairForm.vue

@@ -4,11 +4,6 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="维修工单ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairid">
-              <a-input v-model="model.repairid" placeholder="请输入维修工单ID"  ></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>
@@ -79,11 +74,6 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="关联ID：巡检、点检、保养的ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="relid">
-              <a-input v-model="model.relid" placeholder="请输入关联ID：巡检、点检、保养的ID"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
             <a-form-model-item label="维修工单状态: 0正常、1冻结、2拒绝" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairstatus">
               <a-input v-model="model.repairstatus" placeholder="请输入维修工单状态: 0正常、1冻结、2拒绝"  ></a-input>
             </a-form-model-item>
@@ -100,7 +90,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CmmsRepairForm',
+    name: 'CmmsRepairMyForm',
     components: {
     },
     props: {
@@ -125,14 +115,32 @@
         },
         confirmLoading: false,
         validatorRules: {
-           repairid: [
-              { required: true, message: '请输入维修工单ID!'},
+           repairname: [
+              { required: true, message: '请输入工单名称!'},
+           ],
+           faultdate: [
+              { required: true, message: '请输入故障日期!'},
+           ],
+           faultdesc: [
+              { required: true, message: '请输入故障描述!'},
+           ],
+           repairuser: [
+              { required: true, message: '请输入待办人!'},
+           ],
+           repairdate: [
+              { required: true, message: '请输入维修时间!'},
+           ],
+           feedback: [
+              { required: true, message: '请输入维修反馈!'},
+           ],
+           result: [
+              { required: true, message: '请输入维修结果!'},
            ],
         },
         url: {
-          add: "/cmmsRepair/cmmsRepair/add",
-          edit: "/cmmsRepair/cmmsRepair/edit",
-          queryById: "/cmmsRepair/cmmsRepair/queryById"
+          add: "/cmmsRepairMy/cmmsRepairMy/add",
+          edit: "/cmmsRepairMy/cmmsRepairMy/edit",
+          queryById: "/cmmsRepairMy/cmmsRepairMy/queryById"
         }
       }
     },

src/views/module_ems/cmmsRepair/modules/CmmsRepairModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <cmms-repair-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-repair-form>
+    <cmms-repair-my-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-repair-my-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import CmmsRepairForm from './CmmsRepairForm'
+  import CmmsRepairMyForm from './CmmsRepairMyForm'
 
   export default {
-    name: 'CmmsRepairModal',
+    name: 'CmmsRepairMyModal',
     components: {
-      CmmsRepairForm
+      CmmsRepairMyForm
     },
     data () {
       return {

src/views/module_ems/cmmsRepair/modules/CmmsRepairModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <cmms-repair-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-repair-form>
+    <cmms-repair-my-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-repair-my-form>
   </j-modal>
 </template>
 
 <script>
 
-  import CmmsRepairForm from './CmmsRepairForm'
+  import CmmsRepairMyForm from './CmmsRepairMyForm'
   export default {
-    name: 'CmmsRepairModal',
+    name: 'CmmsRepairMyModal',
     components: {
-      CmmsRepairForm
+      CmmsRepairMyForm
     },
     data () {
       return {

src/views/module_ems/tpmEquipment/modules/TpmEquipmentForm.vue

@@ -29,16 +29,8 @@
                 设备编号 
                 <a-tooltip title="若未填写设备编号 则自动生成">
                   <a-icon type="exclamation-circle" theme="filled" />
-                  <!-- <a-icon type="exclamation-circle" /> -->
-                  <!-- <a-icon type="question-circle-o" /> -->
                 </a-tooltip>
               </span>
-              <!-- <a-tooltip placement="top">
-                <template slot="title">
-                  <span>若未填写设备编号 则自动生成</span>
-                </template>
-                <a-button>Top</a-button>
-              </a-tooltip> -->
               <a-input v-model="model.equipmentcode" placeholder="请输入设备编号"  ></a-input>
             </a-form-model-item>
           </a-col>

src/views/module_ems/tpmTag/modules/TpmTagForm.vue

@@ -3,73 +3,80 @@
     <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="12">
             <a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
               <!-- <a-input v-model="model.equipmentid" placeholder="请输入设备ID"  ></a-input> -->
               <j-search-select-tag v-model="model.equipmentid" placeholder="请选择设备" dict="ems_tpm_equipment,equipmentname,id"  />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="点位名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagname">
-              <a-input v-model="model.tagname" placeholder="请输入点位名"  ></a-input>
+              <!-- <a-input v-model="model.tagname" placeholder="请输入点位名"  ></a-input> -->
+              <a-select
+                v-model="model.tagname"
+                placeholder="请选择点位"
+                show-search
+                allowClear
+                :options="pointOptions">
+                </a-select>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="点位地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagaddress">
               <a-input v-model="model.tagaddress" placeholder="请输入点位地址"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="点位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagtype">
               <a-input v-model="model.tagtype" placeholder="请输入点位类型"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="能源分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="energytypeid">
               <a-input v-model="model.energytypeid" placeholder="请输入能源分类"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="能源分项" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="energyitemid">
               <a-input v-model="model.energyitemid" placeholder="请输入能源分项"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="min">
               <a-input-number v-model="model.min" placeholder="请输入下限" style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="max">
               <a-input-number v-model="model.max" placeholder="请输入上限" style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="报警延时(分钟)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delay">
               <a-input-number v-model="model.delay" placeholder="请输入报警延时(分钟)" style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="其他值1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param1">
               <a-input v-model="model.param1" placeholder="请输入其他值1"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="其他值2" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="param2">
               <a-input v-model="model.param2" placeholder="请输入其他值2"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="当前点位值获得时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logtime">
-              <j-date placeholder="请选择当前点位值获得时间"  v-model="model.logtime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="当前点位值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagvalue">
               <a-input-number v-model="model.tagvalue" placeholder="请输入当前点位值" style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <!-- <a-col :span="24">
+          <a-col :span="12">
+            <a-form-model-item label="获得时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logtime">
+              <j-date placeholder="请选择当前点位值获得时间"  v-model="model.logtime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <!-- <a-col :span="12">
             <a-form-model-item label="最后一次报警时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lastalarmtime">
               <j-date placeholder="请选择最后一次报警时间"  v-model="model.lastalarmtime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
@@ -115,14 +122,17 @@
             { required: true, message: '请选择设备!'},
           ],
           tagname: [
-            { required: true, message: '请输入点位名!'},
+            { required: true, message: '请选择点位!'},
           ],
         },
         url: {
           add: "/tpmTag/tpmTag/add",
           edit: "/tpmTag/tpmTag/edit",
-          queryById: "/tpmTag/tpmTag/queryById"
-        }
+          queryById: "/tpmTag/tpmTag/queryById",
+          getPoint: "/tpmIoserverTag/tpmIoserverTag/tagList"
+        },
+        // 点位数据
+        pointOptions: []
       }
     },
     computed: {
@@ -133,6 +143,8 @@
     created () {
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      // 获取点位下拉列表
+      this.getPointOptions()
     },
     methods: {
       add () {
@@ -171,6 +183,18 @@
          
         })
       },
+      getPointOptions() {
+        getAction(this.url.getPoint).then((res) => {
+          console.log(1111,res.result)
+          this.pointOptions = res.result.map(item => {
+            return {
+              // value: item.id,
+              value: item.tagname,
+              label: item.tagname
+            }
+          })
+        })
+      }
     }
   }
 </script>

src/views/module_ems/tpmTag/modules/TpmTagModal.vue

@@ -23,7 +23,7 @@
     data () {
       return {
         title:'',
-        width:800,
+        width:1200,
         visible: false,
         disableSubmit: false
       }