From 55601386f925a582d9dd16324e7714847c250f29 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 24 Nov 2018 17:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=B7=A5=E8=89=BA=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E5=92=8C=E7=89=A9=E6=96=99=E7=BB=B4=E6=8A=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BasicData/MaterialMaintenance/index.vue | 45 ++++++++-----------
.../WorkshopProcessMaintenance/index.vue | 9 ++--
2 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/src/views/BasicData/MaterialMaintenance/index.vue b/src/views/BasicData/MaterialMaintenance/index.vue
index 0bd061bd..afd74ae3 100644
--- a/src/views/BasicData/MaterialMaintenance/index.vue
+++ b/src/views/BasicData/MaterialMaintenance/index.vue
@@ -14,11 +14,6 @@
height="580"
highlight-current-row
border>
-
-
- {{ scope.row.材料流水号 }}
-
-
{{ scope.row.材料 }}
@@ -58,7 +53,7 @@
-
+
@@ -98,8 +93,12 @@ export default {
form: {
MaterialName: ''
},
+ form2: {
+ MaterialName2: ''
+ },
rules: {
- MaterialName: [{ required: true, message: '请输入材料名称', trigger: 'blur' }]
+ MaterialName: [{ required: true, message: '请输入材料名称', trigger: 'blur' }],
+ MaterialName2: [{ required: true, message: '请输入材料名称', trigger: 'blur' }]
}
}
},
@@ -130,17 +129,18 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
+ this.form.MaterialName = ''
this.dialogFormVisible = true
},
addMaterial(formName) {
- this.dialogFormVisible = false
this.$refs[formName].validate((valid) => {
if (valid) {
addMaterial(this.form.MaterialName).then(response => {
if (response.data[0].result === '1') {
- this.featchMaterial()
this.$message.success('添加成功')
+ this.dialogFormVisible = false
this.form = {}
+ this.featchMaterial()
} else {
this.$message.error('添加失败')
this.form = {}
@@ -150,7 +150,6 @@ export default {
})
},
delMaterial(row) {
- console.log(row)
this.$confirm('此操作将永久删除该行， 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -168,18 +167,18 @@ export default {
})
},
Edit(row) {
- if (this.$refs['form'] !== undefined) {
- this.$refs['form'].resetFields()
+ if (this.$refs['form2'] !== undefined) {
+ this.$refs['form2'].resetFields()
}
this.dialogFormVisible2 = true
- this.form.MaterialName = row.材料
+ this.form2.MaterialName2 = row.材料
this.ID = row.材料流水号
},
- editMaterial(formName) {
- this.$refs[formName].validate((valid) => {
+ editMaterial(form2) {
+ this.$refs[form2].validate((valid) => {
if (valid) {
this.dialogFormVisible2 = false
- editMaterial(this.ID, this.form.MaterialName).then(response => {
+ editMaterial(this.ID, this.form2.MaterialName2).then(response => {
if (response.data[0].result === '1') {
this.featchMaterial()
this.$message.success('编辑成功')
@@ -197,10 +196,4 @@ export default {
diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
index 80c402b5..c3d527b5 100644
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -385,9 +385,12 @@ export default {
this.tableData2 = response.data
})
},
- searchTechnologicalRequirementsOfProcessNum(row) {
- this.expands = []
- this.expands.push(row.工艺编号)
+ searchTechnologicalRequirementsOfProcessNum(row, expandedRows) {
+ // this.expands = []
+ // this.expands.push(row.工艺编号)
+ if (expandedRows.length > 1) {
+ expandedRows.shift()
+ }
this.loading3 = true
searchTechnologicalRequirementsOfProcessNum(row.工艺编号).then(response => {
this.loading3 = false