From bc1a58aead4c8c4408d99ff61f551c1e11512ff6 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Sat, 30 Nov 2019 14:39:19 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=A4=96=E8=B4=AD=E5=A4=87=E6=96=99?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseMaterialPreparationQuery.js | 14 ++ src/utils/request.js | 4 +- .../index.vue | 159 ++++++++++++++++++ 3 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 src/api/WorkshopProcurement/PurchaseMaterialPreparationQuery.js create mode 100644 src/views/WorkshopProcurement/PurchaseMaterialPreparationQuery/index.vue diff --git a/src/api/WorkshopProcurement/PurchaseMaterialPreparationQuery.js b/src/api/WorkshopProcurement/PurchaseMaterialPreparationQuery.js new file mode 100644 index 00000000..1d84328a --- /dev/null +++ b/src/api/WorkshopProcurement/PurchaseMaterialPreparationQuery.js @@ -0,0 +1,14 @@ +import request from '@/utils/request' + +// 查询供应商 +export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_供应商_查询数据_根据条件', + param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12 + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 2cb92ad8..03220e7d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 diff --git a/src/views/WorkshopProcurement/PurchaseMaterialPreparationQuery/index.vue b/src/views/WorkshopProcurement/PurchaseMaterialPreparationQuery/index.vue new file mode 100644 index 00000000..b5fd26d4 --- /dev/null +++ b/src/views/WorkshopProcurement/PurchaseMaterialPreparationQuery/index.vue @@ -0,0 +1,159 @@ + + + + + From 23bf9ec44fca2027826d821e002e0cbec1dc4fbf Mon Sep 17 00:00:00 2001 From: bryan sun Date: Mon, 9 Dec 2019 11:04:55 +0800 Subject: [PATCH 02/13] 1 --- .../PurchaseMaterialPreparationQuery.js | 14 -- src/utils/request.js | 6 +- .../PartDrawingMaintenance/index.vue | 60 ++++++- .../index.vue | 159 ------------------ 4 files changed, 61 insertions(+), 178 deletions(-) delete mode 100644 src/api/WorkshopProcurement/PurchaseMaterialPreparationQuery.js delete mode 100644 src/views/WorkshopProcurement/PurchaseMaterialPreparationQuery/index.vue diff --git a/src/api/WorkshopProcurement/PurchaseMaterialPreparationQuery.js b/src/api/WorkshopProcurement/PurchaseMaterialPreparationQuery.js deleted file mode 100644 index 1d84328a..00000000 --- a/src/api/WorkshopProcurement/PurchaseMaterialPreparationQuery.js +++ /dev/null @@ -1,14 +0,0 @@ -import request from '@/utils/request' - -// 查询供应商 -export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_供应商_查询数据_根据条件', - param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12 - } - }) -} diff --git a/src/utils/request.js b/src/utils/request.js index 4d73841f..14923715 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -23,10 +23,10 @@ export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 -export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` -export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` +export const MESUploadFile = `http://192.168.0.110:8002/submit/MESUploadFile.ashx` +export const MESDownloadFile = `http://192.168.0.110:8002/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue index c94526c6..a139c335 100644 --- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue +++ b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue @@ -27,6 +27,18 @@ 查询 + + 图纸批量导入 + { this.suffix = data.data + console.log(this.suffix, 11111) if (data.data.length > 0) { if (this.operationType === '1') { data.data.map(item => { @@ -326,6 +348,40 @@ export default { } } }) + // } else { + // await request({ + // url: '', + // method: 'post', + // data: { + // type: '3', + // name: `select * from ${this.tableName} where 是否启用 = 1 and num = ${value}` + // } + // }).then(data => { + // this.suffix = data.data + // if (data.data.length > 0) { + // if (this.operationType === '1') { + // data.data.map(item => { + // this.hadFile.push({ + // url: `${MESDownloadFile}?id=${item.uid}.${item.suffix}&name=${item.name}.${item.suffix}`, + // name: `${item.name}.${item.suffix}`, + // suffix: item.suffix, + // id: item.uid + // }) + // }) + // } else if (this.operationType === '0') { + // const server = `${MESDownloadFile}`.split('/') + // data.data.map(item => { + // this.hadFile.push({ + // url: `http://${server[2]}/webpage/part/${item.uid}.${item.suffix}`, + // name: `${item.name}.${item.suffix}`, + // suffix: item.suffix, + // id: item.uid + // }) + // }) + // } + // } + // }) + // } } }, async deleteFileData(id) { diff --git a/src/views/WorkshopProcurement/PurchaseMaterialPreparationQuery/index.vue b/src/views/WorkshopProcurement/PurchaseMaterialPreparationQuery/index.vue deleted file mode 100644 index b5fd26d4..00000000 --- a/src/views/WorkshopProcurement/PurchaseMaterialPreparationQuery/index.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - - - From ffae28a9118e093eac99cce4d78b64ba8c10604b Mon Sep 17 00:00:00 2001 From: bryan sun Date: Mon, 9 Dec 2019 13:47:47 +0800 Subject: [PATCH 03/13] 1 --- .../PartDrawingMaintenance/index.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue index a139c335..8bd75203 100644 --- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue +++ b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue @@ -193,7 +193,9 @@ export default { isDeleteShow: false, deleteShow: '1', row1: [], - operationType: '0' + operationType: '0', + str: '', + arr: [] } }, computed: { @@ -263,11 +265,22 @@ export default { this.getFileList(row.零件图号) }, uploadSuccess(res, file, fileList) { + console.log(res[0].result, 12345) if (res[0].result === '1') { const index = fileList.indexOf(file) fileList.splice(index, 1) } else { - this.$message.error(`${file.name}文件上传失败，请检查上传文件是否正确！`) + this.str = res[0].result + this.arr = this.str.split('|') + console.log(this.arr[0], 0) + console.log(this.arr[1], 1) + if (this.arr[1] === '0') { + this.$notify.error(`${this.arr[0]}该零件不存在，请检查上传文件名称是否正确！`) + } + if (this.arr[1] === '2') { + this.$notify.error(`${this.arr[0]}请勿重复上传！`) + } + // this.$message.error(`${file.name}该零件不存在，请检查上传文件名称是否正确！`) } if (fileList.length === 0) { this.$message.success('文件上传成功') From cc94372fbe8553a10e46ec8c71fb3b88a653f4be Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 9 Dec 2019 14:58:04 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompletionOfWorkshopComponents.js | 16 +- src/api/MarketingCenter/ProjectProgress.js | 22 +- src/utils/request.js | 2 +- .../CompletionOfWorkshopComponents/index.vue | 20 +- .../MarketingCenter/ProjectProgress/index.vue | 289 +++++++++++++++--- 5 files changed, 305 insertions(+), 44 deletions(-) diff --git a/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js b/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js index 723e8a17..0b273eea 100644 --- a/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js +++ b/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js @@ -11,6 +11,18 @@ export function getMachines() { } }) } +// 机床名称 +export function getMachinesStatue(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: ` select COUNT(*) as 是否发货 from [发货管理_发货单明细] left join [发货管理_发货单] + on [发货管理_发货单].发货单流水号 = [发货管理_发货单明细].发货单流水号 where 机床流水号 = ${num}` + } + }) +} // 获取组号 export function getGroups(stepNumber) { return request({ @@ -18,8 +30,8 @@ export function getGroups(stepNumber) { method: 'post', data: { type: '1', - name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组', - param: '机床流水号=' + stepNumber + '=int' + name: '车间生产管理工艺_组件状态查询_查询所有组', + param: '机床流水号=' + stepNumber } }) } diff --git a/src/api/MarketingCenter/ProjectProgress.js b/src/api/MarketingCenter/ProjectProgress.js index 2e10e106..1c38e9ac 100644 --- a/src/api/MarketingCenter/ProjectProgress.js +++ b/src/api/MarketingCenter/ProjectProgress.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -export function initProject() { +export function search1() { return request({ url: '', method: 'post', @@ -10,3 +10,23 @@ export function initProject() { } }) } +export function search2() { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'SELECT count(客户名称) as 客户数量,[省份] FROM [客户关系管理系统_客户_查询数据_MESWOR_视图]where [客户名称是否启用] = 1 group by [省份]' + } + }) +} +export function search3() { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'SELECT count(客户名称) as 客户数量,[省份] FROM [客户关系管理系统_客户_查询数据_MESWOR_视图]where [客户名称是否启用] = 1 group by [省份]' + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index fc41e22d..2cb92ad8 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.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue index 7a8a396e..8b9c687d 100644 --- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue +++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue @@ -49,7 +49,7 @@ -
{{ 机床图号 }}      {{ 机床名称 }}
+
{{ 机床图号 }}      {{ 机床名称 }}
 @@ -89,11 +88,12 @@ + + diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue index c8b92807..86e7c636 100644 --- a/src/views/Inventory/StockInquiry/index.vue +++ b/src/views/Inventory/StockInquiry/index.vue @@ -2,7 +2,7 @@
机床号: - + 组号: - + 零件图号: - + 查询 @@ -121,9 +121,9 @@ {{ scope.row.组号 }} - + diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue index aa250568..8b1aecfe 100644 --- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue +++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue @@ -37,11 +37,11 @@ 操作者: - + 零件图号: - + 工艺名称: - + 查询 新增 diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue index 26528d60..0b272612 100644 --- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue +++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue @@ -3,7 +3,7 @@ 工位号: - + 机床号: - + 零件号: - + 查询 diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index dd7449c7..f533c4ac 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -2,7 +2,7 @@
补录完成日期 - + {{ item.value2 }}
 - + - + 查询 diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index 50014045..881b4e8f 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -4,7 +4,7 @@ - + 项目名称 - + 机床图号 - + 组号 - + - + Date: Thu, 12 Dec 2019 09:46:59 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E5=85=A5?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Inventory/OfflinePartOut/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 903b4535..2c0015ea 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -375,7 +375,7 @@ export default { // 离线外购件出库 addDirectPartm() { if (Number(this.partnumber) < Number(this.form.DirectNumber)) { - this.$message.error('请正确输入数量') + this.$message.error('库存不够，重输领料数量') } else { this.$refs['form'].validate((valid) => { if (valid) {