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; + }