diff --git a/src/api/PurchasingCenter/PurchaseContractReview.js b/src/api/PurchasingCenter/PurchaseContractReview.js
new file mode 100644
index 00000000..13ec34d1
--- /dev/null
+++ b/src/api/PurchasingCenter/PurchaseContractReview.js
@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+
+// 初始化合同号
+export function initContract() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_合同审核_查询数据'
+ }
+ })
+}
+// 初始化采购员
+export function initBuyer() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '人事档案管理_人员与角色_查询数据_采购员'
+ }
+ })
+}
+// 查询供应商
+export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_供应商_查询数据_根据条件',
+ param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
+ }
+ })
+}
+// 采购合同查询
+export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_合同审核_查询数据',
+ param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
+// 采购合同明细查询
+export function searchTable2(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_采购合同内容_查询数据',
+ param: '采购合同流水号=' + num
+ }
+ })
+}
+// 执行审核
+export function submitApproval(num, num1, num2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购管理_合同审核_采购部_修改数据',
+ param: '采购合同流水号=' + num + '&审核情况流水号=' + num1 + '&未通过审核原因=' + num2
+ }
+ })
+}
diff --git a/src/icons/svg/PurchaseContractReview.svg b/src/icons/svg/PurchaseContractReview.svg
new file mode 100644
index 00000000..53c31d40
--- /dev/null
+++ b/src/icons/svg/PurchaseContractReview.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
new file mode 100644
index 00000000..95d78c96
--- /dev/null
+++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
@@ -0,0 +1,306 @@
+
+
+
+ 合同号:
+
+
+ {{ item.label }}
+ {{ item.name }}
+
+
+ 采购员:
+
+
+
+ 供应商:
+
+ 查询
+
+
+
+
+
+
+
+
+
+ {{ 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/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 4b1ffdd3..04cc3fff 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -99,6 +99,23 @@
+
+
+ 未审核
+ 已通过
+ 未通过
+
+
+
+
+ {{ scope.row.未通过审核原因 ? scope.row.未通过审核原因 : '—' }}
+
+
+
+
+ {{ scope.row.审核时间 ? scope.row.审核时间 : '—' }}
+
+
未审批
@@ -106,9 +123,14 @@
未通过
+
+
+ {{ scope.row.未通过原因 ? scope.row.未通过原因 : '—' }}
+
+
- {{ scope.row.审批时间 }}
+ {{ scope.row.审批时间 ? scope.row.审核时间 : '—' }}
@@ -136,11 +158,6 @@
{{ scope.row.合同总额 }}
-
-
- {{ scope.row.未通过原因 }}
-
-
删除
@@ -322,6 +339,7 @@ export default {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].审批情况内容 === '未审批' ? this.disable.push(false) : this.disable.push(true) // 删除按钮禁用
}
+ console.log(response.data.rows)
this.tableData1 = response.data.rows
this.total1 = response.data.total
this.loading1 = false
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 63da88dd..853ca85e 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -28,10 +28,11 @@
- 未分配
- 未询价
- 已询价
- 已采购
+ 已作废
+ 未分配
+ 未询价
+ 已询价
+ 已采购
@@ -106,10 +107,11 @@
- 未分配
- 未询价
- 已询价
- 已采购
+ 已作废
+ 未分配
+ 未询价
+ 已询价
+ 已采购
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index e863b105..d6645fb5 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -105,10 +105,11 @@
- 未分配
- 未询价
- 已询价
- 已采购
+ 已作废
+ 未分配
+ 未询价
+ 已询价
+ 已采购
@@ -281,10 +282,11 @@
- 未分配
- 未询价
- 已询价
- 已采购
+ 已作废
+ 未分配
+ 未询价
+ 已询价
+ 已采购
@@ -324,7 +326,7 @@
- {{ scope.row.数量 }}
+ {{ scope.row.零件数量 }}