ruanqi 3 years ago
parent
commit
4695cb24ef
  1. 13
      src/api/eam/eam.js
  2. 356
      src/views/modules/eam/eamDefect.vue
  3. 2
      src/views/modules/eam/eamPropertiesModel.vue
  4. 424
      src/views/modules/eam/eamWorkOrderForCheck.vue
  5. 47
      src/views/modules/eam/eamWorkPlanForCheck.vue

13
src/api/eam/eam.js

@ -102,3 +102,16 @@ export const savePlanItemAvailable = data => createAPI(`api/pms/eam/savePlanItem
export const deletePlanItemAvailable = data => createAPI(`api/pms/eam/deletePlanItemAvailable`,'post',data)
export const createEamWorkOrder = data => createAPI(`api/pms/eam/createEamWorkOrder`,'post',data)
export const objectIDBlur = data => createAPI(`api/pms/eam/objectIDBlur`,'post',data)
export const modalCodeBlur = data => createAPI(`api/pms/eam/modalCodeBlur`,'post',data)
//---------------点检工单-------------------
export const eamWorkOrderSearch = data => createAPI(`api/pms/eam/eamWorkOrderSearch`,'post',data)
//---------------点检工单-------------------
export const eamDefectSearch = data => createAPI(`api/pms/eam/eamDefectSearch`,'post',data)
export const eamDefectSave = data => createAPI(`api/pms/eam/eamDefectSave`,'post',data)
export const eamDefectEdit = data => createAPI(`api/pms/eam/eamDefectEdit`,'post',data)
export const eamDefectDelete = data => createAPI(`api/pms/eam/eamDefectDelete`,'post',data)

356
src/views/modules/eam/eamDefect.vue

@ -0,0 +1,356 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<el-form-item :label="'故障编码'">
<el-input v-model="searchData.defectID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'故障名称'">
<el-input v-model="searchData.defectDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'在用'">
<el-select filterable v-model="searchData.active" style="width: 130px">
<el-option label="全部" value=""></el-option>
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addModal()">新增</el-button>
<!-- <el-button type="danger" @click="deleteDefect()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
</el-form-item>
</el-form>
<el-table
:height="height"
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="50">-->
<!-- </el-table-column>-->
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
<el-table-column
fixed="right"
header-align="center"
align="center"
width="100"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="updateModal(scope.row)">修改</a>
<a type="text" size="small" @click="deleteDefect(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 100, 500, 1000]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<el-dialog title="故障" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="故障编码:">
<el-input v-model="modalData.defectID" :disabled="modalDisableFlag" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="故障名称:">
<el-input v-model="modalData.defectDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="是否在用:">
<el-select filterable v-model="modalData.active" style="width: 120px">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
</div>
</template>
<script>
import {
eamDefectSearch,
eamDefectSave,
eamDefectEdit,
eamDefectDelete,
} from "@/api/eam/eam.js"
export default {
watch: {
searchData: {
deep: true,
handler: function (newV, oldV) {
this.searchData.defectID = this.searchData.defectID.toUpperCase()
}
},
modalData: {
deep: true,
handler: function (newV, oldV) {
this.modalData.defectID = this.modalData.defectID.toUpperCase()
}
}
},
data () {
return {
searchData: {
site: this.$store.state.user.site,
defectID: '',
defectDesc: '',
active: 'Y',
page: 1,
limit: 10,
},
height: 200,
pageIndex: 1,
pageSize: 100,
totalPage: 0,
dataList: [],
dataListLoading: false,
dataListSelections: [],
modalFlag:false,
modalDisableFlag:false,
modalData:{
flag:'',
site: this.$store.state.user.site,
defectID:'',
defectDesc:'',
active:'',
},
departmentList:[],
//
columnList: [
{
userId: this.$store.state.user.name,
functionId: 101015,
serialNumber: '101015TableDefectID',
tableId: "101015Table",
tableName: "common",
columnProp: 'defectID',
headerAlign: "center",
align: "left",
columnLabel: '故障编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 101015,
serialNumber: '101015TableDefectDesc',
tableId: "101015Table",
tableName: "common",
columnProp: 'defectDesc',
headerAlign: "center",
align: "left",
columnLabel: '故障名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140,
},
{
userId: this.$store.state.user.name,
functionId: 101015,
serialNumber: '101015TableActive',
tableId: "101015Table",
tableName: "common",
columnProp: 'active',
headerAlign: "center",
align: "left",
columnLabel: '在用',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 40,
},
],
levelList:[],
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 210
})
},
created () {
this.getDataList()
},
methods: {
//
getDataList () {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
eamDefectSearch(this.searchData).then(({data}) => {
if (data.code == 0) {
this.dataList = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
}
this.dataListLoading = false
})
},
//
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
//
currentChangeHandle (val) {
this.pageIndex = val
this.getDataList()
},
//
selectionChangeHandle (val) {
this.dataListSelections = val
},
addModal(){
this.modalData={
flag:'1',
site: this.$store.state.user.site,
defectID:'',
defectDesc:'',
active:'',
};
this.modalDisableFlag=false;
this.modalFlag=true;
},
updateModal(row){
this.modalData={
flag:'2',
site: row.site,
defectID:row.defectID,
defectDesc:row.defectDesc,
active:row.active,
};
this.modalDisableFlag=true;
this.modalFlag=true;
},
//
deleteDefect (row) {
this.$confirm(`是否删除这个故障?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
eamDefectDelete(row).then(({data}) => {
if (data && data.code == '0') {
this.getDataList()
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}).catch(() => {
})
},
saveData(){
if (this.modalData.defectID == '' || this.modalData.defectID == null) {
this.$alert('请输入故障编码!', '错误', {
confirmButtonText: '确定'
})
return false
}
if (this.modalData.defectDesc == '' || this.modalData.defectDesc == null) {
this.$alert('请输入故障名称!', '错误', {
confirmButtonText: '确定'
})
return false
}
if (this.modalData.active == '' || this.modalData.active == null) {
this.$alert('选择是否在用!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.modalData.flag=='1'){
eamDefectSave(this.modalData).then(({data}) => {
if (data && data.code == '0') {
this.getDataList()
this.modalFlag=false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}else {
eamDefectEdit(this.modalData).then(({data}) => {
if (data && data.code == '0') {
this.getDataList()
this.modalFlag=false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
},
}
}
</script>

2
src/views/modules/eam/eamPropertiesModel.vue

@ -714,6 +714,8 @@
eamPropertiesItemSearch(inData).then(({data}) => {
if(data.rows.length>0){
this.detailData.itemDesc=data.rows[0].itemDesc
}else {
this.detailData.itemDesc=''
}
})
},

424
src/views/modules/eam/eamWorkOrderForCheck.vue

@ -0,0 +1,424 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<el-form-item :label="'工单编码'">
<el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'计划编码'">
<el-input v-model="searchData.planID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'设备编码'">
<el-input v-model="searchData.objectID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'计划执行人员编码'">
<el-input v-model="searchData.planOperator" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'状态'">
<el-select filterable v-model="searchData.status" style="width: 130px">
<el-option label="全部" value=""></el-option>
<el-option label="未开工" value="未开工"></el-option>
<el-option label="已完工" value="已完工"></el-option>
<el-option label="已取消" value="已取消"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'计划执行日期:'">
<el-date-picker
style="width: 120px"
v-model="searchData.startDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item style="margin-top: 23px;">
<laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
</el-form-item>
<el-form-item :label="' '">
<el-date-picker
style="width: 120px"
v-model="searchData.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="' '">
<el-button @click="getDataList()">查询</el-button>
<!-- <el-button type="primary" @click="addModal()">新增</el-button>-->
</el-form-item>
</el-form>
<el-table
:height="height"
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="50">-->
<!-- </el-table-column>-->
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- fixed="right"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="100"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <a type="text" size="small" @click="updateModal(scope.row)">修改</a>-->
<!-- <a type="text" size="small" @click="deleteGroup(scope.row)">删除</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 100, 500, 1000]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</div>
</template>
<script>
import {
eamWorkOrderSearch,
} from "@/api/eam/eam.js"
export default {
watch: {
searchData: {
deep: true,
handler: function (newV, oldV) {
this.searchData.groupID = this.searchData.groupID.toUpperCase()
}
},
modalData: {
deep: true,
handler: function (newV, oldV) {
this.modalData.groupID = this.modalData.groupID.toUpperCase()
}
}
},
data () {
return {
searchData: {
site: this.$store.state.user.site,
orderNo: '',
planID: '',
objectID: '',
planOperator: '',
functionType: 'A',
status: '',
startDate:'',
endDate:'',
page: 1,
limit: 10,
},
height: 200,
pageIndex: 1,
pageSize: 100,
totalPage: 0,
dataList: [],
dataListLoading: false,
dataListSelections: [],
modalFlag:false,
modalDisableFlag:false,
modalData:{
flag:'',
site: this.$store.state.user.site,
groupID:'',
groupDesc:'',
active:'',
},
departmentList:[],
//
columnList: [
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableSite',
tableId: "101014Table",
tableName: "common",
columnProp: 'site',
headerAlign: "center",
align: "left",
columnLabel: '工厂编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableOrderNo',
tableId: "101014Table",
tableName: "common",
columnProp: 'orderNo',
headerAlign: "center",
align: "left",
columnLabel: '工单编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TablePlanID',
tableId: "101014Table",
tableName: "common",
columnProp: 'planID',
headerAlign: "center",
align: "left",
columnLabel: '计划编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TablePropertiesCode',
tableId: "101014Table",
tableName: "common",
columnProp: 'propertiesCode',
headerAlign: "center",
align: "left",
columnLabel: '模板编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableObjectID',
tableId: "101014Table",
tableName: "common",
columnProp: 'objectID',
headerAlign: "center",
align: "left",
columnLabel: '设备编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableStatus',
tableId: "101014Table",
tableName: "common",
columnProp: 'status',
headerAlign: "center",
align: "left",
columnLabel: '状态',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TablePlanOperatorName',
tableId: "101014Table",
tableName: "common",
columnProp: 'planOperatorName',
headerAlign: "center",
align: "left",
columnLabel: '计划机修人员',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableActualOperatorName',
tableId: "101014Table",
tableName: "common",
columnProp: 'actualOperatorName',
headerAlign: "center",
align: "left",
columnLabel: '实际机修人员',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableActualPlanDate',
tableId: "101014Table",
tableName: "common",
columnProp: 'planDate',
headerAlign: "center",
align: "left",
columnLabel: '计划执行日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableActualActualDate',
tableId: "101014Table",
tableName: "common",
columnProp: 'actualDate',
headerAlign: "center",
align: "left",
columnLabel: '实际执行日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableWorkTime',
tableId: "101014Table",
tableName: "common",
columnProp: 'workTime',
headerAlign: "center",
align: "left",
columnLabel: '工作时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableActualRemark',
tableId: "101014Table",
tableName: "common",
columnProp: 'remark',
headerAlign: "center",
align: "left",
columnLabel: '备注',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
],
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 210
})
},
created () {
this.getDataList()
},
methods: {
//
getDataList () {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
eamWorkOrderSearch(this.searchData).then(({data}) => {
if (data.code == 0) {
this.dataList = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
}
this.dataListLoading = false
})
},
//
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
//
currentChangeHandle (val) {
this.pageIndex = val
this.getDataList()
},
//
selectionChangeHandle (val) {
this.dataListSelections = val
},
}
}
</script>

47
src/views/modules/eam/eamWorkPlanForCheck.vue

@ -83,7 +83,7 @@
<template slot-scope="scope">
<a type="text" size="small" v-if="scope.row.status=='已计划'" @click="createOrder(scope.row)">下达</a>
<a type="text" size="small" @click="updateModal(scope.row)">修改</a>
<a type="text" size="small" @click="deletePlan(scope.row)">删除</a>
<a type="text" size="small" v-if="scope.row.status!='进行中'" @click="deletePlan(scope.row)">删除</a>
<a type="text" size="small" @click="itemModal(scope.row)">计划项目</a>
</template>
</el-table-column>
@ -108,7 +108,7 @@
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(200)"><a herf="#">设备编码</a></span>
<el-input v-model="modalData.objectID" :disabled="modalDisableFlag" style="width: 120px"></el-input>
<el-input v-model="modalData.objectID" :disabled="modalDisableFlag" @blur="objectIDBlur" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="设备名称:">
<el-input v-model="modalData.objectDesc" disabled style="width: 120px"></el-input>
@ -117,7 +117,7 @@
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
<el-form-item >
<span slot="label" style="" @click="getBaseList(1031)"><a herf="#">点检模板</a></span>
<el-input v-model="modalData.propertiesCode" style="width: 120px"></el-input>
<el-input v-model="modalData.propertiesCode" @blur="modalCodeBlur" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="模板名称:">
<el-input v-model="modalData.propertiesDesc" disabled style="width: 120px"></el-input>
@ -325,6 +325,8 @@
savePlanItemAvailable,
deletePlanItemAvailable,
createEamWorkOrder,
objectIDBlur,
modalCodeBlur,
} from "@/api/eam/eam.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
export default {
@ -336,6 +338,7 @@
deep: true,
handler: function (newV, oldV) {
this.searchData.planID = this.searchData.planID.toUpperCase()
this.searchData.objectID = this.searchData.objectID.toUpperCase()
}
},
@ -343,6 +346,17 @@
deep: true,
handler: function (newV, oldV) {
this.modalData.planID = this.modalData.planID.toUpperCase()
this.modalData.objectID = this.modalData.objectID.toUpperCase()
this.modalData.propertiesCode = this.modalData.propertiesCode.toUpperCase()
this.modalData.operator = this.modalData.operator.toUpperCase()
}
},
detailData: {
deep: true,
handler: function (newV, oldV) {
this.modalData.planID = this.modalData.planID.toUpperCase()
this.modalData.itemNo = this.modalData.itemNo.toUpperCase()
this.modalData.codeNo = this.modalData.codeNo.toUpperCase()
}
}
},
@ -1237,6 +1251,7 @@
})
return false
}
row.userId=this.$store.state.user.name
this.$confirm(`是创建日期为`+row.planStartDate+`的点检工单?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -1262,6 +1277,32 @@
}).catch(() => {
})
},
objectIDBlur(){
let inData={
site:this.$store.state.user.site,
objectID:this.modalData.objectID
}
objectIDBlur(inData).then(({data}) => {
if(data.rows.length>0){
this.modalData.objectDesc=data.rows[0].objectDesc
}else {
this.modalData.objectDesc=''
}
})
},
modalCodeBlur(){
let inData={
functionType:'A',
codeNo:this.modalData.propertiesCode
}
modalCodeBlur(inData).then(({data}) => {
if(data.rows.length>0){
this.modalData.propertiesDesc=data.rows[0].codeDesc
}else {
this.modalData.propertiesDesc=''
}
})
},
}
}
</script>

Loading…
Cancel
Save