diff --git a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js index dfb3b616..0af7fba4 100644 --- a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js +++ b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js @@ -49,7 +49,7 @@ export function deleteInvoice(num1, num2) { } }) } -// 传送人接收人初始化 +// 接收人初始化 export function initPerson() { return request({ url: '', @@ -61,6 +61,18 @@ export function initPerson() { } }) } +// 传送人初始化 +export function initPerson1() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=5' + } + }) +} // 初始化合同号 export function initContract() { return request({ diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index 2a147c6f..b8fce6f0 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -7,7 +7,7 @@ 查询 查询全部 到货 - 刷新 + diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index 0e01cc71..4dcebb5c 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -1571,8 +1571,6 @@ export default { span{ margin: 10px 0 10px 10px; } - - - - diff --git a/src/views/Outsourcing/UnqualifiedTreatment/index.vue b/src/views/Outsourcing/UnqualifiedTreatment/index.vue index ad6ebdec..545948fc 100644 --- a/src/views/Outsourcing/UnqualifiedTreatment/index.vue +++ b/src/views/Outsourcing/UnqualifiedTreatment/index.vue @@ -78,18 +78,18 @@ {{ scope.row.废品数量 }} - + - + @@ -107,7 +107,7 @@ - + @@ -138,6 +138,7 @@ import { initOutHelp, searchTable, editList } from '@/api/Outsourcing/Unqualifie export default { data() { return { + num_bhg: '', count2: 0, form: { wasteQuantity: '', // 废品数量 @@ -165,6 +166,7 @@ export default { }, created() { this.fetchData() + this.searchTable() }, methods: { fetchData() { @@ -218,24 +220,29 @@ export default { } this.number = row.外协加工任务单明细流水号 this.form.wasteQuantity = row.废品数量 + this.num_bhg = row.批次数量 this.form.processingMethod = row.不合格处理方式 this.dialogFormVisible1 = true }, // 提交编辑 submitEdit() { - editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => { - if (response.data[0].result === '1') { - this.dialogFormVisible1 = false - this.$message({ - type: 'success', - message: '信息更新成功!' - }) - this.searchTable() - } else { - this.dialogFormVisible1 = false - this.$message.error('信息更新失败') - } - }) + if (this.form.wasteQuantity > this.num_bhg) { + this.$message.error('废品数量大于总数量') + } else { + editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => { + if (response.data[0].result === '1') { + this.dialogFormVisible1 = false + this.$message({ + type: 'success', + message: '信息更新成功!' + }) + this.searchTable() + } else { + this.dialogFormVisible1 = false + this.$message.error('信息更新失败') + } + }) + } }, // 提交添加或者修改 submit(formName) { diff --git a/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue b/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue index ab70f990..4292a685 100644 --- a/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue +++ b/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue @@ -19,7 +19,7 @@ 传送人: @@ -160,7 +160,7 @@ @@ -189,7 +189,7 @@