From 0bd9cd0189edc7c560137372dd7c5b36961fbb11 Mon Sep 17 00:00:00 2001 From: liushuai Date: Sat, 18 Apr 2020 17:41:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScrappedSupplementaryInvestment.js | 4 ++-- .../index.vue | 1 - .../DiscardedPartsInquiry/index.vue | 22 ++++++++++++++++++- .../InitialProduction/index.vue | 8 +++---- .../PartWorkCraftSelect_rdlc/index.vue | 2 +- .../ScrappedSupplementaryInvestment/index.vue | 11 +++++++++- 6 files changed, 38 insertions(+), 10 deletions(-) diff --git a/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js b/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js index 3b1b664c..5e9309fb 100644 --- a/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js +++ b/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js @@ -42,7 +42,7 @@ export function searchtable(check1, value1, check3, value3, check5, value5, valu } }) } -export function editSpare(CutCode, number, id) { +export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people) { return request({ url: '', method: 'post', @@ -51,7 +51,7 @@ export function editSpare(CutCode, number, id) { ModularID: router.currentRoute.path, type: '2', name: '报废补投_提交报废_循环执行', - param: '工艺计划流水号组=' + CutCode + '&报废数量组=' + number + '&报废人=' + id + param: '工艺计划流水号组=' + CutCode + '&报废数量组=' + number + '&报废人=' + id + '&不合格原因组=' + Unqualified + '&备注组=' + remarkGroup + '&质检人组=' + people } }) } diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index 618ad145..a1788a16 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -838,7 +838,6 @@ export default { }, QualityType() { QualityType().then(response => { - console.log(response.data) for (let i = 0; i < response.data.length; i++) { this.QualityTypeNumber.push({ label: response.data[i].质检类型, diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue index 3b13c684..49e03418 100644 --- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue +++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue @@ -84,16 +84,36 @@ {{ scope.row.报废时间 }} - + + + + + + + + + + + + +
- + @@ -239,18 +239,18 @@ - + - + diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 5b99fec1..cb59faee 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -359,7 +359,7 @@ export default { if (val[i].进程 !== '编制中') { this.jinyong = true } - if (val[i].进程 === '编制中') { + if (val[i].进程 === '编制中' || val[i].进程 === '未分配') { this.jinyong1 = true } } diff --git a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue index 69f166a6..1f329507 100644 --- a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue +++ b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue @@ -194,6 +194,9 @@ export default { procedureGroup: [], ScrapQuantity: [], ProcessPlanNumber: [], + Unqualified: [], + remarkGroup: [], + people: [], Data: [], tableData: [], // 表格数据 total: 0, // 总条数 @@ -287,12 +290,18 @@ export default { }).then(() => { this.ScrapQuantity = [] this.ProcessPlanNumber = [] + this.Unqualified = [] + this.remarkGroup = [] + this.people = [] for (let i = 0; i < this.procedureGroup.length; i++) { this.ScrapQuantity.push(this.procedureGroup[i].不合格数量) this.ProcessPlanNumber.push(this.procedureGroup[i].工艺计划流水号) + this.Unqualified.push(this.procedureGroup[i].不合格原因文本) + this.remarkGroup.push(this.procedureGroup[i].备注) + this.people.push(this.procedureGroup[i].人员编号) } this.handleEdit_disable = true - editSpare(this.ProcessPlanNumber, this.ScrapQuantity, this.id).then(response => { + editSpare(this.ProcessPlanNumber, this.ScrapQuantity, this.id, this.Unqualified, this.remarkGroup, this.people).then(response => { if (response.data[0].result === '1') { this.$message.success('报废成功') this.searchTable() From 2f5922ab01a1abac3610a6fda0e211425b8a528a Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 20 Apr 2020 09:36:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/check-versions.js | 14 +- .../AutomaticScheduling/index.vue | 1930 +++++++++++++++++ 2 files changed, 1937 insertions(+), 7 deletions(-) create mode 100644 src/views/ManufacturingCenter/AutomaticScheduling/index.vue diff --git a/build/check-versions.js b/build/check-versions.js index c5c29e90..e697bfd5 100644 --- a/build/check-versions.js +++ b/build/check-versions.js @@ -19,13 +19,13 @@ const versionRequirements = [ } ] -if (shell.which('npm')) { - versionRequirements.push({ - name: 'npm', - currentVersion: exec('npm --version'), - versionRequirement: packageConfig.engines.npm - }) -} +// if (shell.which('npm')) { +// versionRequirements.push({ +// name: 'npm', +// currentVersion: exec('npm --version'), +// versionRequirement: packageConfig.engines.npm +// }) +// } module.exports = function() { const warnings = [] diff --git a/src/views/ManufacturingCenter/AutomaticScheduling/index.vue b/src/views/ManufacturingCenter/AutomaticScheduling/index.vue new file mode 100644 index 00000000..1bee4cab --- /dev/null +++ b/src/views/ManufacturingCenter/AutomaticScheduling/index.vue @@ -0,0 +1,1930 @@ + + + + From 126b272afd79f001caf0a2873933176968d45fac Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 20 Apr 2020 09:39:00 +0800 Subject: [PATCH 3/4] haxibiao --- src/main.js | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/src/main.js b/src/main.js index a9b36909..5591690f 100644 --- a/src/main.js +++ b/src/main.js @@ -73,3 +73,66 @@ export function ExecDatabase(num) { }) } // end---> + +// 哈希表 +export function HashTable() { + let size = 0 + // eslint-disable-next-line no-new-object + let entry = new Object() + this.add = function(key, value) { + if (!this.containsKey(key)) { + size++ + } + entry[key] = value + } + this.getValue = function(key) { + return this.containsKey(key) ? entry[key] : null + } + this.remove = function(key) { + if (this.containsKey(key) && (delete entry[key])) { + size-- + } + } + this.containsKey = function(key) { + return (key in entry) + } + this.containsValue = function(value) { + for (const prop in entry) { + if (entry[prop] === value) { + return true + } + } + return false + } + this.getValues = function() { + // eslint-disable-next-line no-array-constructor + const values = new Array() + for (const prop in entry) { + values.push(entry[prop]) + } + return values + } + // this.getKey = function(value) { + // for (const prop in entry) { + // if (entry[key]) { + // return prop + // } + // } + // } + this.getKeys = function() { + // eslint-disable-next-line no-array-constructor + const keys = new Array() + for (const prop in entry) { + keys.push(prop) + } + return keys + } + this.getSize = function() { + return size + } + this.clear = function() { + size = 0 + // eslint-disable-next-line no-new-object + entry = new Object() + } +} From fdf7585c212598c394c4a781b8039d1ff8de4d1f Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 20 Apr 2020 14:59:39 +0800 Subject: [PATCH 4/4] asdsd --- src/api/Inventory/MaterialOut.js | 15 ++ src/views/Inventory/MaterialOut/index.vue | 267 ++++++++++++--------- src/views/Inventory/MaterialOut/index2.vue | 131 ++++++++++ src/views/layout/components/TagsView.vue | 5 + 4 files changed, 300 insertions(+), 118 deletions(-) create mode 100644 src/views/Inventory/MaterialOut/index2.vue diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js index a0b8dad4..e2c3f5fb 100644 --- a/src/api/Inventory/MaterialOut.js +++ b/src/api/Inventory/MaterialOut.js @@ -231,3 +231,18 @@ export function selectleaders(department) { } }) } +// 领料单查询 +export function searchList222(pageCurrent, pageSize, listPeople_check) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间装配管理_领料单明细_查询数据_新2', + param: '图号=' + listPeople_check, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index 0c654c30..1c687e0c 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -1,125 +1,134 @@