diff --git a/src/api/Inventory/MaterialReturn.js b/src/api/Inventory/MaterialReturn.js
index fbe7b148..9008b7b4 100644
--- a/src/api/Inventory/MaterialReturn.js
+++ b/src/api/Inventory/MaterialReturn.js
@@ -31,6 +31,19 @@ export function searchGroup(num) {
}
})
}
+export function initLocateName() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ // name: 'PDM_项目名称_查询数据'
+ name: '库存管理_货位主文件_查询数据_查询全部'
+ }
+ })
+}
// 查询记录
export function searchRecord(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, check7, time1, time2, pageCurrent, pageSize) {
return request({
@@ -46,3 +59,17 @@ export function searchRecord(check1, project, check2, machine, check3, group, ch
}
})
}
+export function submitMaterialReturn(materialNumber, basicNumber, number, name, id) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '2',
+ // name: 'PDM_组件名称_查询数据',
+ name: '采购管理_物料退货_增加数据',
+ param: '物料流水号=' + materialNumber + '&组件零件基本件流水号=' + basicNumber + '&数量=' + number + '&货位流水号=' + name + '&入库人员流水号=' + id
+ }
+ })
+}
diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js b/src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js
index 5bd24d55..afd80d5e 100644
--- a/src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js
+++ b/src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js
@@ -45,3 +45,17 @@ export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize
}
})
}
+// 查询项目详情
+export function searchtabletotal(projectNum, machineValue) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '项目工时统计_合同详情查询_工时综合查询_合计',
+ param: `项目流水号=${projectNum}&机床流水号=${machineValue}`
+ }
+ })
+}
diff --git a/src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js b/src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js
index b66afd92..56a3733c 100644
--- a/src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js
+++ b/src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js
@@ -16,3 +16,16 @@ export function searchTable(num, time, time1, order, orderName, check, name, che
}
})
}
+export function searchtabletotal(num, time, time1, order, orderName, check, name, check1, partNumber) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '工艺月底工时核算_查询数据_最新_合计',
+ param: '筛选=' + num + '&开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName + '&操作工_check=' + check + '&操作工=' + name + '&零件图号_check=' + check1 + '&零件图号=' + partNumber
+ }
+ })
+}
diff --git a/src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js b/src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js
new file mode 100644
index 00000000..e725386c
--- /dev/null
+++ b/src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js
@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+import state from '@/store'
+import router from '@/router'
+
+// 根据条件查发票结算申请单
+export function searchTable1(...group) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '采购管理_发票结算申请单_查询数据',
+ param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}&供应商_check=${group[6]}&供应商流水号=${group[7]}`,
+ Pagination: group[3] + '&' + group[4]
+ }
+ })
+}
+// 发票结算申请单明细列表
+export function searchTable2(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '采购管理_发票结算申请单明细_查询数据',
+ param: `发票结算申请单流水号=${num}`
+ }
+ })
+}
+// 执行审批
+export function excuteApprove(...data) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '2',
+ name: '采购管理_发票结算申请单_执行审批',
+ param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}&审批流水号=${data[3]}&未通过原因=${data[4]}`
+ }
+ })
+}
+// 查询供应商
+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: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ 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
+ }
+ })
+}
diff --git a/src/views/Inventory/MaterialReturn/index.vue b/src/views/Inventory/MaterialReturn/index.vue
index ef1cb628..6c694c71 100644
--- a/src/views/Inventory/MaterialReturn/index.vue
+++ b/src/views/Inventory/MaterialReturn/index.vue
@@ -1,6 +1,6 @@
-
+
查询
- 导出
-
+
-
+
{{ scope.row.名称 }}
-
+
{{ scope.row.图号或型号 }}
-
+
{{ scope.row.规格 }}
@@ -75,11 +74,31 @@
{{ scope.row.领料人 }}
-
+
{{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
+
+
+ {{ scope.row.出库数量 }}
+
+
+
+
+ {{ scope.row.领料人 }}
+
+
+
+
+ {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
+
+
+
+
+ 退货
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+