From 4160cdcbb52f19d3984768b36bdeef85d35d742e Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Thu, 20 Feb 2020 15:56:28 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/PurchasingCenter/FundApproval.js | 16 +- src/api/WorkshopProcurement/FundApproval.js | 32 +- .../PartAssignment/index.vue | 427 ++++++++---------- .../layout/components/Sidebar/SidebarItem.vue | 3 + 4 files changed, 214 insertions(+), 264 deletions(-) diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/api/PurchasingCenter/FundApproval.js index 3fed5a75..d54ec3f2 100644 --- a/src/api/PurchasingCenter/FundApproval.js +++ b/src/api/PurchasingCenter/FundApproval.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 查询审核/审批/付款 -export function initApproval(pageCurrent, pageSize, state) { +export function initApproval(pageCurrent, pageSize, haha) { return request({ url: '', method: 'post', @@ -12,13 +12,13 @@ export function initApproval(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_采购合同_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${haha}`, Pagination: pageCurrent + '&' + pageSize } }) } // 执行审核/审批/付款 -export function execApproval(num1, num2, reason, person, state) { +export function execApproval(num1, num2, reason, person, haha) { return request({ url: '', method: 'post', @@ -27,12 +27,12 @@ export function execApproval(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '采购管理_采购合同_审批付款_修改数据', - param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}` } }) } // 查询离线合同审核/审批/付款 -export function initApprovalOffline(pageCurrent, pageSize, state) { +export function initApprovalOffline(pageCurrent, pageSize, haha) { return request({ url: '', method: 'post', @@ -41,7 +41,7 @@ export function initApprovalOffline(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_离线合同_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${haha}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -75,7 +75,7 @@ export function searchRequsetFundDetail2(num) { }) } // 执行审核/审批/付款（离线合同） -export function execApprovalOffline(num1, num2, reason, person, state) { +export function execApprovalOffline(num1, num2, reason, person, haha) { return request({ url: '', method: 'post', @@ -84,7 +84,7 @@ export function execApprovalOffline(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '采购管理_离线合同_审批付款_修改数据', - param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}` } }) } diff --git a/src/api/WorkshopProcurement/FundApproval.js b/src/api/WorkshopProcurement/FundApproval.js index 2ec6115f..86f775a7 100644 --- a/src/api/WorkshopProcurement/FundApproval.js +++ b/src/api/WorkshopProcurement/FundApproval.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 查询审批/付款 -export function initApproval(pageCurrent, pageSize, state) { +export function initApproval(pageCurrent, pageSize, state2) { return request({ url: '', method: 'post', @@ -12,13 +12,13 @@ export function initApproval(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '车间采购管理_采购合同_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${state2}`, Pagination: pageCurrent + '&' + pageSize } }) } // 执行审批/付款 -export function execApproval(num1, num2, reason, person, state) { +export function execApproval(num1, num2, reason, person, state2) { return request({ url: '', method: 'post', @@ -27,12 +27,12 @@ export function execApproval(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '车间采购管理_采购合同_审批付款_修改数据', - param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}` } }) } // 查询车间合同审批/付款 -export function initApproval1(pageCurrent, pageSize, state) { +export function initApproval1(pageCurrent, pageSize, state2) { return request({ url: '', method: 'post', @@ -41,7 +41,7 @@ export function initApproval1(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '车间采购管理_采购合同_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${state2}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -60,7 +60,7 @@ export function searchRequsetFundDetail3(num) { }) } // 执行车间合同审批/付款 -export function execApproval1(num1, num2, reason, person, state) { +export function execApproval1(num1, num2, reason, person, state2) { return request({ url: '', method: 'post', @@ -69,12 +69,12 @@ export function execApproval1(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '车间采购管理_采购合同_审批付款_修改数据', - param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}` } }) } // 查询离线合同审批/付款 -export function initApprovalOffline(pageCurrent, pageSize, state) { +export function initApprovalOffline(pageCurrent, pageSize, state2) { return request({ url: '', method: 'post', @@ -83,7 +83,7 @@ export function initApprovalOffline(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '车间采购管理_离线合同_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${state2}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -103,7 +103,7 @@ export function searchRequsetFundDetail(num) { }) } // 执行审批/付款（离线合同） -export function execApprovalOffline(num1, num2, reason, person, state) { +export function execApprovalOffline(num1, num2, reason, person, state2) { return request({ url: '', method: 'post', @@ -112,7 +112,7 @@ export function execApprovalOffline(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '车间采购管理_离线合同_审批付款_修改数据', - param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}` } }) } @@ -131,7 +131,7 @@ export function searchRequsetFundDetail1(num) { }) } // 查询备料审批/付款 -export function initApprovalMaterials(pageCurrent, pageSize, state) { +export function initApprovalMaterials(pageCurrent, pageSize, state2) { return request({ url: '', method: 'post', @@ -140,13 +140,13 @@ export function initApprovalMaterials(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '备料管理_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${state2}`, Pagination: pageCurrent + '&' + pageSize } }) } // 执行审批/付款（备料） -export function execMaterials(num1, num2, reason, person, state) { +export function execMaterials(num1, num2, reason, person, state2) { return request({ url: '', method: 'post', @@ -155,7 +155,7 @@ export function execMaterials(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '备料管理_审批付款_修改数据', - param: `采购计划请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `采购计划请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}` } }) } diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 0bbb19fa..09a2e50c 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -2,7 +2,6 @@
- {{ item.name }}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 交货期： - - 制造: - - 制造部采购 - - 金工: - - 车间生产 - - 采购: - - 采购部门采购 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 交货期： + + 制造: + + 制造部采购 + + 金工: + + 车间生产 + + 采购: + + 采购部门采购 + - 查询 新增 @@ -253,20 +219,15 @@ - - + + - - - - - - + @@ -281,17 +242,9 @@ {{ scope.row.备注 }} - - - - - - - - - - + + @@ -304,7 +257,7 @@ {{ scope.row.图号或型号 }} - + @@ -314,7 +267,7 @@ {{ scope.row.零件数量 }} - + @@ -324,11 +277,6 @@ {{ scope.row.物料计划到货时间 }} - - - - - - - + + @@ -370,7 +318,6 @@ size="small" style="width:200px"/> - Date: Fri, 21 Feb 2020 15:52:33 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E9=87=8D=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Outsourcing/OutsourcingTaskExecution.js | 161 +-- src/utils/request.js | 2 +- .../PartAssignment/index.vue | 10 +- .../OutsourcingTaskExecution/index.vue | 1245 +++-------------- 4 files changed, 230 insertions(+), 1188 deletions(-) diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js index 988f2114..3f1c2a98 100644 --- a/src/api/Outsourcing/OutsourcingTaskExecution.js +++ b/src/api/Outsourcing/OutsourcingTaskExecution.js @@ -15,34 +15,6 @@ export function initOutHelp() { } }) } -// 初始化获取已生成的外协加工任务单 -export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3, check) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '车间生产管理_外协加工任务单_查询数据_2020', - param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num + '&查询历史_check=' + check, - Pagination: pageCurrent + '&' + pageSize - } - }) -} -// 初始化获取外协厂家数据 -export function getData1() { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '车间生产管理工艺_基础表_外协厂家_查询数据' - } - }) -} // 初始化获取已预算价格，未选入到外协加工任务单的零件 export function getTable1(check, partNumber) { return request({ @@ -52,11 +24,41 @@ export function getTable1(check, partNumber) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间生产管理工艺_零件工艺计划_查询数据_外协_新', + name: '车间生产管理工艺_外协任务执行_未选入零件_查询', param: '零件图号_check=' + check + '=int&零件图号=' + partNumber + '=string' } }) } +// 初始化获取已生成的外协加工任务单 +export function getTable(checked, contractNumber, check, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理_外协加工任务单_查询数据_2020', + param: '表单号_check=' + checked + '&表单号=' + contractNumber + '&查询历史_check=' + check, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询任务单明细 +export function getParts(Number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_外协任务执行_外协加工任务单明细_查询数据', + param: '外协加工任务单流水号=' + Number + } + }) +} + // 打回 export function getBack(processPlan) { return request({ @@ -71,59 +73,45 @@ export function getBack(processPlan) { } }) } -// 获取零件工序信息（零件号表中） -export function getprocedure(processPlan, single) { +// 选入零件 +export function insertParts(processNum, Number) { return request({ url: '', method: 'post', data: { UserID: state.state.user.id, ModularID: router.currentRoute.path, - type: '1', - name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_工艺名称简称_新', - param: '工艺计划流水号=' + processPlan + '=int&单件是否外协=' + single + '=int' + type: '2', + name: '车间生产管理工艺_外协加工任务单_选入_循环执行', + param: '外协加工任务单流水号=' + Number + '&工艺计划流水号组=' + processNum } }) } -// 外协厂家查询 -export function searchManufactor(check, name) { +// 计算价格 +export function getPrice(Number, money) { return request({ url: '', method: 'post', data: { UserID: state.state.user.id, ModularID: router.currentRoute.path, - type: '1', - name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件', - param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=' + check + '=bit&外协厂家名称=' + name + '&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string' + type: '2', + name: '车间生产管理工艺_外协加工任务单_保存_循环执行', + param: '外协加工任务单明细流水号组=' + Number + '&加工价格_成交组=' + money } }) } -// 确定价格 -export function spareParts(processNum, single) { +// 成交 +export function editData1(Number, manufacturers, freight, Explain) { return request({ url: '', method: 'post', data: { UserID: state.state.user.id, ModularID: router.currentRoute.path, - type: '1', - name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新', - param: '工艺计划流水号=' + processNum + '=int&工序数量=21=int&单件是否外协=' + single + '=int' - } - }) -} -// 暂未启用 -export function spareParts1(processNum, single) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新', - param: '工艺计划流水号=' + processNum + '=int&工序数量=31=int&单件是否外协=' + single + '=int' + type: '2', + name: '车间生产管理_外协加工任务单_修改数据', + param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0' } }) } @@ -155,20 +143,6 @@ export function editData(Number, manufacturers, freight, Explain) { } }) } -// 成交 -export function editData1(Number, manufacturers, freight, Explain) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: '车间生产管理_外协加工任务单_修改数据', - param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=2&入库标志=1&扣款说明=' + Explain + '&扣款_质量=0&扣款_计划=0&扣款_其他=0' - } - }) -} // 删除外协加工任务单 export function deleteData(Number) { return request({ @@ -197,34 +171,7 @@ export function deleteData1(Number) { } }) } -// 选入零件 -export function insertParts(processNum, Number) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: '车间生产管理_外协加工任务单明细_增加数据', - param: '外协加工任务单流水号=' + Number + '=int&工艺计划流水号=' + processNum + '=int' - } - }) -} -// 查询任务单明细 -export function getParts(Number) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '车间生产管理_外协加工任务单明细_查询数据', - param: '外协加工任务单流水号=' + Number + '=int' - } - }) -} + // 数据库生产表单号 export function getNumber(time) { return request({ @@ -239,17 +186,3 @@ export function getNumber(time) { } }) } -// 计算价格 -export function getPrice(Number, money, money1, money2, money3) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: '车间生产管理_外协加工任务单明细_修改数据', - param: '外协加工任务单明细流水号=' + Number + '=int&加工价格_预算=' + money + '&加工价格_成交=' + money1 + '&材料价格_价格=' + money2 + '&其他价格=' + money3 + '&入库标志=1=int&交检数量=0=int&合格数量=0=int&回用数量=0=int&废品数量=0=int' - } - }) -} diff --git a/src/utils/request.js b/src/utils/request.js index 1aaa917f..0a04c177 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` // export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx` export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx` export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESDownloadExcel.ashx' // 导出excel +export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESCommonBase.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://123.56.95.229:8010/webpage/file/` export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 09a2e50c..ecb3de1b 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -32,7 +32,7 @@ - + - + @@ -119,7 +119,7 @@ {{ scope.row.机床数量 }} - + @@ -169,7 +169,7 @@ {{ scope.row.机床数量 }} - + @@ -473,7 +473,7 @@ {{ scope.row.物料型号 }} - + diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index d5329d35..d468574a 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -5,21 +5,8 @@ 查询 打回车间 - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From aac5311a358356699b35ec89e44e9dd22d7de9de Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Sat, 22 Feb 2020 09:50:42 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=91=BD=E5=90=8D=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ParseQuery.js | 2 +- src/api/ManufacturingCenter/ProjectPlanningQuery.js | 2 +- src/api/Outsourcing/OutFactoryMaintenance.js | 2 +- src/api/Outsourcing/OutsourcingTaskChanges.js | 2 +- src/api/Outsourcing/OutsourcingTaskQuery.js | 2 +- src/views/Inventory/InventoryCheck/index.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/ManufacturingCenter/ParseQuery.js b/src/api/ManufacturingCenter/ParseQuery.js index 50eacc6f..bfaa181d 100644 --- a/src/api/ManufacturingCenter/ParseQuery.js +++ b/src/api/ManufacturingCenter/ParseQuery.js @@ -61,7 +61,7 @@ export function searchAll() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '1_总查询', + name: '综合查询_总查询', param: '机床流水号=' + arguments[0] } }) diff --git a/src/api/ManufacturingCenter/ProjectPlanningQuery.js b/src/api/ManufacturingCenter/ProjectPlanningQuery.js index 12ed521e..fdfadc2e 100644 --- a/src/api/ManufacturingCenter/ProjectPlanningQuery.js +++ b/src/api/ManufacturingCenter/ProjectPlanningQuery.js @@ -80,7 +80,7 @@ export function searchAll(num1, num2) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '16_项目总查询', + name: '项目计划查询_项目总查询', param: '项目流水号_check=' + num1 + '&项目流水号=' + num2 } }) diff --git a/src/api/Outsourcing/OutFactoryMaintenance.js b/src/api/Outsourcing/OutFactoryMaintenance.js index c19635bb..dcad6e8b 100644 --- a/src/api/Outsourcing/OutFactoryMaintenance.js +++ b/src/api/Outsourcing/OutFactoryMaintenance.js @@ -11,7 +11,7 @@ export function searchtable(pageCurrent, pageSize, num1, ManufacturerNumber, num UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件', + name: '车间生产管理工艺_外协厂家_查询', param: '序号_check=' + num1 + '=int&序号=' + ManufacturerNumber + '&外协厂家名称_check=' + num2 + '=int&外协厂家名称=' + ManufacturerName + '&外协厂家简称_check=' + num10 + '=int&外协厂家简称=' + ManufacturerAbbreviation + '&地址_check=' + num3 + '=int&地址=' + address + '&联系人_check=' + num4 + '=int&联系人=' + roleName + '&电话_check=' + num5 + '=int&电话=' + phNumber + '&传真_check=' + num6 + '=int&传真=' + Fax + '&备注_check=' + num7 + '=int&备注=' + Remarks + '&类别_check=' + num8 + '=int&类别=' + category + '&关注_check=' + num11 + '=int&关注=' + attention + '&设备情况_check=' + num9 + '=int&设备情况=' + EquipmentCondition, Pagination: pageCurrent + '&' + pageSize } diff --git a/src/api/Outsourcing/OutsourcingTaskChanges.js b/src/api/Outsourcing/OutsourcingTaskChanges.js index 14935f38..cf1cfdba 100644 --- a/src/api/Outsourcing/OutsourcingTaskChanges.js +++ b/src/api/Outsourcing/OutsourcingTaskChanges.js @@ -61,7 +61,7 @@ export function searchManufactor(name) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件', + name: '车间生产管理工艺_外协厂家_查询', param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=1=bit&外协厂家名称=' + name + '=string&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string' } }) diff --git a/src/api/Outsourcing/OutsourcingTaskQuery.js b/src/api/Outsourcing/OutsourcingTaskQuery.js index e3a7bbe7..a77cbf97 100644 --- a/src/api/Outsourcing/OutsourcingTaskQuery.js +++ b/src/api/Outsourcing/OutsourcingTaskQuery.js @@ -81,7 +81,7 @@ export function searchManufactor(name) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件', + name: '车间生产管理工艺_外协厂家_查询', param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=1=bit&外协厂家名称=' + name + '=string&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string' } }) diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index 2ea4c7cf..c2950ed2 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -237,7 +237,7 @@ export default { method: 'post', data: { type: '1', - name: '库存管理_货位主文件_查询数据_2019-11-28' + name: '库存管理_根据仓库查货位_查询数据' } } request(param).then(res => { From dfae66cac52d90d6ae44c367f2cfa2c01454f28f Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Sat, 22 Feb 2020 11:20:15 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=91=E9=A9=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Outsourcing/OutsourcingTaskExecution/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index 773c7427..96d7d56d 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -40,7 +40,7 @@ 查询 新增 - + - - - - - - - - - + + + + + + + + + + + + + + +