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

设备相关名称修改

Browse Source
20231126-yw
anthonywj 2 years ago
parent 567496fc3a
commit e9e4407c36
7 changed files with 115 additions and 112 deletions
Show Stats Download Patch File Download Diff File

14
src/views/inventory/DeviceInspectMyTake.vue
Unescape Escape View File

@ -36,7 +36,7 @@
</el-form-item>
</el-col>
<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"
@ -83,8 +83,8 @@
</template>
</el-table-column>
<el-table-column label="提醒时间" prop="remindTime"></el-table-column>
<el-table-column label="巡检人" prop="inspectName"></el-table-column>
<el-table-column label="预计结束时间时间" prop="expectedTime"></el-table-column>
<el-table-column label="负责人" prop="inspectName"></el-table-column>
<el-table-column label="预计结束时间" prop="expectedTime"></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
@ -140,14 +140,14 @@
<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>
@ -259,8 +259,8 @@ export default {
},
formName: null,
formMap: {
add: "新增设备巡检任务",
edit: "编辑设备巡检任务",
add: "任务分配-新增任务",
edit: "任务分配-编辑任务",
datail: "详情"
},
deviceInspectTake: {

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

@ -247,7 +247,7 @@ export default {
submit(status) {
//判断巡检人要填
if(status == 2 && this.inspectPlan.inspectUser == null){
return this.$message.error("巡检人不能为空");
return this.$message.error("负责人不能为空");
}
this.inspectPlan.status=status
updateStatus(this.inspectPlan).then((res) => {

32
src/views/inventory/DeviceInspectTake.vue
Unescape Escape View File

@ -51,16 +51,16 @@
<el-col :span="8">
<el-form-item label="任务状态:" class="query-form-item">
<el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择任务状态" clearable>
<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>
</el-row>
<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"
@ -133,8 +133,8 @@
<el-table-column label="开始时间" prop="strartTime"></el-table-column>
<el-table-column label="结束时间" prop="endTime"></el-table-column>
<el-table-column label="提醒时间" prop="remindTime"></el-table-column>
<el-table-column label="巡检人" prop="inspectName"></el-table-column>
<el-table-column label="预计结束时间时间" prop="expectedTime"></el-table-column>
<el-table-column label="负责人" prop="inspectName"></el-table-column>
<el-table-column label="预计结束时间" prop="expectedTime"></el-table-column>
<el-table-column label="操作" width="170">
<template slot-scope="scope">
<el-button
@ -142,7 +142,7 @@
size="small"
:disabled="scope.row.status != 2"
@click.native.stop="startOrder(scope.row,3)"
>开始巡检
>开始任务
</el-button
>
<el-button
@ -150,7 +150,7 @@
size="small"
:disabled="scope.row.status != 3"
@click.native.stop="startOrder(scope.row,4)"
>结束巡检
>结束任务
</el-button
>
<el-button
@ -173,7 +173,7 @@
</el-card>
<el-dialog
title="巡检任务确认"
title="我的任务-任务确认"
:visible.sync="formVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
@ -191,14 +191,14 @@
<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>
@ -273,9 +273,9 @@ export default {
loading: false,
formVisible: false,
statusMap: {
2: "未巡检",
3: "巡检中",
4: "已巡检",
2: "未处理",
3: "处理中",
4: "已处理",
},
statusdetailMap: {
1: "未开始",
@ -285,8 +285,8 @@ export default {
},
formName: null,
formMap: {
add: "新增设备巡检任务",
edit: "编辑设备巡检任务"
add: "任务分配-新增任务",
edit: "任务分配-编辑任务"
},
deviceInspectTake: {
id: null,

14
src/views/inventory/DeviceInspectTakeAdd.vue
Unescape Escape View File

@ -90,10 +90,10 @@
<el-row>
<el-col :span="10">
<el-form-item label="巡检人:" prop="inspectUser">
<el-form-item label="负责人:" prop="inspectUser">
<el-select v-model="inspectTake.inspectUser"
:disabled="type == 3"
placeholder="委托验收人" clearable
placeholder="请选择负责人" clearable
style="width: 90%">
<el-option
v-for="item in userList"
@ -106,11 +106,11 @@
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="项目类型:" prop="type">
<el-form-item label="任务类型:" prop="type">
<el-select v-model="inspectTake.type" style="width: 90%"
:disabled="formName == 'edit' || type == 3 || delectList.length > 0"
@change="repairType"
placeholder="请选择项目类型"
placeholder="请选择任务类型"
>
<el-option label="巡检" :value="1"></el-option>
<el-option label="养护" :value="2"></el-option>
@ -192,7 +192,7 @@
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="巡检图片" prop="inspectImage" width="250">
<el-table-column label="现场照片" prop="inspectImage" width="250">
<template slot-scope="scope">
<div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
</template>
@ -226,7 +226,7 @@
<el-dialog
title="巡检任务选入"
title="项目选入"
:visible.sync="inspectSelectPlanSetVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
@ -441,7 +441,7 @@ export default {
if (valid) {
if(status == 2){
if(isBlank(this.inspectTake.inspectUser)){
return this.$message.error("巡检人不能为空");
return this.$message.error("负责人不能为空");
}
if(isBlank(this.inspectTake.expectedTime)){
return this.$message.error("预期结束时间不能为空");

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

@ -70,10 +70,10 @@
<el-row>
<el-col :span="10">
<el-form-item label="项目类型:" prop="type">
<el-form-item label="任务类型:" prop="type">
<el-select v-model="inspectTake.type" style="width: 90%"
@change="repairType"
disabled placeholder="请选择项目类型" clearable="true">
disabled placeholder="请选择任务类型" clearable="true">
<el-option label="巡检" :value="1"></el-option>
<el-option label="养护" :value="2"></el-option>
<el-option label="报修" :value="3"></el-option>
@ -83,8 +83,8 @@
</el-col>
<el-col :span="10">
<el-form-item label="巡检人:" prop="inspectUser">
<el-select v-model="inspectTake.inspectUser" disabled placeholder="委托验收人" clearable
<el-form-item label="负责人:" prop="inspectUser">
<el-select v-model="inspectTake.inspectUser" disabled placeholder="请选择负责人" clearable
style="width: 90%">
<el-option
v-for="item in userList"
@ -139,10 +139,13 @@
<el-row type="flex" justify="end">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 10px">
<el-button type="primary" @click.native.stop="selectPlanFunction(null)" v-if="type != 5" :loading="loading">选入</el-button>
<el-button type="primary" @click.native.stop="selectPlanFunction(null)" v-if="type != 5" :loading="loading">
选入
</el-button>
</el-button-group>
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button type="primary" @click.native.stop="setPlanFunction(null)" :loading="loading" v-if="type != 5">新增</el-button>
<el-button type="primary" @click.native.stop="setPlanFunction(null)" :loading="loading" v-if="type != 5">新增
</el-button>
</el-button-group>
</el-row>
@ -155,7 +158,7 @@
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="巡检图片" prop="inspectImage" width="250">
<el-table-column label="现场照片" prop="inspectImage" width="250">
<template slot-scope="scope">
<div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
</template>
@ -190,7 +193,7 @@
</el-dialog>
<el-dialog
title="巡检任务选入"
title="项目选入"
:visible.sync="inspectSelectPlanSetVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

4
src/views/inventory/DeviceInspectTakeProjectSet.vue
Unescape Escape View File

@ -36,7 +36,7 @@
</el-row>
<el-row v-if="editType != 2">
<el-col :span="11">
<el-form-item label="巡检图片:">
<el-form-item label="现场照片:">
<el-upload
class="upload-demo"
ref="upload"
@ -56,7 +56,7 @@
size="small"
type="primary"
>
巡检图片
现场照片
</el-button>
<div>只能上传 jpg,png,pdf,doc 文件，且不超过 10 MB</div>
</el-upload>

26
src/views/inventory/DeviceInspectTakeSelect.vue
Unescape Escape View File

@ -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,8 +142,8 @@
<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="负责人" prop="inspectName" width="150"></el-table-column>
<el-table-column label="预计结束时间" prop="expectedTime" width="150"></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
@ -184,14 +184,14 @@
<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>
@ -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,

Write Preview
Loading…
Cancel
Save