diff --git a/src/api/BasicData/FactoryCalendar.js b/src/api/BasicData/FactoryCalendar.js new file mode 100644 index 00000000..46be67f7 --- /dev/null +++ b/src/api/BasicData/FactoryCalendar.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' +// 初始化日历 +export function initClendar(year, month) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_工作日历_获得状态', + param: '工作年=' + year + '&工作月=' + month + } + }) +} +// 修改工作状态 +export function changeState(time, code) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_基础表_工作日历_设置状态', + param: '工作日期=' + time + '&工作日状态=' + code + } + }) +} diff --git a/src/api/BasicData/ShiftManagement.js b/src/api/BasicData/ShiftManagement.js new file mode 100644 index 00000000..033f7c59 --- /dev/null +++ b/src/api/BasicData/ShiftManagement.js @@ -0,0 +1,74 @@ +import request from '@/utils/request' + +// 查询班次 +export function getScheduling(SchedulingType) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '设备管理_基础表_班次表_查询数据', + param: '班次类型=' + SchedulingType + } + }) +} +// 查询班次 +export function searchProgramme() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '设备管理_基础表_班次表_查询班次' + } + }) +} + +// 新增班次 +export function addShift(starttime, endtime, shifttype, shiftnumber, nightwork, work, temporary, difficult, note) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_基础表_班次表_增加数据', + param: '开始工作时间=' + starttime + '&结束工作时间=' + endtime + '&班次类型=' + shifttype + '&班次代码=' + shiftnumber + '&是否夜班=' + nightwork + '&是否工作=' + work + '=int&是否可以安排临时件=' + temporary + '=int&是否可以安排高难度件=' + difficult + '=int&备注=' + note + } + }) +} +// 编辑班次 +export function editShift(shiftCode, starttime, endtime, shifttype, shiftnumber, nightwork, work, temporary, difficult, note) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_基础表_班次表_修改数据', + param: '序号=' + shiftCode + '=int&开始工作时间=' + starttime + '=datetime&结束工作时间=' + endtime + '=datetime&班次类型=' + shifttype + '=int&班次代码=' + shiftnumber + '=int&是否夜班=' + nightwork + '=int&是否工作=' + work + '=int&是否可以安排临时件=' + temporary + '=int&是否可以安排高难度件=' + difficult + '=int&备注=' + note + } + }) +} +// 删除班次 +export function deleteShift(shiftCode) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_基础表_班次表_删除数据', + param: '序号=' + shiftCode + } + }) +} +// 删除班次 +export function addShiftType() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_基础表_班次表_班次类型与工作时间_增加' + } + }) +} + diff --git a/src/api/Inventory/InventoryCheck.js b/src/api/Inventory/InventoryCheck.js index 0fccc1e9..4bd567b6 100644 --- a/src/api/Inventory/InventoryCheck.js +++ b/src/api/Inventory/InventoryCheck.js @@ -197,3 +197,15 @@ export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, p } }) } +// 车间采购外购件查询 +export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, alterdate, craftnumber, materialType, materiallocate) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_库存盘点_修改数量', + param: '收件信息ID=' + receive + '&项目流水号=' + project + '&机床流水号=' + machinenumber + '&组件流水号=' + partnumber + '&原数量=' + oldnumber + '&修改原因=' + reason + '&数量=' + number + '&人员编号=' + people + '&货位流水号=' + locate + '&采购合同明细流水号=' + contractdetail + '&工艺计划流水号=' + craftnumber + '&零件类型代码=' + materialType + '&物料与货位对照流水号=' + materiallocate + } + }) +} diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js index 1ef3d858..b68ee094 100644 --- a/src/api/Inventory/PartOut.js +++ b/src/api/Inventory/PartOut.js @@ -72,3 +72,15 @@ export function WorkShopPart(data1, data2, data3, data4, data5) { } }) } +// 车间采购件零件出库 +export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '零件出库_零件出库_异常出库', + param: '项目流水号=' + data1 + '&机床流水号=' + data2 + '&组件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&工艺计划流水号=' + data5 + '&货位流水号=' + data6 + '&异常数量=' + data7 + '&异常原因=' + data8 + } + }) +} diff --git a/src/api/Inventory/PartsReplacement.js b/src/api/Inventory/PartsReplacement.js new file mode 100644 index 00000000..adb6bf3b --- /dev/null +++ b/src/api/Inventory/PartsReplacement.js @@ -0,0 +1,123 @@ +import request from '@/utils/request' +// 初始化项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// 查询仓库 +export function initWarehouse() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_货位仓库_仓库_查询数据' + } + }) +} +// 机床查询 +export function searchmachine(check, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + } + }) +} +// 分组查询 +export function searchTeam(machineNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + machineNumber + } + }) +} + +// 修改记录查询 +export function searchAlterRecord(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_库存盘点_修改记录查询', + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 异常记录查询 +export function searchErrorRecord(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_零件出库_异常记录查询', + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 补投单查询 +export function searchReplacementCard(pageCurrent, pageSize, card_check, card) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_补投单_补投单查询', + param: '补投单编号_check=' + card_check + '&补投单编号=' + card, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 补投增加 +export function addReplacementCard(Number, house) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_补投单_补投单增加', + param: '人员编号=' + Number + '&仓库流水号=' + house + } + }) +} +// 补投删除 +export function deleteReplacementCard(Number) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_补投单_补投单删除', + param: '补投单流水号=' + Number + } + }) +} +// 补投增加 +export function addCardDetail(Number, project, machine, team, name, mass, locate, parttype, reason) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_零件补投_批量增加补投单明细', + param: '补投单流水号=' + Number + '&项目流水号组=' + project + '&机床流水号组=' + machine + '&组件流水号组=' + team + '&名称组=' + name + '&数量组=' + mass + '&货位流水号组=' + locate + '&零件类型组=' + parttype + '&原因组=' + reason + } + }) +} diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js new file mode 100644 index 00000000..d27a4851 --- /dev/null +++ b/src/api/ManufacturingCenter/CreatePreparationBill.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +// 查询零件 +export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_编制工艺_备料零件查询', + param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4 + '&备料到货=0', + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询零件工艺 +export function searchtable2(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_备料打印_查询工序信息', + param: '工艺计划流水号=' + num1 + } + }) +} +// 更改打印状态 +export function edit(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_备料单导出_状态更改', + param: '工艺计划流水号=' + num1 + } + }) +} diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js new file mode 100644 index 00000000..f58bc510 --- /dev/null +++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +// 查询零件 +export function searchtable(num1, num2, num3, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_编制工艺_备料到货查询', + param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料到货_check=' + num3, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询零件工艺 +export function searchtable2(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_备料打印_查询工序信息', + param: '工艺计划流水号=' + num1 + } + }) +} +// 更改打印状态 +export function edit(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_备料到货_状态更改', + param: '工艺计划流水号=' + num1 + } + }) +} + +export function handlechange(Number, code) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_工作者', + param: '工序流水号=' + Number + '&工作者考勤编号=' + code + } + }) +} diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index b150f8e4..73f70ed3 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -174,7 +174,7 @@ export function initPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/api/ManufacturingCenter/ProcessTaskAssignment.js index 2a897c9b..6507f13d 100644 --- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js +++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js @@ -129,7 +129,7 @@ export function initPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=9' + param: '考核部门编号=17' } }) } diff --git a/src/api/MarketingCenter/PerformanceBond.js b/src/api/MarketingCenter/PerformanceBond.js new file mode 100644 index 00000000..aa498530 --- /dev/null +++ b/src/api/MarketingCenter/PerformanceBond.js @@ -0,0 +1,132 @@ +import request from '@/utils/request' + +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '合同信息管理_项目名称_总_查询' + } + }) +} +export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '合同信息管理_履约保证金_合同信息统计_查询', + param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date', + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function typeOfPerformanceBond(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '合同信息管理_履约保证金类型_查询', + param: '项目流水号=' + num1 + '=int' + } + }) +} +export function searchTableData2(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '合同信息管理_履约保证金_查询', + param: '项目流水号=' + num1 + '=int' + } + }) +} +export function takeBack(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '合同信息管理_履约保证金_收回', + param: '履约保证金流水号=' + num1 + '=int&实际收回日期=' + num2 + '=string' + } + }) +} +export function executionProgressID() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '合同信息管理_执行进度_查询' + } + }) +} +export function initType() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '投标保证金管理_保证金类型查询' + } + }) +} +export function addPerformanceBond() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '合同信息管理_履约保证金_增加', + param: '项目流水号=' + arguments[0] + '&保证金金额=' + arguments[1] + '&保证金类型流水号=' + arguments[2] + '&收回条件=' + arguments[3] + '&截止时间=' + arguments[4] + } + }) +} +export function editPerformanceBond() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '合同信息管理_履约保证金_修改', + param: '项目流水号=' + arguments[0] + '&保证金金额=' + arguments[1] + '&保证金类型流水号=' + arguments[2] + '&收回条件=' + arguments[3] + '&截止时间=' + arguments[4] + '&履约保证金流水号=' + arguments[5] + } + }) +} +export function delPerformanceBond() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '合同信息管理_履约保证金_删除', + param: '项目流水号=' + arguments[0] + '&履约保证金流水号=' + arguments[1] + } + }) +} +export function addPerformanceGuarantee() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '合同信息管理_履约保证金_履约保函新增', + param: '项目流水号=' + arguments[0] + } + }) +} +export function delPerformanceGuarantee() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '合同信息管理_履约保证金_履约保函_删除', + param: '项目流水号=' + arguments[0] + } + }) +} diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index 5cd99a83..cb6176a7 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -1,16 +1,5 @@ import request from '@/utils/request' -// 初始化询价状态 -export function initInquiryState() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购部采购_询价状态_查询' - } - }) -} // 查询分配后的标准件和外购件 export function searchMaterial(pageCurrent, pageSize, check1, num1, check2, num2, person) { return request({ diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/api/PurchasingCenter/FundApproval.js index ed809eac..358b60bf 100644 --- a/src/api/PurchasingCenter/FundApproval.js +++ b/src/api/PurchasingCenter/FundApproval.js @@ -25,15 +25,15 @@ export function execApproval(num1, num2, reason, person, state) { } }) } -// 查询离线合同审核/审批/付款 +// 查询离线合同审批/付款 export function initApprovalOffline(pageCurrent, pageSize, state) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_离线合同_审核审批付款_查询数据', - param: `审核_审批_付款状态=${state}`, + name: '采购管理_离线合同_审批付款_查询数据', + param: `审批_付款状态=${state}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -50,15 +50,15 @@ export function searchRequsetFundDetail(num) { } }) } -// 执行审核/审批/付款（离线合同） +// 执行审批/付款（离线合同） export function execApprovalOffline(num1, num2, reason, person, state) { return request({ url: '', method: 'post', data: { type: '2', - name: '采购管理_离线合同_审核审批付款_修改数据', - param: `离线合同请款流水号=${num1}&审核_审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审核_审批_付款状态=${state}` + name: '采购管理_离线合同_审批付款_修改数据', + param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` } }) } diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index e08a6eb5..2088e18d 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -50,49 +50,27 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c } }) } -// 初始化付款方式 -export function initPayMethod() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_付款方式_查询数据' - } - }) -} -// 初始化付款时间节点 -export function initPayTimeNode() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_付款时间节点_查询数据' - } - }) -} // 增加离线合同 -export function addOfflineContract(contractNum, contractName, supplier, person, date, freight, type, one, two, three, four) { +export function addOfflineContract(contractNum, contractName, supplier, person, date, remark) { return request({ url: '', method: 'post', data: { type: '2', name: '采购管理_离线合同_增加数据', - param: `离线合同编号=${contractNum}&离线合同名称=${contractName}&供应商流水号=${supplier}&人员编号=${person}&规定到货时间=${date}&运费=${freight}&付款方式流水号=${type}&第一次付款时间节点流水号=${one}&第二次付款时间节点流水号=${two}&第三次付款时间节点流水号=${three}&第四次付款时间节点流水号=${four}` + param: `离线合同编号=${contractNum}&离线合同名称=${contractName}&供应商流水号=${supplier}&人员编号=${person}&规定到货时间=${date}&离线合同备注=${remark}` } }) } // 编辑离线合同 -export function editOfflineContract(contractNumValue, contractNum, contractName, supplier, person, date, freight, type, one, two, three, four) { +export function editOfflineContract(contractNumValue, contractNum, contractName, supplier, person, date, remark) { return request({ url: '', method: 'post', data: { type: '2', name: '采购管理_离线合同_修改数据', - param: `离线合同流水号=${contractNumValue}&离线合同编号=${contractNum}&离线合同名称=${contractName}&供应商流水号=${supplier}&人员编号=${person}&规定到货时间=${date}&运费=${freight}&付款方式流水号=${type}&第一次付款时间节点流水号=${one}&第二次付款时间节点流水号=${two}&第三次付款时间节点流水号=${three}&第四次付款时间节点流水号=${four}` + param: `离线合同流水号=${contractNumValue}&离线合同编号=${contractNum}&离线合同名称=${contractName}&供应商流水号=${supplier}&人员编号=${person}&规定到货时间=${date}&离线合同备注=${remark}` } }) } @@ -145,26 +123,14 @@ export function deleteMateriel(num) { }) } // 生成离线合同 -export function doneOfflineContact(contractNum, total, text, partGroup, numGroup, priceGroup) { +export function doneOfflineContact(contractNum, total, partGroup, numGroup, priceGroup) { return request({ url: '', method: 'post', data: { type: '2', name: '采购管理_离线合同_生成合同', - param: `离线合同流水号=${contractNum}&合同总额=${total}&合同文本=${text}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}` - } - }) -} -// 查询合同模板 -export function searchContractDemo(num1 = null) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_合同模板_查询数据', - param: '合同模板流水号=' + num1 + param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}` } }) } diff --git a/src/api/PurchasingCenter/ProjectTotalSearch.js b/src/api/PurchasingCenter/ProjectTotalSearch.js index 1e46e7a1..8e4a7c1e 100644 --- a/src/api/PurchasingCenter/ProjectTotalSearch.js +++ b/src/api/PurchasingCenter/ProjectTotalSearch.js @@ -18,7 +18,7 @@ export function searchProjectTotal(num) { method: 'post', data: { type: '1', - name: '采购管理_项目总价_明细_查询数据', + name: '采购管理_项目采购总价_查询数据', param: `项目流水号=${num}` } }) diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js index 350b076a..bdcc0daf 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -1,4 +1,16 @@ import request from '@/utils/request' +// 查询付款计划 +export function searchTable0(check, date1, date2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_付款计划_查询数据', + param: `时间段_check=${check}&开始时间=${date1}&结束时间=${date2}` + } + }) +} // 初始化合同 export function initContract() { return request({ diff --git a/src/api/PurchasingCenter/PurchaseContractSearch.js b/src/api/PurchasingCenter/PurchaseContractSearch.js index fed900b1..336f1362 100644 --- a/src/api/PurchasingCenter/PurchaseContractSearch.js +++ b/src/api/PurchasingCenter/PurchaseContractSearch.js @@ -60,14 +60,3 @@ export function searchTable2(num) { } }) } -export function submitApproval(num, num1, num2) { - return request({ - url: '', - method: 'post', - data: { - type: '2', - name: '采购管理_合同审批_修改数据', - param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2 - } - }) -} diff --git a/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js b/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js index 1030f460..60be8648 100644 --- a/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js +++ b/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js @@ -11,17 +11,6 @@ export function initProject() { } }) } -// 初始化合同号 -export function initContract() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_付款情况_查询数据' - } - }) -} // 发票查询 export function searchInvoice(...params) { return request({ @@ -30,20 +19,7 @@ export function searchInvoice(...params) { data: { type: '1', name: '采购管理_采购发票_查询数据', - param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&采购合同流水号_check=${params[4]}&采购合同流水号=${params[5]}`, - Pagination: params[0] + '&' + params[1] - } - }) -} -// 发票详情查询 -export function searchInvoiceDetail(...params) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_采购发票_查询数据', - param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&采购合同流水号_check=${params[4]}&采购合同流水号=${params[5]}`, + param: `供应商流水号_check=${params[2]}&供应商流水号=${params[3]}&采购合同流水号_check=${params[4]}&采购合同流水号=${params[5]}`, Pagination: params[0] + '&' + params[1] } }) @@ -56,19 +32,19 @@ export function addInvoice(...params) { data: { type: '2', name: '采购管理_采购发票_增加数据', - param: `采购合同流水号=${params[0]}&开票金额=${params[1]}&传送人流水号=${params[2]}` + param: `采购合同流水号=${params[0]}&开票金额=${params[1]}&传送人流水号=${params[2]}&备注=${params[3]}` } }) } // 发票编辑 -export function editInvoice(num1, num2, num3, time1, money, send, receive, remark) { +export function editInvoice(...params) { return request({ url: '', method: 'post', data: { type: '2', - name: '采购管理_发票_修改数据', - param: '发票流水号=' + num1 + '&采购合同流水号=' + num2 + '&发票号=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark + name: '采购管理_采购发票_修改数据', + param: `发票交接流水号=${params[0]}&发票号=${params[1]}&开户行=${params[2]}&开票时间=${params[3]}&接收人流水号=${params[4]}` } }) } @@ -79,8 +55,8 @@ export function deleteInvoice(num1) { method: 'post', data: { type: '2', - name: '采购管理_发票_删除数据', - param: '发票流水号=' + num1 + name: '采购管理_采购发票_删除数据', + param: '发票交接流水号=' + num1 } }) } @@ -96,3 +72,50 @@ export function initSender() { } }) } +// 初始化供应商 +export function initSupplier() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_供应商_查询数据_根据条件' + } + }) +} +// 根据供应商查合同 +export function searchContract(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购合同_查询数据_根据供应商', + param: `供应商流水号=${num}` + } + }) +} +// 根据供应商查合同 +export function searchOffline(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_离线合同_查询数据_根据供应商', + param: `供应商流水号=${num}` + } + }) +} +// 根据供应商查合同 +export function invoiceDetail(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购发票明细_查询数据', + param: `发票交接流水号=${num}` + } + }) +} diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js index 22b17376..431c9047 100644 --- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js +++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js @@ -54,7 +54,7 @@ export function searchTable1(...params) { data: { type: '1', name: '采购管理_采购部采购_查询物料', - param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&分配状态=${params[10]}`, + param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&物料状态=${params[10]}`, Pagination: params[0] + '&' + params[1] } }) @@ -67,7 +67,7 @@ export function searchTable2(...params) { data: { type: '1', name: '采购管理_采购部采购_查询物料_基本件', - param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&分配状态=${params[4]}`, + param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&物料状态=${params[4]}`, Pagination: params[0] + '&' + params[1] } }) diff --git a/src/api/PurchasingCenter/SetPayPlan.js b/src/api/PurchasingCenter/SetPayPlan.js new file mode 100644 index 00000000..9b57baee --- /dev/null +++ b/src/api/PurchasingCenter/SetPayPlan.js @@ -0,0 +1,74 @@ +import request from '@/utils/request' + +// 初始化合同 +export function initContract() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购请款表_查询数据' + } + }) +} +// 查询表1 +export function searchTable1(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购请款表_查询数据', + param: '采购合同流水号_check=' + params[2] + '&采购合同流水号=' + params[3] + '&供应商名称_check=' + params[4] + '&供应商名称=' + params[5], + Pagination: params[0] + '&' + params[1] + } + }) +} +// 查询表01付款计划 +export function searchTable01(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_付款计划_查询数据', + param: '采购合同流水号_check=1&采购合同流水号=' + params[0] + } + }) +} +// 增加表01付款计划 +export function addTable01(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_付款计划_增加数据', + param: `采购合同流水号=${params[0]}&计划付款日期=${params[1]}&计划付款金额=${params[2]}&计划付款备注=${params[3]}` + } + }) +} +// 删除表01付款计划 +export function deleteTable01(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_付款计划_删除数据', + param: `付款计划流水号=${params[0]}` + } + }) +} +// 采购合同内容查询 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购合同内容_查询数据', + param: '采购合同流水号=' + num + } + }) +} diff --git a/src/components/Calendar/calendar.js b/src/components/Calendar/calendar.js new file mode 100644 index 00000000..3f736c3a --- /dev/null +++ b/src/components/Calendar/calendar.js @@ -0,0 +1,526 @@ +/** +* @1900-2100区间内的公历、农历互转 +* @charset UTF-8 +* @Author Jea杨(JJonline@JJonline.Cn) +* @Time 2014-7-21 +* @Time 2016-8-13 Fixed 2033hex、Attribution Annals +* @Time 2016-9-25 Fixed lunar LeapMonth Param Bug +* @Version 1.0.2 +* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0] +* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0] +*/ +/* eslint-disable */ +var calendar = { + + /** + * 农历1900-2100的润大小信息表 + * @Array Of Property + * @return Hex + */ + lunarInfo:[0x04bd8,0x04ae0,0x0a570,0x054d5,0x0d260,0x0d950,0x16554,0x056a0,0x09ad0,0x055d2,//1900-1909 + 0x04ae0,0x0a5b6,0x0a4d0,0x0d250,0x1d255,0x0b540,0x0d6a0,0x0ada2,0x095b0,0x14977,//1910-1919 + 0x04970,0x0a4b0,0x0b4b5,0x06a50,0x06d40,0x1ab54,0x02b60,0x09570,0x052f2,0x04970,//1920-1929 + 0x06566,0x0d4a0,0x0ea50,0x06e95,0x05ad0,0x02b60,0x186e3,0x092e0,0x1c8d7,0x0c950,//1930-1939 + 0x0d4a0,0x1d8a6,0x0b550,0x056a0,0x1a5b4,0x025d0,0x092d0,0x0d2b2,0x0a950,0x0b557,//1940-1949 + 0x06ca0,0x0b550,0x15355,0x04da0,0x0a5b0,0x14573,0x052b0,0x0a9a8,0x0e950,0x06aa0,//1950-1959 + 0x0aea6,0x0ab50,0x04b60,0x0aae4,0x0a570,0x05260,0x0f263,0x0d950,0x05b57,0x056a0,//1960-1969 + 0x096d0,0x04dd5,0x04ad0,0x0a4d0,0x0d4d4,0x0d250,0x0d558,0x0b540,0x0b6a0,0x195a6,//1970-1979 + 0x095b0,0x049b0,0x0a974,0x0a4b0,0x0b27a,0x06a50,0x06d40,0x0af46,0x0ab60,0x09570,//1980-1989 + 0x04af5,0x04970,0x064b0,0x074a3,0x0ea50,0x06b58,0x055c0,0x0ab60,0x096d5,0x092e0,//1990-1999 + 0x0c960,0x0d954,0x0d4a0,0x0da50,0x07552,0x056a0,0x0abb7,0x025d0,0x092d0,0x0cab5,//2000-2009 + 0x0a950,0x0b4a0,0x0baa4,0x0ad50,0x055d9,0x04ba0,0x0a5b0,0x15176,0x052b0,0x0a930,//2010-2019 + 0x07954,0x06aa0,0x0ad50,0x05b52,0x04b60,0x0a6e6,0x0a4e0,0x0d260,0x0ea65,0x0d530,//2020-2029 + 0x05aa0,0x076a3,0x096d0,0x04afb,0x04ad0,0x0a4d0,0x1d0b6,0x0d250,0x0d520,0x0dd45,//2030-2039 + 0x0b5a0,0x056d0,0x055b2,0x049b0,0x0a577,0x0a4b0,0x0aa50,0x1b255,0x06d20,0x0ada0,//2040-2049 + /**Add By JJonline@JJonline.Cn**/ + 0x14b63,0x09370,0x049f8,0x04970,0x064b0,0x168a6,0x0ea50, 0x06b20,0x1a6c4,0x0aae0,//2050-2059 + 0x0a2e0,0x0d2e3,0x0c960,0x0d557,0x0d4a0,0x0da50,0x05d55,0x056a0,0x0a6d0,0x055d4,//2060-2069 + 0x052d0,0x0a9b8,0x0a950,0x0b4a0,0x0b6a6,0x0ad50,0x055a0,0x0aba4,0x0a5b0,0x052b0,//2070-2079 + 0x0b273,0x06930,0x07337,0x06aa0,0x0ad50,0x14b55,0x04b60,0x0a570,0x054e4,0x0d160,//2080-2089 + 0x0e968,0x0d520,0x0daa0,0x16aa6,0x056d0,0x04ae0,0x0a9d4,0x0a2d0,0x0d150,0x0f252,//2090-2099 + 0x0d520],//2100 + + /** + * 公历每个月份的天数普通表 + * @Array Of Property + * @return Number + */ + solarMonth:[31,28,31,30,31,30,31,31,30,31,30,31], + + /** + * 天干地支之天干速查表 + * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"] + * @return Cn string + */ + Gan:["\u7532","\u4e59","\u4e19","\u4e01","\u620a","\u5df1","\u5e9a","\u8f9b","\u58ec","\u7678"], + + /** + * 天干地支之地支速查表 + * @Array Of Property + * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"] + * @return Cn string + */ + Zhi:["\u5b50","\u4e11","\u5bc5","\u536f","\u8fb0","\u5df3","\u5348","\u672a","\u7533","\u9149","\u620c","\u4ea5"], + + /** + * 天干地支之地支速查表<=>生肖 + * @Array Of Property + * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"] + * @return Cn string + */ + Animals:["\u9f20","\u725b","\u864e","\u5154","\u9f99","\u86c7","\u9a6c","\u7f8a","\u7334","\u9e21","\u72d7","\u732a"], + + /** + * 24节气速查表 + * @Array Of Property + * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"] + * @return Cn string + */ + solarTerm:["\u5c0f\u5bd2","\u5927\u5bd2","\u7acb\u6625","\u96e8\u6c34","\u60ca\u86f0","\u6625\u5206","\u6e05\u660e","\u8c37\u96e8","\u7acb\u590f","\u5c0f\u6ee1","\u8292\u79cd","\u590f\u81f3","\u5c0f\u6691","\u5927\u6691","\u7acb\u79cb","\u5904\u6691","\u767d\u9732","\u79cb\u5206","\u5bd2\u9732","\u971c\u964d","\u7acb\u51ac","\u5c0f\u96ea","\u5927\u96ea","\u51ac\u81f3"], + + /** + * 1900-2100各年的24节气日期速查表 + * @Array Of Property + * @return 0x string For splice + */ + sTermInfo:['9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf97c3598082c95f8c965cc920f', + '97bd0b06bdb0722c965ce1cfcc920f','b027097bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e', + '97bcf97c359801ec95f8c965cc920f','97bd0b06bdb0722c965ce1cfcc920f','b027097bd097c36b0b6fc9274c91aa', + '97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f','97bd0b06bdb0722c965ce1cfcc920f', + 'b027097bd097c36b0b6fc9274c91aa','9778397bd19801ec9210c965cc920e','97b6b97bd19801ec95f8c965cc920f', + '97bd09801d98082c95f8e1cfcc920f','97bd097bd097c36b0b6fc9210c8dc2','9778397bd197c36c9210c9274c91aa', + '97b6b97bd19801ec95f8c965cc920e','97bd09801d98082c95f8e1cfcc920f','97bd097bd097c36b0b6fc9210c8dc2', + '9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec95f8c965cc920e','97bcf97c3598082c95f8e1cfcc920f', + '97bd097bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec9210c965cc920e', + '97bcf97c3598082c95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b97bd19801ec9210c965cc920e','97bcf97c3598082c95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722', + '9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f', + '97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e', + '97bcf97c359801ec95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f','97bd097bd07f595b0b6fc920fb0722', + '9778397bd097c36b0b6fc9210c8dc2','9778397bd19801ec9210c9274c920e','97b6b97bd19801ec95f8c965cc920f', + '97bd07f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c920e', + '97b6b97bd19801ec95f8c965cc920f','97bd07f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2', + '9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec9210c965cc920e','97bd07f1487f595b0b0bc920fb0722', + '7f0e397bd097c36b0b6fc9210c8dc2','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e', + '97bcf7f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b97bd19801ec9210c965cc920e','97bcf7f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722', + '9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf7f1487f531b0b0bb0b6fb0722', + '7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e', + '97bcf7f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b97bd19801ec9210c9274c920e','97bcf7f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722', + '9778397bd097c36b0b6fc9210c91aa','97b6b97bd197c36c9210c9274c920e','97bcf7f0e47f531b0b0bb0b6fb0722', + '7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c920e', + '97b6b7f0e47f531b0723b0b6fb0722','7f0e37f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2', + '9778397bd097c36b0b70c9274c91aa','97b6b7f0e47f531b0723b0b6fb0721','7f0e37f1487f595b0b0bb0b6fb0722', + '7f0e397bd097c35b0b6fc9210c8dc2','9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721', + '7f0e27f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722', + '9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722', + '7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721', + '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9274c91aa', + '97b6b7f0e47f531b0723b0787b0721','7f0e27f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722', + '9778397bd097c36b0b6fc9210c91aa','97b6b7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722', + '7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9210c8dc2','977837f0e37f149b0723b0787b0721', + '7f07e7f0e47f531b0723b0b6fb0722','7f0e37f5307f595b0b0bc920fb0722','7f0e397bd097c35b0b6fc9210c8dc2', + '977837f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0721','7f0e37f1487f595b0b0bb0b6fb0722', + '7f0e397bd097c35b0b6fc9210c8dc2','977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721', + '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','977837f0e37f14998082b0787b06bd', + '7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722', + '977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722', + '7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721', + '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14998082b0787b06bd', + '7f07e7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722', + '977837f0e37f14998082b0723b06bd','7f07e7f0e37f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722', + '7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b0721', + '7f07e7f0e47f531b0723b0b6fb0722','7f0e37f1487f595b0b0bb0b6fb0722','7f0e37f0e37f14898082b0723b02d5', + '7ec967f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0722','7f0e37f1487f531b0b0bb0b6fb0722', + '7f0e37f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721', + '7f0e37f1487f531b0b0bb0b6fb0722','7f0e37f0e37f14898082b072297c35','7ec967f0e37f14998082b0787b06bd', + '7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e37f0e37f14898082b072297c35', + '7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722', + '7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f149b0723b0787b0721', + '7f0e27f1487f531b0b0bb0b6fb0722','7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14998082b0723b06bd', + '7f07e7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722','7f0e37f0e366aa89801eb072297c35', + '7ec967f0e37f14998082b0723b06bd','7f07e7f0e37f14998083b0787b0721','7f0e27f0e47f531b0723b0b6fb0722', + '7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14898082b0723b02d5','7f07e7f0e37f14998082b0787b0721', + '7f07e7f0e47f531b0723b0b6fb0722','7f0e36665b66aa89801e9808297c35','665f67f0e37f14898082b0723b02d5', + '7ec967f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0722','7f0e36665b66a449801e9808297c35', + '665f67f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721', + '7f0e36665b66a449801e9808297c35','665f67f0e37f14898082b072297c35','7ec967f0e37f14998082b0787b06bd', + '7f07e7f0e47f531b0723b0b6fb0721','7f0e26665b66a449801e9808297c35','665f67f0e37f1489801eb072297c35', + '7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722'], + + /** + * 数字转中文速查表 + * @Array Of Property + * @trans ['日','一','二','三','四','五','六','七','八','九','十'] + * @return Cn string + */ + nStr1:["\u65e5","\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341"], + + /** + * 日期转农历称呼速查表 + * @Array Of Property + * @trans ['初','十','廿','卅'] + * @return Cn string + */ + nStr2:["\u521d","\u5341","\u5eff","\u5345"], + + /** + * 月份转农历称呼速查表 + * @Array Of Property + * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊'] + * @return Cn string + */ + nStr3:["\u6b63","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341","\u51ac","\u814a"], + + /** + * 返回农历y年一整年的总天数 + * @param lunar Year + * @return Number + * @eg:var count = calendar.lYearDays(1987) ;//count=387 + */ + lYearDays:function(y) { + var i, sum = 348; + for(i=0x8000; i>0x8; i>>=1) { sum += (calendar.lunarInfo[y-1900] & i)? 1: 0; } + return(sum+calendar.leapDays(y)); + }, + + /** + * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0 + * @param lunar Year + * @return Number (0-12) + * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6 + */ + leapMonth:function(y) { //闰字编码 \u95f0 + return(calendar.lunarInfo[y-1900] & 0xf); + }, + + /** + * 返回农历y年闰月的天数 若该年没有闰月则返回0 + * @param lunar Year + * @return Number (0、29、30) + * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29 + */ + leapDays:function(y) { + if(calendar.leapMonth(y)) { + return((calendar.lunarInfo[y-1900] & 0x10000)? 30: 29); + } + return(0); + }, + + /** + * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法 + * @param lunar Year + * @return Number (-1、29、30) + * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29 + */ + monthDays:function(y,m) { + if(m>12 || m<1) {return -1}//月份参数从1至12，参数错误返回-1 + return( (calendar.lunarInfo[y-1900] & (0x10000>>m))? 30: 29 ); + }, + + /** + * 返回公历(!)y年m月的天数 + * @param solar Year + * @return Number (-1、28、29、30、31) + * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30 + */ + solarDays:function(y,m) { + if(m>12 || m<1) {return -1} //若参数错误 返回-1 + var ms = m-1; + if(ms==1) { //2月份的闰平规律测算后确认返回28或29 + return(((y%4 == 0) && (y%100 != 0) || (y%400 == 0))? 29: 28); + }else { + return(calendar.solarMonth[ms]); + } + }, + + /** + * 农历年份转换为干支纪年 + * @param lYear 农历年的年份数 + * @return Cn string + */ + toGanZhiYear:function(lYear) { + var ganKey = (lYear - 3) % 10; + var zhiKey = (lYear - 3) % 12; + if(ganKey == 0) ganKey = 10;//如果余数为0则为最后一个天干 + if(zhiKey == 0) zhiKey = 12;//如果余数为0则为最后一个地支 + return calendar.Gan[ganKey-1] + calendar.Zhi[zhiKey-1]; + + }, + + /** + * 公历月、日判断所属星座 + * @param cMonth [description] + * @param cDay [description] + * @return Cn string + */ + toAstro:function(cMonth,cDay) { + var s = "\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf"; + var arr = [20,19,21,21,21,22,23,23,23,23,22,22]; + return s.substr(cMonth*2 - (cDay < arr[cMonth-1] ? 2 : 0),2) + "\u5ea7";//座 + }, + + /** + * 传入offset偏移量返回干支 + * @param offset 相对甲子的偏移量 + * @return Cn string + */ + toGanZhi:function(offset) { + return calendar.Gan[offset%10] + calendar.Zhi[offset%12]; + }, + + /** + * 传入公历(!)y年获得该年第n个节气的公历日期 + * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起 + * @return day Number + * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春 + */ + getTerm:function(y,n) { + if(y<1900 || y>2100) {return -1;} + if(n<1 || n>24) {return -1;} + var _table = calendar.sTermInfo[y-1900]; + var _info = [ + parseInt('0x'+_table.substr(0,5)).toString() , + parseInt('0x'+_table.substr(5,5)).toString(), + parseInt('0x'+_table.substr(10,5)).toString(), + parseInt('0x'+_table.substr(15,5)).toString(), + parseInt('0x'+_table.substr(20,5)).toString(), + parseInt('0x'+_table.substr(25,5)).toString() + ]; + var _calday = [ + _info[0].substr(0,1), + _info[0].substr(1,2), + _info[0].substr(3,1), + _info[0].substr(4,2), + + _info[1].substr(0,1), + _info[1].substr(1,2), + _info[1].substr(3,1), + _info[1].substr(4,2), + + _info[2].substr(0,1), + _info[2].substr(1,2), + _info[2].substr(3,1), + _info[2].substr(4,2), + + _info[3].substr(0,1), + _info[3].substr(1,2), + _info[3].substr(3,1), + _info[3].substr(4,2), + + _info[4].substr(0,1), + _info[4].substr(1,2), + _info[4].substr(3,1), + _info[4].substr(4,2), + + _info[5].substr(0,1), + _info[5].substr(1,2), + _info[5].substr(3,1), + _info[5].substr(4,2), + ]; + return parseInt(_calday[n-1]); + }, + + /** + * 传入农历数字月份返回汉语通俗表示法 + * @param lunar month + * @return Cn string + * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月' + */ + toChinaMonth:function(m) { // 月 => \u6708 + if(m>12 || m<1) {return -1} //若参数错误 返回-1 + var s = calendar.nStr3[m-1]; + s+= "\u6708";//加上月字 + return s; + }, + + /** + * 传入农历日期数字返回汉字表示法 + * @param lunar day + * @return Cn string + * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一' + */ + toChinaDay:function(d){ //日 => \u65e5 + var s; + switch (d) { + case 10: + s = '\u521d\u5341'; break; + case 20: + s = '\u4e8c\u5341'; break; + break; + case 30: + s = '\u4e09\u5341'; break; + break; + default : + s = calendar.nStr2[Math.floor(d/10)]; + s += calendar.nStr1[d%10]; + } + return(s); + }, + + /** + * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春” + * @param y year + * @return Cn string + * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔' + */ + getAnimal: function(y) { + return calendar.Animals[(y - 4) % 12] + }, + + /** + * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON + * @param y solar year + * @param m solar month + * @param d solar day + * @return JSON object + * @eg:console.log(calendar.solar2lunar(1987,11,01)); + */ + solar2lunar:function (y,m,d) { //参数区间1900.1.31~2100.12.31 + if(y<1900 || y>2100) {return -1;}//年份限定、上限 + if(y==1900&&m==1&&d<31) {return -1;}//下限 + if(!y) { //未传参 获得当天 + var objDate = new Date(); + }else { + var objDate = new Date(y,parseInt(m)-1,d) + } + var i, leap=0, temp=0; + //修正ymd参数 + var y = objDate.getFullYear(),m = objDate.getMonth()+1,d = objDate.getDate(); + var offset = (Date.UTC(objDate.getFullYear(),objDate.getMonth(),objDate.getDate()) - Date.UTC(1900,0,31))/86400000; + for(i=1900; i<2101 && offset>0; i++) { temp=calendar.lYearDays(i); offset-=temp; } + if(offset<0) { offset+=temp; i--; } + + //是否今天 + var isTodayObj = new Date(),isToday=false; + if(isTodayObj.getFullYear()==y && isTodayObj.getMonth()+1==m && isTodayObj.getDate()==d) { + isToday = true; + } + //星期几 + var nWeek = objDate.getDay(),cWeek = calendar.nStr1[nWeek]; + if(nWeek==0) {nWeek =7;}//数字表示周几顺应天朝周一开始的惯例 + //农历年 + var year = i; + + var leap = calendar.leapMonth(i); //闰哪个月 + var isLeap = false; + + //效验闰月 + for(i=1; i<13 && offset>0; i++) { + //闰月 + if(leap>0 && i==(leap+1) && isLeap==false){ + --i; + isLeap = true; temp = calendar.leapDays(year); //计算农历闰月天数 + } + else{ + temp = calendar.monthDays(year, i);//计算农历普通月天数 + } + //解除闰月 + if(isLeap==true && i==(leap+1)) { isLeap = false; } + offset -= temp; + } + + if(offset==0 && leap>0 && i==leap+1) + if(isLeap){ + isLeap = false; + }else{ + isLeap = true; --i; + } + if(offset<0){ offset += temp; --i; } + //农历月 + var month = i; + //农历日 + var day = offset + 1; + + //天干地支处理 + var sm = m-1; + var gzY = calendar.toGanZhiYear(year); + + //月柱 1900年1月小寒以前为 丙子月(60进制12) + var firstNode = calendar.getTerm(year,(m*2-1));//返回当月「节」为几日开始 + var secondNode = calendar.getTerm(year,(m*2));//返回当月「节」为几日开始 + + //依据12节气修正干支月 + var gzM = calendar.toGanZhi((y-1900)*12+m+11); + if(d>=firstNode) { + gzM = calendar.toGanZhi((y-1900)*12+m+12); + } + + //传入的日期的节气与否 + var isTerm = false; + var Term = null; + if(firstNode==d) { + isTerm = true; + Term = calendar.solarTerm[m*2-2]; + } + if(secondNode==d) { + isTerm = true; + Term = calendar.solarTerm[m*2-1]; + } + //日柱 当月一日与 1900/1/1 相差天数 + var dayCyclical = Date.UTC(y,sm,1,0,0,0,0)/86400000+25567+10; + var gzD = calendar.toGanZhi(dayCyclical+d-1); + //该日期所属的星座 + var astro = calendar.toAstro(m,d); + + return {'lYear':year,'lMonth':month,'lDay':day,'Animal':calendar.getAnimal(year),'IMonthCn':(isLeap?"\u95f0":'')+calendar.toChinaMonth(month),'IDayCn':calendar.toChinaDay(day),'cYear':y,'cMonth':m,'cDay':d,'gzYear':gzY,'gzMonth':gzM,'gzDay':gzD,'isToday':isToday,'isLeap':isLeap,'nWeek':nWeek,'ncWeek':"\u661f\u671f"+cWeek,'isTerm':isTerm,'Term':Term,'astro':astro}; + }, + + /** + * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON + * @param y lunar year + * @param m lunar month + * @param d lunar day + * @param isLeapMonth lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可] + * @return JSON object + * @eg:console.log(calendar.lunar2solar(1987,9,10)); + */ + lunar2solar:function(y,m,d,isLeapMonth) { //参数区间1900.1.31~2100.12.1 + var isLeapMonth = !!isLeapMonth; + var leapOffset = 0; + var leapMonth = calendar.leapMonth(y); + var leapDay = calendar.leapDays(y); + if(isLeapMonth&&(leapMonth!=m)) {return -1;}//传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同 + if(y==2100&&m==12&&d>1 || y==1900&&m==1&&d<31) {return -1;}//超出了最大极限值 + var day = calendar.monthDays(y,m); + var _day = day; + //bugFix 2016-9-25 + //if month is leap, _day use leapDays method + if(isLeapMonth) { + _day = calendar.leapDays(y,m); + } + if(y < 1900 || y > 2100 || d > _day) {return -1;}//参数合法性效验 + + //计算农历的时间差 + var offset = 0; + for(var i=1900;i0) { + offset+=calendar.leapDays(y);isAdd = true; + } + } + offset+=calendar.monthDays(y,i); + } + //转换闰月农历 需补充该年闰月的前一个月的时差 + if(isLeapMonth) {offset+=day;} + //1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点) + var stmap = Date.UTC(1900,1,30,0,0,0); + var calObj = new Date((offset+d-31)*86400000+stmap); + var cY = calObj.getUTCFullYear(); + var cM = calObj.getUTCMonth()+1; + var cD = calObj.getUTCDate(); + + return calendar.solar2lunar(cY,cM,cD); + } +}; + +export default calendar +/* eslint-disable */ diff --git a/src/components/Calendar/calendar.vue b/src/components/Calendar/calendar.vue new file mode 100644 index 00000000..b0976ff2 --- /dev/null +++ b/src/components/Calendar/calendar.vue @@ -0,0 +1,837 @@ + + + + + diff --git a/src/icons/svg/FactoryCalendar.svg b/src/icons/svg/FactoryCalendar.svg new file mode 100644 index 00000000..9980dd3f --- /dev/null +++ b/src/icons/svg/FactoryCalendar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PartsReplacement.svg b/src/icons/svg/PartsReplacement.svg new file mode 100644 index 00000000..20046d83 --- /dev/null +++ b/src/icons/svg/PartsReplacement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PerformanceBond.svg b/src/icons/svg/PerformanceBond.svg new file mode 100644 index 00000000..57462e9f --- /dev/null +++ b/src/icons/svg/PerformanceBond.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/PurchaseBudgetSearch.svg b/src/icons/svg/SetPayPlan.svg similarity index 100% rename from src/icons/svg/PurchaseBudgetSearch.svg rename to src/icons/svg/SetPayPlan.svg diff --git a/src/icons/svg/ShiftManagement.svg b/src/icons/svg/ShiftManagement.svg new file mode 100644 index 00000000..26a18fe0 --- /dev/null +++ b/src/icons/svg/ShiftManagement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/utils/curd.js b/src/utils/curd.js index 77d5b535..664ddb7e 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -230,7 +230,7 @@ export default { if (response.data[0].result === '1') { this.$message.success('删除成功') callback.call(this) // 回调函数修正this指向组件本身 - } else { this.$message.error('删除失败') } + } else { this.$message.error('数据占用') } }) }).catch(() => { this.$message({ diff --git a/src/utils/request.js b/src/utils/request.js index 9f774934..6db16b7c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -8,6 +8,7 @@ export const name = `OP8888` // 创建axios实例 export const upload = `http://localhost:8411/submit/uploadFile.ashx` +export const uploadInvoiceScan = `http://localhost:8411/submit/uploadInvoiceScan.ashx` export const download = `http://localhost:8411/submit/downloadFile.ashx` const service = axios.create({ diff --git a/src/views/BasicData/FactoryCalendar/index.vue b/src/views/BasicData/FactoryCalendar/index.vue new file mode 100644 index 00000000..95fd58c7 --- /dev/null +++ b/src/views/BasicData/FactoryCalendar/index.vue @@ -0,0 +1,257 @@ + + + + + diff --git a/src/views/BasicData/ShiftManagement/index.vue b/src/views/BasicData/ShiftManagement/index.vue new file mode 100644 index 00000000..4c6f53d8 --- /dev/null +++ b/src/views/BasicData/ShiftManagement/index.vue @@ -0,0 +1,474 @@ + + + + + diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index eaf9f20e..5eb3c4ce 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -40,6 +40,7 @@ @@ -68,7 +69,7 @@ {{ scope.row.零件名称 }} - + @@ -78,9 +79,13 @@ {{ scope.row.零件类型名称 }} - - + + + + diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index d0fa55ee..3d29e001 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -86,7 +86,7 @@ ～ - + diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue new file mode 100644 index 00000000..2321edd2 --- /dev/null +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 8a863728..1d2c2221 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -605,6 +605,7 @@ export default { }, created() { this.fetchData() + this.searchData() }, methods: { fetchData() { @@ -617,7 +618,6 @@ export default { searchData() { this.loading = true search(this.pageCurrent, this.pageSize, this.PrNum).then(response => { - console.log(response.data) this.tableData = response.data.rows this.total = response.data.total this.loading = false diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue index 9ad2f106..a6ed0441 100644 --- a/src/views/MarketingCenter/BidBond/index.vue +++ b/src/views/MarketingCenter/BidBond/index.vue @@ -32,7 +32,7 @@ size="small" type="date" placeholder="请选择结束日期"/> - 查询 + 查询 增加 diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index a8b20576..b3758cbc 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -11,7 +11,7 @@ 销售经理： - 查询 + 查询 新增 查看收款信息 @@ -61,6 +61,11 @@ {{ scope.row.项目名称 }} + + + @@ -243,12 +248,15 @@ title="收款计划" width="200" trigger="hover"> -
+

