From 1f4bc9f584c07a0958747657b7353ccbd1d56b41 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 16 八月 2023 17:39:00 +0800
Subject: [PATCH] bug修复及销售子单产品管理相关
---
src/components/makepager/TableCommonView.vue | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 3e14cf8..5abfbd8 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -28,13 +28,14 @@
<span v-if="item.price">{{ "锟�" + number_format(scope.row[item.prop], 2, ".", ",") }}</span>
<div v-else-if="item.status" :class="scope.row.status">{{ scope.row[item.prop] }}</div>
<span v-else-if="item.isTime">{{
- dateFormat("YYYY-mm-dd HH:MM:SS", scope.row[item.prop]) === "1900-01-01 08:00:00"
+ dateFormat("YYYY-mm-dd HH:MM:SS", scope.row[item.prop]) === "1900-01-01 00:06:26"
? "--"
: dateFormat("YYYY-mm-dd HH:MM:SS", scope.row[item.prop])
}}</span>
<span v-else-if="item.isClick && scope.row[item.prop]" class="sel-name" @click="selNameClick(scope.row)">{{
scope.row[item.prop]
}}</span>
+ <span v-else-if="item.isFirst">{{ scope.row[item.prop] ? "鏄�" : "鍚�" }}</span>
<span
v-else-if="item.isSalesLeadClick && scope.row[item.prop]"
class="sel-name"
@@ -71,6 +72,26 @@
@click="selCommonClick(scope.row)"
>{{ scope.row[item.prop] }}</span
>
+ <div v-else-if="item.isProductName" class="product-view">
+ <ul v-if="scope.row.products && scope.row.products.length > 0">
+ <li v-for="(item, index) in scope.row.products" :key="index">
+ <div :class="scope.row.products.length === 1 ? 'name-view no-bottom' : 'name-view'">
+ {{ item.name }}
+ </div>
+ </li>
+ </ul>
+ <div v-else class="no-product">{{ "--" }}</div>
+ </div>
+ <div v-else-if="item.isProductAmount" class="product-view">
+ <ul v-if="scope.row.products && scope.row.products.length > 0">
+ <li v-for="(item, index) in scope.row.products" :key="index">
+ <div :class="scope.row.products.length === 1 ? 'name-view no-bottom' : 'name-view'">
+ {{ item.amount }}
+ </div>
+ </li>
+ </ul>
+ <div v-else class="no-product">{{ "--" }}</div>
+ </div>
<span v-else>{{ scope.row[item.prop] ? scope.row[item.prop] : "--" }}</span>
</template>
</el-table-column>
@@ -267,6 +288,26 @@
color: $color-primary;
cursor: pointer;
}
+ .product-view {
+ // background: #cc7d7d;
+ margin-left: -10px;
+ margin-right: -11px;
+ li {
+ height: 57px;
+ line-height: 57px;
+ .name-view {
+ padding-left: 10px;
+ border-bottom: 1px solid #ebeef5;
+ }
+ .no-bottom {
+ border-bottom: 0px;
+ }
+ }
+ .no-product {
+ height: 57px;
+ line-height: 57px;
+ }
+ }
}
::v-deep {
.el-table__footer-wrapper tbody td.el-table__cell {
--
Gitblit v1.8.0