diff --git a/src/utils/request.js b/src/utils/request.js index 56ffd77d..7218f9b2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,8 +16,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/` @@ -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/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue index 65360cff..72df16c6 100644 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue @@ -22,7 +22,6 @@ - 项目名称: - 机床图号: {{ item.name }} - 组号: - 时间段: - - - 物料状态: - - 物料类别: + @@ -79,18 +72,6 @@ :label="item.label" :value="item.value"/> - 物料品种: - - -
采购员: @@ -102,20 +83,23 @@
- - 物料名称: - - 物料规格: - - 物料型号: - - + 查询 -
+ clearable> + + + + + + 查询 +
- + - + - + @@ -160,27 +144,27 @@ {{ scope.row.组号 }} - + - + - + - + - + @@ -195,7 +179,7 @@ {{ scope.row.备注 }} - + @@ -254,7 +238,6 @@ - 项目名称: - 机床图号: {{ item.name }} - + + + + 查询 + clearable + @change="searchMaterialVariety"> + +
采购员: @@ -291,17 +287,27 @@
- 组       号: - + - 物料状态: - -
+ + + + 查询 +
退回
- - 物料类别: - - - - 物料品种: - - - - - - 物料名称: - - 物料规格: - - 物料型号: - - - + - + - + @@ -377,27 +348,27 @@ {{ scope.row.组号 }} - + - + - + - + - + @@ -412,7 +383,7 @@ {{ scope.row.备注 }} - + @@ -468,7 +439,6 @@ - 项目名称: - 机床图号: {{ item.name }} - 查询 + + + + +
采购员: @@ -505,17 +477,16 @@
- 组       号: - - - - 物料状态: - -
+ + + + 查询 +
退回
- - 零件图号: - - 零件名称: - - - - 零件规格: - - 零件材料: - - - + - + - + - + - + - + - + @@ -598,7 +557,7 @@ {{ scope.row.备注 }} - + @@ -935,20 +894,22 @@ export default { searchMaterialVariety() { // 初始化物料品种 this.MaterialVariety = [] this.MaterialVarietyValue = '' - this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue) + if (this.MaterialCategoryValue) { + this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue) + } }, searchTable0() { // 查询标准件 this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0 this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0 this.projectValue ? this.check3 = 1 : this.check3 = 0 - let check0, check1, check2, check3, check4 + let check0, check1, check2, check3 this.machineValue ? check0 = 1 : check0 = 0 this.groupValue ? check1 = 1 : check1 = 0 this.materialName ? this.check4 = 1 : this.check4 = 0 this.materialSpec ? check2 = 1 : check2 = 0 this.materialModel ? check3 = 1 : check3 = 0 - this.dateRange ? check4 = 1 : (check4 = 0, this.dateRange = '') - searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1, check4, this.dateRange[0], this.dateRange[1]).then(response => { + // this.dateRange ? check4 = 0 : (check4 = 0, this.dateRange = '') + searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => { this.tableData0 = response.data.rows this.total0 = response.data.total })