diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js b/src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js
new file mode 100644
index 00000000..5bd24d55
--- /dev/null
+++ b/src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js
@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+import state from '@/store'
+import router from '@/router'
+
+// 初始化 项目名称
+export function initProject() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: 'PDM_项目名称_查询数据_总计划'
+ }
+ })
+}
+
+// 查询机床
+export function initMachine(projectNum) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: 'PDM_机床名称_查询数据2',
+ param: `项目流水号=${projectNum}`
+ }
+ })
+}
+
+// 查询项目详情
+export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '项目工时统计_合同详情查询_工时综合查询',
+ param: `项目流水号=${projectNum}&机床流水号=${machineValue}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
+ }
+ })
+}
diff --git a/src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js b/src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js
new file mode 100644
index 00000000..b66afd92
--- /dev/null
+++ b/src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+import state from '@/store'
+import router from '@/router'
+
+export function searchTable(num, time, time1, order, orderName, check, name, check1, partNumber, pageCurrent, pageSize) {
+ 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,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
index cb1b504a..7a22c634 100644
--- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
@@ -28,7 +28,7 @@
导出
-
+
{{ scope.row.采购合同编号 }}
diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue
index dd860967..5baebf6b 100644
--- a/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue
@@ -28,7 +28,7 @@
导出
-
+
{{ scope.row.采购合同编号 }}
diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue
new file mode 100644
index 00000000..0befc052
--- /dev/null
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue
@@ -0,0 +1,236 @@
+
+
+
+
+
+
+
+
+
+ 查询
+ 导出
+
+
+
+
+
+ {{ scope.row.跟单号 }}
+
+
+
+
+ {{ scope.row.序号 }}
+
+
+
+
+ {{ scope.row.工序名 }}
+
+
+
+
+ {{ scope.row.计划数量 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.加工数量 }}
+
+
+
+
+ {{ scope.row.修补单件工时 }}
+
+
+
+
+ {{ scope.row.修补工时 }}
+
+
+
+
+ {{ scope.row.完成工时 }}
+
+
+
+
+ {{ scope.row.扫码工时 }}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.计划加工日期 }}
+
+
+
+
+ {{ scope.row.加工完成时间 }}
+
+
+
+
+ {{ scope.row.图号及规格 }}
+
+
+
+
+ {{ scope.row.制品名称 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
new file mode 100644
index 00000000..d1beaafd
--- /dev/null
+++ b/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
@@ -0,0 +1,235 @@
+
+
+
+
+
+
+
+ 筛选
+
+ 查询
+ 导出
+
+
+
+
+
+ {{ scope.row.跟单号 }}
+
+
+
+
+ {{ scope.row.完成日期 }}
+
+
+
+
+ {{ scope.row.操作工 }}
+
+
+
+
+ {{ scope.row.零件图号 }}
+
+
+
+
+ {{ scope.row.工序顺序 }}
+
+
+
+
+ {{ scope.row.工艺名称 }}
+
+
+
+
+ {{ scope.row.完成数量 }}
+
+
+
+
+ {{ scope.row.修补单件工时 }}
+
+
+
+
+ {{ scope.row.修补工时 }}
+
+
+
+
+ {{ scope.row.完成工时 }}
+
+
+
+
+ {{ scope.row.备注 }}
+
+
+
+
+ {{ scope.row.扫码工时 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.机床图号 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
index ae7b8823..af61984f 100644
--- a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
@@ -35,7 +35,7 @@
导出
-
+
{{ scope.row.供应商名称 }}
diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
index 67d957cd..20aeb95a 100644
--- a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
+++ b/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
@@ -35,7 +35,7 @@
导出
-
+
{{ scope.row.供应商名称 }}
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index 220a7e4a..7582519c 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -21,7 +21,7 @@
-
+
{{ scope.row.操作工 }}
@@ -60,7 +60,7 @@
-
+
{{ scope.row.零件图号 }}
@@ -91,16 +91,16 @@
{{ scope.row.修补单件工时 }}
-
-
- {{ scope.row.完成工时 }}
-
-
{{ scope.row.修补工时 }}
+
+
+ {{ Number(scope.row.完成工时) + Number(scope.row.修补工时) }}
+
+
{{ scope.row.扫码工时 }}
@@ -111,6 +111,16 @@
{{ scope.row.完成日期 }}
+
+
+ {{ scope.row.修改人员 }}
+
+
+
+
+ {{ scope.row.修改时间 ? scope.row.修改时间.split(' ')[0] : '-' }}
+
+
编辑
@@ -150,7 +160,7 @@
-
+
@@ -171,6 +181,7 @@