ruanqi 3 years ago
parent
commit
ea5e02b1db
  1. 2
      src/api/eam/eam.js
  2. 40
      src/views/modules/eam/eamAdmin.vue
  3. 482
      src/views/modules/eam/eamWorkPlanForCheck.vue
  4. 142
      src/views/modules/eam/eamWorkPlanForMaintenance.vue

2
src/api/eam/eam.js

@ -123,3 +123,5 @@ export const eamObjectDefectSave = data => createAPI(`api/pms/eam/eamObjectDefec
export const eamObjectDefectEdit = data => createAPI(`api/pms/eam/eamObjectDefectEdit`,'post',data)
export const eamObjectDefectDelete = data => createAPI(`api/pms/eam/eamObjectDefectDelete`,'post',data)
export const getObjectList = data => createAPI(`api/pms/eam/getObjectList`,'post',data)

40
src/views/modules/eam/eamAdmin.vue

@ -109,14 +109,16 @@
<el-form-item label="邮箱:">
<el-input v-model="modalData.email" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="人员等级:">
<el-select v-model="modalData.levelID" style="width: 120px"
placeholder="请选择">
<el-option v-for="item in levelList " :key="index" :label="item.adminLevelID+'-'+item.adminLevelDesc"
:value="item.adminLevelID">
<el-form-item >
<span slot="label" style="" @click="getBaseList(202)"><a herf="#">人员等级</a></span>
<!-- <el-select v-model="modalData.levelID" style="width: 120px"-->
<!-- placeholder="请选择">-->
<!-- <el-option v-for="item in levelList " :key="index" :label="item.adminLevelID+'-'+item.adminLevelDesc"-->
<!-- :value="item.adminLevelID">-->
</el-option>
</el-select>
<!-- </el-option>-->
<!-- </el-select>-->
<el-input v-model="modalData.levelID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="MES账号:">
<el-input v-model="modalData.mesUser" style="width: 120px"></el-input>
@ -127,6 +129,7 @@
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
@ -139,7 +142,11 @@
initAdminLevel,
getEmpyDeptList,
} from "@/api/eam/eam.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
export default {
components: {
Chooselist
},
watch: {
searchData: {
deep: true,
@ -158,7 +165,7 @@
},
data () {
return {
tagNo:'',
searchData: {
site: this.$store.state.user.site,
adminID: '',
@ -387,6 +394,23 @@
this.getDataList()
},
methods: {
// S
getBaseList (val,type) {
this.tagNo = val
this.$nextTick(() => {
let strVal = ''
if (val === 202) {
strVal = this.modalData.levelID
}
this.$refs.baseList.init(val, strVal)
})
},
/* 列表方法的回调 */
getBaseData (val) {
if (this.tagNo === 202) {
this.modalData.levelID = val.AdminLevelID
}
},
//
getDataList () {
this.searchData.limit = this.pageSize

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

@ -1,165 +1,226 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" :model="searchData" >
<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.planDesc" 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-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-select filterable v-model="searchData.status" style="width: 120px">
<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-button @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addModal()">新增计划</el-button>
<!-- <el-button type="danger" @click="deletePlan()" :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="160"
label="操作">
<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" v-if="scope.row.status!='进行中'" @click="deletePlan(scope.row)">删除</a>
<a type="text" size="small" @click="itemModal(scope.row)">计划项目</a>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 50, 100, 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="570px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="计划编码:">
<el-input v-model="modalData.planID" disabled style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="计划描述:">
<el-input v-model="modalData.planDesc" style="width: 120px"></el-input>
<el-form :inline="true" label-position="top" :model="searchData" >
<el-form-item :label="'计划编码'">
<el-input v-model="searchData.planID" style="width: 120px"></el-input>
</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" @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>
</el-form-item>
</el-form>
<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" @blur="modalCodeBlur" style="width: 120px"></el-input>
<el-form-item :label="'计划描述'">
<el-input v-model="searchData.planDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="模板名称:">
<el-input v-model="modalData.propertiesDesc" disabled style="width: 120px"></el-input>
<el-form-item :label="'设备编码'">
<el-input v-model="searchData.objectID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="计划开始日期:">
<el-form-item :label="'计划开始日期:'">
<el-date-picker
style="width: 120px"
v-model="modalData.planStartDate"
v-model="searchData.startDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选">
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="计划结束日期:">
<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="modalData.planEndDate"
v-model="searchData.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选">
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
<el-form-item >
<span slot="label" style="" @click="getBaseList(201)"><a herf="#">默认机修人员</a></span>
<el-input v-model="modalData.operator" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="点检周期(天):">
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width: 120px"></el-input>
<el-form-item :label="'状态'">
<el-select filterable v-model="searchData.status" style="width: 120px">
<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-input v-model="modalData.remark" style="width: 254px"></el-input>
<el-form-item :label="' '">
<el-button @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addModal()">新增计划</el-button>
<!-- <el-button type="danger" @click="deletePlan()" :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="160"
label="操作">
<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" v-if="scope.row.status!='进行中'" @click="deletePlan(scope.row)">删除</a>
<a type="text" size="small" @click="itemModal(scope.row)">计划项目</a>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 50, 100, 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="570px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="计划编码:">
<el-input v-model="modalData.planID" disabled style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="计划描述:">
<el-input v-model="modalData.planDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item v-if="this.modalData.flag==2" >
<span slot="label" style="" @click="getBaseList(200)"><a herf="#">设备编码</a></span>
<el-input v-model="modalData.objectID" :disabled="modalDisableFlag" @blur="objectIDBlur" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="设备名称:" v-if="this.modalData.flag==2" >
<el-input v-model="modalData.objectDesc" disabled style="width: 120px"></el-input>
</el-form-item>
</el-form>
<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" @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>
</el-form-item>
<el-form-item label="计划开始日期:">
<el-date-picker
style="width: 120px"
v-model="modalData.planStartDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="必选">
</el-date-picker>
</el-form-item>
<el-form-item label="计划结束日期:">
<el-date-picker
style="width: 120px"
v-model="modalData.planEndDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="可选">
</el-date-picker>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
<el-form-item >
<span slot="label" style="" @click="getBaseList(201)"><a herf="#">默认机修人员</a></span>
<el-input v-model="modalData.operator" style="width: 120px"></el-input>
</el-form-item>
<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>
<el-form-item label="点检周期(天):">
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="备注:">
<el-input v-model="modalData.remark" style="width: 254px"></el-input>
</el-form-item>
</el-form>
<div v-if="this.modalData.flag==1">
<div style="text-align: center ;font-size: 11px">
<span> ----------------------------------------------------选择设备----------------------------------------------------</span>
</div>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -8px;">
<el-form-item label="设备编码">
<el-input v-model="objectData.objectID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="设备名称">
<el-input v-model="objectData.objectDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(1027)"><a herf="#">设备分类编码</a></span>
<el-input v-model="objectData.familyID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button @click="getObjectList()">查询</el-button>
</el-form-item>
</el-form>
<el-table
:height="200"
:data="objectList"
border
v-loading="dataListLoading"
@selection-change="selectionChangeHandle"
style="width: 100%;">
<el-table-column
type="selection"
header-align="center"
align="center"
width="50">
</el-table-column>
<el-table-column
prop="objectID"
header-align="center"
align="left"
min-width="30"
label="设备编码">
</el-table-column>
<el-table-column
prop="objectDesc"
header-align="center"
align="left"
min-width="30"
label="设备名称">
</el-table-column>
<el-table-column
prop="familyID"
header-align="center"
align="left"
min-width="30"
label="设备分类">
</el-table-column>
<el-table-column
prop="familyName"
header-align="center"
align="left"
min-width="30"
label="分类名称">
</el-table-column>
</el-table>
</div>
<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>
<el-dialog title="点检项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="830px">
<el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
@ -170,7 +231,7 @@
<el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<!-- <el-button type="primary" @click="addDetailModal()">新增</el-button>-->
<!-- <el-button type="primary" @click="addDetailModal()">新增</el-button>-->
</el-form-item>
</el-form>
<el-table
@ -327,6 +388,7 @@
createEamWorkOrder,
objectIDBlur,
modalCodeBlur,
getObjectList,
} from "@/api/eam/eam.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
export default {
@ -341,7 +403,6 @@
this.searchData.objectID = this.searchData.objectID.toUpperCase()
}
},
modalData: {
deep: true,
handler: function (newV, oldV) {
@ -368,7 +429,7 @@
planID: '',
planDesc: '',
objectID: '',
status: '已计划',
status: '',
startDate: new Date(),
endDate:'',
functionType:'A',
@ -385,6 +446,7 @@
modalFlag:false,
modalDisableFlag:false,
modalData:{
objectList:[],
flag:'',
functionType:'A',
site: this.$store.state.user.site,
@ -400,9 +462,14 @@
planEndDate:'',
userId:'',
remark:'',
},
objectData:{
site: this.$store.state.user.site,
objectID:'',
objectDesc:'',
familyID:'',
},
objectList:[],
//
columnList: [
{
@ -567,6 +634,24 @@
fixed: '',
columnWidth: 140,
},
{
userId: this.$store.state.user.name,
functionId: 101013,
serialNumber: '101013TableOperator',
tableId: "101013Table",
tableName: "点检计划表",
columnProp: 'operator',
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: 101013,
@ -659,9 +744,9 @@
columnDetailList: [
{
userId: this.$store.state.user.name,
functionId: 101009,
serialNumber: '101009Table2EamPropertiesItemID',
tableId: "101009Table2",
functionId: 101013,
serialNumber: '101013Table2EamPropertiesItemID',
tableId: "101013Table2",
tableName: "点检项目表",
columnProp: 'itemNo',
headerAlign: "center",
@ -677,9 +762,9 @@
},
{
userId: this.$store.state.user.name,
functionId: 101009,
serialNumber: '101009Table2EamPropertiesItemDesc',
tableId: "101009Table2",
functionId: 101013,
serialNumber: '101013Table2EamPropertiesItemDesc',
tableId: "101013Table2",
tableName: "点检项目表",
columnProp: 'itemDesc',
headerAlign: "center",
@ -695,9 +780,9 @@
},
{
userId: this.$store.state.user.name,
functionId: 101009,
serialNumber: '101009Table2EamPropertiesItemRemark',
tableId: "101009Table2",
functionId: 101013,
serialNumber: '101013Table2EamPropertiesItemRemark',
tableId: "101013Table2",
tableName: "点检项目表",
columnProp: 'itemRemark',
headerAlign: "center",
@ -713,9 +798,9 @@
},
{
userId: this.$store.state.user.name,
functionId: 101009,
serialNumber: '101009Table2ValueType',
tableId: "101009Table2",
functionId: 101013,
serialNumber: '101013Table2ValueType',
tableId: "101013Table2",
tableName: "点检项目表",
columnProp: 'valueType',
headerAlign: "center",
@ -731,9 +816,9 @@
},
{
userId: this.$store.state.user.name,
functionId: 101009,
serialNumber: '101009Table2DefaultValue',
tableId: "101009Table2",
functionId: 101013,
serialNumber: '101013Table2DefaultValue',
tableId: "101013Table2",
tableName: "点检项目表",
columnProp: 'defaultValue',
headerAlign: "center",
@ -749,9 +834,9 @@
},
{
userId: this.$store.state.user.name,
functionId: 101009,
serialNumber: '101009Table2MaxValue',
tableId: "101009Table2",
functionId: 101013,
serialNumber: '101013Table2MaxValue',
tableId: "101013Table2",
tableName: "点检项目表",
columnProp: 'maxValue',
headerAlign: "center",
@ -767,9 +852,9 @@
},
{
userId: this.$store.state.user.name,
functionId: 101009,
serialNumber: '101009Table2MinValue',
tableId: "101009Table2",
functionId: 101013,
serialNumber: '101013Table2MinValue',
tableId: "101013Table2",
tableName: "点检项目表",
columnProp: 'minValue',
headerAlign: "center",
@ -785,9 +870,9 @@
},
{
userId: this.$store.state.user.name,
functionId: 101009,
serialNumber: '101009TableValueChooseFlag',
tableId: "101009Table",
functionId: 101013,
serialNumber: '101013TableValueChooseFlag',
tableId: "101013Table",
tableName: "common",
columnProp: 'valueChooseFlag',
headerAlign: "center",
@ -870,7 +955,10 @@
strVal = this.modalData.operator
this.$refs.baseList.init(val, strVal)
}
if (val === 1027) {
strVal = this.objectData.familyID
this.$refs.baseList.init(val, strVal)
}
})
},
/* 列表方法的回调 */
@ -886,6 +974,9 @@
if (this.tagNo === 201) {
this.modalData.operator = val.AdminID
}
if (this.tagNo === 1027) {
this.objectData.familyID = val.FamilyID
}
},
//
getDataList () {
@ -919,6 +1010,7 @@
addModal(){
this.modalData={
flag:'1',
objectList:[],
functionType:'A',
site: this.$store.state.user.site,
planID:'',
@ -936,11 +1028,13 @@
remark:'',
};
this.modalDisableFlag=false;
this.objectList=[];
this.modalFlag=true;
},
updateModal(row){
this.modalData={
flag:'2',
objectList:[],
functionType:'A',
site:row.site,
planID:row.planID,
@ -1018,7 +1112,32 @@
})
return
}
if (this.modalData.planEndDate == '' || this.modalData.planEndDate == null) {
this.$alert('请选择结束日期!', '错误', {
confirmButtonText: '确定'
})
return false
}
if (this.modalData.planEndDate < this.dayjs().format("YYYY-MM-DD")) {
this.$alert('计划结束日期不能小于今天!', '错误', {
confirmButtonText: '确定'
})
return
}
if (this.modalData.planStartDate > this.modalData.planEndDate) {
this.$alert('计划开始日期不能小于结束日期!', '错误', {
confirmButtonText: '确定'
})
return
}
if(this.modalData.flag=='1'){
if(this.dataListSelections.length==0){
this.$alert('请勾选设备!', '错误', {
confirmButtonText: '确定'
})
return false
}
this.modalData.objectList=this.dataListSelections
eamWorkPlanSave(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@ -1109,8 +1228,8 @@
// eamPropertiesItemSave(this.itemModalData).then(({data}) => {
// if (data && data.code == '0') {
// searchPlanItems(this.detailData).then(({data}) => {
// this.detailList = data.rows
// })
// this.detailList = data.rows
// })
// this.itemModalFlag=false
// this.$message({
// message: '',
@ -1245,12 +1364,12 @@
//--------------------------end
createOrder(row){
if(row.planStartDate < this.dayjs().format("YYYY-MM-DD")){
this.$alert('计划开始日期小于今天!请修改开始日期', '错误', {
confirmButtonText: '确定'
})
return false
}
if(row.planStartDate < this.dayjs().format("YYYY-MM-DD")){
this.$alert('计划开始日期小于今天!请修改开始日期', '错误', {
confirmButtonText: '确定'
})
return false
}
row.userId=this.$store.state.user.name
this.$confirm(`是创建日期为`+row.planStartDate+`的点检工单?`, '提示', {
confirmButtonText: '确定',
@ -1303,6 +1422,11 @@
}
})
},
getObjectList(){
getObjectList(this.objectData).then(({data}) => {
this.objectList = data.rows
})
}
}
}
</script>

142
src/views/modules/eam/eamWorkPlanForMaintenance.vue

@ -106,11 +106,11 @@
<el-form-item label="计划描述:">
<el-input v-model="modalData.planDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item >
<el-form-item v-if="this.modalData.flag==2" >
<span slot="label" style="" @click="getBaseList(200)"><a herf="#">设备编码</a></span>
<el-input v-model="modalData.objectID" :disabled="modalDisableFlag" @blur="objectIDBlur" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="设备名称:">
<el-form-item label="设备名称:" v-if="this.modalData.flag==2" >
<el-input v-model="modalData.objectDesc" disabled style="width: 120px"></el-input>
</el-form-item>
</el-form>
@ -148,13 +148,74 @@
</el-form-item>
<el-form-item label="维保周期(天):">
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width: 120px"></el-input>
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="备注:">
<el-input v-model="modalData.remark" style="width: 254px"></el-input>
</el-form-item>
</el-form>
<div v-if="this.modalData.flag==1">
<div style="text-align: center ;font-size: 11px">
<span> ----------------------------------------------------选择设备----------------------------------------------------</span>
</div>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -8px;">
<el-form-item label="设备编码">
<el-input v-model="objectData.objectID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="设备名称">
<el-input v-model="objectData.objectDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(1027)"><a herf="#">设备分类编码</a></span>
<el-input v-model="objectData.familyID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button @click="getObjectList()">查询</el-button>
</el-form-item>
</el-form>
<el-table
:height="200"
:data="objectList"
border
v-loading="dataListLoading"
@selection-change="selectionChangeHandle"
style="width: 100%;">
<el-table-column
type="selection"
header-align="center"
align="center"
width="50">
</el-table-column>
<el-table-column
prop="objectID"
header-align="center"
align="left"
min-width="30"
label="设备编码">
</el-table-column>
<el-table-column
prop="objectDesc"
header-align="center"
align="left"
min-width="30"
label="设备名称">
</el-table-column>
<el-table-column
prop="familyID"
header-align="center"
align="left"
min-width="30"
label="设备分类">
</el-table-column>
<el-table-column
prop="familyName"
header-align="center"
align="left"
min-width="30"
label="分类名称">
</el-table-column>
</el-table>
</div>
<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>
@ -327,6 +388,7 @@
createEamWorkOrder,
objectIDBlur,
modalCodeBlur,
getObjectList,
} from "@/api/eam/eam.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
export default {
@ -341,7 +403,6 @@
this.searchData.objectID = this.searchData.objectID.toUpperCase()
}
},
modalData: {
deep: true,
handler: function (newV, oldV) {
@ -368,7 +429,7 @@
planID: '',
planDesc: '',
objectID: '',
status: '已计划',
status: '',
startDate: new Date(),
endDate:'',
functionType:'B',
@ -385,6 +446,7 @@
modalFlag:false,
modalDisableFlag:false,
modalData:{
objectList:[],
flag:'',
functionType:'B',
site: this.$store.state.user.site,
@ -400,9 +462,14 @@
planEndDate:'',
userId:'',
remark:'',
},
objectData:{
site: this.$store.state.user.site,
objectID:'',
objectDesc:'',
familyID:'',
},
objectList:[],
//
columnList: [
{
@ -567,6 +634,24 @@
fixed: '',
columnWidth: 140,
},
{
userId: this.$store.state.user.name,
functionId: 101013,
serialNumber: '101013TableOperator',
tableId: "101013Table",
tableName: "点检计划表",
columnProp: 'operator',
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: 101017,
@ -870,7 +955,10 @@
strVal = this.modalData.operator
this.$refs.baseList.init(val, strVal)
}
if (val === 1027) {
strVal = this.objectData.familyID
this.$refs.baseList.init(val, strVal)
}
})
},
/* 列表方法的回调 */
@ -886,6 +974,9 @@
if (this.tagNo === 201) {
this.modalData.operator = val.AdminID
}
if (this.tagNo === 1027) {
this.objectData.familyID = val.FamilyID
}
},
//
getDataList () {
@ -919,6 +1010,7 @@
addModal(){
this.modalData={
flag:'1',
objectList:[],
functionType:'B',
site: this.$store.state.user.site,
planID:'',
@ -936,11 +1028,13 @@
remark:'',
};
this.modalDisableFlag=false;
this.objectList=[];
this.modalFlag=true;
},
updateModal(row){
this.modalData={
flag:'2',
objectList:[],
functionType:'B',
site:row.site,
planID:row.planID,
@ -1018,7 +1112,32 @@
})
return
}
if (this.modalData.planEndDate == '' || this.modalData.planEndDate == null) {
this.$alert('请选择结束日期!', '错误', {
confirmButtonText: '确定'
})
return false
}
if (this.modalData.planEndDate < this.dayjs().format("YYYY-MM-DD")) {
this.$alert('计划结束日期不能小于今天!', '错误', {
confirmButtonText: '确定'
})
return
}
if (this.modalData.planStartDate > this.modalData.planEndDate) {
this.$alert('计划开始日期不能小于结束日期!', '错误', {
confirmButtonText: '确定'
})
return
}
if(this.modalData.flag=='1'){
if(this.dataListSelections.length==0){
this.$alert('请勾选设备!', '错误', {
confirmButtonText: '确定'
})
return false
}
this.modalData.objectList=this.dataListSelections
eamWorkPlanSave(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@ -1303,6 +1422,11 @@
}
})
},
getObjectList(){
getObjectList(this.objectData).then(({data}) => {
this.objectList = data.rows
})
}
}
}
</script>

Loading…
Cancel
Save