diff --git a/src/api/ManufacturingCenter/ContractApprovalQuery.js b/src/api/ManufacturingCenter/ContractApprovalQuery.js
new file mode 100644
index 00000000..eeceb5e8
--- /dev/null
+++ b/src/api/ManufacturingCenter/ContractApprovalQuery.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import state from '@/store'
+import router from '@/router'
+
+// 初始化采购员
+export function initBuyer() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '人事档案管理_人员与角色_查询数据_采购员'
+ }
+ })
+}
+// 采购合同查询
+export function searchTable1(check1, supplier, check2, start, end, check3, name, pageCurrent, pageSize) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '采购管理_合同审核查询_查询数据',
+ param: '供应商名称_check=' + check1 + '&供应商名称=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end + '&人员编号_check=' + check3 + '&人员编号=' + name,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
+// 采购合同明细查询
+export function searchTable2(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '采购管理_采购合同内容_查询数据',
+ param: '采购合同流水号=' + num
+ }
+ })
+}
diff --git a/src/api/ManufacturingCenter/RequestApprovalQuery.js b/src/api/ManufacturingCenter/RequestApprovalQuery.js
new file mode 100644
index 00000000..d54ec3f2
--- /dev/null
+++ b/src/api/ManufacturingCenter/RequestApprovalQuery.js
@@ -0,0 +1,118 @@
+import request from '@/utils/request'
+import state from '@/store'
+import router from '@/router'
+
+// 查询审核/审批/付款
+export function initApproval(pageCurrent, pageSize, haha) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '采购管理_采购合同_审批付款_查询数据',
+ param: `审批_付款状态=${haha}`,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
+// 执行审核/审批/付款
+export function execApproval(num1, num2, reason, person, haha) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '2',
+ name: '采购管理_采购合同_审批付款_修改数据',
+ param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}`
+ }
+ })
+}
+// 查询离线合同审核/审批/付款
+export function initApprovalOffline(pageCurrent, pageSize, haha) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '采购管理_离线合同_审批付款_查询数据',
+ param: `审批_付款状态=${haha}`,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
+// 查询离线合同请款信息明细
+export function searchRequsetFundDetail1(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '采购管理_采购合同_请款明细_查询数据',
+ param: `采购合同请款流水号=${num}`
+ }
+ })
+}
+// 查询离线合同请款信息明细
+export function searchRequsetFundDetail2(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '采购管理_离线合同_请款明细_查询数据',
+ param: `离线合同请款流水号=${num}`
+ }
+ })
+}
+// 执行审核/审批/付款(离线合同)
+export function execApprovalOffline(num1, num2, reason, person, haha) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '2',
+ name: '采购管理_离线合同_审批付款_修改数据',
+ param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}`
+ }
+ })
+}
+// 采购合同内容查询
+export function searchContactDetail(check, num1, num2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '采购管理_采购合同内容_查询数据_合并后',
+ param: `check=${check}&采购合同流水号=${num1}&离线合同流水号=${num2}`
+ }
+ })
+}
+// 查询离线合同明细
+export function searchMateriel(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '采购管理_离线合同明细_查询数据',
+ param: `离线合同流水号=${num}`
+ }
+ })
+}
diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
new file mode 100644
index 00000000..f4805aea
--- /dev/null
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+
+ 提交时间:
+
+ 查询
+
+
+
+
+
+ {{ scope.row.采购合同编号 }}
+
+
+
+
+ {{ scope.row.供应商名称 }}
+
+
+
+
+ {{ scope.row.姓名 }}
+
+
+
+
+ {{ scope.row.合同总额 }}
+
+
+
+
+ {{ scope.row.预付款 }}
+
+
+
+
+ {{ scope.row.规定到货时间 }}
+
+
+
+
+ {{ scope.row.提交时间 }}
+
+
+
+
+ {{ scope.row.审核时间 }}
+
+
+
+
+ {{ scope.row.审核人 }}
+
+
+
+
+ {{ scope.row.审核结果 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
new file mode 100644
index 00000000..a6422de2
--- /dev/null
+++ b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
@@ -0,0 +1,318 @@
+
+
+
+
+
+
+
+ {{ scope.row.供应商名称 }}
+
+
+
+
+ {{ scope.row.请款时间 }}
+
+
+
+
+ {{ scope.row.姓名 }}
+
+
+
+
+ {{ scope.row.请款金额 }}
+
+
+
+
+ 通过
+ 不通过
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
+
+
+
+
+ {{ parseFloat(scope.row.到货金额).toFixed(2) }}
+
+
+
+
+ {{ parseFloat(scope.row.已付金额).toFixed(2) }}
+
+
+
+
+ {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+
+
+
+
+
+
+
+
+ {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
+
+
+
+
+ {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
+
+
+
+
+ {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
+
+
+
+
+ {{ scope.row.数量 }}
+
+
+
+
+ {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
+
+
+
+
+ {{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
+
+
+
+
+ {{ parseFloat(scope.row.单价||0).toFixed(2) }}
+
+
+
+
+ {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
+
+
+
+
+ {{ scope.row.备注 }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue
index 03721baa..8dec3bbd 100644
--- a/src/views/PurchasingCenter/FundApproval1/index.vue
+++ b/src/views/PurchasingCenter/FundApproval1/index.vue
@@ -246,6 +246,9 @@ export default {
// this.searchTable2()
},
searchTable1() {
+ this.tableData1 = []
+ this.gridData1 = []
+ this.contractDetail2 = []
initApproval(this.pageCurrent1, this.pageSize1, 0).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue
index a5deb020..85e55bff 100644
--- a/src/views/PurchasingCenter/FundApproval2/index.vue
+++ b/src/views/PurchasingCenter/FundApproval2/index.vue
@@ -287,6 +287,9 @@ export default {
this.searchTable2()
},
searchTable1() {
+ this.tableData1 = []
+ this.gridData1 = []
+ this.contractDetail2 = []
initApproval(this.pageCurrent1, this.pageSize1, 1).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total