diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js new file mode 100644 index 00000000..56b61613 --- /dev/null +++ b/src/api/ManufacturingCenter/CreatePreparationBill.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +// 查询零件 +export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_编制工艺_备料零件查询', + param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询零件工艺 +export function searchtable2(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_备料打印_查询工序信息', + param: '工艺计划流水号=' + num1 + } + }) +} +// 更改打印状态 +export function edit(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_备料单导出_状态更改', + param: '工艺计划流水号=' + num1 + } + }) +} 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/PurchaseInvoiceDelivery.js b/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js index 1030f460..9dd4b537 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({ @@ -61,14 +48,14 @@ export function addInvoice(...params) { }) } // 发票编辑 -export function editInvoice(num1, num2, num3, time1, money, send, receive, remark) { +export function editInvoice(...params) { return request({ url: '', method: 'post', data: { type: '2', - name: '采购管理_发票_修改数据', - param: '发票流水号=' + num1 + '&采购合同流水号=' + num2 + '&发票号=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark + name: '采购管理_采购发票_修改数据', + param: `发票交接流水号=${params[0]}&发票号=${params[1]}&开户行=${params[2]}&开票时间=${params[3]}&接收人流水号=${params[4]}` } }) } @@ -79,8 +66,8 @@ export function deleteInvoice(num1) { method: 'post', data: { type: '2', - name: '采购管理_发票_删除数据', - param: '发票流水号=' + num1 + name: '采购管理_采购发票_删除数据', + param: '发票交接流水号=' + num1 } }) } diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js index 22b17376..431c9047 100644 --- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js +++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js @@ -54,7 +54,7 @@ export function searchTable1(...params) { data: { type: '1', name: '采购管理_采购部采购_查询物料', - param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&分配状态=${params[10]}`, + param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&物料状态=${params[10]}`, Pagination: params[0] + '&' + params[1] } }) @@ -67,7 +67,7 @@ export function searchTable2(...params) { data: { type: '1', name: '采购管理_采购部采购_查询物料_基本件', - param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&分配状态=${params[4]}`, + param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&物料状态=${params[4]}`, Pagination: params[0] + '&' + params[1] } }) 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/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue new file mode 100644 index 00000000..73e8f9ce --- /dev/null +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index a8b20576..c71abd89 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -233,7 +233,7 @@ diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index ef657846..a7cf28db 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -186,7 +186,7 @@
-

合同进度

+

项目进度

已完成进度: 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 { 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 @@ +
GAOJING