From 16801690bf3202589f29ab665f50c2c5c48c8db6 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 17 Nov 2023 15:24:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80=E3=80=81=E5=B7=A1=E6=A3=80?=
=?UTF-8?q?=E3=80=81=E4=BF=9D=E5=85=BB=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/device/deviceOrder/index.vue | 225 +++++++++++++----
.../device/spotInspectionOrder/index.vue | 122 ++++++++-
src/views/device/upkeepOrder/index.vue | 237 +++++++++++++++---
3 files changed, 486 insertions(+), 98 deletions(-)
diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index 18e9be6..3985dae 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -26,12 +26,14 @@
/>
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
@@ -163,7 +191,7 @@
@keyup.enter.native="handleQuery"
/>
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -252,62 +332,64 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
@@ -320,17 +402,15 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['device:deviceOrder:edit']"
- >填写记录
-
+ v-hasPermi="['device:spotInspectionOrder:edit']"
+ >填写记录
删除
-
+ v-hasPermi="['device:spotInspectionOrder:remove']"
+ >删除
@@ -453,12 +533,43 @@ import {
addDeviceOrder,
updateDeviceOrder
} from "@/api/device/deviceOrder";
+import {getWorkCenter} from "@/api/device/plan";
export default {
name: "DeviceOrder",
dicts: ['device_order_status', 'device_loop_type','device_reach_standard'],
data() {
return {
+ // 日期范围选择快捷
+ pickerOptions: {
+ shortcuts: [{
+ text: '最近一周',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '最近一个月',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '最近三个月',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit('pick', [start, end]);
+ }
+ }]
+ },
+ // 工作中心
+ workCenterList:[],
// 记录
recordList: [],
// 遮罩层
@@ -509,7 +620,11 @@ export default {
createBy: null,
createTime: null,
updateBy: null,
- updateTime: null
+ updateTime: null,
+ loopStartArray: [],
+ orderStartArray: [],
+ orderEndArray: [],
+ loopEndArray: [],
},
// 表单参数
form: {
@@ -520,9 +635,17 @@ export default {
};
},
created() {
+ this.setWorkCenter();
this.getList();
},
methods: {
+ // 获取工作中心
+ setWorkCenter() {
+ getWorkCenter().then(response => {
+ this.workCenterList = response.data;
+ console.log(this.workCenterList)
+ })
+ },
/** 查询计划工单列表 */
getList() {
this.loading = true;
@@ -569,6 +692,10 @@ export default {
updateBy: null,
updateTime: null,
equ: {equipmentName: null},
+ loopStartArray: [],
+ orderStartArray: [],
+ orderEndArray: [],
+ loopEndArray: []
};
this.resetForm("form");
},
@@ -579,6 +706,10 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
+ this.queryParams.loopStartArray = [];
+ this.queryParams.orderStartArray = [];
+ this.queryParams.orderEndArray = [];
+ this.queryParams.loopEndArray = [];
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index b18de08..3fb8710 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -43,6 +43,26 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -259,10 +318,11 @@
-
+
-
+
+
@@ -270,29 +330,28 @@
-
+
{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}
-
-
-
+
+
@@ -461,6 +520,34 @@ export default {
return {
dialogImageUrl: '',
dialogVisible: false,
+ // 日期范围选择快捷
+ pickerOptions: {
+ shortcuts: [{
+ text: '最近一周',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '最近一个月',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '最近三个月',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit('pick', [start, end]);
+ }
+ }]
+ },
// 记录
recordList: [],
disabled: false,
@@ -518,6 +605,9 @@ export default {
createTime: null,
updateBy: null,
updateTime: null,
+ loopStartArray: [],
+ orderStartArray: [],
+ orderEndArray: [],
},
// 表单参数
form: {
@@ -598,6 +688,9 @@ export default {
updateBy: null,
updateTime: null,
equ: {equipmentName: null},
+ loopStartArray: [],
+ orderStartArray: [],
+ orderEndArray: [],
};
this.resetForm("form");
},
@@ -608,6 +701,9 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
+ this.queryParams.loopStartArray = [];
+ this.queryParams.orderStartArray = [];
+ this.queryParams.orderEndArray = [];
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index fd925a5..9011860 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -17,21 +17,23 @@
@keyup.enter.native="handleQuery"
/>
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
@@ -161,7 +191,7 @@
@keyup.enter.native="handleQuery"
/>
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -249,40 +351,58 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -307,6 +427,7 @@
- 待检验
- 未通过
- 通过
+ 待检验
+ 未通过
+ 通过