diff --git a/dist.zip b/dist.zip new file mode 100644 index 00000000..b5a1d8a0 Binary files /dev/null and b/dist.zip differ diff --git a/src/api/MarketingCenter/CreateProject.js b/src/api/MarketingCenter/CreateProject.js index 33408fec..d8ddfc41 100644 --- a/src/api/MarketingCenter/CreateProject.js +++ b/src/api/MarketingCenter/CreateProject.js @@ -10,14 +10,14 @@ export function initProject() { } }) } -export function searchTable1(pageCurrent, pageSize, num1, num3, num5, num6, num7, num8, num9, num10) { +export function searchTable1(pageCurrent, pageSize, num1, num3, num5, num6, num7, num8, num9, num10, num11, num12) { return request({ url: '', method: 'post', data: { type: '1', - name: '合同信息管理_合同信息_制造部_查询', - param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string', + name: '合同信息管理_合同信息_制造部_查询_新', + param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&合同编号_check=' + num11 + '=int&合同编号=' + num12 + '=string', Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/ArrivalStateSearch.js b/src/api/WorkshopProcurement/ArrivalStateSearch.js index fc550fe1..eff7cc78 100644 --- a/src/api/WorkshopProcurement/ArrivalStateSearch.js +++ b/src/api/WorkshopProcurement/ArrivalStateSearch.js @@ -7,44 +7,18 @@ export function initArrivalStateContact() { method: 'post', data: { type: '1', - name: '车间管理_到货情况_查询数据', - param: '采购合同流水号_check=0&供应商名称_check=0' + name: '车间管理_到货情况_查询数据_新1' } }) } // 查询到货情况 -export function searchArrivalState(pageCurrent, pageSize, check1, num, check2, name) { +export function searchArrivalState(num) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间管理_到货情况_查询数据', - param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, - Pagination: pageCurrent + '&' + pageSize - } - }) -} -// 查询到货情况 -export function searchArrivalNum(num) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '车间管理_合同物料到货情况_查询数据_外购件', - param: `采购合同流水号=${num}` - } - }) -} -// 查询到货情况 -export function searchArrivalNum1(num) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '车间管理_合同物料到货情况_查询数据_基本件', + name: '车间管理_到货情况_查询数据_新_成组采购', param: `采购合同流水号=${num}` } }) diff --git a/src/api/WorkshopProcurement/CreatingProcurementContracts.js b/src/api/WorkshopProcurement/CreatingProcurementContracts.js index b1295e5a..0158c1e6 100644 --- a/src/api/WorkshopProcurement/CreatingProcurementContracts.js +++ b/src/api/WorkshopProcurement/CreatingProcurementContracts.js @@ -50,7 +50,7 @@ export function searchData1(num) { method: 'post', data: { type: '1', - name: '车间管理_基本件采购_请购单明细_查询数据_外购件', + name: '车间采购管理_成组采购_查询数据', param: '请购单流水号=' + num } }) @@ -101,4 +101,47 @@ export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, } }) } - +export function doneContract1(num1, RequisitionNumber, name1, time2, group, id, num2, text, type, freight, AdvanceCharge, partsNum, priceGroup, taxGroup, currency, remark) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间管理_基本件采购_请购单和请购单明细_增加数据_成组采购', + param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&规定到货时间=${time2}&组号=${group}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&模板类型=${type}&运费=${freight}&预付款=${AdvanceCharge}&数量=${partsNum}&单价=${priceGroup}&税率=${taxGroup}&币种流水号=${currency}&备注=${remark}` + } + }) +} +export function submitGroup(num, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_成组采购_生成数据', + param: '请购单流水号=' + num + '&组件流水号=' + num1 + } + }) +} +export function update1(num, num1, num2, num3, num4) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_成组采购_更新数据', + param: '组件流水号=' + num + '&数量=' + num1 + '&单价=' + num2 + '&交货期=' + num3 + '&备注=' + num4 + } + }) +} +export function unLinkGroup(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_成组采购_取消数据', + param: '请购单流水号=' + num + } + }) +} diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js b/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js index 7f18ca88..346841b2 100644 --- a/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js +++ b/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js @@ -115,7 +115,19 @@ export function searchPurchaseDetail(data) { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同明细_查询数据', + name: '车间采购管理_采购合同明细_查询数据NEW', + param: '采购合同流水号=' + data + } + }) +} +// 查询采购合同明细 +export function searchPurchaseDetail1(data) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同明细_成组采购_查询数据', param: '采购合同流水号=' + data } }) diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js index 662c8143..9ab7ee88 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -12,27 +12,27 @@ export function searchCailiao(name) { }) } // 查询采购单 -export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, material) { +export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check, num1) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_采购计划_查询数据_到货', - param: `采购单号_check=${check1}&采购单号=${num}&供应商_check=${check2}&供应商=${name}&材料=${material}`, + param: `采购单号_check=${check1}&采购单号=${num}&供应商_check=${check2}&供应商=${name}&零件图号_check=${check}&零件图号=${num1}`, Pagination: pageCurrent + '&' + pageSize } }) } // 查询采购计划明细 -export function searchMateriel(num, num1) { +export function searchMateriel(num, check, num1) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_采购计划明细_查询数据_未选入', - param: `采购计划流水号=${num}&材料=${num1}` + param: `采购计划流水号=${num}&零件图号_check=${check}&零件图号=${num1}` } }) } @@ -177,14 +177,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c } }) } -export function saveWeight(num1, num2, num3, num4) { +export function saveWeight(num1, num3, num4) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_到货明细关联备料_保存单件重量和总重量', - param: `采购计划明细流水号=${num1}&单件重量=${num2}&总重量=${num3}&总金额=${num4}` + param: `采购计划明细流水号=${num1}&总重量=${num3}&总金额=${num4}` } }) } diff --git a/src/api/WorkshopProcurement/OfflineProcurement.js b/src/api/WorkshopProcurement/OfflineProcurement.js new file mode 100644 index 00000000..7b693454 --- /dev/null +++ b/src/api/WorkshopProcurement/OfflineProcurement.js @@ -0,0 +1,145 @@ +import request from '@/utils/request' + +// 查询供应商 +export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_供应商_查询数据_根据条件', + param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12 + } + }) +} +// 创建采购单 +export function addPurchaseOrder(PurchaseOrderName, supplier) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_离线采购计划_增加数据', + param: `离线采购计划名称=${PurchaseOrderName}&供应商=${supplier}` + } + }) +} +// 编辑采购单 +export function editPurchaseOrder(PurchaseOrderNameValue, PurchaseOrderName, supplier) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_离线采购计划_编辑数据', + param: `离线采购计划流水号=${PurchaseOrderNameValue}&离线采购计划名称=${PurchaseOrderName}&供应商=${supplier}` + } + }) +} +// 删除采购单 +export function deletePurchaseOrder(PurchaseOrderNameValue) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_离线采购计划_删除数据', + param: `离线采购计划流水号=${PurchaseOrderNameValue}` + } + }) +} +// 查询采购单 +export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check3, name2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_离线采购计划_查询数据', + param: `离线采购计划编号_check=${check1}&离线采购计划编号=${num}&供应商流水号_check=${check3}&供应商流水号=${name2}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询材料 +export function searchMX(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_离线采购计划明细_查询数据', + param: '离线采购计划流水号=' + num + } + }) +} +export function AddMaterial(num, num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_离线采购计划明细_增加数据_循环', + param: `离线采购计划流水号=${num}&工艺计划流水号组=${num1}&数量组=${num2}` + } + }) +} +// 机床名称 +export function getMachines() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_机床名称_根据机床查询', + param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' + } + }) +} + +export function getGroups(stepNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组', + param: '机床流水号=' + stepNumber + '=int' + } + }) +} + +export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新', + param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function saveWeight(num1, num2, num3, num4) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_离线采购计划明细_编辑数据', + param: `离线采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&数量=${num4}` + } + }) +} +export function deleteMX(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_离线采购计划明细_移出数据', + param: `离线采购计划明细流水号=${num1}` + } + }) +} diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js index d7f6fe41..548d8787 100644 --- a/src/api/WorkshopProcurement/ProcurementContractApproval.js +++ b/src/api/WorkshopProcurement/ProcurementContractApproval.js @@ -59,3 +59,15 @@ export function submitApproval(num, num1, num2, num3) { } }) } +// 采购合同明细查询 +export function searchTable3(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同明细_成组采购_查询数据', + param: '采购合同流水号=' + num + } + }) +} diff --git a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js index 9e4bdcfc..fe13ab38 100644 --- a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js +++ b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js @@ -55,7 +55,7 @@ export function searchTable3(num) { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同_查询数据_基本件', + name: '车间采购管理_采购合同明细_成组采购_查询数据', param: '采购合同流水号=' + num } }) diff --git a/src/utils/request.js b/src/utils/request.js index 2cb92ad8..fc41e22d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -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.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/utils/tool.js b/src/utils/tool.js index b2e909dc..a1f1afe9 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -155,3 +155,72 @@ export function groupBy(datas, keys) { }) return result } +// 去除js浮点加法bug +export function numAdd(arg1, arg2) { + var r1, r2, m + try { + r1 = arg1.toString().split('.')[1].length + } catch (e) { + r1 = 0 + } + try { + r2 = arg2.toString().split('.')[1].length + } catch (e) { + r2 = 0 + } + m = Math.pow(10, Math.max(r1, r2)) + return (arg1 * m + arg2 * m) / m +} +// 去除js浮点减法bug +export function numSubtract(arg1, arg2) { + var r1, r2, m, n + try { + r1 = arg1.toString().split('.')[1].length + } catch (e) { + r1 = 0 + } + try { + r2 = arg2.toString().split('.')[1].length + } catch (e) { + r2 = 0 + } + m = Math.pow(10, Math.max(r1, r2)) + n = (r1 >= r2) ? r1 : r2 + return ((arg1 * m - arg2 * m) / m).toFixed(n) +} +// 去除js浮点乘法bug +export function numMultiply(arg1, arg2) { + var m = 0 + var s1 = arg1.toString() + var s2 = arg2.toString() + try { + m += s1.split('.')[1].length + } catch (e) { + console.log(e) + } + try { + m += s2.split('.')[1].length + } catch (e) { + console.log(e) + } + return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m) +} +// 去除js浮点除法bug +export function numDivide(arg1, arg2) { + var t1 = 0 + var t2 = 0 + var r1, r2 + try { + t1 = arg1.toString().split('.')[1].length + } catch (e) { + console.log(e) + } + try { + t2 = arg2.toString().split('.')[1].length + } catch (e) { + console.log(e) + } + r1 = Math.Number(arg1.toString().replace('.', '')) + r2 = Math.Number(arg2.toString().replace('.', '')) + return (r1 / r2) * Math.pow(10, t2 - t1) +} diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue index bafe54b1..9a581314 100644 --- a/src/views/Assembly/MakeAssemblyPlan/index.vue +++ b/src/views/Assembly/MakeAssemblyPlan/index.vue @@ -151,7 +151,6 @@ export default { if (row.组件流水号 !== '' && row.组件流水号 !== null) { searchgroupName(row.组件流水号).then(response => { console.log(row, 22222) - this.groupNumberValue = response.data[0].组号 this.tableData2[index].任务名称 = response.data[0].组件名称 }) } @@ -171,7 +170,7 @@ export default { }) }, confirmEdit(row) { - editData(row.计划流水号, row.组件流水号, this.groupNumberValue, row.任务名称, row.计划工时).then(response => { + editData(row.计划流水号, row.组件流水号, row.组号, row.任务名称, row.计划工时).then(response => { if (response.data[0].result === '1') { row.edit = false this.tableData2 = [] @@ -266,7 +265,6 @@ export default { }) } }) - this.groupNumberValue = '' this.groupNum = [] searchgroup(this.machineNumberValue).then(response => { for (let i = 0; i < response.data.length; i++) { diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue index fddb93f6..383c9e53 100644 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -148,8 +148,8 @@ export default { this.name ? check4 = 1 : check4 = 0 this.spec ? check5 = 1 : check5 = 0 this.model ? check6 = 1 : check6 = 0 - this.outTime ? check7 = 1 : check7 = 0 - searchRecord1(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, check7, this.inTime[0] || '', this.inTime[1] || '', this.pageCurrent1, this.pageSize1).then(res => { + this.inTime ? check7 = 1 : (check7 = 0, this.inTime = '') + searchRecord1(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, check7, this.inTime[0], this.inTime[1], this.pageCurrent1, this.pageSize1).then(res => { this.tableData1 = res.data.rows this.total1 = res.data.total }) diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue index 4d482779..80995f00 100644 --- a/src/views/Inventory/PurchaseOutRecord/index.vue +++ b/src/views/Inventory/PurchaseOutRecord/index.vue @@ -145,8 +145,9 @@ export default { this.name ? check4 = 1 : check4 = 0 this.spec ? check5 = 1 : check5 = 0 this.model ? check6 = 1 : check6 = 0 - this.outTime ? check7 = 1 : check7 = 0 - searchRecord(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, check7, this.outTime[0] || '', this.outTime[1] || '', this.pageCurrent1, this.pageSize1).then(res => { + this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '') + console.log(this.outTime, 999) + searchRecord(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, check7, this.outTime[0], this.outTime[1], this.pageCurrent1, this.pageSize1).then(res => { this.tableData = res.data.rows this.total1 = res.data.total }) diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue index a3d40405..3336ea87 100644 --- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue +++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue @@ -7,7 +7,7 @@ v-model="entryNameValue" :remote-method="remoteMethod" placeholder="项目名称" - style="margin-right: 10px" + style="margin-right: 10px; width: 150px" size="small" clearable filterable @@ -21,14 +21,14 @@ :value="item.value"/> 机床图号: - + - 查询 + 查询 @@ -38,7 +38,6 @@ style="width: 100%;max-height: 400px;" stripe size="mini" - height="300" highlight-current-row border @row-click="searchSpareParts"> @@ -68,137 +67,143 @@ -
- -
- - - - 组号: - - - - 零件图号: - - 查询 - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -211,7 +216,7 @@ export default { pageSize: 10, total: 0, pageCurrent1: 1, - pageSize1: 10, + pageSize1: 1000000, total1: 0, list: [], check3: '', diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue index 41579e2f..404f9fa7 100644 --- a/src/views/ManufacturingCenter/InventoryQuery/index.vue +++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue @@ -3,9 +3,9 @@
- - - + + + - 查询 + 查询
- + - + @@ -55,7 +55,7 @@ {{ scope.row.货位名称 }} - +