|
@@ -127,8 +127,8 @@
|
|
|
@click="handleDel(record)"
|
|
|
class="button-error"
|
|
|
id="bulkWarehousingOrderList-del-btn">删除</a-button>
|
|
|
- <!-- <span v-if="record.state == 'FINISH' && record.state != 'WAIT_PUT_WAREHOUSE'">--</span> -->
|
|
|
- <span v-if="(record.state == 'FINISH' || !$hasPermissions('B_bulkWarehousingOrder_edit')) &&(record.state == 'FINISH' || !$hasPermissions('B_bulkWarehousingOrder_del')) &&(record.state != 'WAIT_PUT_WAREHOUSE' || !$hasPermissions('B_bulkWarehousingOrder_put'))">--</span>
|
|
|
+ <!-- <span v-if="record.state == 'FINISH' && record.state != 'WAIT_PUT_WAREHOUSE'">--</span> -->
|
|
|
+ <span v-if="(record.state == 'FINISH' || !$hasPermissions('B_bulkWarehousingOrder_edit')) &&(record.state == 'FINISH' || !$hasPermissions('B_bulkWarehousingOrder_del')) &&(record.state != 'WAIT_PUT_WAREHOUSE' || !$hasPermissions('B_bulkWarehousingOrder_put'))">--</span>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</a-spin>
|
|
@@ -174,7 +174,7 @@ export default {
|
|
|
{ title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '总金额', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '业务状态', dataIndex: 'stateDictValue', width: 100, align: 'center' },
|
|
|
- { title: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 100, align: 'center' },
|
|
|
+ { title: '财务状态', dataIndex: 'settleState', scopedSlots: { customRender: 'settleState' }, width: 100, align: 'center' },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|