From 43e7a6ffb36b0e4273b77f537931688c9db30790 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Mon, 4 Mar 2019 19:00:34 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 26 +- .../InvoiceSettlementApplication.js | 111 +++ .../InvoiceSettlementApprove.js | 0 .../svg/InvoiceSettlementApplication.svg | 1 + .../InvoiceSettlementApplication/index.vue | 743 ++++++++++++++++++ .../InvoiceSettlementApprove/index.vue | 67 ++ 6 files changed, 923 insertions(+), 25 deletions(-) create mode 100644 src/api/PurchasingCenter/InvoiceSettlementApplication.js create mode 100644 src/api/PurchasingCenter/InvoiceSettlementApprove.js create mode 100644 src/icons/svg/InvoiceSettlementApplication.svg create mode 100644 src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue create mode 100644 src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue diff --git a/index.html b/index.html index c727e55c..32210826 100644 --- a/index.html +++ b/index.html @@ -8,31 +8,7 @@
- + diff --git a/src/api/PurchasingCenter/InvoiceSettlementApplication.js b/src/api/PurchasingCenter/InvoiceSettlementApplication.js new file mode 100644 index 00000000..97df2770 --- /dev/null +++ b/src/api/PurchasingCenter/InvoiceSettlementApplication.js @@ -0,0 +1,111 @@ +import request from '@/utils/request' + +// 根据条件查发票结算申请单 +export function searchTable1(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_查询数据', + param: `发票号_check=${group[0]}&发票号=${group[1]}`, + Pagination: group[2] + '&' + group[3] + } + }) +} +// 编辑发票结算申请单 +export function submitEdit(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_修改数据', + param: `发票号=${group[0]}&发票金额=${group[1]}&已付款项=${group[2]}&尚欠金额=${group[3]}&税额=${group[4]}&是否费用类=${group[5]}&备注=${group[6]}&发票结算申请单流水号=${group[7]}` + } + }) +} +// 删除发票结算申请单 +export function submitDelete(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_删除数据', + param: `发票结算申请单流水号=${group[0]}` + } + }) +} +// 提交申请 发票结算申请单 +export function submitApply(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_发票结算申请单_提交申请', + param: `发票结算申请单流水号=${group[0]}&申请人=${group[1]}` + } + }) +} +// 发票结算申请单明细列表 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单明细_查询数据', + param: `发票结算申请单流水号=${num}` + } + }) +} +// 入库单查询 +export function searchInboundCard(data1, data2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_采购入库单_入库单查询', + param: '入库单号_check=' + data1 + '&入库单号=' + data2 + } + }) +} +// 入库单明细查询 +export function searchInboundCardDetail(data1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_采购入库单_入库单明细_查询数据', + param: '采购入库单流水号=' + data1 + } + }) +} +// 发票结算申请单明细增加 +export function addTable2(data, group) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_发票结算申请单明细_增加数据', + param: '发票结算申请单流水号=' + data + '&采购入库单流水号组=' + group + } + }) +} +// 发票结算申请单明细删除 +export function deleteTable2(group) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_发票结算申请单明细_删除数据', + param: '发票结算申请单明细流水号组=' + group + } + }) +} diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/api/PurchasingCenter/InvoiceSettlementApprove.js new file mode 100644 index 00000000..e69de29b diff --git a/src/icons/svg/InvoiceSettlementApplication.svg b/src/icons/svg/InvoiceSettlementApplication.svg new file mode 100644 index 00000000..6640f8dc --- /dev/null +++ b/src/icons/svg/InvoiceSettlementApplication.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue new file mode 100644 index 00000000..be937a36 --- /dev/null +++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue @@ -0,0 +1,743 @@ + + + + + diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue new file mode 100644 index 00000000..d0ae0558 --- /dev/null +++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue @@ -0,0 +1,67 @@ + + + + + From 70ec28997f89f28ea548e26048ea197ea1a152af Mon Sep 17 00:00:00 2001 From: chenjianan Date: Tue, 5 Mar 2019 10:22:15 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoiceSettlementApprove.js | 51 +++ src/icons/svg/InvoiceSettlementApprove.svg | 1 + src/utils/request.js | 6 +- .../InvoiceSettlementApplication/index.vue | 51 +-- .../InvoiceSettlementApprove/index.vue | 318 +++++++++++++++++- 5 files changed, 392 insertions(+), 35 deletions(-) create mode 100644 src/icons/svg/InvoiceSettlementApprove.svg diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/api/PurchasingCenter/InvoiceSettlementApprove.js index e69de29b..6c8898e1 100644 --- a/src/api/PurchasingCenter/InvoiceSettlementApprove.js +++ b/src/api/PurchasingCenter/InvoiceSettlementApprove.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +// 根据条件查发票结算申请单 +export function searchTable1(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_查询数据', + param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1`, + Pagination: group[3] + '&' + group[4] + } + }) +} +// 发票结算申请单明细列表 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单明细_查询数据', + param: `发票结算申请单流水号=${num}` + } + }) +} +// 入库单明细查询 +export function searchInboundCardDetail(data1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_采购入库单_入库单明细_查询数据', + param: '采购入库单流水号=' + data1 + } + }) +} +// 执行审批 +export function excuteApprove(...data) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_执行审批', + param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}` + } + }) +} diff --git a/src/icons/svg/InvoiceSettlementApprove.svg b/src/icons/svg/InvoiceSettlementApprove.svg new file mode 100644 index 00000000..300ca023 --- /dev/null +++ b/src/icons/svg/InvoiceSettlementApprove.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index f4f36407..2a00e14c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,19 +7,19 @@ export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket` export const name = `OP8888` // 创建axios实例 -export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice +export const readFile = `http://localhost:8411/webpage/file/` // invoice export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond -export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice +export const uploadInvoiceScan = `http://localhost:8411/submit/uploadInvoiceScan.ashx` // invoice export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间git diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue index be937a36..a1ef01ed 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue @@ -64,42 +64,42 @@ @@ -705,18 +705,29 @@ export default { if (this.group2.length === 0) { this.$message.warning('请选择入库单') } else { - const group = [] - for (let i = 0; i < this.group2.length; i++) { - group.push(this.group2[i].发票结算申请单明细流水号组) - } - deleteTable2(group).then(response => { - if (response.data[0].result === '1') { - this.$message.success('移除成功') - this.dialogVisible2 = false - searchTable2(this.applyOrderNum).then(response => { - this.tableData2 = response.data - }) - } else { this.$message.error('移除失败') } + this.$confirm('此操作将移除入库单, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + const group = [] + for (let i = 0; i < this.group2.length; i++) { + group.push(this.group2[i].发票结算申请单明细流水号组) + } + deleteTable2(group).then(response => { + if (response.data[0].result === '1') { + this.$message.success('移除成功') + this.dialogVisible2 = false + searchTable2(this.applyOrderNum).then(response => { + this.tableData2 = response.data + }) + } else { this.$message.error('移除失败') } + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消操作' + }) }) } } diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue index d0ae0558..1bf094f6 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue @@ -2,38 +2,261 @@
申请时间: -  ~ - +  ~ + 查询 + - 登录角色：采购部负责人，生产部负责人，财务部负责人，总经理。 - 表1 - 发票结算申请单：点击查看发票附件信息 及表2，点击审批通过/不通过（原因），审批时间。 - 表2 - 采购入库单列表：点击查询表3 - 表3 - 采购入库单明细表 +

