From f6ef7676e290db8c703e537671aa1ba339191ba7 Mon Sep 17 00:00:00 2001 From: liushuai Date: Mon, 2 Dec 2019 17:15:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/PartAssignment.js | 4 ++-- src/utils/request.js | 2 +- .../PartAssignment/index.vue | 18 ++++++++++++--- .../ImportChangeParts/specificationData1.vue | 23 +++++++++---------- .../CreatingProcurementContracts/index.vue | 11 ++++++--- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index 518303d7..a0b27598 100644 --- a/src/api/ManufacturingCenter/PartAssignment.js +++ b/src/api/ManufacturingCenter/PartAssignment.js @@ -67,14 +67,14 @@ export function searchTable1(PurchaseOrder, check4) { } }) } -export function addData(num1, num2, id, time) { +export function addData(num1, num2, id, time, remarks) { return request({ url: '', method: 'post', data: { type: '2', name: '车间管理_基本件采购_请购单_增加数据', - param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time + param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time + '&备注=' + remarks } }) } diff --git a/src/utils/request.js b/src/utils/request.js index 2cb92ad8..fc41e22d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 2e3ce56b..072970d5 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -219,7 +219,7 @@ - + @@ -242,6 +242,11 @@ {{ scope.row.请购时间 }} + + + @@ -349,6 +354,12 @@ value-format="yyyy-MM-dd" placeholder="选择日期"/> + + +
取消 @@ -563,7 +574,8 @@ export default { form: { 请购单编号: '', 请购车间: '制造部', - 请购时间: '' + 请购时间: '', + Remarks: '' }, rules: { 请购单编号: [{ required: true, message: '请输入请购单编号', trigger: 'blur' }], @@ -908,7 +920,7 @@ export default { submitAdd(formName) { this.$refs[formName].validate((valid) => { if (valid) { - addData(this.form.请购车间, this.name, this.id, this.form.请购时间).then(response => { + addData(this.form.请购车间, this.name, this.id, this.form.请购时间, this.form.Remarks).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') this.dialogFormVisible = false diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue index 8332a33a..7b303b51 100644 --- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue +++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue @@ -515,35 +515,34 @@ export default { submitChangeType(row) { this.Number = row.id this.Type = row.整改类型 - if (row.整改类型 === 1) { - if (this.groupName.indexOf('MX') > -1) { + if (this.groupName.indexOf('MX') > -1) { + if (row.整改类型 === 1) { update(this.projectName, this.machineValue, row.id, row.整改类型).then(response => { if (response.data[0].result === '1') { this.fetchData() } }) - } else { - update1(row.id, row.整改类型).then(response => { - if (response.data[0].result === '1') { - this.fetchData() - } - }) - } - } else { - if (row.整改类型 === 2) { + } else if (row.整改类型 === 2) { this.title1 = '替换' this.oldPartsValue = row.图号或者型号.split('-')[0] + '-' + row.图号或者型号.split('-')[1].substring(2, 7) searchOldParts(this.projectName, this.machineValue, this.oldPartsValue).then(response => { this.PartsValueNum = response.data[0].图号或者型号 }) + this.dialogParts = true } else { this.title1 = '补充加工' this.oldPartsValue = row.图号或者型号.split('-')[0] + '-' + row.图号或者型号.split('-')[1].substring(2, 7) searchOldParts(this.projectName, this.machineValue, this.oldPartsValue).then(response => { this.PartsValueNum = response.data[0].图号或者型号 }) + this.dialogParts = true } - this.dialogParts = true + } else { + update1(row.id, row.整改类型).then(response => { + if (response.data[0].result === '1') { + this.fetchData() + } + }) } }, searchMaterial1(row) { diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 2ad09f14..ee12874c 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -7,7 +7,10 @@ v-for="item in contractNum" :key="item.value" :label="item.label" - :value="item.value"/> + :value="item.value"> +
{{ item.label }}
+
{{ item.name }}
+ @@ -466,7 +469,8 @@ export default { this.contractNum.push({ label: response.data[i].请购单编号, value: response.data[i].请购单流水号, - id: response.data[i].请购类型 + id: response.data[i].请购类型, + name: response.data[i].备注 }) } }) @@ -585,7 +589,8 @@ export default { this.contractNum.push({ label: response.data[i].请购单编号, value: response.data[i].请购单流水号, - id: response.data[i].请购类型 + id: response.data[i].请购类型, + name: response.data[i].备注 }) } })