点检巡检保养优化

master
wws 10 months ago
parent 266c770f50
commit 607b9d4be0

@ -386,8 +386,8 @@
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="是否达标:"> <el-form-item label="是否达标:">
<el-radio v-model="standard.detailReach" label="0"></el-radio> <el-radio v-model="standard.detailReach" label="0"></el-radio>
<el-radio v-model="standard.detailReach" label="1"></el-radio> <el-radio v-model="standard.detailReach" label="1"></el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

@ -374,7 +374,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span=12 :offset="1"> <el-col :span=12 :offset="1">
<el-form-item label-width="100px" label="巡检执行时间"> <el-form-item label-width="100px" label="循环时间范围">
<el-date-picker <el-date-picker
@change="changeArray" @change="changeArray"
v-model="form.planTimeArray" v-model="form.planTimeArray"

@ -69,14 +69,6 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
<el-date-picker clearable
v-model="queryParams.planLoopStart"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择循环执行时间开始">
</el-date-picker>
</el-form-item>
<el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd"> <el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.planLoopEnd" v-model="queryParams.planLoopEnd"
@ -104,12 +96,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label-width="90px" label="是否可生产" prop="planRestrict"> <el-form-item label-width="90px" label="是否可生产" prop="planRestrict">
<el-input <el-select v-model="queryParams.planRestrict" placeholder="请选择计划状态" clearable>
v-model="queryParams.planRestrict" <el-option
placeholder="请输入是否可生产" v-for="dict in dict.type.device_yes_no"
clearable :key="dict.value"
@keyup.enter.native="handleQuery" :label="dict.label"
/> :value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="false" label="是否委外" prop="planOutsource"> <el-form-item v-if="false" label="是否委外" prop="planOutsource">
<el-input <el-input
@ -191,7 +185,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="createBy"> <el-form-item v-if="false" label="创建人" prop="createBy">
<el-input <el-input
v-model="queryParams.createBy" v-model="queryParams.createBy"
placeholder="请输入创建人" placeholder="请输入创建人"
@ -199,7 +193,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item v-if="false" label="创建时间" prop="createTime">
<el-date-picker <el-date-picker
v-model="queryParams.createTimeArray" v-model="queryParams.createTimeArray"
type="daterange" type="daterange"
@ -212,7 +206,20 @@
:picker-options="pickerOptions"> :picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="更新人" prop="updateBy"> <el-form-item label-width="100px" label="循环开始时间" prop="planLoopStart">
<el-date-picker
v-model="queryParams.loopStartArray"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item v-if="false" label="更新人" prop="updateBy">
<el-input <el-input
v-model="queryParams.updateBy" v-model="queryParams.updateBy"
placeholder="请输入更新人" placeholder="请输入更新人"
@ -220,7 +227,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="更新时间" prop="updateTime"> <el-form-item v-if="false" label="更新时间" prop="updateTime">
<el-date-picker <el-date-picker
v-model="queryParams.updateTimeArray" v-model="queryParams.updateTimeArray"
type="daterange" type="daterange"
@ -302,12 +309,12 @@
<dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/> <dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="180"> <el-table-column label="循环开始时间" align="center" prop="planLoopStart" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="循环执行时间结束" align="center" prop="planLoopEnd" width="180"> <el-table-column v-if="false" label="循环执行时间结束" align="center" prop="planLoopEnd" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
</template> </template>
@ -423,9 +430,15 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span=12 :offset="1"> <el-col :span="9" :offset="2">
<el-form-item label-width="100px" label="点检开始时间"> <el-form-item label-width="100px" label="点检开始时间">
<el-date-picker <el-date-picker
v-model="form.planLoopStart"
type="date"
placeholder="开始时间">
</el-date-picker>
<el-date-picker
v-if="false"
@change="changeArray" @change="changeArray"
v-model="form.planTimeArray" v-model="form.planTimeArray"
type="datetimerange" type="datetimerange"
@ -780,6 +793,7 @@ export default {
updateTime: null, updateTime: null,
createTimeArray: [], createTimeArray: [],
updateTimeArray: [], updateTimeArray: [],
loopStartArray: [],
}, },
// //
form: { form: {
@ -793,6 +807,7 @@ export default {
personList: [], personList: [],
planWorkshop: null, planWorkshop: null,
planType: "spotInspection", planType: "spotInspection",
planLoopStart: null,
}, },
// //
rules: {} rules: {}
@ -1123,6 +1138,7 @@ export default {
planTimeArray: [], planTimeArray: [],
equipmentItem: [], equipmentItem: [],
personList: [], personList: [],
loopStartArray: [],
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -1137,6 +1153,7 @@ export default {
// //
this.queryParams.createTimeArray = []; this.queryParams.createTimeArray = [];
this.queryParams.updateTimeArray = []; this.queryParams.updateTimeArray = [];
this.queryParams.loopStartArray = [];
this.handleQuery(); this.handleQuery();
}, },
// //

@ -394,6 +394,9 @@
<el-radio v-model="standard.detailReach" label="1"></el-radio> <el-radio v-model="standard.detailReach" label="1"></el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="2">
<el-button type="primary" icon="el-icon-picture" circle @click="imgDialog = true"></el-button>
</el-col>
</el-row> </el-row>
</div> </div>
<div v-else> <div v-else>
@ -477,6 +480,11 @@ export default {
dicts: ['device_order_status', 'device_loop_type'], dicts: ['device_order_status', 'device_loop_type'],
data() { data() {
return { return {
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
//
imgDialog: false,
// //
workCenterList:[], workCenterList:[],
// //
@ -544,6 +552,17 @@ export default {
this.setWorkCenter(); this.setWorkCenter();
}, },
methods: { methods: {
// test
handleRemove(file) {
console.log(file);
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
handleDownload(file) {
console.log(file);
},
// //
setWorkCenter() { setWorkCenter() {
getWorkCenter().then(response => { getWorkCenter().then(response => {

@ -772,8 +772,8 @@
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="是否达标:"> <el-form-item label="是否达标:">
<el-radio v-model="standard.detailReach" label="0"></el-radio> <el-radio v-model="standard.detailReach" label="0"></el-radio>
<el-radio v-model="standard.detailReach" label="1"></el-radio> <el-radio v-model="standard.detailReach" label="1"></el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -1088,7 +1088,7 @@ export default {
this.form.personList = this.selectPersonList; this.form.personList = this.selectPersonList;
addUpkeepOrder(this.form).then(response => { addUpkeepOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.orderDialog = false;
this.getList(); this.getList();
}); });
}, },

Loading…
Cancel
Save