From 3fed67dec147985d398ed570ea0df14ef27702f2 Mon Sep 17 00:00:00 2001 From: liushuai Date: Fri, 7 Dec 2018 18:58:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=AF=BC=E5=85=A5=E3=80=81?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E4=BB=B6=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/TechnologyCenter/ImportParts.js | 74 ++- src/utils/curd.js | 1 + src/utils/request.js | 4 +- .../PartAssignment/index.vue | 4 +- .../CreatePackingList/index.vue | 4 +- .../ImportChangeParts/index.vue | 259 ++++++++ .../ImportChangeParts/specificationData1.vue | 620 ++++++++++++++++++ .../TechnologyCenter/ImportParts/index.vue | 3 +- .../ImportParts/specificationData.vue | 1 + .../TechnologyCenter/QueryParts/index.vue | 2 + 10 files changed, 962 insertions(+), 10 deletions(-) create mode 100644 src/views/TechnologyCenter/ImportChangeParts/index.vue create mode 100644 src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js index 22f79d22..87d185cb 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/api/TechnologyCenter/ImportParts.js @@ -34,7 +34,28 @@ export function isDrawingNum(projectName, machineNum, groupNum, drawingNum) { } }) } - +export function update(projectName, machineNum, id, type, drawingNum) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: 'PDM_零件明细表_基本件_数据导入保存_编辑整改类型', + param: `项目名称=${projectName}&机床名称=${machineNum}&id=${id}&整改类型=${type}&前图号或者型号=${drawingNum}` + } + }) +} +export function searchOldParts(projectName, machineNum, drawingNum) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_零件明细表_整改件_数据关联查询_gj', + param: `项目名称=${projectName}&机床名称=${machineNum}&图号或者型号=${drawingNum}` + } + }) +} export function importBasics(establishment, proofread, review, date, projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) { return request({ url: '', @@ -42,7 +63,7 @@ export function importBasics(establishment, proofread, review, date, projectName data: { type: '2', name: '组件明细表_基本件_导入数据gj', - param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注=${remarks}&分类码=${classificationCode}` + param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}` } }) } @@ -54,7 +75,7 @@ export function importPurcharse(establishment, proofread, review, date, projectN data: { type: '2', name: '零件明细表_外购件和标准件_导入数据gj', - param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注=${remarks}&分类码=${classificationCode}` + param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}` } }) } @@ -70,6 +91,17 @@ export function specificationQuery(projectCheck, project, machineCheck, machine, } }) } +export function specificationQuery1(projectCheck, project, machineCheck, machine, groupCheck, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_零件明细表_整改件_规范数据查询_gj', + param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + } + }) +} export function specificationQueryWB(projectCheck, project, machineCheck, machine, groupCheck, group) { return request({ url: '', @@ -92,6 +124,17 @@ export function unSpecificationQuery(projectCheck, project, machineCheck, machin } }) } +export function unSpecificationQuery1(projectCheck, project, machineCheck, machine, groupCheck, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_零件明细表_整改件_不规范数据查询_gj', + param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + } + }) +} export function unSpecificationQueryWB(projectCheck, project, machineCheck, machine, groupCheck, group) { return request({ url: '', @@ -223,6 +266,18 @@ export function searchGroupNum(project, name) { } }) } +// 查询组号 +export function searchGroupNum1(project, name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_零件明细表_整改件_数据导入保存_组号_查询数据gj', + param: `项目=${project}&机床=${name}` + } + }) +} // 传递零件 export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, type, transmit, num6, id) { return request({ @@ -235,7 +290,18 @@ export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, typ } }) } - +// 传递零件 +export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, type, transmit, num6, id, oldId) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: 'PDM_零件明细表_整改件_大量导入', + param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&前id=' + oldId + } + }) +} export function transferWG(groupNum, materialNum, totalNum, remarks, mark, designNum, isTransfer, dataType, No, id) { return request({ url: '', diff --git a/src/utils/curd.js b/src/utils/curd.js index d1374579..77d5b535 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -169,6 +169,7 @@ export default { if (type(callback) === 'function' && type(requestData) === 'function' && type(form) === 'string') { console.log(this.$refs[form]) this.$refs[form].validate((valid) => { + console.log(valid) if (valid) { requestData(...param).then(response => { if (response.data[0].result === '1') { diff --git a/src/utils/request.js b/src/utils/request.js index b68b29f8..9f774934 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -14,9 +14,9 @@ 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://localhost:8411/submit/MESCommonBase.ashx`, baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://192.168.1.112: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/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 2a71ed34..ca5358cd 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -804,10 +804,12 @@ export default { } }, Production() { + this.result = 0 if (this.PartType === '基本件' && this.BasicPartsNumber.length !== 0) { for (let i = 0; i < this.BasicPartsNumber.length; i++) { Production(this.groupFloatValue, this.BasicPartsNumber[i], this.projectFloatValue, this.machineFloatValue).then(response => { - if (response.data[0].result === '1') { + this.result += parseInt(response.data[0].result) + if (this.result === this.BasicPartsNumber.length) { this.$message.success('投产成功') searchPart(this.groupFloatValue).then(response => { this.tableData1 = response.data diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue index 9be6bbab..a2f0b344 100644 --- a/src/views/TechnologyCenter/CreatePackingList/index.vue +++ b/src/views/TechnologyCenter/CreatePackingList/index.vue @@ -471,8 +471,8 @@ export default { 数量: '' }, machineRules: { - 机床号: [{ required: true, message: '请选择机床号', trigger: 'change' }], - 数量: [{ required: true, message: '请输入数量', trigger: 'blur' }] + // 机床号: [{ required: true, message: '请选择机床号', trigger: 'change' }], + // 数量: [{ required: true, message: '请输入数量', trigger: 'blur' }] }, rules: { }, diff --git a/src/views/TechnologyCenter/ImportChangeParts/index.vue b/src/views/TechnologyCenter/ImportChangeParts/index.vue new file mode 100644 index 00000000..bb1e7089 --- /dev/null +++ b/src/views/TechnologyCenter/ImportChangeParts/index.vue @@ -0,0 +1,259 @@ + + + + diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue new file mode 100644 index 00000000..40ed0bf3 --- /dev/null +++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue @@ -0,0 +1,620 @@ + + + + + + + diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index b3340237..b037f57d 100644 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ b/src/views/TechnologyCenter/ImportParts/index.vue @@ -191,6 +191,7 @@ export default { manufacturer = this.worksheet[j][`O${attr}`] ? this.worksheet[j][`O${attr}`].v : '' remarks = this.worksheet[j][`Q${attr}`] ? this.worksheet[j][`Q${attr}`].v : '' classificationCode = this.worksheet[j][`R${attr}`] ? this.worksheet[j][`R${attr}`].v : '' + console.log(drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode, 2222222222) if (!drawingNum && !name && !type && !material && !spareNum && !useNum && !manufacturer && !remarks && !classificationCode) { // 当图号、名称、规格、材料、备件数量、装机数量、制造商、备注、分类码都为空时，循环终止，防止向数据库中插入多余且无用的数据 break } else { @@ -216,6 +217,7 @@ export default { this.err === 0 ? this.$message.success(`导入完成`) : this.$message.error(`导入失败零件个数为${this.err}，请检查文件是否正确`) this.projectChange(this.projectName) // 调用查询机床方法，通过watch属性检测变化会自动得到下面表格的值。 } catch (e) { + console.log(e) this.err++ this.$notify.error(`导入数据错误,请检查导入文件是否正确`) console.log(`导入数据错误${e}`) @@ -237,7 +239,6 @@ export default { } } } catch (e) { - alert(3) this.err++ this.$message.error(`导入数据错误`) console.log(`导入数据错误${e}`) diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue index edc83d37..be6c409e 100644 --- a/src/views/TechnologyCenter/ImportParts/specificationData.vue +++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue @@ -360,6 +360,7 @@ export default { }, methods: { async fetchData() { + this.pageCurrent = 1 try { this.listLoading = true this.total = 0 diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index 05f1d787..4ea18908 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -88,6 +88,7 @@ size="mini" type="danger" icon="el-icon-delete" + disabled @click="handleDelete(scope.row)">删除 @@ -157,6 +158,7 @@ size="mini" type="danger" icon="el-icon-delete" + disabled @click="handleDelete(scope.row)">删除