diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index ab95d0a1..60b8c4a6 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -353,7 +353,7 @@ export function searchMerge(num) { } }) } -export function getPerson(num) { +export function getPerson() { return request({ url: '', method: 'post', @@ -387,3 +387,38 @@ export function tiaozheng2(num1, num2) { } }) } +// 查询时间@change修改 +export function timeChange1(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_创建询价单_外购件时间修改', + param: '外购件开始时间=' + num1 + '&外购件结束时间=' + num2 + } + }) +} +// 查询时间@change修改 +export function timeChange2(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_创建询价单_基本件时间修改', + param: '基本件开始时间=' + num1 + '&基本件结束时间=' + num2 + } + }) +} +// 查询时间初始化查询 +export function timeSearch() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_创建询价单_时间查询' + } + }) +} diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js index c7d93675..7dd0c706 100644 --- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js +++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -52,27 +52,26 @@ export function initPartDrawing(check1, name) { }) } // 查询外购备料 -export function searchPurchasedMaterials(pageCurrent, pageSize, check1, name) { +export function searchPurchasedMaterials(check1, name) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_外购备料_查询数据', - param: `零件图号_check=${check1}&零件图号=${name}`, - Pagination: pageCurrent + '&' + pageSize + param: `零件图号_check=${check1}&零件图号=${name}` } }) } // 查询采购单 -export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name) { +export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check3, name2) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_采购计划_查询数据', - param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, + param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js index e8cec860..3a1598d6 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -37,14 +37,14 @@ export function searchMateriel(num, num1) { }) } // 查询到货单 -export function searchArriveOrder(num, num1, num2, num3, num5, num6, num7, pageCurrent, pageSize) { +export function searchArriveOrder(num, num1, num8, num9, num2, num3, num5, num6, num7, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_到货单查询_新', - param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`, + param: `供应商名称_check=${num}&供应商名称=${num1}&供应商名称_check=${num8}&供应商名称=${num9}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/styles/index.scss b/src/styles/index.scss index 6af05507..ae382d70 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -109,7 +109,7 @@ el-form-item__content{ //background-color: #2e296a!important; } .el-card__body{ - padding: 10px !important; + padding: 0 10px 0 10px !important; margin: 0px !important; } .app-container{ @@ -275,3 +275,6 @@ h3 { color: white; } } +.el-tabs--border-card>.el-tabs__content { + padding: 15px 15px 0px 15px!important; +} diff --git a/src/utils/request.js b/src/utils/request.js index 56ffd77d..da3f9d7b 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/` diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue index ac0edbed..1677c574 100644 --- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue +++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue @@ -445,8 +445,8 @@ export default { } // 数据的值 }, legend: { // 图例 - left: 'left' - // selectedMode: false, // 图例可点击 + left: 'left', + selectedMode: false // 图例可点击 }, dataZoom: [{ type: 'inside', diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index ec47f960..096ef815 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -29,7 +29,7 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 @@ -142,30 +142,6 @@ {{ scope.row.零件类型名称 }} - - - - - - - - - - - - - - - - - - - - - - - -
- 打回 @@ -268,15 +240,15 @@
-
@@ -426,11 +398,11 @@ export default { gongyijihua: '', radio: 0, // 第一组 total: 0, // 总条数 - pageSize: 10, // 每页显示条数 + pageSize: 10000, // 每页显示条数 pageList: 1, // 后台获取页 currentPage: 1, // 显示当前页 total3: 0, // 总条数 - pageSize3: 10, // 每页显示条数 + pageSize3: 10000, // 每页显示条数 pageList3: 1, // 后台获取页 currentPage3: 1, // 显示当前页 listLoading: false, @@ -725,7 +697,7 @@ export default { this.listLoading1 = false }) this.total = 0 - this.pageSize = 10 + this.pageSize = 10000 this.pageList = 1 this.getTable() } else { @@ -788,7 +760,7 @@ export default { this.checked_baitu = false this.checked_gaonandu = false this.total = 0 - this.pageSize = 10 + this.pageSize = 10000 this.pageList = 1 this.shijiancuo1 = 0 this.shijiancuo = 0 @@ -1000,7 +972,7 @@ export default { message: '打回档案成功!' }) this.total = 0 - this.pageSize = 10 + this.pageSize = 10000 this.pageList = 1 this.getTable() } else { diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index 6dca3f59..b65efc54 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -48,7 +48,7 @@ style="top: 1px;" placeholder="选择开始日期"/> - 零件计划变更 + 零件计划变更 导出Excel
- 选入 + 选入 - 全部选入 + 全部选入
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index e25ae23e..345097fd 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -38,46 +38,35 @@ - - 项目名称: - + + - 机床图号: - + - 组号: - + - - - 物料状态: - - 物料名称: + - 物料变更: - - 物料规格: + - 物料型号: - 时间段: + end-placeholder="结束日期" + @change="timeChange1()"/> 查询 导出未询价物料清单 @@ -105,7 +95,7 @@ 调整采购任务 - + - + @@ -169,17 +159,17 @@ - + - + - + @@ -239,58 +229,48 @@ - -
- -
+
+ +
+ - - 项目名称: - + + - 机床图号: - + - 组号: - + - - - 物料状态: - - 零件图号: + - 零件名称: - 零件规格: - 时间段: + end-placeholder="结束日期" + @change="timeChange2()"/> 查询 导出未询价物料清单 @@ -422,6 +403,185 @@ @current-change="handleCurrentChange12"/>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -907,7 +1067,7 @@ diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index eb372cbd..da6efd9a 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -1,72 +1,35 @@ -
+
采购计划单号: 供应商: - + + + + 查询 创建采购计划单 + + 选入外购备料 + 保存采购计划单 @@ -126,21 +133,21 @@ {{ scope.row.计划完成日期.split(' ')[0] }} - + @@ -354,6 +361,7 @@ export default { purchasingOrder: '', // 采购单号 purchasingOrderNumber: '', // 采购计划流水号 supplierName0: '', // 供应商名称（外面的） + supplierName0s: [], // 供应商名称（外面的） supplierName: '', // 供应商名称 tableData2: [], total2: 0, @@ -435,6 +443,10 @@ export default { label: response.data[i].供应商名称, value: response.data[i].供应商流水号 }) + this.supplierName0s.push({ + label: response.data[i].供应商名称, + value: response.data[i].供应商流水号 + }) } }) searchRawMaterial(this.RawMaterialName, this.pageCurrent, this.pageSize).then(response => { @@ -509,8 +521,9 @@ export default { searchTable1() { // 查询外购备料 this.loading1 = true this.partDrawingNumber ? this.check1 = 1 : this.check1 = 0 - searchPurchasedMaterials(this.pageCurrent1, this.pageSize1, this.check1, this.partDrawingNumber).then(response => { - this.tableData1 = response.data.rows + // this.pageCurrent1, this.pageSize1, + searchPurchasedMaterials(this.check1, this.partDrawingNumber).then(response => { + this.tableData1 = response.data this.total1 = response.data.total this.loading1 = false }) @@ -533,7 +546,7 @@ export default { searchTable2() { // 查询采购单列表 this.purchasingOrder ? this.check3 = 1 : this.check3 = 0 this.supplierName0 ? this.check4 = 1 : this.check4 = 0 - searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, this.check4, this.supplierName0).then(response => { + searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, 0, 0, this.check4, this.supplierName0).then(response => { this.tableData2 = response.data.rows this.total2 = response.data.total }) diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue index f597dc98..eb3938b9 100644 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -3,7 +3,14 @@
供应商: - + + + + 时间段: { + for (let i = 0; i < response.data.length; i++) { + this.supplierName.push({ + label: response.data[i].供应商名称, + value: response.data[i].供应商流水号 + }) + } + }) + }, searchCailiao() { this.Cailiao = [] searchCailiao(this.供应商111).then(response => { @@ -637,14 +657,14 @@ export default { searchTable4() { this.tableData5 = [] this.tableData6 = [] - this.Name ? this.check = 1 : this.check = 0 + this.supplierNameValue ? this.check = 1 : this.check = 0 this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '') if (this.PickingValue === 0 || this.PickingValue === 1) { this.check2 = 1 } else { this.check2 = 0 } - searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => { + searchArriveOrder(0, 0, this.check, this.supplierNameValue, this.check1, this.dateRange[0], this.dateRange[1], this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => { this.tableData4 = response.data.rows this.total4 = response.data.total }) diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue index ee0d84a3..293c3b67 100644 --- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue @@ -1,35 +1,36 @@