{{ scope.row.执行进度名 }} 未完成

-
+

{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天

+
+

{{ scope.row.执行进度名 }}阶段收款已完成

+
进度未完 已完成 未开始 @@ -279,7 +287,7 @@ :current-page="PageCurrent2" :page-sizes="[10, 20, 30, 40]" :page-size="10" - :total="total2" + :total="PageSize2" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange2" @current-change="handleCurrentChange2"/> @@ -1091,7 +1099,7 @@ export default { }) this.$message.success('删除成功') } else { - this.$message.error('删除失败') + this.$message.error('数据占用') } }) }) @@ -1146,7 +1154,7 @@ export default { this.$message.success('删除成功') this.tableData2 = [] } else { - this.$message.error('删除失败') + this.$message.error('数据占用') } }) }) diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index ef657846..43515ddb 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -27,7 +27,7 @@ size="small" type="date" placeholder="请选择结束日期"/> - 查询 + 查询 增加 @@ -148,7 +148,7 @@ {{ scope.row.电话 }} - + @@ -186,7 +186,7 @@
-

合同进度

+

项目进度

已完成进度： @@ -507,7 +507,7 @@ - 查询 + 查询 @@ -286,7 +286,7 @@ - 查询 + 查询 + + + - - - - + - + @@ -163,7 +163,7 @@ export default { this.searchTable1() }, searchTable2() { - initApprovalOffline(this.pageCurrent2, this.pageSize2, 3).then(response => { + initApprovalOffline(this.pageCurrent2, this.pageSize2, 2).then(response => { console.log(response.data.rows) this.tableData2 = response.data.rows this.total2 = response.data.total @@ -227,7 +227,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - execApprovalOffline(row.离线合同请款流水号, 1, '通过', this.id, 3).then(response => { + execApprovalOffline(row.离线合同请款流水号, 1, '通过', this.id, 2).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') this.searchTable2() @@ -245,7 +245,7 @@ export default { confirmButtonText: '确定', cancelButtonText: '取消' }).then(({ value }) => { - execApprovalOffline(row.离线合同请款流水号, 2, value, this.id, 3).then(response => { + execApprovalOffline(row.离线合同请款流水号, 2, value, this.id, 2).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') this.searchTable2() diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 676eb163..466c47fd 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -1,148 +1,148 @@ + + + +