From bccc982ab69f6ac7be7a485b52d3a9d10f21a0c5 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 17 Dec 2018 19:46:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=88=9D=E6=AC=A1=E6=8A=95=E4=BA=A7?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ManufacturingCenter/InitialProduction/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index c8c94e65..3d29e001 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -86,7 +86,7 @@ ～ - + From 3363e1bbc3f9f8fb4c814a53a5adcc09704c2588 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Mon, 17 Dec 2018 20:16:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeliveryManagement/index.vue | 3 +- .../MarketingCenter/PerformanceBond/index.vue | 33 ++++++++++--------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue index 92e810fa..67b0a632 100644 --- a/src/views/MarketingCenter/DeliveryManagement/index.vue +++ b/src/views/MarketingCenter/DeliveryManagement/index.vue @@ -105,7 +105,8 @@ :before-upload="beforeUpload" :on-success="onSuccess" :action="'http://localhost:8411/submit/upload2.ashx?InvoiceNum='+ invoiceNum" - list-type="picture-card"> + list-type="picture-card" + limit="4"> diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue index 7735b5c0..50299734 100644 --- a/src/views/MarketingCenter/PerformanceBond/index.vue +++ b/src/views/MarketingCenter/PerformanceBond/index.vue @@ -198,21 +198,24 @@ - 删除 -
- - - - - - +
+ 删除 +
+ + + + + + +
From aad83ce3ac59503616d94bbc7914437921bf444e Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Mon, 17 Dec 2018 20:19:03 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/MarketingCenter/DeliveryManagement/index.vue | 3 +-- src/views/MarketingCenter/PerformanceBond/index.vue | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue index 67b0a632..92e810fa 100644 --- a/src/views/MarketingCenter/DeliveryManagement/index.vue +++ b/src/views/MarketingCenter/DeliveryManagement/index.vue @@ -105,8 +105,7 @@ :before-upload="beforeUpload" :on-success="onSuccess" :action="'http://localhost:8411/submit/upload2.ashx?InvoiceNum='+ invoiceNum" - list-type="picture-card" - limit="4"> + list-type="picture-card"> diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue index 50299734..5c3eddfc 100644 --- a/src/views/MarketingCenter/PerformanceBond/index.vue +++ b/src/views/MarketingCenter/PerformanceBond/index.vue @@ -208,8 +208,7 @@ :before-upload="beforeUpload" :on-success="onSuccess" :action="'http://localhost:8411/submit/upload3.ashx?ProjectId='+ projectId" - list-type="picture-card" - limit="1"> + list-type="picture-card"> From c5435fa539e58f40ea607240b2967dd4623330e0 Mon Sep 17 00:00:00 2001 From: lixin Date: Mon, 17 Dec 2018 20:28:25 +0800 Subject: [PATCH 4/6] lx --- src/api/Inventory/PartsReplacement.js | 21 +++- .../Inventory/PartsReplacement/index.vue | 115 ++++++++++++++---- 2 files changed, 105 insertions(+), 31 deletions(-) diff --git a/src/api/Inventory/PartsReplacement.js b/src/api/Inventory/PartsReplacement.js index 11c7aea3..adb6bf3b 100644 --- a/src/api/Inventory/PartsReplacement.js +++ b/src/api/Inventory/PartsReplacement.js @@ -10,6 +10,17 @@ export function initProject() { } }) } +// 查询仓库 +export function initWarehouse() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_货位仓库_仓库_查询数据' + } + }) +} // 机床查询 export function searchmachine(check, num) { return request({ @@ -75,14 +86,14 @@ export function searchReplacementCard(pageCurrent, pageSize, card_check, card) { }) } // 补投增加 -export function addReplacementCard(Number) { +export function addReplacementCard(Number, house) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_补投单_补投单增加', - param: '人员编号=' + Number + param: '人员编号=' + Number + '&仓库流水号=' + house } }) } @@ -99,14 +110,14 @@ export function deleteReplacementCard(Number) { }) } // 补投增加 -export function addCardDetail(Number, project, machine, team, mun, reason) { +export function addCardDetail(Number, project, machine, team, name, mass, locate, parttype, reason) { return request({ url: '', method: 'post', data: { type: '2', - name: '库存管理_仓库补投_补投单明细增加', - param: '补投单流水号=' + Number + '&项目流水号=' + project + '&机床流水号=' + machine + '&组件流水号=' + team + '&补投数量=' + mun + '&原因=' + reason + name: '库存管理_零件补投_批量增加补投单明细', + param: '补投单流水号=' + Number + '&项目流水号组=' + project + '&机床流水号组=' + machine + '&组件流水号组=' + team + '&名称组=' + name + '&数量组=' + mass + '&货位流水号组=' + locate + '&零件类型组=' + parttype + '&原因组=' + reason } }) } diff --git a/src/views/Inventory/PartsReplacement/index.vue b/src/views/Inventory/PartsReplacement/index.vue index 818f4ff3..9b06c74c 100644 --- a/src/views/Inventory/PartsReplacement/index.vue +++ b/src/views/Inventory/PartsReplacement/index.vue @@ -1,6 +1,14 @@ + + + + + +
+ + - + - + - + - + + + + @@ -131,9 +153,19 @@ {{ scope.row.异常原因 }} - + + + + + + + @@ -202,9 +234,15 @@ {{ scope.row.补投时间 }} + + + @@ -218,7 +256,6 @@ layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange3" @current-change="handleCurrentChange3"/> - 传递
@@ -257,7 +294,7 @@ + + + diff --git a/src/views/WorkshopProcurement/PayStateSearch/index.vue b/src/views/WorkshopProcurement/PayStateSearch/index.vue index c5369aba..1cc8fffa 100644 --- a/src/views/WorkshopProcurement/PayStateSearch/index.vue +++ b/src/views/WorkshopProcurement/PayStateSearch/index.vue @@ -74,7 +74,7 @@ diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue index 6003c704..b0068019 100644 --- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue @@ -34,17 +34,17 @@ height="300px" highlight-current-row @row-click="searchTable2"> - + - + - + @@ -54,22 +54,22 @@ {{ scope.row.供应商名称 }} - + - + - + - + diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue index 7030453e..8bb276d3 100644 --- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue @@ -43,17 +43,17 @@ height="300px" highlight-current-row @row-click="searchTable2"> - + - + - + @@ -63,33 +63,34 @@ {{ scope.row.供应商名称 }} - + - + - + - + - + - + @@ -110,131 +111,133 @@
- - - - - - - - - - - - - - - - - -
GAOJING产品销售合同
需方江苏高精机电装备有限公司合同编号{{ contract }}
供方{{ supplier }}签订地点江苏盐城
-
根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。
-
一、 产品名称、规格型号、材质、数量、单价和交货期：
- - - - - - - - - - - - - -
零件名称零件图号材料交货期备注数量单价总价
-
- - - - - - - - - - - - - - +
+
物料名称物料规格物料型号交货期备注数量单价总价
- - + + - - + + + + - -
总价: (人民币){{ RMB }}(未税) {{ TotalAmount }}GAOJING产品销售合同
总价: (人民币){{ RMB1 }}(含{{ taxRate }}增值税) {{ TotalAmount1 }}需方江苏高精机电装备有限公司合同编号{{ contract }}
-
以上价格为含税增值税价格，供方开具真实有效的16%增值税发票
-
- - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
供 方需 方
供方{{ supplier }}签订地点江苏盐城
单位名称（章） - 单位名称（章）江苏高精
法定代表人 - 法定代表人 -
委托代理人 - 委托代理人 -
电话 - 电话 -
传真 - 传真 -
开户银行 - 开户银行 -
账号 - 账号 -
税号 - 税号 -
邮政编码 - 邮政编码 -
-
签订时间：____年__月__日
-
有效期限：____年__月__日至____年__月__日
+ +
根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。
+
一、 产品名称、规格型号、材质、数量、单价和交货期：
+ + + + + + + + + + + + + +
零件名称零件图号材料交货期备注数量单价总价
+
+ + + + + + + + + + + + + + + + + + + + + + + +
物料名称物料规格物料型号交货期备注数量单价总价
总价: (人民币){{ RMB }}(未税) {{ TotalAmount }}
总价: (人民币){{ RMB1 }}(含{{ taxRate }}增值税) {{ TotalAmount1 }}
+
以上价格为含税增值税价格，供方开具真实有效的16%增值税发票
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
供 方需 方
单位名称（章） + 单位名称（章）江苏高精
法定代表人 + 法定代表人 +
委托代理人 + 委托代理人 +
电话 + 电话 +
传真 + 传真 +
开户银行 + 开户银行 +
账号 + 账号 +
税号 + 税号 +
邮政编码 + 邮政编码 +
+
签订时间：____年__月__日
+
有效期限：____年__月__日至____年__月__日
+
@@ -279,6 +282,7 @@