From eab1a12dc2b297149fc0e6537b94b691c7027fb7 Mon Sep 17 00:00:00 2001 From: beyond <931414026@qq.com> Date: Fri, 17 Apr 2020 09:52:01 +0800 Subject: [PATCH] beyond 4.17 --- src/views/CheckReport/AddCheckReport.vue | 51 ++++++-- src/views/CheckReport/CheckReportList.vue | 2 +- .../CheckReport/components/DetailList.vue | 5 +- .../CheckReport/components/DetailReport4.vue | 115 ++++++++++++++++++ src/views/CheckReport/components/MyDialog.vue | 1 + .../OutSourceEnter/AddOutSourceEnter.vue | 14 ++- .../OutSourceEnter/components/OutSource.vue | 1 + src/views/OutSourcing/AddOutSourcing.vue | 4 + src/views/OutSourcing/components/MyDialog.vue | 4 + 9 files changed, 187 insertions(+), 10 deletions(-) create mode 100644 src/views/CheckReport/components/DetailReport4.vue diff --git a/src/views/CheckReport/AddCheckReport.vue b/src/views/CheckReport/AddCheckReport.vue index d3df89d6..296387db 100644 --- a/src/views/CheckReport/AddCheckReport.vue +++ b/src/views/CheckReport/AddCheckReport.vue @@ -127,6 +127,7 @@ + @@ -273,11 +274,12 @@ import MyEmp2 from './components/MyEmp2' import DetailReport from './components/DetailReport' import DetailReport2 from './components/DetailReport2' import DetailReport3 from './components/DetailReport3' +import DetailReport4 from './components/DetailReport4' import OutSource from './components/OutSource' var _that export default { name: 'AddCheckReport', - components: { OutSource, DetailReport3, DetailReport2, DetailReport, MyEmp2, MyMater, MyQuality, MyAccept, ProduceTask, MyArrival, MyCenter, MyDelivery, MySupplier, MyDetail, MyEmp }, + components: { DetailReport4, OutSource, DetailReport3, DetailReport2, DetailReport, MyEmp2, MyMater, MyQuality, MyAccept, ProduceTask, MyArrival, MyCenter, MyDelivery, MySupplier, MyDetail, MyEmp }, data() { const validatePass = (rule, value, callback) => { // console.log(value) @@ -351,8 +353,10 @@ export default { IsProduceManagerId: false, // 生产任务单传给物品信息数据 reportdata3: [], + reportdata4: [], // 生产任务单控制物品明细 reportcontrol3: false, + reportcontrol4: false, // 采购到货单传给物品信息数据 reportdata2: [], // 采购到货单控制物品明细 @@ -511,16 +515,49 @@ export default { _that = this }, methods: { - outSourceDetail(val) { - console.log(val) - this.$refs.editable.clear() - for (let i = 0; i < val.length; i++) { - this.$refs.editable.insert(val[i]) + report4(val) { + console.log('val', val) + this.sourceSerialNumber = val.id + this.personalForm.sourceSerialNumber = val.id + this.personalForm.productCode = val.productCode + this.personalForm.productName = val.productName + this.personalForm.unit = val.unit + this.personalForm.typeId = val.type + this.typeId = val.typeName + this.judgequilty = (val.quantity).toFixed(2) + this.personalForm.checkQuantity = (val.quantity).toFixed(2) + if (Number(this.personalForm.checkQuantity) <= 100) { + this.personalForm.sampleQuantity = 5 } + if (Number(this.personalForm.checkQuantity) >= 101) { + this.personalForm.sampleQuantity = Math.round(Number(this.personalForm.checkQuantity) * 0.05) + } + // 增加明细 + this.adddetail(val.productCode) + }, + outSourceDetail(val) { }, outSource(val) { console.log(val) this.personalForm.sourceNumber = val.number + console.log(123) + this.$refs.editable.clear() + this.$refs.personalForm2.clearValidate() + this.$refs.personalForm2.resetFields() + this.$refs.personalForm3.clearValidate() + this.$refs.personalForm3.resetFields() + this.personalForm.productName = '' + this.personalForm.unit = '' + this.personalForm.typeId = '' + this.personalForm.failedQuantity = '' + this.personalForm.passRate = '' + this.reportdata4 = val.outsourcingEnterDetailVos + this.personalForm.inspectionDeptId = val.produceDeptId + if (val.handlePersonId !== '' && val.handlePersonId !== null && val.handlePersonId !== undefined) { + this.personalForm.produceManagerId = val.handlePersonId + this.produceManagerId = val.handlePersonName + this.IsProduceManagerId = true + } }, getdatatime() { // 默认显示今天 var date = new Date() @@ -629,7 +666,7 @@ export default { } else if (this.personalForm.sourceType === '3') { this.reportcontrol3 = true } else if (this.personalForm.sourceType === '4') { - // this.outsourcecontrol = true + this.reportcontrol4 = true } }, adddetail(val) { diff --git a/src/views/CheckReport/CheckReportList.vue b/src/views/CheckReport/CheckReportList.vue index 8ba6b93a..a73fd636 100644 --- a/src/views/CheckReport/CheckReportList.vue +++ b/src/views/CheckReport/CheckReportList.vue @@ -206,7 +206,7 @@ export default { 1: _that.$t('updates.zjsqd'), 2: _that.$t('updates.cgdhd'), 3: _that.$t('updates.zscrw'), - 4: _that.$t('Hmodule.Nosource') + 4: '外包单' } return statusMap[status] }, diff --git a/src/views/CheckReport/components/DetailList.vue b/src/views/CheckReport/components/DetailList.vue index 994ae3be..94f5f453 100644 --- a/src/views/CheckReport/components/DetailList.vue +++ b/src/views/CheckReport/components/DetailList.vue @@ -288,7 +288,10 @@ export default { }, sourceTypeFilter(status) { const statusMap = { - 1: _that.$t('updates.zjsqd') + 1: _that.$t('updates.zjsqd'), + 2: _that.$t('updates.cgdhd'), + 3: _that.$t('updates.zscrw'), + 4: '外包单' } return statusMap[status] }, diff --git a/src/views/CheckReport/components/DetailReport4.vue b/src/views/CheckReport/components/DetailReport4.vue new file mode 100644 index 00000000..9633e1ec --- /dev/null +++ b/src/views/CheckReport/components/DetailReport4.vue @@ -0,0 +1,115 @@ + + + + + diff --git a/src/views/CheckReport/components/MyDialog.vue b/src/views/CheckReport/components/MyDialog.vue index d0f78787..fc7a505a 100644 --- a/src/views/CheckReport/components/MyDialog.vue +++ b/src/views/CheckReport/components/MyDialog.vue @@ -17,6 +17,7 @@ + diff --git a/src/views/OutSourceEnter/AddOutSourceEnter.vue b/src/views/OutSourceEnter/AddOutSourceEnter.vue index 1cd8318f..aa994714 100644 --- a/src/views/OutSourceEnter/AddOutSourceEnter.vue +++ b/src/views/OutSourceEnter/AddOutSourceEnter.vue @@ -335,8 +335,20 @@ export default { outSourceDetail(val) { console.log(val) this.$refs.editable.clear() + let flag = 0 for (let i = 0; i < val.length; i++) { - this.$refs.editable.insert(val[i]) + if (val[i].qualifyQuantity > 0) { + flag++ + this.$refs.editable.insert(val[i]) + } + } + if (flag === 0) { + this.$notify.error({ + title: 'wrong', + message: '请先质检再入库', + offset: 100 + }) + return false } }, outSource(val) { diff --git a/src/views/OutSourceEnter/components/OutSource.vue b/src/views/OutSourceEnter/components/OutSource.vue index 6ef8d0c6..10509cb5 100644 --- a/src/views/OutSourceEnter/components/OutSource.vue +++ b/src/views/OutSourceEnter/components/OutSource.vue @@ -316,6 +316,7 @@ export default { const outSourceDetail = outsourcingDetailVos.map(function(item) { return { actualEnterQuantity: item.quantity, + qualifyQuantity: item.qualifyQuantity, productCode: item.productCode, productName: item.productName, categoryName: item.productCategoryName, diff --git a/src/views/OutSourcing/AddOutSourcing.vue b/src/views/OutSourcing/AddOutSourcing.vue index 7deef40b..fd4da43e 100644 --- a/src/views/OutSourcing/AddOutSourcing.vue +++ b/src/views/OutSourcing/AddOutSourcing.vue @@ -474,6 +474,10 @@ export default { EnterDetail.map(function(elem) { return elem }).forEach(function(elem) { + elem.reportCheckingQuantity = 0 + elem.actualCheckingQuantity = 0 + elem.qualifyQuantity = 0 + elem.unqualifyQuantity = 0 if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) { delete elem.productCode } diff --git a/src/views/OutSourcing/components/MyDialog.vue b/src/views/OutSourcing/components/MyDialog.vue index 8ca69ebd..e58ce825 100644 --- a/src/views/OutSourcing/components/MyDialog.vue +++ b/src/views/OutSourcing/components/MyDialog.vue @@ -482,6 +482,10 @@ export default { EnterDetail.map(function(elem) { return elem }).forEach(function(elem) { + elem.reportCheckingQuantity = 0 + elem.actualCheckingQuantity = 0 + elem.qualifyQuantity = 0 + elem.unqualifyQuantity = 0 if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) { delete elem.productCode }