diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js
index 537d2474..d7f6fe41 100644
--- a/src/api/WorkshopProcurement/ProcurementContractApproval.js
+++ b/src/api/WorkshopProcurement/ProcurementContractApproval.js
@@ -43,19 +43,7 @@ export function searchTable2(num) {
method: 'post',
data: {
type: '1',
- name: '车间采购管理_采购合同_查询数据_外购件',
- param: '采购合同流水号=' + num
- }
- })
-}
-// 采购合同明细查询
-export function searchTable3(num) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '车间采购管理_采购合同_查询数据_基本件',
+ name: '车间采购管理_采购合同明细_查询数据NEW',
param: '采购合同流水号=' + num
}
})
diff --git a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
index 5548a8bf..9e4bdcfc 100644
--- a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
+++ b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
@@ -43,7 +43,7 @@ export function searchTable2(num) {
method: 'post',
data: {
type: '1',
- name: '车间采购管理_采购合同_查询数据_外购件',
+ name: '车间采购管理_采购合同明细_查询数据NEW',
param: '采购合同流水号=' + num
}
})
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index d9c7f19e..8a1adc39 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -401,7 +401,6 @@
diff --git a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
index b70b2b43..3d4078b4 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
@@ -59,61 +59,86 @@
总计划
-
+
{{ scope.row.项目名称 }}
-
+
{{ scope.row.机床图号 }}
-
+
{{ scope.row.机床名称 }}
-
+
{{ scope.row.客户名称 }}
-
+
{{ scope.row.合同签订日期 }}
-
+
{{ scope.row.发货节点 }}
-
+
{{ scope.row.机床设计完成时间.split(' ')[0] }}
-
+
+
+ {{ scope.row.机床设计实际完成时间 }}
+
+
+
{{ scope.row.采购完成时间.split(' ')[0] }}
-
+
+
+ {{ scope.row.采购实际完成时间 }}
+
+
+
{{ scope.row.备料完成时间.split(' ')[0] }}
-
+
+
+ {{ scope.row.备料实际完成时间 }}
+
+
+
{{ scope.row.机床生产完成时间.split(' ')[0] }}
-
+
+
+ {{ scope.row.机床生产实际完成时间 }}
+
+
+
{{ scope.row.机床装配完成时间.split(' ')[0] }}
+
+
+ {{ scope.row.机床装配实际完成时间 }}
+
+
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index 5cda1918..aeeba313 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -93,68 +93,62 @@
- | GAOJING |
- 产品销售合同 |
+ GAOJING |
+ 产品销售合同 |
+ ![]() |
| 需方 |
- 江苏高精机电装备有限公司 |
+ 江苏高精机电装备有限公司 |
合同编号 |
- {{ contract }} |
+ {{ contract }} |
| 供方 |
- {{ supplier }} |
+ {{ supplier }} |
签订地点 |
- 江苏盐城 |
+ 江苏盐城 |
根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。
一、 产品名称、规格型号、材质、数量、单价和交货期：
-
-
- | 零件名称 |
- 零件图号 |
- 材料 |
- 交货期 |
- 备注 |
- 数量 |
- 单件定额工时 |
- 准结定额工时 |
- 单价 |
- 总价 |
-
-
-
-
-
- | 物料名称 |
- 物料规格 |
- 物料型号 |
+ 图号 |
+ 名称 |
+ 规格 |
交货期 |
备注 |
数量 |
- 单件定额工时 |
- 准结定额工时 |
单价 |
总价 |
+
+
+
+
+
+
+
+
+
+
+
+
- | 总价: (人民币){{ RMB }}(未税) |
+ 总价: (人民币){{ RMB }}(未税) |
{{ TotalAmount }} |
- | 总价: (人民币){{ RMB1 }}(含{{ taxRate }}增值税) |
+ 总价: (人民币){{ RMB1 }}(含{{ taxRate }}增值税) |
{{ TotalAmount1 }} |
- 以上价格为含税增值税价格，供方开具真实有效的16%增值税发票
+ 以上价格为含税增值税价格，供方开具真实有效的{{ taxRate }}增值税发票
@@ -186,31 +180,31 @@
| 电话 |
|
-
+
| 传真 |
|
传真 |
|
-
+
| 开户银行 |
|
开户银行 |
|
-
+
| 账号 |
|
账号 |
|
-
+
| 税号 |
|
税号 |
|
-
+
| 邮政编码 |
|
邮政编码 |
@@ -282,7 +276,8 @@