|
@@ -255,7 +255,7 @@
|
|
|
size="small"
|
|
|
type="link"
|
|
|
class="button-warning"
|
|
|
- v-if="record.billStatus=='FINISH' && record.expenseClainFlag == 'N'"
|
|
|
+ v-if="record.billStatus=='FINISH' &&(record.expenseClainFlag == 'N' ||record.expenseClainFlag == 'M' )"
|
|
|
@click="handleExpense(record)"
|
|
|
>转费用报销单</a-button>
|
|
|
</div>
|
|
@@ -547,18 +547,18 @@ export default {
|
|
|
}
|
|
|
]
|
|
|
optionsKey.map(key => {
|
|
|
- if(hasExpense[key.id]){
|
|
|
+ if (hasExpense[key.id]) {
|
|
|
showModalFlag.push(key)
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
- if(showModalFlag.length){
|
|
|
+
|
|
|
+ if (showModalFlag.length) {
|
|
|
// 直接转费用单
|
|
|
- if(showModalFlag.length == 1){
|
|
|
+ if (showModalFlag.length == 1) {
|
|
|
_this.expenseSave(hasExpense[showModalFlag[0].id])
|
|
|
}
|
|
|
// 有2个以上采购额时
|
|
|
- if (showModalFlag.length>1) {
|
|
|
+ if (showModalFlag.length > 1) {
|
|
|
_this.$confirm({
|
|
|
title: '转费用报销单?',
|
|
|
centered: true,
|