From b89bc814c5f3940c4f3e62c9401432cd7e87f61c Mon Sep 17 00:00:00 2001 From: chenjianan Date: Thu, 13 Dec 2018 10:01:51 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseInvoiceDelivery.js | 17 +-- .../PurchaseInvoiceDelivery/index.vue | 143 +++++++++++------- 2 files changed, 94 insertions(+), 66 deletions(-) diff --git a/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js b/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js index 1030f460..38ff422d 100644 --- a/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js +++ b/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js @@ -35,19 +35,6 @@ export function searchInvoice(...params) { } }) } -// 发票详情查询 -export function searchInvoiceDetail(...params) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_采购发票_查询数据', - param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&采购合同流水号_check=${params[4]}&采购合同流水号=${params[5]}`, - Pagination: params[0] + '&' + params[1] - } - }) -} // 发票增加（后台调用） export function addInvoice(...params) { return request({ @@ -79,8 +66,8 @@ export function deleteInvoice(num1) { method: 'post', data: { type: '2', - name: '采购管理_发票_删除数据', - param: '发票流水号=' + num1 + name: '采购管理_采购发票_删除数据', + param: '发票交接流水号=' + num1 } }) } diff --git a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue index 087a7a8e..2b3a9d36 100644 --- a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue +++ b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue @@ -27,6 +27,7 @@ style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询 - + + + + + + + + + + + + + diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index d0b30233..0e01cc71 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -329,12 +329,12 @@ 计算价格 确定价格 成交 - 导出外协加工任务单 + 导出外协加工任务单 - +
@@ -717,7 +717,7 @@ export default { } this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费 this.大写金额 = convertCurrency(this.总计) - // cjn end + // RWD end if (response.data.length === 0) { this.loading = false } @@ -1016,7 +1016,7 @@ export default { if (response.data.length === 0) { this.loading = false } - // cjn end + // RWD end if (response.data.length === 0) { this.loading = false } @@ -1140,7 +1140,7 @@ export default { } this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费 this.大写金额 = convertCurrency(this.总计) - // cjn end + // RWD end if (response.data.length === 0) { this.loading = false } @@ -1533,7 +1533,7 @@ export default { this.$message.warning('请选择订单') } }, - downLoadCjn(tableid) { + downLoadRWD(tableid) { if (this.List3.length === 0) { this.$message.warning('暂无数据') } else { From c23decc507c7c32f5677c6e80f59438286967755 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Thu, 13 Dec 2018 19:39:13 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseContractRequestFund.js | 12 + src/api/PurchasingCenter/SetPayPlan.js | 74 +++++ ...urchaseBudgetSearch.svg => SetPayPlan.svg} | 0 .../PurchaseContractRequestFund/index.vue | 129 +++++++- .../PurchasingCenter/SetPayPlan/index.vue | 292 ++++++++++++++++++ 5 files changed, 505 insertions(+), 2 deletions(-) create mode 100644 src/api/PurchasingCenter/SetPayPlan.js rename src/icons/svg/{PurchaseBudgetSearch.svg => SetPayPlan.svg} (100%) create mode 100644 src/views/PurchasingCenter/SetPayPlan/index.vue diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js index 350b076a..bdcc0daf 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -1,4 +1,16 @@ import request from '@/utils/request' +// 查询付款计划 +export function searchTable0(check, date1, date2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_付款计划_查询数据', + param: `时间段_check=${check}&开始时间=${date1}&结束时间=${date2}` + } + }) +} // 初始化合同 export function initContract() { return request({ diff --git a/src/api/PurchasingCenter/SetPayPlan.js b/src/api/PurchasingCenter/SetPayPlan.js new file mode 100644 index 00000000..9b57baee --- /dev/null +++ b/src/api/PurchasingCenter/SetPayPlan.js @@ -0,0 +1,74 @@ +import request from '@/utils/request' + +// 初始化合同 +export function initContract() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购请款表_查询数据' + } + }) +} +// 查询表1 +export function searchTable1(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购请款表_查询数据', + param: '采购合同流水号_check=' + params[2] + '&采购合同流水号=' + params[3] + '&供应商名称_check=' + params[4] + '&供应商名称=' + params[5], + Pagination: params[0] + '&' + params[1] + } + }) +} +// 查询表01付款计划 +export function searchTable01(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_付款计划_查询数据', + param: '采购合同流水号_check=1&采购合同流水号=' + params[0] + } + }) +} +// 增加表01付款计划 +export function addTable01(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_付款计划_增加数据', + param: `采购合同流水号=${params[0]}&计划付款日期=${params[1]}&计划付款金额=${params[2]}&计划付款备注=${params[3]}` + } + }) +} +// 删除表01付款计划 +export function deleteTable01(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_付款计划_删除数据', + param: `付款计划流水号=${params[0]}` + } + }) +} +// 采购合同内容查询 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购合同内容_查询数据', + param: '采购合同流水号=' + num + } + }) +} diff --git a/src/icons/svg/PurchaseBudgetSearch.svg b/src/icons/svg/SetPayPlan.svg similarity index 100% rename from src/icons/svg/PurchaseBudgetSearch.svg rename to src/icons/svg/SetPayPlan.svg diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue index fed3cf2e..600bc1e5 100644 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue @@ -1,5 +1,68 @@ + From 4ae83111816abccf09ef55bf885a9fa8bff1a4ce Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 13 Dec 2018 19:41:31 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=A4=87=E6=96=99=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreatePreparationBill.js | 16 +++++++- .../CreatePreparationBill/index.vue | 38 ++++++++++++------- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js index fe656af7..56b61613 100644 --- a/src/api/ManufacturingCenter/CreatePreparationBill.js +++ b/src/api/ManufacturingCenter/CreatePreparationBill.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询已分配零件 +// 查询零件 export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize) { return request({ url: '', @@ -13,7 +13,19 @@ export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize) { } }) } -// 查询已分配零件 +// 查询零件工艺 +export function searchtable2(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_备料打印_查询工序信息', + param: '工艺计划流水号=' + num1 + } + }) +} +// 更改打印状态 export function edit(num1) { return request({ url: '', diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 4908c868..73e8f9ce 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -6,7 +6,7 @@ 查询 查询全部 - 导出备料单 + 导出备料单 @@ -51,24 +51,24 @@ -
GAOJING
+ - - - + + + - - - + + + - - + + @@ -77,7 +77,7 @@