diff --git a/src/utils/request.js b/src/utils/request.js index d0c3d10c..5b272345 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.107:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.107:8079/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 @@ -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.104:8074/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/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 9578cbec..1274075e 100644 --- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue +++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue @@ -30,7 +30,8 @@ - {{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }} + + {{ scope.row.工序间是否外协 === 2 ? '外协' : (scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名) }} diff --git a/src/views/ManufacturingCenter/OnlineProcessChange/index.vue b/src/views/ManufacturingCenter/OnlineProcessChange/index.vue index f5238be2..fc6d4559 100644 --- a/src/views/ManufacturingCenter/OnlineProcessChange/index.vue +++ b/src/views/ManufacturingCenter/OnlineProcessChange/index.vue @@ -506,7 +506,6 @@ import { readyChange, TableAddLi1, TableAddLi, - getPartnames3, getPartnames4, modifyRemark, detailInfo diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index 3bba91fa..0e26c366 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -24,7 +24,7 @@ 导出 - + - + {{ scope.row.工艺名称 }} @@ -57,11 +57,11 @@ {{ scope.row.操作者 }} - - - {{ scope.row.排产日期 }} - - + + + + + {{ scope.row.完成日期 }} @@ -70,7 +70,7 @@ - + - + - - - - - - {{ scope.row.跟单号 }} + + + + + + {{ scope.row.零件图号 }} diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue index 74befd92..c469cd22 100644 --- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -37,7 +37,7 @@ {{ scope.row.设备总工时 }} - + {{ scope.row.修补准结总工时 }} @@ -66,7 +66,7 @@ - + {{ scope.row.零件图号 }} @@ -96,12 +96,12 @@ {{ scope.row.设备工时 }} - + {{ scope.row.修补准结工时 }} - + {{ scope.row.操作时间 }} diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index a58ba796..c4c4ffc5 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -233,21 +233,23 @@ - + + + 选入物料 @@ -1188,7 +1190,7 @@ export default { tableData11: [], // 外购件列表 total11: 0, pageCurrent11: 1, - pageSize11: 1000, + pageSize11: 50, tableData12: [], // 基本件列表 total12: 0, pageCurrent12: 1,