|
@@ -84,7 +84,7 @@
|
|
|
</template>
|
|
|
<!-- 收款 -->
|
|
|
<template slot="financial" slot-scope="text, record">
|
|
|
- <stateIcon :title="record.settleStateDictValue" :state="record.settleState == 'FINISH'?'1':'2'"></stateIcon>
|
|
|
+ <stateIcon :title="record.settleStateDictValue" :state="record.settleState == 'FINISH'&&record.state!='CANCEL'?'1':'2'"></stateIcon>
|
|
|
</template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
@@ -98,7 +98,7 @@
|
|
|
<a-button
|
|
|
size="small"
|
|
|
type="link"
|
|
|
- v-if="record.hasStockBill == '1' && $hasPermissions('B_purchaseReturnOutStock')"
|
|
|
+ v-if="record.hasStockBill == '0' && $hasPermissions('B_purchaseReturnOutStock')"
|
|
|
@click="handleWarehouse(record)"
|
|
|
class="button-primary"
|
|
|
id="bulkReturnGoodsList-warehouse-btn">生成出库单</a-button>
|
|
@@ -116,7 +116,7 @@
|
|
|
v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_purchaseReturnDel')"
|
|
|
@click="handleDel(record)"
|
|
|
id="purchaseReturnList-del-btn">删除</a-button>
|
|
|
- <span v-if="!((record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && ($hasPermissions('B_purchaseReturnEdit') || $hasPermissions('B_purchaseReturnDel'))) && !(record.hasStockBill == '1' && ($hasPermissions('B_purchaseReturnOutStock') || $hasPermissions('B_purchaseReturnFinishBill')))">--</span>
|
|
|
+ <span v-if="!((record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && ($hasPermissions('B_purchaseReturnEdit') || $hasPermissions('B_purchaseReturnDel'))) && !(record.hasStockBill == '0' && ($hasPermissions('B_purchaseReturnOutStock') || $hasPermissions('B_purchaseReturnFinishBill')))">--</span>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</a-spin>
|