diff --git a/src/api/Assembly/AssemblyExecution.js b/src/api/Assembly/AssemblyExecution.js new file mode 100644 index 00000000..f7eff3e2 --- /dev/null +++ b/src/api/Assembly/AssemblyExecution.js @@ -0,0 +1,87 @@ +import request from '@/utils/request' +// 初始化机床项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// 组件查询 +export function searchgroup(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} +// 机床查询 +export function searchTable1(machineNumberValue, check2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_机床信息_查询数据', + param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + } + }) +} +// 组件查询 +export function searchTable2(machineNumberValue, check2, groupNumberValue, check3) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_基本件采购_查询数据', + param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + '&组件流水号_check=' + check3 + '&组件流水号=' + groupNumberValue + } + }) +} +// 机床名称_机床状态_修改数据 +export function MachineToolStateUpdate(machineNumberValue, check) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_机床状态_修改数据', + param: '机床流水号=' + machineNumberValue + '&装配状态=' + check + } + }) +} + +// 机床名称_调试状态_修改数据 +export function DebugStatusUpdate(machineNumberValue, check) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_调试状态_修改数据', + param: '机床流水号=' + machineNumberValue + '&调试状态=' + check + } + }) +} + +// 组件名称_组件状态_修改数据 +export function ComponentStateUpdate(machineNumberValue, check) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_组件状态_修改数据', + param: '组件流水号=' + machineNumberValue + '&组件是否完成=' + check + } + }) +} + diff --git a/src/api/Assembly/DeliveryApplication.js b/src/api/Assembly/DeliveryApplication.js new file mode 100644 index 00000000..5d27c1d4 --- /dev/null +++ b/src/api/Assembly/DeliveryApplication.js @@ -0,0 +1,38 @@ +import request from '@/utils/request' + +// 初始化机床项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// PDM_机床名称_发货状态_查询数据 +export function selecttable(check2, machineNumberValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_发货状态_查询数据', + param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + } + }) +} +// PDM_机床名称_发货状态_编辑数据 +export function updatestate(machineNumberValue, state) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_发货状态_编辑数据', + param: '机床流水号=' + machineNumberValue + '&发货状态=' + state + } + }) +} + diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js new file mode 100644 index 00000000..5d27c1d4 --- /dev/null +++ b/src/api/Assembly/QualityInspectionInformationInquiry.js @@ -0,0 +1,38 @@ +import request from '@/utils/request' + +// 初始化机床项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// PDM_机床名称_发货状态_查询数据 +export function selecttable(check2, machineNumberValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_发货状态_查询数据', + param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + } + }) +} +// PDM_机床名称_发货状态_编辑数据 +export function updatestate(machineNumberValue, state) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_发货状态_编辑数据', + param: '机床流水号=' + machineNumberValue + '&发货状态=' + state + } + }) +} + diff --git a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js index 7a4fa413..63742b3b 100644 --- a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js +++ b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js @@ -1,5 +1,17 @@ import request from '@/utils/request' +// 查询零件（包含借用件） +export function getPartnames3(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员机床组号或图号查', + param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2 + } + }) +} // 典艺查询<高精原有数据> export function searchProcess11(num) { return request({ diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue new file mode 100644 index 00000000..75eda729 --- /dev/null +++ b/src/views/Assembly/AssemblyExecution/index.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/views/Assembly/DeliveryApplication/index.vue b/src/views/Assembly/DeliveryApplication/index.vue new file mode 100644 index 00000000..957016d1 --- /dev/null +++ b/src/views/Assembly/DeliveryApplication/index.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue new file mode 100644 index 00000000..f1616531 --- /dev/null +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index cab4d0d6..d0cb1f1c 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -285,6 +285,13 @@ {{ scope.row.机床主管 }} + + +
- + diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue index 03fdcf68..c070b9fc 100644 --- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue +++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue @@ -9,16 +9,24 @@ :label="item.label" :value="item.value"/> - 零件号: + + 机床-分组 或 零件号: + + + :value="item.value"> + {{ item.label }} + -{{ item.group }} +   {{ item.machine }} + 是否核准 在制零件工艺调整 @@ -42,7 +50,7 @@
- + 物料类型: { + for (let i = 0; i < response.data.length; i++) { + this.partNum.push({ + label: response.data[i].零件图号, + value: response.data[i].工艺计划流水号, + machine: response.data[i].机床图号, + group: response.data[i].组号 + }) + } + }) + }, searchParts() { // 根据条件查零件号 this.tableData = [] this.partNum = [] @@ -1457,6 +1486,7 @@ export default { this.spec = '' this.newNum = '' this.searchParts() + this.searchPartsByMachineGroup() this.$message.success('保存成功') }) } diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue index 674bdd5e..e7454513 100644 --- a/src/views/PurchasingCenter/FundApproval2/index.vue +++ b/src/views/PurchasingCenter/FundApproval2/index.vue @@ -118,8 +118,47 @@

采购合同

-
+

离线合同

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +

离线合同

GAOJING合同名称 + 供应商 + +
合同编号 + 采购员 +
序号名称规格型号数量单价合计交货期备注
总计 + + +
+
+