diff --git a/src/utils/request.js b/src/utils/request.js
index 543826d2..461b1f09 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,7 +10,7 @@ export const name = `OP8888`
export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
const service = axios.create({
- // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
+ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,git
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue
index 064a5477..7f41f690 100644
--- a/src/views/Inventory/ExchangePart/index.vue
+++ b/src/views/Inventory/ExchangePart/index.vue
@@ -76,17 +76,17 @@
+
+
+
-
-
-
@@ -127,7 +127,7 @@
- 交换
+ 交换
@@ -167,24 +167,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -265,13 +265,15 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
- ProjectValue: ' ',
+ count1: 0,
+ count2: 0, // 清表单验证计数器
+ ProjectValue: '',
Project: [],
ProjectValue_check: 1,
- MachineValue: ' ',
+ MachineValue: '',
Machine: [],
MachineValue_check: 1,
- GroupNumValue: ' ',
+ GroupNumValue: '',
GroupNumValue_check: 1,
GroupNum: [],
tableDataBasic: [],
@@ -302,7 +304,7 @@ export default {
rules: { // 表单验证规则
ExchangeNumber: [{ required: true, message: '请输入交换件编号', trigger: 'blur' }],
ExchangeNumberx: [{ required: true, message: '请输入交换件数量', trigger: 'blur' }],
- ExchangeNote: [{ required: true, message: '请输入交换件备注', trigger: 'change' }]
+ ExchangeNote: [{ required: true, message: '请输入交换件备注', trigger: 'blur' }]
},
PageCurrent: 1,
PageSize: 10,
@@ -334,7 +336,6 @@ export default {
// 获取人员编号
getpeopleid() {
this.picikingPeople = this.id
- console.log(this.picikingPeople)
},
searchMachine() { // 查询机床
if (this.ProjectValue === '') {
@@ -362,19 +363,18 @@ export default {
searchPartinfo() {
this.tableDataPurchase = []
this.tableDataBasic = []
- if (this.ProjectValue === ' ') {
+ if (this.ProjectValue === '') {
this.ProjectValue_check = 0
}
- if (this.MachineValue === ' ') {
+ if (this.MachineValue === '') {
this.MachineValue_check = 0
}
- if (this.GroupNumValue === ' ') {
+ if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
}
this.listLoading = true
searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataPurchase = response.data.rows
- console.log(this.tableDataPurchase)
this.total = response.data.total
})
this.listLoading = false
@@ -397,39 +397,66 @@ export default {
this.listLoading1 = false
})
},
+ handleSizeChange1(val) {
+ this.PageCurrent1 = 1
+ this.PageSize1 = val
+ this.getExchangeTable()
+ },
+ handleCurrentChange1(val) {
+ this.PageCurrent1 = val
+ this.getExchangeTable()
+ },
// 选择领料单
chooseListinfor(row) {
this.pickingListNumberx = row.领料单流水号
- console.log(this.pickingListNumberx)
this.searchListDetailt()
},
// 增加交换件
- addListDetailinfor() {
- addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote).then(response => {
- if (response.data[0].result === '1') {
- this.$message.success('增加成功')
- } else { this.$message.error('增加失败') }
+ addListDetailinfor(form) {
+ this.$refs[form].validate((valid) => {
+ if (valid) {
+ addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote).then(response => {
+ if (response.data[0].result === '1') {
+ this.$message.success('增加成功')
+ } else { this.$message.error('增加失败') }
+ }).then(() => {
+ this.dialogFormVisible = false
+ this.PageCurrent1 = 1
+ this.getExchangeTable()
+ })
+ }
})
- this.dialogFormVisible = false
- this.getExchangeTable()
},
// 打开交换表单
- exchange() {
- this.title = '交换'
- this.dialogFormVisible = true
+ exchange(form) {
+ if (this.tableData1.length === 0) {
+ this.$message.error('请选择交换件')
+ } else if (this.tableData2.length === 0) {
+ this.$message.error('请选择交换件')
+ } else {
+ this.count1 = this.count1 + 1
+ if (this.count1 !== 1) {
+ this.$refs[form].resetFields()
+ }
+ this.title = '交换'
+ this.form.ExchangeNumber = ''
+ this.form.ExchangeNumberx = ''
+ this.form.ExchangeNote = ''
+ this.dialogFormVisible = true
+ }
},
// 重置表单
- callOff() {
+ callOff(formName) {
this.form.ExchangeNumber = ''
this.form.ExchangeNumberx = ''
this.form.ExchangeNote = ''
this.dialogFormVisible = false
+ this.$refs[formName].resetFields()
},
// 选中零件交换
selecting(row) {
const arr = new Array(row)
this.tableData1 = arr
- console.log(this.tableData1)
},
// 选中被零件交换
selected(row) {
@@ -448,8 +475,9 @@ export default {
dropExchangeList(this.exchangeListNumber, this.eTeamPartNumber).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
- this.getExchangeTable().then(response => {
- })
+ this.dialogFormVisible = false
+ this.PageCurrent1 = 1
+ this.getExchangeTable()
} else {
this.$message.error('删除失败')
}