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

Merge remote-tracking branch 'origin/dev2.0' into dev2.0

Browse Source
20231126-yw
郑明梁 2 years ago
parent ee10756c23 74d0205da4
commit 5c7cc65722
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,6 +1,6 @@
<template> <template>
<div> <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-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-group style="display: flex;margin: 0px 0 10px 85%; height: 35px">
<el-button type="primary" @click.native="submit(2)">审核通过</el-button> <el-button type="primary" @click.native="submit(2)">审核通过</el-button>

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

@ -1,6 +1,6 @@
<template> <template>
<div> <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-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-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button <el-button

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

@ -1,6 +1,6 @@
<template> <template>
<div> <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-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-group style="display: flex;margin: 0px 0 10px 75%; height: 35px" v-if="type != 3">
<el-button <el-button

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

@ -1,6 +1,6 @@
<template> <template>
<div> <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-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-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> <el-button type="primary" v-if="type != 5" @click.native="submit(type)">提交</el-button>

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

@ -46,7 +46,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="预计结束时间:"> <el-form-item class="query-form-item" label="预计结束时间时间:">
<el-date-picker <el-date-picker
:picker-options="pickerEdOptions" :picker-options="pickerEdOptions"
v-model="edDateRange" v-model="edDateRange"
@ -107,9 +107,9 @@
<el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择任务状态" clearable> <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择任务状态" clearable>
<el-option label="草稿" :value=0></el-option> <el-option label="草稿" :value=0></el-option>
<el-option label="未分配" :value=1></el-option> <el-option label="未分配" :value=1></el-option>
<el-option label="未处理" :value=2></el-option> <el-option label="未巡检" :value=2></el-option>
<el-option label="处理中" :value=3></el-option> <el-option label="巡检中" :value=3></el-option>
<el-option label="已处理" :value=4></el-option> <el-option label="已巡检" :value=4></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -142,9 +142,9 @@
<el-table-column label="开始时间" prop="strartTime" width="150"></el-table-column> <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="endTime" width="150"> </el-table-column>
<el-table-column label="提醒时间" prop="remindTime" 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="inspectName" width="150"></el-table-column>
<el-table-column label="预计结束时间" prop="expectedTime" width="150"></el-table-column> <el-table-column label="预计结束时间时间" prop="expectedTime" width="150"></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -184,14 +184,14 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="delectList" style="width: 100%" border highlight-current-row> <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="序号" 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="projectContent" width="500"></el-table-column>
<el-table-column label="状态" prop="status" width="100"> <el-table-column label="状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag>{{ statusdetailMap[scope.row.status] }}</el-tag> <el-tag>{{ statusdetailMap[scope.row.status] }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="现场照片" prop="inspectImage" width="300"> <el-table-column label="巡检图片" prop="inspectImage" width="300">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div> <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
</template> </template>
@ -267,9 +267,9 @@ export default {
statusMap: { statusMap: {
0: "草稿", 0: "草稿",
1: "未分配", 1: "未分配",
2: "未处理", 2: "未巡检",
3: "处理中", 3: "巡检中",
4: "已处理", 4: "已巡检",
}, },
statusdetailMap: { statusdetailMap: {
1: "未开始", 1: "未开始",
@ -279,8 +279,8 @@ export default {
}, },
formName: null, formName: null,
formMap: { formMap: {
add: "任务分配-新增任务", add: "新增设备巡检任务",
edit: "任务分配-编辑任务" edit: "编辑设备巡检任务"
}, },
deviceInspectTake: { deviceInspectTake: {
id: null, id: null,

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

@ -278,7 +278,7 @@ export default {
this.deviceRepairOrder = row; this.deviceRepairOrder = row;
}, },
deleteDialog(rowId) { deleteDialog(rowId) {
this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', { this.$confirm('此操作将永久删除该维保设备清单, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'

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

@ -361,7 +361,7 @@ export default {
}); });
}, },
deleteDialog(rowId) { deleteDialog(rowId) {
this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', { this.$confirm('此操作将永久删除该报修单, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'

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

@ -1,6 +1,6 @@
<template> <template>
<div> <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-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-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<!--<el-button--> <!--<el-button-->

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

@ -1,6 +1,6 @@
<template> <template>
<div> <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-form :model="repairOrder" ref="dataForm" label-width="120px" style="margin-bottom: -15px">
<el-row> <el-row>

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

@ -1,6 +1,6 @@
<template> <template>
<div> <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-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-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button <el-button

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

@ -376,7 +376,7 @@ export default {
}); });
}, },
deleteDialog(rowId) { deleteDialog(rowId) {
this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', { this.$confirm('此操作将永久删除该报修单, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'

Write Preview
Loading…
Cancel
Save