From 6f874098b29d6c6f2108a0a37cc55abb39748996 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Mon, 10 Dec 2018 19:55:41 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=90=88=E5=90=8C:=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreatePurchaseContract.js | 12 + .../CreatePurchaseContract/index.vue | 286 +++++++++++------- 2 files changed, 182 insertions(+), 116 deletions(-) diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js index 56a81486..a65df82b 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -24,3 +24,15 @@ export function searchSheetContract(num1) { } }) } +// 生成采购合同 +export function doneContract(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_采购合同_增加数据', + param: `采购合同编号=${params[0]}&采购合同名称=${params[1]}&交货日期=${params[2]}&支付日期=${params[3]}&支付方式=${params[4]}&开票信息=${params[5]}&其他说明=${params[6]}&合同总额=${params[7]}&采购员=${params[8]}&供应商流水号=${params[9]}&单价是否含税=${params[10]}&组件零件流水号组=${params[11]}&组件零件基本件流水号组=${params[12]}&数量组=${params[13]}&单价组=${params[14]}&交货期组=${params[15]}` + } + }) +} diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index a22d3519..3733f117 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -30,9 +30,9 @@ - + + + + + + + + + + + + + @@ -54,12 +66,7 @@ - - - - - - + @@ -99,26 +106,26 @@ {{ scope.row.数量 }} - + - + @@ -130,11 +137,11 @@ 调整合同 - 生成合同
合同总额： 确定总额 + 生成合同
@@ -152,7 +159,7 @@ + + From 807333efe801d91446d153068759cde871b0ca52 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Tue, 11 Dec 2018 19:45:46 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/MarketingCenter/CRM.js | 8 +- src/api/MarketingCenter/InvoiceRecord.js | 35 ++ src/icons/svg/InvoiceRecord.svg | 7 + src/views/MarketingCenter/CRM/index.vue | 28 +- .../ContractCapitalManagement/index.vue | 26 +- .../MarketingCenter/InvoiceRecord/index.vue | 300 ++++++++++++++++++ 6 files changed, 379 insertions(+), 25 deletions(-) create mode 100644 src/api/MarketingCenter/InvoiceRecord.js create mode 100644 src/icons/svg/InvoiceRecord.svg create mode 100644 src/views/MarketingCenter/InvoiceRecord/index.vue diff --git a/src/api/MarketingCenter/CRM.js b/src/api/MarketingCenter/CRM.js index 54dab127..7b667e45 100644 --- a/src/api/MarketingCenter/CRM.js +++ b/src/api/MarketingCenter/CRM.js @@ -149,14 +149,14 @@ export function editMarketingManager(MarketingManagerId, AdressID) { } }) } -export function addCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark) { +export function addCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, OpeningBank) { return request({ url: '', method: 'post', data: { type: '2', name: '客户关系管理系统_客户_增加数据_MESWORK', - param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&开户行=' + OpeningBank } }) } @@ -171,14 +171,14 @@ export function selectAdressOfID(AdressID) { } }) } -export function editCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, ID) { +export function editCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, ID, OpeningBank) { return request({ url: '', method: 'post', data: { type: '2', name: '客户关系管理系统_客户_修改数据_MESWORK', - param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&客户流水号=' + ID + param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&客户流水号=' + ID + '&开户行=' + OpeningBank } }) } diff --git a/src/api/MarketingCenter/InvoiceRecord.js b/src/api/MarketingCenter/InvoiceRecord.js new file mode 100644 index 00000000..7d661ed6 --- /dev/null +++ b/src/api/MarketingCenter/InvoiceRecord.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '合同信息管理_项目名称_总_查询' + } + }) +} +export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '合同资金管理_开票记录_合同信息统计_查询', + param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date', + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function searchTableData2(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '合同信息管理_开票记录_查询', + param: '项目流水号=' + num1 + '=int' + } + }) +} diff --git a/src/icons/svg/InvoiceRecord.svg b/src/icons/svg/InvoiceRecord.svg new file mode 100644 index 00000000..cd5cb717 --- /dev/null +++ b/src/icons/svg/InvoiceRecord.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue index 9ad99674..bf9fafa8 100644 --- a/src/views/MarketingCenter/CRM/index.vue +++ b/src/views/MarketingCenter/CRM/index.vue @@ -118,7 +118,7 @@ {{ scope.row.电话 }} - + @@ -138,6 +138,11 @@ {{ scope.row.税号 }} + + + + + + + 责权省份 + + + +
+ + + + + + + + +
+
+ 取消 + 确认 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取消 + 确 定 +
+ + + + + 查询 + + + + + + + + + + + + + + + +
+ 取消 + 确 定 +
+ + +