wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-12-15 增加“自动生成”标记，判断计划到达结束日期自动生成

java8
fengyuan_yang 2 years ago
parent
a888ae6cec
commit
632323a5df
2 changed files with 95 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      src/views/modules/eam/eamWorkPlanForCheck.vue
  2. 43
      src/views/modules/eam/eamWorkPlanForMaintenance.vue

84
src/views/modules/eam/eamWorkPlanForCheck.vue
View File

@ -139,7 +139,7 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="propertiesCode" :rules="rules.propertiesCodeType"> <el-form-item prop="propertiesCode" :rules="rules.propertiesCodeType">
<span slot="label" @click="getBaseList(31)"><a herf="#">点检模板</a></span>
<span slot="label" @click="getBaseList(31)"><a href="#">点检模板</a></span>
<el-input v-model="modalData.propertiesCode" @blur="modalCodeBlur" style="width: 260px"></el-input> <el-input v-model="modalData.propertiesCode" @blur="modalCodeBlur" style="width: 260px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模板名称" prop="propertiesDesc" :rules="rules.propertiesDescType"> <el-form-item label="模板名称" prop="propertiesDesc" :rules="rules.propertiesDescType">
@ -184,10 +184,10 @@
</el-time-picker> </el-time-picker>
</el-form-item> </el-form-item>
<el-form-item label="点检频率" prop="planPeriod" :rules="rules.planPeriodType"> <el-form-item label="点检频率" prop="planPeriod" :rules="rules.planPeriodType">
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 80px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="点检周期"> <el-form-item label="点检周期">
<el-select v-model="modalData.planCycle" style="width: 80px">
<el-select v-model="modalData.planCycle" style="width: 60px">
<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-option label="月" value="月"></el-option> <el-option label="月" value="月"></el-option>
@ -197,6 +197,9 @@
<el-form-item label="周末"> <el-form-item label="周末">
<input type="checkbox" value="A" name="addWorkOrderRule" v-model="modalData.workOrderRule"/> <input type="checkbox" value="A" name="addWorkOrderRule" v-model="modalData.workOrderRule"/>
</el-form-item> </el-form-item>
<el-form-item label="自动生成">
<input type="checkbox" value="Y" name="autoRenewalRule" v-model="modalData.autoRenewal"/>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item prop="operatorName" :rules="rules.operatorNameType"> <el-form-item prop="operatorName" :rules="rules.operatorNameType">
@ -277,26 +280,28 @@
</el-dialog> </el-dialog>
<!-- 编辑 --> <!-- 编辑 -->
<el-dialog title="点检计划" :close-on-click-modal="false" v-drag :visible.sync="updateModalFlag" width="570px">
<el-dialog title="点检计划" :close-on-click-modal="false" v-drag :visible.sync="updateModalFlag" width="580px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="计划编码"> <el-form-item label="计划编码">
<el-input v-model="modalData.planID" disabled style="width: 120px"></el-input>
<el-input v-model="modalData.planID" disabled style="width: 260px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="计划描述" prop="planDesc" :rules="rules.planDescType"> <el-form-item label="计划描述" prop="planDesc" :rules="rules.planDescType">
<el-input v-model="modalData.planDesc" style="width: 120px"></el-input>
<el-input v-model="modalData.planDesc" style="width: 260px"></el-input>
</el-form-item> </el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="propertiesCode" :rules="rules.propertiesCodeType"> <el-form-item prop="propertiesCode" :rules="rules.propertiesCodeType">
<span slot="label" style="" @click="getBaseList(31)"><a herf="#">点检模板</a></span> <span slot="label" style="" @click="getBaseList(31)"><a herf="#">点检模板</a></span>
<el-input v-model="modalData.propertiesCode" @blur="modalCodeBlur" style="width: 120px"></el-input>
<el-input v-model="modalData.propertiesCode" @blur="modalCodeBlur" style="width: 260px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模板名称" prop="propertiesDesc" :rules="rules.propertiesDescType"> <el-form-item label="模板名称" prop="propertiesDesc" :rules="rules.propertiesDescType">
<el-input v-model="modalData.propertiesDesc" disabled style="width: 120px"></el-input>
<el-input v-model="modalData.propertiesDesc" disabled style="width: 260px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item label="计划开始日期" prop="planStartDate" :rules="rules.planStartDateType"> <el-form-item label="计划开始日期" prop="planStartDate" :rules="rules.planStartDateType">
<el-date-picker <el-date-picker
style="width: 120px"
style="width: 260px"
v-model="modalData.planStartDate" v-model="modalData.planStartDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -305,33 +310,30 @@
</el-form-item> </el-form-item>
<el-form-item label="计划结束日期" prop="planEndDate" :rules="rules.planEndDateType"> <el-form-item label="计划结束日期" prop="planEndDate" :rules="rules.planEndDateType">
<el-date-picker <el-date-picker
style="width: 120px"
style="width: 260px"
v-model="modalData.planEndDate" v-model="modalData.planEndDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="必选"> placeholder="必选">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item label="任务开始时间" prop="taskStartDate" :rules="rules.taskStartDateType"> <el-form-item label="任务开始时间" prop="taskStartDate" :rules="rules.taskStartDateType">
<el-time-picker <el-time-picker
format="HH:mm" format="HH:mm"
arrow-control arrow-control
style="width: 220px"
style="width: 260px"
v-model="modalData.taskStartDate" v-model="modalData.taskStartDate"
placeholder="必选" placeholder="必选"
value-format="HH:mm"> value-format="HH:mm">
</el-time-picker> </el-time-picker>
</el-form-item> </el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item label="备注">
<el-input v-model="modalData.remark" style="width: 255px"></el-input>
</el-form-item>
<el-form-item label="点检频率" prop="planPeriod" :rules="rules.planPeriodType"> <el-form-item label="点检频率" prop="planPeriod" :rules="rules.planPeriodType">
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 80px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="点检周期"> <el-form-item label="点检周期">
<el-select filterable v-model="modalData.planCycle" style="width: 50px">
<el-select filterable v-model="modalData.planCycle" style="width: 60px">
<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-option label="月" value="月"></el-option> <el-option label="月" value="月"></el-option>
@ -341,15 +343,23 @@
<el-form-item label="周末"> <el-form-item label="周末">
<input type="checkbox" value="A" name="updateWorkOrderRule" v-model="modalData.workOrderRule"/> <input type="checkbox" value="A" name="updateWorkOrderRule" v-model="modalData.workOrderRule"/>
</el-form-item> </el-form-item>
<el-form-item label="自动生成">
<input type="checkbox" value="Y" name="autoRenewalRule" v-model="modalData.autoRenewal"/>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item prop="operatorName" :rules="rules.operatorNameType"> <el-form-item prop="operatorName" :rules="rules.operatorNameType">
<span slot="label" style="" @click="getOperatorList()"><a>计划执行人员</a></span>
<el-input v-model="modalData.operatorName" style="width: 255px"></el-input>
<span slot="label" @click="getOperatorList()"><a>计划执行人员</a></span>
<el-input v-model="modalData.operatorName" style="width: 260px"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="checkerName" :rules="rules.checkerNameType"> <el-form-item prop="checkerName" :rules="rules.checkerNameType">
<span slot="label" style="" @click="getCheckerList()"><a>选择审核人员</a></span>
<el-input v-model="modalData.checkerName" style="width: 255px"></el-input>
<span slot="label" @click="getCheckerList()"><a>选择审核人员</a></span>
<el-input v-model="modalData.checkerName" style="width: 260px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item label="备注">
<el-input v-model="modalData.remark" style="width: 534px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="text-align: center ;font-size: 11px"> <div style="text-align: center ;font-size: 11px">
@ -845,7 +855,8 @@
remark:'', remark:'',
workOrderRule:'', workOrderRule:'',
planCycle: '', planCycle: '',
taskStartDate: ''
taskStartDate: '',
autoRenewal: ''
}, },
objectData:{ objectData:{
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -2011,7 +2022,8 @@
remark: '', remark: '',
workOrderRule: '', workOrderRule: '',
planCycle: '天', planCycle: '天',
taskStartDate: ''
taskStartDate: '',
autoRenewal: ''
} }
this.modalDisableFlag = false this.modalDisableFlag = false
this.objectList = [] this.objectList = []
@ -2044,7 +2056,8 @@
remark: row.remark, remark: row.remark,
workOrderRule: row.workOrderRule, workOrderRule: row.workOrderRule,
planCycle: row.planCycle, planCycle: row.planCycle,
taskStartDate: row.taskStartDate
taskStartDate: row.taskStartDate,
autoRenewal: row.autoRenewal
} }
this.updateObjectList = [] this.updateObjectList = []
this.updateDetailData = {} this.updateDetailData = {}
@ -2144,6 +2157,7 @@
} }
this.saveLoading = true this.saveLoading = true
this.modalData.objectList = this.dataListSelections this.modalData.objectList = this.dataListSelections
// 周日
let obj = document.getElementsByName('addWorkOrderRule') let obj = document.getElementsByName('addWorkOrderRule')
let s = '' let s = ''
for (let i = 0; i < obj.length; i++) { for (let i = 0; i < obj.length; i++) {
@ -2153,6 +2167,16 @@
} }
s = s.substring(0, s.length - 1) s = s.substring(0, s.length - 1)
this.modalData.workOrderRule = s this.modalData.workOrderRule = s
// 自动生成
let obj2 = document.getElementsByName('autoRenewalRule')
let s2 = ''
for (let i = 0; i < obj2.length; i++) {
if (obj2[i].checked) {
s2 += obj2[i].value + ','
}
}
s2 = s2.substring(0, s2.length - 1)
this.modalData.autoRenewal = s2
eamWorkPlanSave(this.modalData).then(({data}) => { eamWorkPlanSave(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()
@ -2183,6 +2207,16 @@
} }
s = s.substring(0,s.length-1) s = s.substring(0,s.length-1)
this.modalData.workOrderRule = s this.modalData.workOrderRule = s
// 自动生成
let obj2 = document.getElementsByName('autoRenewalRule')
let s2 = ''
for (let i = 0; i < obj2.length; i++) {
if (obj2[i].checked) {
s2 += obj2[i].value + ','
}
}
s2 = s2.substring(0, s2.length - 1)
this.modalData.autoRenewal = s2
eamWorkPlanEdit(this.modalData).then(({data}) => { eamWorkPlanEdit(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()

43
src/views/modules/eam/eamWorkPlanForMaintenance.vue
View File

@ -170,10 +170,10 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="维保频率" prop="planPeriod" :rules="rules.planPeriodType"> <el-form-item label="维保频率" prop="planPeriod" :rules="rules.planPeriodType">
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 80px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="维保周期"> <el-form-item label="维保周期">
<el-select filterable v-model="modalData.planCycle" style="width: 80px">
<el-select filterable v-model="modalData.planCycle" style="width: 60px">
<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-option label="月" value="月"></el-option> <el-option label="月" value="月"></el-option>
@ -183,6 +183,9 @@
<el-form-item label="周末"> <el-form-item label="周末">
<input type="checkbox" value="A" name="addWorkOrderRule" v-model="modalData.workOrderRule"/> <input type="checkbox" value="A" name="addWorkOrderRule" v-model="modalData.workOrderRule"/>
</el-form-item> </el-form-item>
<el-form-item label="自动生成">
<input type="checkbox" value="Y" name="autoRenewalRule" v-model="modalData.autoRenewal"/>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item prop="operatorName" :rules="rules.operatorNameType"> <el-form-item prop="operatorName" :rules="rules.operatorNameType">
@ -300,10 +303,10 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="维保频率" prop="planPeriod" :rules="rules.planPeriodType"> <el-form-item label="维保频率" prop="planPeriod" :rules="rules.planPeriodType">
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 80px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="维保周期"> <el-form-item label="维保周期">
<el-select filterable v-model="modalData.planCycle" style="width: 80px">
<el-select filterable v-model="modalData.planCycle" style="width: 60px">
<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-option label="月" value="月"></el-option> <el-option label="月" value="月"></el-option>
@ -313,6 +316,9 @@
<el-form-item label="周末"> <el-form-item label="周末">
<input type="checkbox" value="A" name="updateWorkOrderRule" v-model="modalData.workOrderRule"/> <input type="checkbox" value="A" name="updateWorkOrderRule" v-model="modalData.workOrderRule"/>
</el-form-item> </el-form-item>
<el-form-item label="自动生成">
<input type="checkbox" value="Y" name="autoRenewalRule" v-model="modalData.autoRenewal"/>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item prop="operatorName" :rules="rules.operatorNameType"> <el-form-item prop="operatorName" :rules="rules.operatorNameType">
@ -834,7 +840,8 @@
remark:'', remark:'',
workOrderRule: '', workOrderRule: '',
planCycle: '', planCycle: '',
planHaltDate: ''
planHaltDate: '',
autoRenewal: ''
}, },
objectData:{ objectData:{
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -1976,7 +1983,8 @@
remark: '', remark: '',
workOrderRule: '', workOrderRule: '',
planCycle: '天', planCycle: '天',
planHaltDate: ''
planHaltDate: '',
autoRenewal: ''
} }
this.modalDisableFlag = false this.modalDisableFlag = false
this.objectList = [] this.objectList = []
@ -2008,7 +2016,8 @@
remark: row.remark, remark: row.remark,
workOrderRule: row.workOrderRule, workOrderRule: row.workOrderRule,
planCycle: row.planCycle, planCycle: row.planCycle,
planHaltDate: row.planHaltDate
planHaltDate: row.planHaltDate,
autoRenewal: row.autoRenewal
} }
this.updateObjectList = [] this.updateObjectList = []
this.updateDetailData = {} this.updateDetailData = {}
@ -2115,6 +2124,16 @@
} }
s = s.substring(0,s.length-1) s = s.substring(0,s.length-1)
this.modalData.workOrderRule = s this.modalData.workOrderRule = s
// 自动生成
let obj2 = document.getElementsByName('autoRenewalRule')
let s2 = ''
for (let i = 0; i < obj2.length; i++) {
if (obj2[i].checked) {
s2 += obj2[i].value + ','
}
}
s2 = s2.substring(0, s2.length - 1)
this.modalData.autoRenewal = s2
eamWorkPlanSave(this.modalData).then(({data}) => { eamWorkPlanSave(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()
@ -2145,6 +2164,16 @@
} }
s = s.substring(0,s.length-1) s = s.substring(0,s.length-1)
this.modalData.workOrderRule = s this.modalData.workOrderRule = s
// 自动生成
let obj2 = document.getElementsByName('autoRenewalRule')
let s2 = ''
for (let i = 0; i < obj2.length; i++) {
if (obj2[i].checked) {
s2 += obj2[i].value + ','
}
}
s2 = s2.substring(0, s2.length - 1)
this.modalData.autoRenewal = s2
eamWorkPlanEdit(this.modalData).then(({data}) => { eamWorkPlanEdit(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()

Write Preview
Loading…
Cancel
Save