|
|
@@ -18,11 +18,8 @@
|
|
|
<el-tag
|
|
|
:size="'mini'"
|
|
|
v-text="
|
|
|
- (
|
|
|
- statusOptions.find(
|
|
|
- (item) => item.value == sitem.status
|
|
|
- ) || {}
|
|
|
- ).label || '--'
|
|
|
+ (statusOptions.find((item) => item.value == sitem.status) || {})
|
|
|
+ .label || '--'
|
|
|
"
|
|
|
></el-tag>
|
|
|
</template>
|
|
|
@@ -44,8 +41,7 @@
|
|
|
<el-popover placement="top" width="300" trigger="hover">
|
|
|
<ul>
|
|
|
<li>
|
|
|
- <span>销售方公司编号：</span
|
|
|
- ><span>{{ sitem.supplierNo }}</span>
|
|
|
+ <span>销售方公司编号：</span><span>{{ sitem.supplierNo }}</span>
|
|
|
</li>
|
|
|
</ul>
|
|
|
<i class="el-icon-warning-outline fr" slot="reference"></i>
|
|
|
@@ -64,14 +60,11 @@
|
|
|
</el-popover>
|
|
|
</template>
|
|
|
<template slot="is_active">
|
|
|
- <span
|
|
|
- v-if="
|
|
|
- sitem.order_type === '1' ||
|
|
|
- sitem.order_type === '2' "
|
|
|
+ <span v-if="sitem.order_type === '1' || sitem.order_type === '2'"
|
|
|
><span
|
|
|
- >{{
|
|
|
- sitem.is_activity === "1" ? "参与活动" : "不参与活动"
|
|
|
- }}/{{ sitem.good_type }}</span
|
|
|
+ >{{ sitem.is_activity === "1" ? "参与活动" : "不参与活动" }}/{{
|
|
|
+ sitem.good_type
|
|
|
+ }}</span
|
|
|
></span
|
|
|
>
|
|
|
<span v-else>--</span>
|
|
|
@@ -114,22 +107,10 @@
|
|
|
width="100"
|
|
|
/>
|
|
|
|
|
|
- <el-table-column
|
|
|
- label="退货数量"
|
|
|
- prop="return_num"
|
|
|
- width="100"
|
|
|
- >
|
|
|
+ <el-table-column label="退货数量" prop="return_num" width="100">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="未发货数量"
|
|
|
- prop="wsend_num"
|
|
|
- width="90"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="已发货数量"
|
|
|
- prop="send_num"
|
|
|
- width="90"
|
|
|
- />
|
|
|
+ <el-table-column label="未发货数量" prop="addr_wsend" width="90" />
|
|
|
+ <el-table-column label="已发货数量" prop="addr_send" width="90" />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<span v-else>--</span>
|
|
|
@@ -153,8 +134,7 @@
|
|
|
newTime !== '' &&
|
|
|
sitem &&
|
|
|
!(
|
|
|
- (sitem.order_type === '1' ||
|
|
|
- sitem.order_type === '2') &&
|
|
|
+ (sitem.order_type === '1' || sitem.order_type === '2') &&
|
|
|
is_stock === '1'
|
|
|
) &&
|
|
|
powers.some((item) => item == '041') &&
|
|
|
@@ -178,8 +158,7 @@
|
|
|
sitem &&
|
|
|
(status === '4' || status === '3' || status === '2') &&
|
|
|
!(
|
|
|
- ((sitem && sitem.order_type === '1') ||
|
|
|
- sitem.order_type === '2') &&
|
|
|
+ ((sitem && sitem.order_type === '1') || sitem.order_type === '2') &&
|
|
|
is_stock === '1'
|
|
|
)
|
|
|
"
|
|
|
@@ -206,8 +185,7 @@
|
|
|
powers.some((item) => item == '036') &&
|
|
|
status === '3' &&
|
|
|
!(
|
|
|
- (sitem.order_type === '1' ||
|
|
|
- sitem.order_type === '2') &&
|
|
|
+ (sitem.order_type === '1' || sitem.order_type === '2') &&
|
|
|
is_stock === '1'
|
|
|
)
|
|
|
"
|
|
|
@@ -238,7 +216,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
- <script>
|
|
|
+<script>
|
|
|
import mixinPage from "@/mixins/elPaginationHandle";
|
|
|
import resToken from "@/mixins/resToken";
|
|
|
import asyncRequest from "@/apis/service/sellOut/sellReturn";
|
|
|
@@ -379,5 +357,3 @@ export default {
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
|
-
|
|
|
-
|
