From 5956b34b1bd9198a787a1e0ea290b2cd99d898f2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 22 九月 2026 09:47:52 +0800
Subject: [PATCH] 新疆-融邦环保 1.大屏展示数据修改 2.销售台账展示字段修改
---
src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue | 2 +-
src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue | 3 +--
src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue | 10 +++++++++-
src/views/salesManagement/salesLedger/index.vue | 25 -------------------------
src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue | 10 +++++++++-
src/views/reportAnalysis/PSIDataAnalysis/index.vue | 5 +++--
6 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue b/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue
index 87cde44..a1b0b38 100644
--- a/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue
+++ b/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue
@@ -5,7 +5,6 @@
@change="handleChange"
>
<el-radio-button :label="1">鍘熸潗鏂�</el-radio-button>
- <el-radio-button :label="3">鍗婃垚鍝�</el-radio-button>
<el-radio-button :label="2">鎴愬搧</el-radio-button>
</el-radio-group>
</template>
@@ -16,7 +15,7 @@
const props = defineProps({
modelValue: {
type: Number,
- default: 1, // 榛樿閫変腑"鍘熸潗鏂�"
+ default: 2, // 榛樿閫変腑"鎴愬搧"
},
})
diff --git a/src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue b/src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue
index f4e49b6..e522631 100644
--- a/src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue
+++ b/src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue
@@ -30,7 +30,7 @@
import ProductTypeSwitch from './ProductTypeSwitch.vue'
import { productInOutAnalysis } from '@/api/viewIndex.js'
-const productType = ref(1) // 1=鍘熸潗鏂� 2=鍗婃垚鍝� 3=鎴愬搧
+const productType = ref(2) // 1=鍘熸潗鏂� 2=鎴愬搧
const chartStyle = { width: '100%', height: '130%' }
diff --git a/src/views/reportAnalysis/PSIDataAnalysis/index.vue b/src/views/reportAnalysis/PSIDataAnalysis/index.vue
index f81e482..daa1952 100644
--- a/src/views/reportAnalysis/PSIDataAnalysis/index.vue
+++ b/src/views/reportAnalysis/PSIDataAnalysis/index.vue
@@ -34,8 +34,9 @@
<!-- 鍙充晶鍖哄煙 -->
<div class="right-panel">
- <RightBottom />
- <RightTop />
+ <!-- 鍙充晶涓ゅ潡娌跨敤 dataDashboard 鐨勭粍浠讹紝杩欓噷榛樿鐪嬪搴� -->
+ <RightBottom :default-date-type="3" />
+ <RightTop :default-date-type="3" />
</div>
</div>
</div>
diff --git a/src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue b/src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue
index 6fcd80f..da39694 100644
--- a/src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue
+++ b/src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue
@@ -33,7 +33,15 @@
height: '100%',
}
-const dateType = ref(1) // 1=鍛� 2=鏈� 3=瀛ｅ害
+// 澶嶇敤鏈粍浠剁殑椤甸潰鍙寚瀹氬垵濮嬪懆鏈燂紝涓嶄紶浠嶆寜銆屽懆銆嶅睍绀猴紙dataDashboard 涓嶅彈褰卞搷锛�
+const props = defineProps({
+ defaultDateType: {
+ type: Number,
+ default: 1, // 1=鍛� 2=鏈� 3=瀛ｅ害
+ },
+})
+
+const dateType = ref(props.defaultDateType)
// 椋炴満鍥炬爣 SVG path锛堜笌 right-top 涓�鑷达級
const aircraft =
diff --git a/src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue b/src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue
index 96e4548..b5c56f0 100644
--- a/src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue
+++ b/src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue
@@ -32,7 +32,15 @@
height: '100%',
}
-const radio1 = ref(1)
+// 澶嶇敤鏈粍浠剁殑椤甸潰鍙寚瀹氬垵濮嬪懆鏈燂紝涓嶄紶浠嶆寜銆屽懆銆嶅睍绀猴紙dataDashboard 涓嶅彈褰卞搷锛�
+const props = defineProps({
+ defaultDateType: {
+ type: Number,
+ default: 1, // 1=鍛� 2=鏈� 3=瀛ｅ害
+ },
+})
+
+const radio1 = ref(props.defaultDateType)
// 椋炴満鍥炬爣 SVG path
const aircraft =
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 6aa990e..b6ba5f0 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -115,31 +115,6 @@
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" />
- <el-table-column label="瀹℃壒涓暟閲�" width="120" align="center">
- <template #default="scope">
- <span>{{ scope.row.pendingApprovalQuantity || 0 }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鍙戣揣杞︾墝" minWidth="100px" align="center">
- <template #default="scope">
- <div>
- <el-tag type="success" v-if="scope.row.shippingCarNumber"
- >{{ scope.row.shippingCarNumber }}
- </el-tag>
- <el-tag v-else type="info">- </el-tag>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="鍙戣揣鏃ユ湡" minWidth="100px" align="center">
- <template #default="scope">
- <div>
- <div v-if="scope.row.shippingDate">
- {{ scope.row.shippingDate }}
- </div>
- <el-tag v-else type="info">- </el-tag>
- </div>
- </template>
- </el-table-column>
<el-table-column label="鏁伴噺" prop="quantity" />
<el-table-column label="閫�璐ф暟閲�" prop="returnQuantity" />
<el-table-column label="绋庣巼(%)" prop="taxRate" />
--
Gitblit v1.9.3