diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/api/PurchasingCenter/FundApproval.js
index 09da01e8..ed809eac 100644
--- a/src/api/PurchasingCenter/FundApproval.js
+++ b/src/api/PurchasingCenter/FundApproval.js
@@ -1,27 +1,27 @@
import request from '@/utils/request'
-// 查询审核/审批/付款
+// 查询审批/付款
export function initApproval(pageCurrent, pageSize, state) {
return request({
url: '',
method: 'post',
data: {
type: '1',
- name: '采购管理_请款表_查询数据_审核审批',
- param: `审核_审批_付款状态=${state}`,
+ name: '采购管理_请款表_查询数据_审批付款',
+ param: `审批_付款状态=${state}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
-// 执行审核/审批/付款
+// 执行审批/付款
export function execApproval(num1, num2, reason, person, state) {
return request({
url: '',
method: 'post',
data: {
type: '2',
- name: '采购管理_请款表_修改数据_审核审批',
- param: `采购科请款流水号=${num1}&审核_审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审核_审批_付款状态=${state}`
+ name: '采购管理_请款表_修改数据_审批付款',
+ param: `采购请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
}
})
}
diff --git a/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js b/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js
new file mode 100644
index 00000000..1030f460
--- /dev/null
+++ b/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js
@@ -0,0 +1,98 @@
+import request from '@/utils/request'
+
+// 初始化项目
+export function initProject() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: 'PDM_项目名称_采购部采购_查询数据'
+ }
+ })
+}
+// 初始化合同号
+export function initContract() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_付款情况_查询数据'
+ }
+ })
+}
+// 发票查询
+export function searchInvoice(...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 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({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购管理_采购发票_增加数据',
+ param: `采购合同流水号=${params[0]}&开票金额=${params[1]}&传送人流水号=${params[2]}`
+ }
+ })
+}
+// 发票编辑
+export function editInvoice(num1, num2, num3, time1, money, send, receive, remark) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购管理_发票_修改数据',
+ param: '发票流水号=' + num1 + '&采购合同流水号=' + num2 + '&发票号=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark
+ }
+ })
+}
+// 发票删除
+export function deleteInvoice(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购管理_发票_删除数据',
+ param: '发票流水号=' + num1
+ }
+ })
+}
+// 传送人初始化 采购科改16
+export function initSender() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+ param: '考核部门编号=16'
+ }
+ })
+}
diff --git a/src/icons/svg/ReceiptConnectionSheet.svg b/src/icons/svg/PurchaseInvoiceDelivery.svg
similarity index 100%
rename from src/icons/svg/ReceiptConnectionSheet.svg
rename to src/icons/svg/PurchaseInvoiceDelivery.svg
diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue
index 4ac8bcb0..18e45acc 100644
--- a/src/views/PurchasingCenter/FundApproval2/index.vue
+++ b/src/views/PurchasingCenter/FundApproval2/index.vue
@@ -2,7 +2,7 @@
-
+
{{ scope.row.采购合同编号 }}
@@ -12,39 +12,19 @@
{{ scope.row.采购合同名称 }}
-
-
- {{ scope.row.规定到货时间.split(' ')[0] }}
-
-
-
+
{{ scope.row.供应商名称 }}
-
+
- {{ scope.row.付款方式内容 }}
+ {{ scope.row.请款人 }}
-
+
- {{ scope.row.姓名 }}
-
-
-
-
- {{ scope.row.总金额 }}
-
-
-
-
- {{ scope.row.欠款金额 }}
-
-
-
-
- {{ scope.row.已付金额 }}
+ {{ scope.row.合同总额 }}
@@ -168,7 +148,8 @@ export default {
this.searchTable2()
},
searchTable1() {
- initApproval(this.pageCurrent1, this.pageSize1, 2).then(response => {
+ initApproval(this.pageCurrent1, this.pageSize1, 1).then(response => {
+ console.log(response.data)
this.tableData1 = response.data.rows
this.total1 = response.data.total
})
@@ -209,7 +190,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- execApproval(row.采购科请款流水号, 1, '通过', this.id, 2).then(response => {
+ execApproval(row.采购请款流水号, 1, '通过', this.id, 1).then(response => {
if (response.data[0].result === '1') {
this.$message.success('执行成功')
this.searchTable1()
@@ -227,7 +208,7 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消'
}).then(({ value }) => {
- execApproval(row.采购科请款流水号, 2, value, this.id, 2).then(response => {
+ execApproval(row.采购请款流水号, 2, value, this.id, 1).then(response => {
if (response.data[0].result === '1') {
this.$message.success('执行成功')
this.searchTable1()
diff --git a/src/views/PurchasingCenter/FundApproval3/index.vue b/src/views/PurchasingCenter/FundApproval3/index.vue
index 5263419a..e309a3cf 100644
--- a/src/views/PurchasingCenter/FundApproval3/index.vue
+++ b/src/views/PurchasingCenter/FundApproval3/index.vue
@@ -2,7 +2,7 @@
-
+
{{ scope.row.采购合同编号 }}
@@ -12,39 +12,19 @@
{{ scope.row.采购合同名称 }}
-
-
- {{ scope.row.规定到货时间.split(' ')[0] }}
-
-
-
+
{{ scope.row.供应商名称 }}
-
+
- {{ scope.row.付款方式内容 }}
+ {{ scope.row.请款人 }}
-
+
- {{ scope.row.姓名 }}
-
-
-
-
- {{ scope.row.总金额 }}
-
-
-
-
- {{ scope.row.欠款金额 }}
-
-
-
-
- {{ scope.row.已付金额 }}
+ {{ scope.row.合同总额 }}
@@ -94,7 +74,7 @@
{{ scope.row.请款金额 }}
-
+
@@ -168,7 +148,7 @@ export default {
this.searchTable2()
},
searchTable1() {
- initApproval(this.pageCurrent1, this.pageSize1, 3).then(response => {
+ initApproval(this.pageCurrent1, this.pageSize1, 2).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
})
@@ -209,7 +189,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- execApproval(row.采购科请款流水号, 1, '通过', this.id, 3).then(response => {
+ execApproval(row.采购请款流水号, 1, '通过', this.id, 2).then(response => {
if (response.data[0].result === '1') {
this.$message.success('执行成功')
// 记录付款金额及时间
@@ -228,7 +208,7 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消'
}).then(({ value }) => {
- execApproval(row.采购科请款流水号, 2, value, this.id, 3).then(response => {
+ execApproval(row.采购请款流水号, 2, value, this.id, 2).then(response => {
if (response.data[0].result === '1') {
this.$message.success('执行成功')
this.searchTable1()
diff --git a/src/views/PurchasingCenter/PayStateSearch/index.vue b/src/views/PurchasingCenter/PayStateSearch/index.vue
index 82342d0a..fe61db07 100644
--- a/src/views/PurchasingCenter/PayStateSearch/index.vue
+++ b/src/views/PurchasingCenter/PayStateSearch/index.vue
@@ -24,57 +24,67 @@
-
+
{{ scope.row.采购合同编号 }}
-
+
{{ scope.row.采购合同名称 }}
-
-
- {{ scope.row.规定到货时间.split(' ')[0] }}
-
-
-
+
{{ scope.row.供应商名称 }}
-
-
- {{ scope.row.付款方式内容 }}
-
-
-
+
{{ scope.row.姓名 }}
-
+
- {{ Number(scope.row.总金额).toFixed(2) }}
+ {{ scope.row.交货日期 }}
-
+
- {{ Number(scope.row.欠款金额).toFixed(2) }}
+ {{ scope.row.支付日期 }}
-
+
- {{ Number(scope.row.总金额 - scope.row.欠款金额).toFixed(2) }}
+ {{ scope.row.支付方式 }}
-
+
+
+ {{ scope.row.其他说明 }}
+
+
+
+
+ {{ scope.row.合同总额 }}
+
+
+
+
+ {{ (Number(scope.row.合同总额)-Number(scope.row.已付金额)).toFixed(2) }}
+
+
+
+
+ {{ Number(scope.row.已付金额).toFixed(2) }}
+
+
+
@@ -124,6 +134,7 @@ export default {
},
created() {
this.fetchData()
+ this.searchTable1()
},
methods: {
fetchData() {
@@ -142,6 +153,7 @@ export default {
this.supplierName ? this.check2 = 1 : this.check2 = 0
searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {
this.tableData1 = response.data.rows
+ console.log(response.data.rows)
this.total1 = response.data.total
})
},
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index e4561580..fed3cf2e 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -153,6 +153,7 @@ export default {
},
created() {
this.fetchData()
+ this.searchTable1()
},
methods: {
fetchData() {
diff --git a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
new file mode 100644
index 00000000..087a7a8e
--- /dev/null
+++ b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
@@ -0,0 +1,441 @@
+
+
+
+ 项目名称:
+
+
+
+ 采购合同号:
+
+
+ {{ item.label }}
+ {{ item.name }}
+
+
+ 查询
+ 增加
+
+
+
+
+
+
+ {{ scope.row.采购合同编号 }}
+
+
+
+
+ {{ scope.row.采购合同名称 }}
+
+
+
+
+ {{ scope.row.供应商名称 }}
+
+
+
+
+ {{ scope.row.项目名称 ? scope.row.项目名称 : '—' }}
+
+
+
+
+ {{ scope.row.开票金额 }}
+
+
+
+
+ {{ scope.row.传送人 }}
+
+
+
+
+ {{ scope.row.传送时间 }}
+
+
+
+
+ 已接收
+ 未接收
+
+
+
+
+ {{ scope.row.接收人 ? scope.row.接收人 : '—' }}
+
+
+
+
+ {{ scope.row.接收时间 ? scope.row.接收时间 : '—' }}
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+ {{ scope.row.发票号 }}
+
+
+
+
+ {{ scope.row.开户行 }}
+
+
+
+
+ {{ scope.row.开票时间 ? scope.row.开票时间 : '—' }}
+
+
+
+
+ {{ scope.row.合同总额 }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+