diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js index 642bd02b..e4176c32 100644 --- a/src/api/Inventory/CreatePickingList.js +++ b/src/api/Inventory/CreatePickingList.js @@ -42,8 +42,8 @@ export function searchTable(...params) { data: { type: '1', name: '车间装配管理_领料单_三表_查询数据', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&型号_check=${params[6]}&型号=${params[7]}&规格_check=${params[8]}&规格=${params[9]}&零件类型=${params[12]}`, - Pagination: params[10] + '&' + params[11] + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&型号_check=${params[6]}&型号=${params[7]}&规格_check=${params[8]}&规格=${params[9]}&领料情况_check=${params[10]}&领料情况=${params[11]}&零件类型=${params[14]}`, + Pagination: params[12] + '&' + params[13] } }) } diff --git a/src/api/Inventory/PurchaseInRecord.js b/src/api/Inventory/PurchaseInRecord.js index e86dedea..7ac36d53 100644 --- a/src/api/Inventory/PurchaseInRecord.js +++ b/src/api/Inventory/PurchaseInRecord.js @@ -1,25 +1,13 @@ import request from '@/utils/request' -// 初始化项目 -export function initProject() { +// 初始化机床项目 +export function initMachineProject() { return request({ url: '', method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据_按时间排序' - } - }) -} -// 机床查询 -export function searchMachine(num) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: 'PDM_机床名称_查询数据', - param: '项目流水号_check=1&项目流水号=' + num + name: 'PDM_项目名称_查询数据' } }) } @@ -36,27 +24,14 @@ export function searchGroup(num) { }) } // 查询采购件入库记录 -export function searchRecord1(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, pageCurrent, pageSize) { +export function searchRecord1(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, check7, time1, time2, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: `库存管理_入库记录_采购件_查询数据`, - param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}`, - Pagination: pageCurrent + '&' + pageSize - } - }) -} -// 查询离线件入库记录 -export function searchRecord2(check4, name, check5, spec, check6, model, pageCurrent, pageSize) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: `库存管理_入库记录_离线件_查询数据`, - param: `名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}`, + param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}&入库时间_check=${check7}&入库开始时间=${time1}&入库结束时间=${time2}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/Inventory/PurchaseOutRecord.js b/src/api/Inventory/PurchaseOutRecord.js index 27505231..b71a1eff 100644 --- a/src/api/Inventory/PurchaseOutRecord.js +++ b/src/api/Inventory/PurchaseOutRecord.js @@ -1,25 +1,13 @@ import request from '@/utils/request' -// 初始化项目 -export function initProject() { +// 初始化机床项目 +export function initMachineProject() { return request({ url: '', method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据_按时间排序' - } - }) -} -// 机床查询 -export function searchMachine(num) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: 'PDM_机床名称_查询数据', - param: '项目流水号_check=1&项目流水号=' + num + name: 'PDM_项目名称_查询数据' } }) } diff --git a/src/assets/img/img28.png b/src/assets/img/img28.png new file mode 100644 index 00000000..60a122b3 Binary files /dev/null and b/src/assets/img/img28.png differ diff --git a/src/utils/request.js b/src/utils/request.js index cc410d30..1da72057 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,7 +16,7 @@ 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.0.109:8411/submit/MESCommonBase.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 // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` @@ -25,7 +25,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.109:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index 74dc3854..cf44b474 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -361,9 +361,9 @@ {{ scope.row.工艺名称 }} - + diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 6b152024..f8eab07a 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -1,6 +1,6 @@ - + @@ -81,7 +81,7 @@
- + - + - + - + - + - + @@ -128,7 +128,7 @@ {{ scope.row.备件总数量 }} - + @@ -137,7 +137,7 @@
- + - + - + - + - + - + @@ -189,7 +189,7 @@ {{ scope.row.备件总数量 }} - + @@ -198,7 +198,7 @@
- - - + + + - + - + - + @@ -251,32 +251,28 @@ - -
- - 查询 - 创建领料单 - - 选入物料 - - 删除领料单 - 选中领料单：{{ pickingListNumberShow }} - 领料人：{{ peopleName }} - 移除领料明细 -
-
- - +
+ + + + 查询 + 创建领料单 + + 选入物料 + + 删除领料单 + 移除领料明细 + + +
+
+ + - - - -
+
-
-
- + +
+
+ + - + - + - + - + @@ -327,17 +325,17 @@ {{ scope.row.组号 }} - + - + - + @@ -376,13 +374,13 @@ - 查看详情 + 领料详情 -
- + +
@@ -417,6 +415,7 @@ export default { return { 审批情况: '', peopleName: '', + ListMX: '', PartType: '基本件', machineNumberValue: '', machineNumber: [], @@ -438,13 +437,13 @@ export default { tableData1: [], tableData2: [], pageCurrent0: 1, - pageSize0: 20, + pageSize0: 300, total0: 0, pageCurrent1: 1, - pageSize1: 20, + pageSize1: 300, total1: 0, pageCurrent2: 1, - pageSize2: 20, + pageSize2: 300, total2: 0, pickListTable1: [], pageCurrent3: 1, @@ -481,7 +480,6 @@ export default { }, mounted() { this.fetchData() - this.searchTable() this.searchList() }, methods: { @@ -550,67 +548,86 @@ export default { }) }, tableRowClassName({ row }) { - return '.warning-row' - // if (row.是否审批 === 1) { - // return '.warning-row' - // } else { - // return '' - // } + if (parseInt(row.是否审批) === 1) { + return 'shenpi-row' + } else { + return '' + } }, selectable(row, index) { // 控制某行是否可选 - console.log(row) return row.领料单编号 === null // 未采购&&确认物料修改 }, + selectable1(row) { + return row.领用数量 !== 0 + }, // 查三表 searchTable() { - this.multipleSelection = [] - this.multipleSelection1 = [] - if (this.PartType === '标准件') { - this.searchTable0() - } else if (this.PartType === '外购件') { - this.searchTable1() - } else if (this.PartType === '基本件') { - this.searchTable2() - } else if (this.PartType === '离线采购件') { - this.searchTable4() + if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { + this.multipleSelection = [] + this.multipleSelection1 = [] + if (this.PartType === '标准件') { + this.searchTable0() + } else if (this.PartType === '外购件') { + this.searchTable1() + } else if (this.PartType === '基本件') { + this.searchTable2() + } else if (this.PartType === '离线采购件') { + this.searchTable4() + } + } else { + this.$message.warning('请选择机床后再查询') } }, // 标准件 searchTable0() { - let check1, check2, check3, check4, check5 + let check1, check2, check3, check4, check5, check6 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 this.materialModel ? check4 = 1 : check4 = 0 this.materialSpec ? check5 = 1 : check5 = 0 - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, this.pageCurrent0, this.pageSize0, 1).then(response => { - console.log(response.data.rows) + if (this.PickingValue !== 0 && this.PickingValue !== 1) { + check6 = 0 + } else { + check6 = 1 + } + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent0, this.pageSize0, 1).then(response => { this.tableData0 = response.data.rows this.total0 = response.data.total }) }, // 外购件 searchTable1() { - let check1, check2, check3, check4, check5 + let check1, check2, check3, check4, check5, check6 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 this.materialModel ? check4 = 1 : check4 = 0 this.materialSpec ? check5 = 1 : check5 = 0 - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, this.pageCurrent1, this.pageSize1, 2).then(response => { + if (this.PickingValue !== 0 && this.PickingValue !== 1) { + check6 = 0 + } else { + check6 = 1 + } + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent1, this.pageSize1, 2).then(response => { this.tableData1 = response.data.rows this.total1 = response.data.total }) }, // 基本件 searchTable2() { - let check1, check2, check3, check4, check5 + let check1, check2, check3, check4, check5, check6 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 this.materialModel ? check4 = 1 : check4 = 0 this.materialSpec ? check5 = 1 : check5 = 0 - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, this.pageCurrent2, this.pageSize2, 3).then(response => { + if (this.PickingValue !== 0 && this.PickingValue !== 1) { + check6 = 0 + } else { + check6 = 1 + } + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent2, this.pageSize2, 3).then(response => { this.tableData2 = response.data.rows this.total2 = response.data.total }) @@ -779,7 +796,6 @@ export default { // 多选 handleSelectionChange1(val) { this.multipleSelection1 = val - console.log(val, 111) }, // 选入 selectInto() { @@ -846,7 +862,6 @@ export default { }, // 查看领料单明细 clickList(row) { - console.log(row) row ? this.审批情况 = row.是否审批 : this.审批情况 row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow @@ -855,15 +870,17 @@ export default { this.pickListTable2 = res.data }) }, + searchMX(row) { + this.ListMX = row.领料单明细流水号 + }, // 删除领料单明细 - dropListDetail(row) { - console.log(row) + dropListDetail() { this.$confirm('此操作将永久删除该行, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - dropListDetail(row.领料单明细流水号).then(response => { + dropListDetail(this.ListMX).then(response => { if (Number(response.data[0].result) === 1) { this.$message.success('删除成功') this.searchTable() @@ -897,10 +914,8 @@ export default { margin: 0 } - diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index 88bd1880..d7dcdff1 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -1,196 +1,114 @@