From c72c41317a34e043cc7a63e3c0a368e5f5e25eb4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 15 五月 2024 10:32:56 +0800
Subject: [PATCH] 提交拉取
---
north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue | 80 +++++++++++++++++++++++++--------------
north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java | 1
2 files changed, 52 insertions(+), 29 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
index fd3e4e5..951453a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
@@ -21,7 +21,7 @@
request.post(`/maintenance/openSelectId/${row.id}`).then((res) => {
if (res.code == 200) {
- getMaintenanceRepair.value = res.data.data[0]
+ getBasicData.value = res.data.data[0]
dialogTableVisible.value=true
} else {
@@ -62,6 +62,27 @@
return count.toFixed(2)
}
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ processType: [],
+
+})
+
+//瀹氫箟鎺ユ敹鍔犺浇寮圭獥鐨勫��
+const getBasicData = ref({
+ deviceName: '',
+ type: '',
+ faultTime: '',
+ faultReason: '',
+ maintenanceTime: '',
+ maintenanceIllustrate: '',
+ startTime: '',
+ stopTime: '',
+ process: '',
+ personnel: '',
+ cost: '',
+})
+
//鑾峰彇3澶╁墠鍒板綋鍓嶆椂闂�
function getNowTime() {
const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
@@ -79,21 +100,6 @@
date1: '',
})
-const getMaintenanceRepair = ref({
- id: '',
- device_id: '',
- type: '',
- device_name: '',
- fault_time: '',
- fault_reason: '',
- maintenance_time: '',
- maintenance_illustrate: '',
- start_time: '',
- stop_time: '',
- process: '',
- personnel: '',
- cost: '',
-})
//绗竴娆″姞杞借幏鍙栬繎3澶╂椂闂村拰榛樿鐘舵��
form.date1 = getNowTime()
@@ -105,6 +111,7 @@
if (res.code == 200) {
xGrid.value.loadData(res.data.data)
+ titleSelectJson.value.processType = res.data.process;
gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
@@ -226,7 +233,18 @@
const dialogTableVisible = ref(false)
const formLabelWidth = '140px'
+const updateBasic = () => {
+ // request.post(`/basicDataProduce/updateBasic/${id}/${process}/${name}/${type}`).then((res) => {
+ // if (res.code == 200) {
+ // ElMessage.success(t('processCard.modifySuccessfully'))
+ // router.push({path: '/main/productionBasicData/SelectProductionBasicData', query: {random:Math.random()}})
+ // } else {
+ //
+ // ElMessage.warning(res.msg)
+ // }
+ // })
+}
</script>
@@ -301,7 +319,7 @@
<el-row>
<el-col :span="12">
<el-form-item :label-width="formLabelWidth" label="璁惧鍚嶇О">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-input v-model="getBasicData.deviceName" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -317,7 +335,7 @@
<el-col :span="12">
<el-form-item :label-width="formLabelWidth" label="鏁呴殰鏃ユ湡">
<el-date-picker
- v-model="value1"
+ v-model="getBasicData.faultTime"
:size="size"
placeholder="2023-01-01"
type="date"
@@ -326,7 +344,7 @@
</el-col>
<el-col :span="12">
<el-form-item :label-width="formLabelWidth" label="鏁呴殰鍘熷洜">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-input v-model="getBasicData.faultReason" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-col>
</el-row>
@@ -334,7 +352,7 @@
<el-col :span="12">
<el-form-item :label-width="formLabelWidth" label="淇濆吇鏃ユ湡">
<el-date-picker
- v-model="value1"
+ v-model="getBasicData.maintenanceTime"
:size="size"
placeholder="2023-02-01"
type="date"
@@ -343,7 +361,7 @@
</el-col>
<el-col :span="12">
<el-form-item :label-width="formLabelWidth" label="淇濆吇璇存槑">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-input v-model="getBasicData.maintenanceIllustrate" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-col>
</el-row>
@@ -351,7 +369,7 @@
<el-col :span="12">
<el-form-item :label-width="formLabelWidth" label="淇濆吇/缁翠慨寮�濮嬫椂闂�">
<el-date-picker
- v-model="value1"
+ v-model="getBasicData.startTime"
:size="size"
placeholder="2023-02-01"
type="date"
@@ -361,7 +379,7 @@
<el-col :span="12">
<el-form-item :label-width="formLabelWidth" label="淇濆吇/缁翠慨瀹屾垚鏃堕棿">
<el-date-picker
- v-model="value1"
+ v-model="getBasicData.stopTime"
:size="size"
placeholder="2023-02-01"
type="date"
@@ -372,21 +390,25 @@
<el-row>
<el-col :span="12">
<el-form-item :label-width="formLabelWidth" label="鎵�鍦ㄥ伐鑹�">
- <el-select v-model="form.region" placeholder="閽㈠寲" style="width: 220px">
- <el-option label="鍒囧壊" value="shanghai"/>
- <el-option label="纾ㄨ竟" value="mobian"/>
- <el-option label="閽㈠寲" value="ganghua"/>
+ <el-select v-model="getBasicData.process" clearable placeholder="" style="width: 220px"
+ >
+ <el-option
+ v-for="item in titleSelectJson['processType']"
+ :key="item.id"
+ :label="item.basic_name"
+ :value="item.basic_name"
+ />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label-width="formLabelWidth" label="淇濆吇/缁翠慨浜哄憳">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-input v-model="getBasicData.personnel" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-col>
</el-row>
<el-form-item :label-width="formLabelWidth" label="璐圭敤">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-input v-model="getBasicData.cost" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-form>
<template #footer>
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
index cefa4d6..886decd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
@@ -66,6 +66,7 @@
public Map<String, Object> selectMaintenanceSv(Date selectTime1, Date selectTime2) {
Map<String, Object> map = new HashMap<>();
map.put("data", deviceMaintenanceMapper.selectMaintenanceMp(selectTime1,selectTime2));
+ map.put("process", deviceMaintenanceMapper.selectProcessMp());
return map;
}
--
Gitblit v1.8.0