From 34f5cb9ca155b6448b125b30f955aee395b807a2 Mon Sep 17 00:00:00 2001 From: liushuai Date: Tue, 23 Apr 2019 14:47:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcurementContractApproval.js | 14 +- .../ProcurementContractEnquiry.js | 2 +- .../PartAssignment/index.vue | 1 - .../ProjectPlanningQuery/index.vue | 47 ++++-- .../ProcurementContractApproval/index.vue | 129 ++++++--------- .../ProcurementContractEnquiry/index.vue | 156 +++++++++--------- 6 files changed, 171 insertions(+), 178 deletions(-) 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 @@

总计划

- + - + - + - + - + - + - + - + + + + - + + + + - + + + + - + + + + + + +
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 @@
电话
传真 传真
开户银行 开户银行
账号 账号
税号 税号
邮政编码 邮政编码