From 1b8e4827f42b67c5e0ace23bbfbc9d6a18aeb1f1 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sat, 29 Dec 2018 11:10:15 +0800 Subject: [PATCH 01/34] console --- index.html | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/index.html b/index.html index 7d978087..c727e55c 100644 --- a/index.html +++ b/index.html @@ -8,6 +8,31 @@
+ From d441411fa9f0d7b1aaada1d09b083cf6144ec0c7 Mon Sep 17 00:00:00 2001 From: liushuai Date: Sat, 29 Dec 2018 12:11:59 +0800 Subject: [PATCH 02/34] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkshopProcurement/AccountingPrice.js | 6 ++--- .../ProcurementContractApproval.js | 2 +- .../PurchaseContractChange.js | 2 +- .../PurchasingQualityInspection.js | 2 +- .../QualityInspectionQuery.js | 17 +++----------- .../CreatePackingList/index.vue | 1 - .../TechnologyCenter/ImportParts/index.vue | 1 + .../CreatingProcurementContracts/index.vue | 5 ++++ .../QualityInspectionQuery/index.vue | 23 ++----------------- 9 files changed, 17 insertions(+), 42 deletions(-) diff --git a/src/api/WorkshopProcurement/AccountingPrice.js b/src/api/WorkshopProcurement/AccountingPrice.js index 2f1c25a8..4a53883d 100644 --- a/src/api/WorkshopProcurement/AccountingPrice.js +++ b/src/api/WorkshopProcurement/AccountingPrice.js @@ -7,19 +7,19 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' + name: '车间采购管理_采购合同_查询' } }) } // 查询表1 -export function searchParts(pageCurrent, pageSize, check1, num, check2, name) { +export function searchParts(pageCurrent, pageSize, check1, num) { return request({ url: '', method: 'post', data: { type: '1', name: '车间管理_核算价格_查询数据', - param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, + param: `采购合同流水号_check=${check1}&采购合同流水号=${num}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js index ae79da7d..0116c33e 100644 --- a/src/api/WorkshopProcurement/ProcurementContractApproval.js +++ b/src/api/WorkshopProcurement/ProcurementContractApproval.js @@ -7,7 +7,7 @@ export function initContract() { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同_查询_cjn' + name: '车间采购管理_采购合同_未审批查询' } }) } diff --git a/src/api/WorkshopProcurement/PurchaseContractChange.js b/src/api/WorkshopProcurement/PurchaseContractChange.js index a802ba6a..124734fd 100644 --- a/src/api/WorkshopProcurement/PurchaseContractChange.js +++ b/src/api/WorkshopProcurement/PurchaseContractChange.js @@ -7,7 +7,7 @@ export function initContract() { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同_查询_cjn' + name: '车间采购管理_采购合同_查询' } }) } diff --git a/src/api/WorkshopProcurement/PurchasingQualityInspection.js b/src/api/WorkshopProcurement/PurchasingQualityInspection.js index 4bc6c826..f368dd00 100644 --- a/src/api/WorkshopProcurement/PurchasingQualityInspection.js +++ b/src/api/WorkshopProcurement/PurchasingQualityInspection.js @@ -7,7 +7,7 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' + name: '车间采购管理_采购合同_查询' } }) } diff --git a/src/api/WorkshopProcurement/QualityInspectionQuery.js b/src/api/WorkshopProcurement/QualityInspectionQuery.js index 8be8d887..d2d5e9ab 100644 --- a/src/api/WorkshopProcurement/QualityInspectionQuery.js +++ b/src/api/WorkshopProcurement/QualityInspectionQuery.js @@ -7,30 +7,19 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' - } - }) -} -// 初始化零件 -export function initParts() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '车间管理_基本件外购质检_零件查询' + name: '车间采购管理_采购合同_查询' } }) } // 查询表1 -export function searchParts(pageCurrent, pageSize, check1, num, check2, name, check3, num1) { +export function searchParts(pageCurrent, pageSize, check1, num, check2, name) { return request({ url: '', method: 'post', data: { type: '1', name: '车间管理_质检情况_查询数据', - param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}&物料流水号_check=${check3}&物料流水号=${num1}`, + param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue index 64c1a7f4..5b683f91 100644 --- a/src/views/TechnologyCenter/CreatePackingList/index.vue +++ b/src/views/TechnologyCenter/CreatePackingList/index.vue @@ -606,7 +606,6 @@ export default { console.log(resp) const groupData = resp.data.map(item => { item.类别 = '机床所属部件' - item.代号 = data[i].代号 + '-' + item.代号 + '组' return item }) console.log(groupData) diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index c3f40d9e..3d830dee 100644 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ b/src/views/TechnologyCenter/ImportParts/index.vue @@ -168,6 +168,7 @@ export default { this.disabled = false return } else { + console.log(this.worksheet[j], 111111111) if (this.worksheet[j].M2.v.substring(0, 1) !== '9') { this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = '' this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = '' diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 961ce743..6c5ecb89 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -543,6 +543,11 @@ export default { this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '') this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '') searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => { + for (let i = 0; i < response.data.length; i++) { + if (response.data[i].创立日期 !== '' && response.data[i].创立日期 !== null) { + response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0] + } + } this.tableData01 = response.data }) }, diff --git a/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue b/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue index 0b9a71e2..107e8184 100644 --- a/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue +++ b/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue @@ -15,14 +15,6 @@ 供应商: - 零件名称: - - - 查询 @@ -102,7 +94,7 @@ - + From 10f76b86830f64830d6d0782cda8ccbbe8b88b1b Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 4 Jan 2019 15:33:16 +0800 Subject: [PATCH 24/34] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ProcessPlanning.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index 6f0f26fc..be639a9b 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -209,8 +209,8 @@ export function gongyiCopy(num1, num2) { method: 'post', data: { type: '1', - name: '车间生产管理工艺_零件工序_工艺拷贝_工艺流水号', - param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int' + name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号', + param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int' } }) } From dcb990e1354c8cefafda4b5685754d4a2be9cbe2 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 4 Jan 2019 16:00:19 +0800 Subject: [PATCH 25/34] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- .../ProcessPlanning/index.vue | 22 ++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 69fb2138..1668f767 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,7 +19,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index 89d9bb97..676e867a 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -43,9 +43,10 @@ 查询 + 是否核准 在制零件工艺调整 - 切换编辑模式 + 切换编辑模式
种类: @@ -57,9 +58,8 @@ - 是否核准 规格: - + 投产总数量:
@@ -81,8 +81,6 @@ 计算公差 - 复制并保存 - 粘贴 典艺 @@ -90,7 +88,9 @@ 删除 - 保存 + 复制并保存 + + 保存 @@ -353,10 +353,9 @@ - + - @@ -834,6 +833,8 @@ export default { }, WYbtn() { // 完艺按钮 this.tableData4 = [] + this.tuhaoValue = '' + this.remark1 = '' this.dialogFormVisible1 = true }, selectPerson(row) { // 选择工艺员 @@ -1218,20 +1219,15 @@ export default { .doing-row4 { background: #f0f9eb; } - .el-card { margin-bottom: 15px; } - .el-date-editor { width: 150px } - span { margin: 10px 0 10px 10px; } - - diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue index 5e0477d3..e7c2a055 100644 --- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue +++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue @@ -546,7 +546,7 @@ export default { const data = this.tableDataAll[i] const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量) console.log(data.前id, data.前图号或者型号) - const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, 1, data.是否传递, data.序号, data.id, data.前id, data.前图号或者型号) + const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.前id, data.前图号或者型号) await sleep(10) if (resp.data[0].result === '0') { this.err++ From 4a95aa3c504dab1e83935f5a4a77ad70c203e3ad Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 4 Jan 2019 18:47:51 +0800 Subject: [PATCH 32/34] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=A4=87=E6=96=99?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- .../CreatePreparationBill/index.vue | 57 ++++++++++++------- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 69fb2138..1668f767 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,7 +19,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index dae8ca1b..cdb8bb53 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -6,7 +6,7 @@ 查询 查询全部 - 导出备料单 + 导出备料单 导出完成 @@ -52,27 +52,29 @@ - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + +
GAOJING备料单
零件名称零件图号备料
{{ list.零件名称 }}{{ list.零件图号 }}{{ list.工艺要求 }}
+
@@ -80,6 +82,7 @@