发票结算申请单

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +

采购入库单

+ 发票号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

采购入库单明细

+ + + + + + + + + + + + + + + + + + + + + + +
@@ -64,4 +355,7 @@ export default { span{ margin: 10px 0 10px 10px; } + #expandTable .el-form-item{ + margin: 0; + } From d30253b6d9c95172c4a5caeef2b24a7d155a3a1c Mon Sep 17 00:00:00 2001 From: chenjianan Date: Tue, 5 Mar 2019 16:10:02 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/PurchasingCenter/OfflineContract.js | 16 +++- .../OfflineContract/index.vue | 92 +++++++++++++++---- 2 files changed, 87 insertions(+), 21 deletions(-) diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index 2088e18d..2995bcc8 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -122,15 +122,27 @@ export function deleteMateriel(num) { } }) } +// 保存离线合同 +export function saveOfflineContact(contractNum, total, partGroup, numGroup, priceGroup, dateGroup, remarkGroup) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_离线合同_保存合同', + param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}&交货期要求组=${dateGroup}&备注组=${remarkGroup}` + } + }) +} // 生成离线合同 -export function doneOfflineContact(contractNum, total, partGroup, numGroup, priceGroup) { +export function doneOfflineContact(contractNum, total, partGroup, numGroup, priceGroup, dateGroup, remarkGroup) { return request({ url: '', method: 'post', data: { type: '2', name: '采购管理_离线合同_生成合同', - param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}` + param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}&交货期要求组=${dateGroup}&备注组=${remarkGroup}` } }) } diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 14632376..9803aece 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -129,7 +129,7 @@ style="margin-left: 10px" @click="addMateriel">选入物料 - + - + @@ -194,9 +194,10 @@ layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange2" @current-change="handleCurrentChange2"/> - 生成离线合同 + 生成 + 保存 - + + + + + + +