Commit 68f0f9aa by LJM

优化

parent b2d6d5e3
......@@ -238,6 +238,10 @@ export default {
this.dialogVisible_1 = true;
break;
case 2:
if (this.multipleSelection.length > 1) {
this.$message.warning('不支持批量操作');
return;
}
// 作废:校验待提审或进行中(未发货未入库)状态
const invalidCancel = this.multipleSelection.filter(item => !([0, 2].includes(item.consignment_status) && item.deliver_status == 0 && item.stock_in_status == 0));
if (invalidCancel.length) {
......@@ -248,6 +252,10 @@ export default {
this.dialogVisible_2 = true;
break;
case 3:
if (this.multipleSelection.length > 1) {
this.$message.warning('不支持批量操作');
return;
}
// 关单:校验进行中且部分发货/全部发货,部分入库状态
const invalidClose = this.multipleSelection.filter(item => !(item.consignment_status == '2' && [1, 2].includes(item.deliver_status) && item.stock_in_status == 1));
if (invalidClose.length) {
......
......@@ -27,11 +27,7 @@
</el-table-column>
<el-table-column prop="status_name" label="状态" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="commission_rate" label="抽佣比例(%)" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column label="合同有效期" width="290" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
{{ scope.row.start_time }} - {{ scope.row.end_time }}
</template>
</el-table-column>
<el-table-column prop="end_time" label="合同有效期" width="290" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="check_date" label="对账日期" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="update_time" label="更新时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="create_name" label="创建人" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment