|
@@ -188,7 +188,7 @@ export default {
|
|
|
{ title: '总售价', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '收款方式', dataIndex: 'settleStyle', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '急件', dataIndex: 'urgentFlag', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '急件', dataIndex: 'oosFlag', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '业务状态', scopedSlots: { customRender: 'billStatus' }, width: 110, align: 'center' },
|
|
|
{ title: '财务状态', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center', fixed: 'right' }
|
|
@@ -241,13 +241,16 @@ export default {
|
|
|
title: '提示',
|
|
|
content: '请点击下方按钮确认操作?',
|
|
|
centered: true,
|
|
|
+ closable: true,
|
|
|
okText: '审核通过',
|
|
|
cancelText: '审核不通过',
|
|
|
onOk () {
|
|
|
_this.auditOrder(row.id, 'AUDIT_PASS')
|
|
|
},
|
|
|
- onCancel () {
|
|
|
- _this.auditOrder(row.id, 'AUDIT_REJECT')
|
|
|
+ onCancel (e) {
|
|
|
+ if (!e.triggerCancel) {
|
|
|
+ _this.auditOrder(row.id, 'AUDIT_REJECT')
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -269,6 +272,7 @@ export default {
|
|
|
title: '提示',
|
|
|
content: '确认要出库吗?',
|
|
|
centered: true,
|
|
|
+ closable: true,
|
|
|
onOk () {
|
|
|
salesWriteStockOut({
|
|
|
id: row.id,
|
|
@@ -297,6 +301,7 @@ export default {
|
|
|
title: '提示',
|
|
|
content: '确认要删除吗?',
|
|
|
centered: true,
|
|
|
+ closable: true,
|
|
|
onOk () {
|
|
|
salesDel({ id: row.id }).then(res => {
|
|
|
if (res.status == 200) {
|