diff --git a/src/api/TechnologyCenter/CreatePackingList.js b/src/api/TechnologyCenter/CreatePackingList.js
index 82c9e20b..6080da49 100644
--- a/src/api/TechnologyCenter/CreatePackingList.js
+++ b/src/api/TechnologyCenter/CreatePackingList.js
@@ -148,7 +148,7 @@ export function deleteFileData(num) {
data: {
type: '2',
name: 'PDM_装箱单_随机技术文件_删除数据',
- param: `序号=${num}`
+ param: `文件编号=${num}`
}
})
}
@@ -160,7 +160,7 @@ export function editFileData(name, number, remark, num) {
data: {
type: '2',
name: 'PDM_装箱单_随机技术文件_修改数据',
- param: `名称=${name}&数量=${number}&备注=${remark}&序号=${num}`
+ param: `名称=${name}&数量=${number}&备注=${remark}&文件编号=${num}`
}
})
}
@@ -196,24 +196,24 @@ export function deleteSpareData(num) {
data: {
type: '2',
name: 'PDM_装箱单_备件_删除数据',
- param: `序号=${num}`
+ param: `备件编号=${num}`
}
})
}
-export function editSpareData(name, specification, number, unit, remark, num) {
+export function editSpareData(name, specification, unit, number, remark, num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_装箱单_备件_修改数据',
- param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&序号=${num}`
+ param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&备件编号=${num}`
}
})
}
-export function addSpareData(name, specification, number, unit, remark, num) {
+export function addSpareData(name, specification, unit, number, remark, num) {
return request({
url: '',
method: 'post',
diff --git a/src/utils/curd.js b/src/utils/curd.js
index 1436c6b3..d1374579 100644
--- a/src/utils/curd.js
+++ b/src/utils/curd.js
@@ -167,6 +167,7 @@ export default {
// 4) 回调函数，必须
Vue.prototype.addTable = function(requestData, param, form, callback) {
if (type(callback) === 'function' && type(requestData) === 'function' && type(form) === 'string') {
+ console.log(this.$refs[form])
this.$refs[form].validate((valid) => {
if (valid) {
requestData(...param).then(response => {
diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue
index 76cbc503..7e38a3db 100644
--- a/src/views/BasicData/PersonnelManagement/index.vue
+++ b/src/views/BasicData/PersonnelManagement/index.vue
@@ -15,7 +15,8 @@
新增
-
+
+
@@ -29,7 +30,9 @@
-
+
+
+
@@ -176,18 +179,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -467,6 +470,7 @@ export default {
deleteTable() {
if (this.id) {
this.deleteRow(delList, this.id, function() { this.getTreeData() })
+ this.i = 1
} else {
this.$message.warning(`请选择部门`)
}
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 33fe4419..87f6c63d 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -40,11 +40,11 @@
查询
进度颜色：
-
拖期
即将拖期
如期
工序外协
+ 报废
@@ -396,7 +396,6 @@ export default {
this.Groups = []
if (this.project !== '') {
getMachines(this.project).then(response => {
- console.log(response.data)
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 22451047..a16a697c 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -173,7 +173,7 @@
v-loading="listLoading1"
:data="tableData1"
class="table"
- border
+ borde
style="max-height: 500px"
height="500">
@@ -1224,6 +1224,7 @@ export default {
}
}).then(() => {
this.tableData1.push(this.result[i])
+ console.log(this.tableData1)
selection2(this.工艺计划流水号[this.indexAdjust]).then(response => { // 刷新对话框显示和颜色
for (let i = 0; i < response.data.length; i++) {
this.partType = response.data[i].零件类型
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 9c479d7b..4e298a0a 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -475,6 +475,7 @@
diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue
index ee3a44f7..9be6bbab 100644
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -260,7 +260,7 @@
编辑
-
+
@@ -321,10 +321,10 @@
-
+
-
+
-
+
@@ -381,7 +381,7 @@
-
+
@@ -439,13 +439,17 @@ export default {
spareVisible: false,
spareTitle: '',
spareForm: {
- 序号: '',
+ 备件编号: '',
名称: '',
规格: '',
单位: '',
备注: '',
数量: ''
},
+ spareRule: {
+ 名称: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+ 数量: [{ required: true, message: '请输入数量', trigger: 'blur' }]
+ },
spareData: [],
receiptForm: {
装箱单号: '',
@@ -455,12 +459,21 @@ export default {
联系人: '',
联系方式: ''
},
+ receiptRules: {
+ 装箱单号: [{ required: true, message: '请输入装箱单号', trigger: 'blur' }],
+ 名称: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+ 发货节点: [{ required: true, message: '请输入发货节点', trigger: 'blur' }]
+ },
machineForm: {
序号: '',
机床号: '',
备注: '',
数量: ''
},
+ machineRules: {
+ 机床号: [{ required: true, message: '请选择机床号', trigger: 'change' }],
+ 数量: [{ required: true, message: '请输入数量', trigger: 'blur' }]
+ },
rules: {
},
machineTableData: [],
@@ -469,10 +482,14 @@ export default {
fileVisible: false,
fileTitle: '',
fileForm: {
- 序号: '',
+ 文件编号: '',
名称: '',
数量: '',
备注: ''
+ },
+ filerules: {
+ 名称: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+ 数量: [{ required: true, message: '请输入数量', trigger: 'blur' }]
}
}
},
@@ -495,6 +512,10 @@ export default {
}
},
projectValue(val) {
+ this.machineTableData = []
+ this.receiptData = []
+ this.spareData = []
+ this.fileData = []
if (val) {
this.getMachineSelect(val)
}
@@ -570,8 +591,11 @@ export default {
cancel() {
this.receiptVisible = false
this.machineVisible = false
+ this.fileVisible = false
+ this.spareVisible = false
},
async getMachineData() {
+ this.machineTableData = []
const response = await getMachineData(this.receiptNum)
const data = response.data
for (let i = 0; i < data.length; i++) {
@@ -598,11 +622,15 @@ export default {
})
},
async submitAddMachine() {
- const response = await addMachineData(this.projectName, this.machineValue, this.machineForm.备注, this.machineForm.数量, this.receiptNum)
- if (response.data[0].result === '1') {
+ this.addTable(addMachineData, [this.projectName, this.machineValue, this.machineForm.备注, this.machineForm.数量, this.receiptNum], 'machineForm', function() {
this.machineVisible = false
this.getMachineData()
- }
+ })
+ // const response = await addMachineData(this.projectName, this.machineValue, this.machineForm.备注, this.machineForm.数量, this.receiptNum)
+ // if (response.data[0].result === '1') {
+ // this.machineVisible = false
+ // this.getMachineData()
+ // }
},
editMachine(row) {
this.editForm(row, 'machineForm', function() {
@@ -611,11 +639,15 @@ export default {
})
},
async submitEditMachine() {
- const response = await updateMachineData(this.machineForm.序号, this.machineForm.数量, this.machineForm.备注)
- if (response.data[0].result === '1') {
+ this.editTable(updateMachineData, [this.machineForm.序号, this.machineForm.数量, this.machineForm.备注], 'machineForm', function() {
this.machineVisible = false
this.getMachineData()
- }
+ })
+ // const response = await updateMachineData(this.machineForm.序号, this.machineForm.数量, this.machineForm.备注)
+ // if (response.data[0].result === '1') {
+ // this.machineVisible = false
+ // this.getMachineData()
+ // }
},
deleteMachine(row) {
this.deleteRow(deleteMachineData, row.序号, function() {
@@ -625,20 +657,18 @@ export default {
async getFileData() {
const response = await getFileData(this.receiptNum)
this.fileData = response.data
- console.log(this.fileData)
},
addFile() {
- this.addForm('machineForm', function() {
+ this.addForm('fileForm', function() {
this.fileTitle = `添加文件`
this.fileVisible = true
})
},
async submitAddFile() {
- const response = await addFileData(this.fileForm.名称, this.fileForm.数量, this.fileForm.备注, this.receiptNum)
- if (response.data[0].result === '1') {
+ this.addTable(addFileData, [this.fileForm.名称, this.fileForm.数量, this.fileForm.备注, this.receiptNum], 'fileForm', function() {
this.fileVisible = false
this.getFileData()
- }
+ })
},
editFile(row) {
this.editForm(row, 'fileForm', function() {
@@ -647,14 +677,13 @@ export default {
})
},
async submitEditFile() {
- const response = await editFileData(this.fileForm.名称, this.fileForm.数量, this.fileForm.备注, this.fileForm.序号)
- if (response.data[0].result === '1') {
+ this.editTable(editFileData, [this.fileForm.名称, this.fileForm.数量, this.fileForm.备注, this.fileForm.文件编号], 'fileForm', function() {
this.fileVisible = false
this.getFileData()
- }
+ })
},
deleteFile(row) {
- this.deleteRow(deleteFileData, row.序号, function() {
+ this.deleteRow(deleteFileData, row.文件编号, function() {
this.getFileData()
})
},
@@ -669,11 +698,15 @@ export default {
})
},
async submitAddSpare() {
- const response = await addSpareData(this.spareForm.名称, this.spareForm.规格, this.spareForm.单位, this.spareForm.数量, this.spareForm.备注, this.receiptNum)
- if (response.data[0].result === '1') {
+ this.addTable(addSpareData, [this.spareForm.名称, this.spareForm.规格, this.spareForm.单位, this.spareForm.数量, this.spareForm.备注, this.receiptNum], 'spareForm', function() {
this.spareVisible = false
this.getSpareData()
- }
+ })
+ // const response = await addSpareData(this.spareForm.名称, this.spareForm.规格, this.spareForm.单位, this.spareForm.数量, this.spareForm.备注, this.receiptNum)
+ // if (response.data[0].result === '1') {
+ // this.spareVisible = false
+ // this.getSpareData()
+ // }
},
editSpare(row) {
this.editForm(row, 'spareForm', function() {
@@ -682,14 +715,18 @@ export default {
})
},
async submitEditSpare() {
- const response = await editSpareData(this.spareForm.名称, this.spareForm.规格, this.spareForm.单位, this.spareForm.数量, this.spareForm.备注, this.fileForm.序号)
- if (response.data[0].result === '1') {
+ this.editTable(editSpareData, [this.spareForm.名称, this.spareForm.规格, this.spareForm.单位, this.spareForm.数量, this.spareForm.备注, this.spareForm.备件编号], 'spareForm', function() {
this.spareVisible = false
this.getSpareData()
- }
+ })
+ // const response = await editSpareData(this.spareForm.名称, this.spareForm.规格, this.spareForm.单位, this.spareForm.数量, this.spareForm.备注, this.spareForm.备件编号)
+ // if (response.data[0].result === '1') {
+ // this.spareVisible = false
+ // this.getSpareData()
+ // }
},
deleteSpare(row) {
- this.deleteRow(deleteSpareData, row.序号, function() {
+ this.deleteRow(deleteSpareData, row.备件编号, function() {
this.getSpareData()
})
}
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index fb295a00..2da64dde 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -22,25 +22,24 @@
- 导入到数据库
+ 导入到数据库
-
-
- 将文件拖到此处，或点击上传
- 只能上传jpg/png文件，且不超过500kb
-
+
+
+
+
+
+
+
+
+