|
|
|
@ -96,7 +96,7 @@ |
|
|
|
width="100" |
|
|
|
:label="buttons.operating"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a v-if="scope.row.authorizeFlag == '未审批'" @click="initReview(scope.row)">{{buttons.audit}}</a> |
|
|
|
<a v-if="scope.row.strCanAuthFlag == 'Y'" @click="initReview(scope.row)">{{buttons.audit}}</a> |
|
|
|
<span v-else>{{buttons.audit}}</span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -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 @@ |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="审批备注"> |
|
|
|
<!--<el-input style="width: 200px;" :readonly = "item.userName == saveData.userId && item.authFlag != 'Y' ? false : true" placeholder="" v-model="item.remark"></el-input>--> |
|
|
|
<el-input type="textarea" :readonly = "(reviewStepList[index].userName == userId && reviewStepList[index].id == null && (index == 0 ? true : reviewStepList[index -1].authFlag == 'Y')) ? false : true " :rows="3" style="text-align: left;width: 415px;" v-model="item.remark"></el-input> |
|
|
|
<el-input type="textarea" :readonly = "( reviewStepList[index].canAuthFlag == 'Y') ? false : true " :rows="3" style="text-align: left;width: 415px;" v-model="item.remark"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<el-button type="primary" v-if="(reviewStepList[index].userName == userId && reviewStepList[index].id == null && (index == 0 ? true : reviewStepList[index -1].authFlag == 'Y')) ? true : false " @click="saveReview(reviewStepList[index] ,'N')">不同意</el-button> |
|
|
|
<el-button type="primary" v-if="(reviewStepList[index].userName == userId && reviewStepList[index].id == null && (index == 0 ? true : reviewStepList[index -1].authFlag == 'Y')) ? true : false " @click="saveReview(reviewStepList[index],'Y')">同意</el-button> |
|
|
|
<el-button type="primary" v-if="( reviewStepList[index].canAuthFlag == 'Y') ? true : false " @click="saveReview(reviewStepList[index] ,'N')">不同意</el-button> |
|
|
|
<el-button type="primary" v-if="( reviewStepList[index].canAuthFlag == 'Y') ? true : false " @click="saveReview(reviewStepList[index],'Y')">同意</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
</div> |
|
|
|
@ -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 = "审批未通过" |
|
|
|
} |
|
|
|
|
zuowenwen
4 years ago