diff --git a/src/api/purchaseorder/purchaseRequisition.js b/src/api/purchaseorder/purchaseRequisition.js
index 0b354d8..287cd3c 100644
--- a/src/api/purchaseorder/purchaseRequisition.js
+++ b/src/api/purchaseorder/purchaseRequisition.js
@@ -16,7 +16,7 @@ export const savePRDetail = data => createAPI(`PRHeader/savePRDetail`,'POST',dat
export const getExportList = data => createAPI(`PRHeader/getExportList`,'POST',data)
//获取审批记录信息
-export const authorizationHistList = data => createAPI(`PRHeader/getAuthorizationHistList`,'POST',data)
+export const authorizationHistList = data => createAPI(`PRHeader/getReviewSteps`,'POST',data)
//获取审批记录信息
export const updatePRHeaderAuthorizeFlag = data => createAPI(`PRHeader/updatePRHeaderAuthorizeFlag`,'POST',data)
diff --git a/src/views/modules/purchaseorder/procurementReview.vue b/src/views/modules/purchaseorder/procurementReview.vue
index 21c1fe1..594c131 100644
--- a/src/views/modules/purchaseorder/procurementReview.vue
+++ b/src/views/modules/purchaseorder/procurementReview.vue
@@ -96,7 +96,7 @@
width="100"
:label="buttons.operating">
- {{buttons.audit}}
+ {{buttons.audit}}
{{buttons.audit}}
@@ -105,7 +105,7 @@
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
- :page-sizes="[10, 50, 200, 500]"
+ :page-sizes="[100, 200, 500]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
@@ -130,11 +130,11 @@
-
+
- 不同意
- 同意
+ 不同意
+ 同意
@@ -241,6 +241,7 @@
authorizeFlag: 'N',
site: this.$store.state.user.site,
userId: this.$store.state.user.name,
+ strUserId: this.$store.state.user.id,
limit: '',
page: '',
},
@@ -615,7 +616,7 @@
},
// 分页
pageIndex: 1,
- pageSize: 10,
+ pageSize: 100,
totalPage: 0,
dataListLoading: false,
dataListSelections: [],
@@ -624,7 +625,7 @@
},
mounted() {
this.$nextTick(() => {
- this.height = window.innerHeight - 282;
+ this.height = window.innerHeight - 200;
})
},
activated() {
@@ -671,9 +672,7 @@
})
},
saveReview(row ,val) {
- debugger
this.setUp.saveButton = true
- this.setUp.saveButton = false
this.saveData = {}
if(row.remark == '' && row.authFlag == null){
this.$alert(data.msg, '操作提示', {
@@ -683,38 +682,33 @@
}
});
}
- this.saveData.recordTypeDb = this.menuId
this.saveData.orderRef1 = this.currentReviewStepData.requisitionno
- this.saveData.orderRef2 = ""
- this.saveData.orderRef3 = ""
+ this.saveData.approvedFlag = val
this.saveData.site = this.site
+ this.saveData.userName = row.userName
this.saveData.authRuleId = row.authRuleId
- this.saveData.stepId = row.stepId
- this.saveData.authTypeDb = row.authTypeDb
- this.saveData.authUserId = row.authUserId
- this.saveData.authGroupId = row.authGroupId
- this.saveData.actAuthorizator = row.authUserId
- this.saveData.actAuthorizeDate = null
- this.saveData.remark = row.remark
- this.saveData.authFlag = 'Y'
- this.saveData.canAuthFlag = 'N'
- this.saveData.approveResultComments = ""
- this.saveData.needAuthBeforePrintFlag = row.needAuthBeforePrintFlag
- this.saveData.needDoubleConfirmFlag = "N"
- this.saveData.firstStepFlag = row.firstStepFlag
this.saveData.lastStepFlag = row.lastStepFlag
+ this.saveData.id = row.id
+ this.saveData.approveResultComments = row.approveResultComments
this.saveData.partNo = this.currentReviewStepData.partno
this.saveData.itemNo = this.currentReviewStepData.itemno
this.saveData.qty = this.currentReviewStepData.qty
- this.saveData.userName = row.userName
+ this.saveData.authTypeDb = row.authTypeDb
+ this.saveData.authUserId = row.authUserId
+ this.saveData.authGroupId = row.authGroupId
this.saveData.orderType = this.currentReviewStepData.orderType
this.saveData.supplierId = this.currentReviewStepData.supplierid
this.saveData.supplierName = this.currentReviewStepData.suppliername
this.saveData.torNumdown = 1
this.saveData.torNumacc = 1
- this.saveData.approvedFlag = val
+ this.saveData.stepId = row.stepId
+ this.saveData.remark = row.remark
if(val == "Y"){
- this.saveData.approveResult = "审批部分通过"
+ if(row.lastStepFlag == 'Y'){
+ this.saveData.approveResult = "审批全通过"
+ }else {
+ this.saveData.approveResult = "审批部分通过"
+ }
}else if(val == "N"){
this.saveData.approveResult = "审批未通过"
}
diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue
index f1c7a3b..b51a489 100644
--- a/src/views/modules/purchaseorder/purchaseRequisition.vue
+++ b/src/views/modules/purchaseorder/purchaseRequisition.vue
@@ -97,6 +97,7 @@
{{buttons.edit}}
{{buttons.close}}
+ {{buttons.reapply}}
{{buttons.reviewDetails}}
@@ -346,6 +347,8 @@
taxcode : '',
currencyRate : 1,
additionalCose : 0,
+ orderref1 : '',
+ orderref2 : '',
},
mainQueryData: {
requisitionno: '',
@@ -636,7 +639,7 @@
functionId: 2001,
tableId: "reviewDetails2001",
tableName: "reviewDetails",
- columnProp: "authRuleId",
+ columnProp: "strRuleDesc",
headerAlign: "center",
align: "center",
columnLabel: "审批组名称",
@@ -652,7 +655,7 @@
functionId: 2001,
tableId: "reviewDetails2001",
tableName: "reviewDetails",
- columnProp: "actAuthorizator",
+ columnProp: "strActAuthorizator",
headerAlign: "center",
align: "center",
columnLabel: "最终审批人",
@@ -685,7 +688,7 @@
functionId: 2001,
tableId: "reviewDetails2001",
tableName: "reviewDetails",
- columnProp: "canAuthFlag",
+ columnProp: "strCanAuthFlag",
headerAlign: "center",
align: "center",
columnLabel: "是否可以审批",
@@ -701,7 +704,7 @@
functionId: 2001,
tableId: "reviewDetails2001",
tableName: "reviewDetails",
- columnProp: "authFlag",
+ columnProp: "strAuthFlag",
headerAlign: "center",
align: "center",
columnLabel: "是否审批",
@@ -733,7 +736,7 @@
functionId: 2001,
tableId: "reviewDetails2001",
tableName: "reviewDetails",
- columnProp: "approveResultComments",
+ columnProp: "remark",
headerAlign: "center",
align: "center",
columnLabel: "审批备注",
@@ -824,6 +827,7 @@
reviewDetails : "审批详情",
close : '关闭',
fileDownload : '下载',
+ reapply : '重新申请',
},
// 导出 start
exportData: [],
@@ -955,7 +959,7 @@
updateAuthorizeFlag(row){
let saveData = {
site : row.site,
- requisitionNo : row.requisitionNo,
+ requisitionno : row.requisitionno,
status : '已关闭',
authorizeFlag : 'Y',
approvedFlag : 'N',
@@ -1073,7 +1077,12 @@
this.orderTypeList = data.rows
})
},
- initAddModel(row) {
+ initReapply(row){
+ this.currentPRDetailData.orderref1 = row.requisitionno
+ this.currentPRDetailData.orderref2 = row.itemno
+ this.initAddModel(null ,'Y')
+ },
+ initAddModel(row ,val) {
this.fileList = []
if (row == null) {
this.currentPRDetailData.requisitionno = ''
@@ -1098,6 +1107,10 @@
this.currentPRDetailData.status = ''
this.currentPRDetailData.taxCode = row.taxCode
}
+ if(val != 'Y'){
+ this.currentPRDetailData.orderref1 = null
+ this.currentPRDetailData.orderref2 = null
+ }
this.getNumber()
this.bannersBut = false
this.addPRDetailFlag = true