diff --git a/src/views/inventory/DeviceInspectPlanAuditModify.vue b/src/views/inventory/DeviceInspectPlanAuditModify.vue
index ae4f8be8..91f10a78 100644
--- a/src/views/inventory/DeviceInspectPlanAuditModify.vue
+++ b/src/views/inventory/DeviceInspectPlanAuditModify.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-card style="margin: 5px;margin-top: -20px">
+ <el-card style="margin-top: -10px">
<el-form :model="inspectPlan" ref="formRef" :rules="formRules" label-width="120px" style="margin-bottom: -15px">
<el-button-group style="display: flex;margin: 0px 0 10px 85%; height: 35px">
<el-button type="primary" @click.native="submit(2)">审核通过</el-button>
diff --git a/src/views/inventory/DeviceInspectPlanModify.vue b/src/views/inventory/DeviceInspectPlanModify.vue
index 34a95fd6..cedd385e 100644
--- a/src/views/inventory/DeviceInspectPlanModify.vue
+++ b/src/views/inventory/DeviceInspectPlanModify.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-card style="margin: 5px;margin-top: -20px">
+ <el-card style="margin-top: -10px">
<el-form :model="inspectPlan" ref="formRef" :rules="formRules" label-width="120px" style="margin-bottom: -15px">
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button
diff --git a/src/views/inventory/DeviceInspectTakeAdd.vue b/src/views/inventory/DeviceInspectTakeAdd.vue
index 4364e71c..7e30294f 100644
--- a/src/views/inventory/DeviceInspectTakeAdd.vue
+++ b/src/views/inventory/DeviceInspectTakeAdd.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-card style="margin: 5px;margin-top: -20px">
+ <el-card style="margin-top: -10px">
<el-form :model="inspectTake" ref="formRef" label-width="120px" style="margin-bottom: -15px" :rules="rules">
<el-button-group style="display: flex;margin: 0px 0 10px 75%; height: 35px" v-if="type != 3">
<el-button
diff --git a/src/views/inventory/DeviceInspectTakeAuditModify.vue b/src/views/inventory/DeviceInspectTakeAuditModify.vue
index a5131a65..63a4a60c 100644
--- a/src/views/inventory/DeviceInspectTakeAuditModify.vue
+++ b/src/views/inventory/DeviceInspectTakeAuditModify.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-card style="margin: 5px;margin-top: -20px">
+ <el-card style="margin-top: -10px">
<el-form :model="inspectTake" ref="formRef" label-width="120px" style="margin-bottom: -15px">
<el-button-group style="display: flex;margin: 0px 0 10px 90%; height: 35px">
<el-button type="primary" v-if="type != 5" @click.native="submit(type)">提交</el-button>
diff --git a/src/views/inventory/DeviceInspectTakeSelect.vue b/src/views/inventory/DeviceInspectTakeSelect.vue
index 4d3cc99b..e269433d 100644
--- a/src/views/inventory/DeviceInspectTakeSelect.vue
+++ b/src/views/inventory/DeviceInspectTakeSelect.vue
@@ -46,7 +46,7 @@
<el-row>
<el-col :span="8">
- <el-form-item class="query-form-item" label="预计结束时间:">
+ <el-form-item class="query-form-item" label="预计结束时间时间:">
<el-date-picker
:picker-options="pickerEdOptions"
v-model="edDateRange"
@@ -107,9 +107,9 @@
<el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择任务状态" clearable>
<el-option label="草稿" :value=0></el-option>
<el-option label="未分配" :value=1></el-option>
- <el-option label="未处理" :value=2></el-option>
- <el-option label="处理中" :value=3></el-option>
- <el-option label="已处理" :value=4></el-option>
+ <el-option label="未巡检" :value=2></el-option>
+ <el-option label="巡检中" :value=3></el-option>
+ <el-option label="已巡检" :value=4></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -142,9 +142,9 @@
<el-table-column label="开始时间" prop="strartTime" width="150"></el-table-column>
<el-table-column label="结束时间" prop="endTime" width="150"> </el-table-column>
<el-table-column label="提醒时间" prop="remindTime" width="150"></el-table-column>
- <el-table-column label="负责人" prop="inspectName" width="150"></el-table-column>
- <el-table-column label="预计结束时间" prop="expectedTime" width="150"></el-table-column>
- <el-table-column label="操作">
+ <el-table-column label="巡检人" prop="inspectName" width="150"></el-table-column>
+ <el-table-column label="预计结束时间时间" prop="expectedTime" width="150"></el-table-column>
+ <el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button
type="text"
@@ -184,19 +184,19 @@
<el-card class="el-card">
<el-table v-loading="loading" :data="delectList" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="60"></el-table-column>
- <el-table-column label="项目编码" prop="projectCode" width="300"></el-table-column>
+ <el-table-column label="巡检项目编码" prop="projectCode" width="300"></el-table-column>
<el-table-column label="项目内容" prop="projectContent" width="500"></el-table-column>
<el-table-column label="状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag>{{ statusdetailMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
- <el-table-column label="现场照片" prop="inspectImage" width="300">
+ <el-table-column label="巡检图片" prop="inspectImage" width="300">
<template slot-scope="scope">
<div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
</template>
</el-table-column>
- <el-table-column label="操作" width="100">
+ <el-table-column label="操作" width="100" >
<template slot-scope="scope">
<el-button
type="text"
@@ -267,9 +267,9 @@ export default {
statusMap: {
0: "草稿",
1: "未分配",
- 2: "未处理",
- 3: "处理中",
- 4: "已处理",
+ 2: "未巡检",
+ 3: "巡检中",
+ 4: "已巡检",
},
statusdetailMap: {
1: "未开始",
@@ -279,8 +279,8 @@ export default {
},
formName: null,
formMap: {
- add: "任务分配-新增任务",
- edit: "任务分配-编辑任务"
+ add: "新增设备巡检任务",
+ edit: "编辑设备巡检任务"
},
deviceInspectTake: {
id: null,
diff --git a/src/views/inventory/DeviceProjectSet.vue b/src/views/inventory/DeviceProjectSet.vue
index 4b56e007..f92f7f0f 100644
--- a/src/views/inventory/DeviceProjectSet.vue
+++ b/src/views/inventory/DeviceProjectSet.vue
@@ -278,7 +278,7 @@ export default {
this.deviceRepairOrder = row;
},
deleteDialog(rowId) {
- this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
+ this.$confirm('此操作将永久删除该维保设备清单, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/views/inventory/DeviceRepairOrderAudit.vue b/src/views/inventory/DeviceRepairOrderAudit.vue
index d1ebe119..f6ff091f 100644
--- a/src/views/inventory/DeviceRepairOrderAudit.vue
+++ b/src/views/inventory/DeviceRepairOrderAudit.vue
@@ -361,7 +361,7 @@ export default {
});
},
deleteDialog(rowId) {
- this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
+ this.$confirm('此操作将永久删除该报修单, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/views/inventory/DeviceRepairOrderAuditModify.vue b/src/views/inventory/DeviceRepairOrderAuditModify.vue
index 4cf866d0..cd2c6fe1 100644
--- a/src/views/inventory/DeviceRepairOrderAuditModify.vue
+++ b/src/views/inventory/DeviceRepairOrderAuditModify.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-card style="margin: 5px;margin-top: -20px">
+ <el-card style="margin-top: -10px">
<el-form :model="repairOrder" ref="dataForm" label-width="100px" :rules="formRules" style="margin-bottom: -15px" >
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<!--<el-button-->
diff --git a/src/views/inventory/DeviceRepairOrderDetails.vue b/src/views/inventory/DeviceRepairOrderDetails.vue
index 598170c1..3724fed9 100644
--- a/src/views/inventory/DeviceRepairOrderDetails.vue
+++ b/src/views/inventory/DeviceRepairOrderDetails.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-card style="margin: 5px;margin-top: -20px">
+ <el-card style="margin-top: -10px">
<el-form :model="repairOrder" ref="dataForm" label-width="120px" style="margin-bottom: -15px">
<el-row>
diff --git a/src/views/inventory/DeviceRepairOrderModify.vue b/src/views/inventory/DeviceRepairOrderModify.vue
index b283eb2b..52d289d0 100644
--- a/src/views/inventory/DeviceRepairOrderModify.vue
+++ b/src/views/inventory/DeviceRepairOrderModify.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-card style="margin: 5px;margin-top: -20px">
+ <el-card style="margin-top: -10px">
<el-form :model="repairOrder" ref="dataForm" label-width="120px" style="margin-bottom: -15px" :rules="formRules">
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button
diff --git a/src/views/inventory/DeviceRepairOrderNew.vue b/src/views/inventory/DeviceRepairOrderNew.vue
index c5242aba..e520295e 100644
--- a/src/views/inventory/DeviceRepairOrderNew.vue
+++ b/src/views/inventory/DeviceRepairOrderNew.vue
@@ -376,7 +376,7 @@ export default {
});
},
deleteDialog(rowId) {
- this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
+ this.$confirm('此操作将永久删除该报修单, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'