diff --git a/src/api/BasicData/WorkshopProcessMaintenance.js b/src/api/BasicData/WorkshopProcessMaintenance.js
index 07e1f574..8d6dcc09 100644
--- a/src/api/BasicData/WorkshopProcessMaintenance.js
+++ b/src/api/BasicData/WorkshopProcessMaintenance.js
@@ -1,13 +1,12 @@
import request from '@/utils/request'
// 查工艺分类名称
-export function searchProcessClassification(ProcessClassification) {
+export function searchProcessClassification() {
return request({
url: '',
method: 'post',
data: {
type: '1',
- name: '车间生产管理工艺_基础表_工艺分类名称_查询数据',
- param: '工艺分类名称=' + ProcessClassification
+ name: '车间生产管理工艺_基础表_工艺分类名称_查询数据'
}
})
}
diff --git a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
index d24ecf3d..1c57210f 100644
--- a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
+++ b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
@@ -30,7 +30,7 @@ export function addTable(equipmentName, equipmentModel, performance, processingC
data: {
type: '2',
name: '设备管理_设备加工能力_增加数据_设备维护New',
- param: '设备名称=' + equipmentName + '=string&设备型号=' + equipmentModel + '=string&设备性能指标=' + performance + '= string&设备加工能力工时=' + processingCapacity + '=string&设备工时系数=' + workingTimeFactor + '=string&工艺名称简称=' + processName + '=string&工艺编号=' + processNumber + '=string&班次类型=' + shift + '= string&整改工时系数=' + reorganizationTimeFactor + '=string&设备编号=' + equipmentNumber + '=string&预留工时系数=' + reservedTimeFactor
+ param: '设备名称=' + equipmentName + '&设备型号=' + equipmentModel + '&设备性能指标=' + performance + '&设备加工能力工时=' + processingCapacity + '&设备工时系数=' + workingTimeFactor + '&工艺名称简称=' + processName + '&工艺编号=' + processNumber + '&班次类型=' + shift + '&整改工时系数=' + reorganizationTimeFactor + '&设备编号=' + equipmentNumber + '&预留工时系数=' + reservedTimeFactor
}
})
}
diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
index 23add9cb..21f77eb7 100644
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -242,13 +242,14 @@ export default {
methods: {
searchProcessClassification() {
this.loading1 = true
- searchProcessClassification(this.ProcessClassification).then(response => {
+ searchProcessClassification().then(response => {
this.loading1 = false
this.tableData1 = response.data
this.total1 = response.data
return this.tableData1
}).then(data => {
this.Num = data
+ this.max = []
for (let i = 0; i < this.Num.length; i++) {
this.max.push(this.Num[i].工艺分类流水号)
}
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index c3a6fafa..80447156 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -98,18 +98,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -122,7 +110,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -140,7 +140,7 @@
-
+
@@ -200,12 +200,12 @@ export default {
设备名称: [{ required: true, message: '请选择设备名称', change: 'blur' }],
设备编号: [{ required: true, message: '请选择设备编号', change: 'blur' }],
设备型号: [{ required: true, message: '请选择设备型号', change: 'blur' }],
- 设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }],
- 设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }],
- 班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }],
- 设备工时系数: [{ required: true, message: '请选择设备工时系数', change: 'blur' }],
- 整改工时系数: [{ required: true, message: '请选择整改工时系数', change: 'blur' }],
- 预留工时系数: [{ required: true, message: '请选择预留工时系数', change: 'blur' }]
+ 设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }]
+ // 设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }],
+ // 班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }],
+ // 设备工时系数: [{ required: true, message: '请选择设备工时系数', change: 'blur' }],
+ // 整改工时系数: [{ required: true, message: '请选择整改工时系数', change: 'blur' }],
+ // 预留工时系数: [{ required: true, message: '请选择预留工时系数', change: 'blur' }]
}
}
},
@@ -241,9 +241,20 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
- this.dialogFormVisible = true
this.title = '增加'
- this.form = {}
+ this.form = {
+ 设备名称: '',
+ 设备编号: '',
+ 设备型号: '',
+ 设备加工工艺: ''
+ }
+ this.form.设备性能指标 = 1
+ this.form.设备加工能力 = 1
+ this.form.班次类型 = 1
+ this.form.设备工时系数 = 1
+ this.form.整改工时系数 = 1
+ this.form.预留工时系数 = 1
+ this.dialogFormVisible = true
},
handleEdit(row) {
if (this.$refs['form'] !== undefined) {
@@ -268,10 +279,8 @@ export default {
if (valid) {
if (this.title === '增加') {
this.submitAdd()
- this.title = ''
} else if (this.title === '编辑') {
this.submitEdit()
- this.title = ''
}
}
})
@@ -290,6 +299,7 @@ export default {
type: 'success'
})
this.dialogFormVisible = false
+ this.title = ''
this.fetchData()
} else {
this.$message.error('信息添加失败')
@@ -305,6 +315,7 @@ export default {
type: 'success'
})
this.dialogFormVisible = false
+ this.title = ''
this.fetchData()
} else {
this.$message.error('信息编辑失败')