UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备计划代码提交

Browse Source
dev
郑明梁 2 years ago
parent 0a047acb1b
commit 2848f1f0bf
5 changed files with 70 additions and 41 deletions

50
src/views/inventory/DeviceInspectPlanCompleted.vue
Unescape Escape View File

@ -158,11 +158,34 @@
<el-tag :type="statusFilterType(scope.row.level)">{{ levelMap[scope.row.level] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="计划状态" prop="planStatus">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.planStatus)">{{ planStatusMap[scope.row.planStatus] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="editInspectPlan(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
@ -206,7 +229,21 @@
>
</DeviceInspectPlanProjectSet>
</el-dialog>
<el-dialog
:title="formMap[formName]"
:visible.sync="formVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="65%"
v-if="formVisible"
>
<deviceInspectPlanModify
type = "detail"
:inspectPlan="deviceInspectPlan"
:closeDialog="closeDialog"
>
</deviceInspectPlanModify>
</el-dialog>
</div>
</template>
@ -216,7 +253,7 @@ import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getDeviceInspectPlanList, deleteInspectPlan, updateStatus} from "@/api/inventory/deviceInspectPlan";
import {selectDeviceInspectPlanDelect} from "@/api/inventory/deviceInspectPlanDelect";
import DeviceInspectPlanProjectSet from "@/views/inventory/DeviceInspectProjectSelect";
import deviceInspectPlanModify from "@/views/inventory/DeviceInspectPlanModify.vue";
export default {
@ -251,7 +288,7 @@ export default {
},
planStatusMap: {
1: "未启用",
2: "运行中",
2: "启动",
3: "已结束",
4: "已过期"
},
@ -495,9 +532,14 @@ export default {
this.detailQuery = row
this.deviceProjectSelectVisible = true
},
editInspectPlan(row) {
this.formVisible = true;
this.formName = 'edit';
this.deviceInspectPlan = row;
},
},
components: {DeviceInspectPlanProjectSet},
components: {DeviceInspectPlanProjectSet,deviceInspectPlanModify},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();

34
src/views/inventory/DeviceInspectPlanModify.vue
Unescape Escape View File

@ -72,6 +72,7 @@
type="datetime"
placeholder="选择计划开始时间"
style="width: 90%"
:disabled="type == 'detail'"
:picker-options="pickerOptionsStart"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
@ -84,6 +85,7 @@
<el-date-picker
v-model="inspectPlan.endTime"
type="datetime"
:disabled="type == 'detail'"
:picker-options="pickerOptionsEnd"
placeholder="选择计划结束时间"
style="width: 90%"
@ -98,13 +100,13 @@
<el-row>
<el-col :span="7">
<el-form-item label="时间频率:" prop="frequency">
<el-input v-model="inspectPlan.frequency" type="number" placeholder="请选择时间频率" style="width: 100%"
<el-input v-model="inspectPlan.frequency" :disabled="type == 'detail'" type="number" placeholder="请选择时间频率" style="width: 100%"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="单位:" label-width="60px" prop="frequencyUnit">
<el-select v-model="inspectPlan.frequencyUnit" style="width: 60%" placeholder="单位" clearable>
<el-form-item label="单位:" label-width="60px" :disabled="type == 'detail'" prop="frequencyUnit">
<el-select v-model="inspectPlan.frequencyUnit" :disabled="type == 'detail'"style="width: 60%" placeholder="单位" clearable>
<el-option label="年" :value=1></el-option>
<el-option label="月" :value=2></el-option>
<el-option label="日" :value=3></el-option>
@ -116,7 +118,7 @@
</el-col>
<el-col :span="10">
<el-form-item label="计划级别:" prop="level">
<el-select v-model="inspectPlan.level" style="width: 90%" placeholder="请选择计划级别" clearable>
<el-select v-model="inspectPlan.level" :disabled="type == 'detail'" style="width: 90%" placeholder="请选择计划级别" clearable>
<el-option label="低级" :value=1></el-option>
<el-option label="中级" :value=2></el-option>
<el-option label="高级" :value=3></el-option>
@ -124,16 +126,16 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item label="计划状态:" prop="planStatus">-->
<!-- <el-select v-model="inspectPlan.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>-->
<!-- <el-option label="不启用" :value=1></el-option>-->
<!-- <el-option label="启用" :value=2></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row v-if="type == 'detail'">
<el-col :span="10">
<el-form-item label="计划状态:" prop="planStatus">
<el-select v-model="inspectPlan.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>
<el-option label="不启用" :value=1></el-option>
<el-option label="启用" :value=2></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
@ -278,6 +280,10 @@ export default {
type: Object,
required: true
},
type: {
type: Object,
required: true
},
closeDialog: {
type: Function,
required: true

2
src/views/inventory/DeviceInspectPlanNew.vue
Unescape Escape View File

@ -279,7 +279,7 @@ export default {
},
planStatusMap: {
1: "未启用",
2: "运行中",
2: "启动",
3: "已结束",
4: "已过期"
},

24
src/views/inventory/DeviceInspectTakeAuditModify.vue
Unescape Escape View File

@ -253,19 +253,12 @@ export default {
var falg = true
if (this.type == 2) {
for (var i = 0; i < this.delectList.length; i++) {
if (this.delectList[i].status == 1) {
if (this.delectList[i].status != 2) {
return this.$message.error("还有任务未检查！");
}
if (this.delectList[i].status == 3) {
falg = false
}
}
}
this.inspectTake.status = status
//要是详情里面有异常就改成异常状态
if(!falg){
this.inspectTake.status = 3
}
uploadDeviceInspecTake(this.inspectTake).then((res) => {
if (res.code === 20000) {
this.$message.success("提交成功");
@ -334,19 +327,8 @@ export default {
}
this.inspectTakeSetVisible = true;
} else {
let formName = isBlank(this.inspectTake.id) ? "add" : "edit";
saveDeviceInspectPlan(this.inspectTake, formName).then((res) => {
if (res.code === 20000) {
this.inspectTake.id = res.data.id;
this.inspectTake.orderId = res.data.orderId;
this.inputQuery.taskOrderIdFk = this.inspectTake.orderId
this.inspectTakeSetVisible = true;
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
});
this.inputQuery.taskOrderIdFk = this.inspectTake.orderId
this.inspectTakeSetVisible = true;
}
},

1
src/views/inventory/DeviceProjectSelect.vue
Unescape Escape View File

@ -255,7 +255,6 @@ export default {
})
},
selectDetail(row) {
debugger
this.selectQuery = row
}
},

Write Preview
Loading…
Cancel
Save