|
@@ -62,7 +62,7 @@
|
|
|
<template v-slot:action="{ row }">
|
|
<template v-slot:action="{ row }">
|
|
|
<template>
|
|
<template>
|
|
|
<el-link
|
|
<el-link
|
|
|
- v-if="row.orderSource != 1"
|
|
|
|
|
|
|
+ v-if="row.orderSource != 1 && row.activeName == 'first'"
|
|
|
type="primary"
|
|
type="primary"
|
|
|
:underline="false"
|
|
:underline="false"
|
|
|
icon="el-icon-edit"
|
|
icon="el-icon-edit"
|
|
@@ -72,7 +72,7 @@
|
|
|
</el-link>
|
|
</el-link>
|
|
|
|
|
|
|
|
<el-popconfirm
|
|
<el-popconfirm
|
|
|
- v-if="row.orderSource != 1 "
|
|
|
|
|
|
|
+ v-if="row.orderSource != 1 && row.activeName == 'first'"
|
|
|
class="ele-action"
|
|
class="ele-action"
|
|
|
title="确定要删除此销售订单吗？"
|
|
title="确定要删除此销售订单吗？"
|
|
|
@confirm="remove(row)"
|
|
@confirm="remove(row)"
|
|
@@ -218,13 +218,13 @@ import { Alert } from 'element-ui';
|
|
|
|
|
|
|
|
{
|
|
{
|
|
|
prop: 'productSumWeight',
|
|
prop: 'productSumWeight',
|
|
|
- label: '合同重量',
|
|
|
|
|
|
|
+ label: '订单重量',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
slot: 'productSumWeight'
|
|
slot: 'productSumWeight'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
prop: 'contractNum',
|
|
prop: 'contractNum',
|
|
|
- label: this.clientEnvironmentId == '4' ? '交付数量' : '合同数量',
|
|
|
|
|
|
|
+ label: this.clientEnvironmentId == '4' ? '交付数量' : '订单数量',
|
|
|
align: 'center'
|
|
align: 'center'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
ysy