样式修改，名称修改

pages.json

@@ -18,23 +18,23 @@
 	],
 	"subPackages": [{
 		"root": "subpkg", // 分包根目录
-		"pages": [
-			{
-				"path": "pages/puhse-order/index",
-				"style": {
-					"navigationBarTitleText": "采购订单查询"
-				}
-			},
-			{
-				"path": "pages/puhse-order/details",
-				"style": {
-					"navigationBarTitleText": "订单详情"
-				}
-			},
+		"pages": [
+			{
+				"path": "pages/puhse-order/index",
+				"style": {
+					"navigationBarTitleText": "采购订单查询"
+				}
+			},
+			{
+				"path": "pages/puhse-order/details",
+				"style": {
+					"navigationBarTitleText": "订单详情"
+				}
+			},
 			{
 				"path": "pages/mintir/index",
 				"style": {
-					"navigationBarTitleText": "数据检测",
+					"navigationBarTitleText": "数据监测",
 					"enablePullDownRefresh": true
 				}
 			},
@@ -67,18 +67,18 @@
 				"style": {
 					"navigationBarTitleText": "批次详情"
 				}
-			},
-			{
-				"path": "pages/outbond-detal/details",
-				"style": {
-					"navigationBarTitleText": "药品明细出库"
-				}
-			},
-			{
-				"path": "pages/outbond-detal/durg-batch",
-				"style": {
-					"navigationBarTitleText": "药品批次详情"
-				}
+			},
+			{
+				"path": "pages/outbond-detal/details",
+				"style": {
+					"navigationBarTitleText": "药品明细出库"
+				}
+			},
+			{
+				"path": "pages/outbond-detal/durg-batch",
+				"style": {
+					"navigationBarTitleText": "药品批次详情"
+				}
 			},
 			{
 				"path": "pages/proplanconfirm/index",
@@ -150,7 +150,7 @@
 			}
 		]
 
-	}, {
+	}, {
 		//药品
 		"root": "durgsubpkg",
 		"pages":[
@@ -167,18 +167,18 @@
 					"navigationBarTitleText": "受理详情",
 					"enablePullDownRefresh": false
 				}
-			},
-			{
-				"path": "pages/depart-return/index",
-				"style": {
-					"navigationBarTitleText": "退货管理"
-				}
-			},
-			{
-				"path": "pages/depart-return/details",
-				"style": {
-					"navigationBarTitleText": "退货详情"
-				}
+			},
+			{
+				"path": "pages/depart-return/index",
+				"style": {
+					"navigationBarTitleText": "退货管理"
+				}
+			},
+			{
+				"path": "pages/depart-return/details",
+				"style": {
+					"navigationBarTitleText": "退货详情"
+				}
 			}
 		]
 	}],

pages/platform/index.vue

@@ -144,36 +144,37 @@
 						// 	path: "/subpkg/pages/dire-manment/index"
 						// },
 					],
-					mcs: [{
-							iconUrl: "../../static/shangjia.svg",
-							name: "订单受理",
-							bgColor: "#F4CE98",
-							path: "/subpkg/pages/mcs-order-taking/index"
-						},
-						{
-							iconUrl: "../../static/shangjia.svg",
-							name: "订单出库",
-							bgColor: "#7DCEFF",
-							path: "/subpkg/pages/order-outbond/index"
-						},
-						{
-							iconUrl: "../../static/shangjia.svg",
-							name: "退货管理",
-							bgColor: "#2CE4BF",
-							path: "/subpkg/pages/mcs-depart-return/index"
-						},
-						{
-							iconUrl: "../../static/shangjia.svg",
-							name: "采购单查询",
-							bgColor: "#2CE4BF",
-							path: "/subpkg/pages/mcs-puhse-order/index"
-						},
-						{
-							iconUrl: "../../static/shangjia.svg",
-							name: "数据监测",
-							bgColor: "#F4CE98",
-							path: "/subpkg/pages/mintir/index"
-						},
+					mcs: [
+						// {
+						// 	iconUrl: "../../static/shangjia.svg",
+						// 	name: "订单受理",
+						// 	bgColor: "#F4CE98",
+						// 	path: "/subpkg/pages/mcs-order-taking/index"
+						// },
+						// {
+						// 	iconUrl: "../../static/shangjia.svg",
+						// 	name: "订单出库",
+						// 	bgColor: "#7DCEFF",
+						// 	path: "/subpkg/pages/order-outbond/index"
+						// },
+						// {
+						// 	iconUrl: "../../static/shangjia.svg",
+						// 	name: "退货管理",
+						// 	bgColor: "#2CE4BF",
+						// 	path: "/subpkg/pages/mcs-depart-return/index"
+						// },
+						// {
+						// 	iconUrl: "../../static/shangjia.svg",
+						// 	name: "采购单查询",
+						// 	bgColor: "#2CE4BF",
+						// 	path: "/subpkg/pages/mcs-puhse-order/index"
+						// },
+						// {
+						// 	iconUrl: "../../static/shangjia.svg",
+						// 	name: "数据监测",
+						// 	bgColor: "#F4CE98",
+						// 	path: "/subpkg/pages/mintir/index"
+						// },
 						// {
 						// 	iconUrl: "../../static/shangjia.svg",
 						// 	name: "验收管理",
@@ -207,6 +208,23 @@
 			this.setInst();
 			this.getUserData({
 				sysType: "2"
+			}).then(res => {
+				if (res  && res.data) {
+					const menus = res.data.permission.menus;
+					const colorMap = {
+						'mcs-order-taking': '#F4CE98',
+						'order-outbond': '#7DCEFF',
+						'mcs-depart-return': '#2CE4BF',
+						'mcs-puhse-order': '#2CE4BF',
+						'mintir': '#F4CE98'
+					};
+					this.appData.mcs = menus.map(menu => ({
+						iconUrl: "../../static/shangjia.svg",
+						name: menu.menuName,
+						bgColor: colorMap[menu.menuId] || '#F4CE98',
+						path: `/subpkg/pages/${menu.menuId}/index`
+					}));
+				}
 			});
 		},
 		watch: {
@@ -216,15 +234,15 @@
 		},
 		methods: {
 			...mapActions(['getHouseData', 'getUserData', 'getHomeAwaitData', 'getMessData']),
-			...mapMutations(['setHouseName', 'setInst']),
-			onPullDownRefresh() {
-				this.setInst();
-				this.getUserData({
-					sysType: "2"
-				});
-				setTimeout(function() {
-					uni.stopPullDownRefresh(); //停止下拉刷新动画
-				}, 1000);
+			...mapMutations(['setHouseName', 'setInst']),
+			onPullDownRefresh() {
+				this.setInst();
+				this.getUserData({
+					sysType: "2"
+				});
+				setTimeout(function() {
+					uni.stopPullDownRefresh(); //停止下拉刷新动画
+				}, 1000);
 			},
 			//跳转页面
 			appView(item) {

store/modules/puhse-order.js

@@ -18,7 +18,7 @@ export const actions = {
 				...data.pam,
 			}, '加载中').then(res => {
 				if (res.success == true) {
-					data.that.$refs.paging.complete(res.data);
+					data.that.$refs.paging.complete(res.data.records);
 				}
 			}).catch(e => {
 				reject(e)

subpkg/pages/mintir/index.vue

@@ -6,13 +6,8 @@
 				<view class="cartsList-name">
 					消耗数据趋势
 				</view>
-				<view class="cartsList-seleven">
-					<uni-data-select v-model="valueList" :localdata="rangelineChart" @change="changelineChart"
-						:clear="false"></uni-data-select>
-				</view>
-			</view>
-			<view class="select-button">
-				<view :style="{
+				<view class="select-button">
+					<view :style="{
 			       border: flagE === index + 1 ? '1px solid #90ffe4' : '1px solid #808080',
 					color: flagE === index + 1 ? '#90ffe4' : '#808080',
 					height: '40rpx',
@@ -26,6 +21,11 @@
 			    }" v-for="(item, index) in navList" :key="item.id" @click="handleClickBtnE(index)">
 					{{ item.name }}
 				</view>
+				</view>
+				<view class="cartsList-seleven">
+					<uni-data-select v-model="valueList" :localdata="rangelineChart" @change="changelineChart"
+						:clear="false"></uni-data-select>
+				</view>
 			</view>
 			<view class="chart-wrap">
 				<view class="line-chart-con">
@@ -60,14 +60,14 @@
 	import scrollView from './scrollView/scrollView.vue';
 	import PieCharts from './PieCharts/PieCharts.vue';
 	import enterprise from './enterprise/enterprise.vue';
-	import tiewk from './tiewk/tiewk.vue';
+	import tiewk from './tiewk/tiewk.vue';
 	import Lechart from '@/subpkg/uni_modules/lime-echart/components/l-echart/l-echart.vue';
 	export default {
 		components: {
 			scrollView,
 			PieCharts,
 			tiewk,
-			enterprise,
+			enterprise,
 			Lechart
 		},
 		data() {
@@ -122,7 +122,7 @@
 			this.listData();
 			this.Listson()
 		},
-		mounted() {
+		mounted() {
 			console.log('页面加载了没有');
 			//加载饼环数据
 			this.loadRingData();
@@ -490,10 +490,10 @@
 		width: 100%;
 		height: 100rpx;
 		display: flex;
+		align-items: center;
 		justify-content: space-between;
 		background-color: #ffffff;
 		border-width: 4rpx 4rpx 4rpx 4rpx;
-		/* 上、右、下、左 边框宽度 */
 		border-style: solid;
 		border-color: #90ffe4;
 		padding: 20rpx;
@@ -504,15 +504,11 @@
 		.cartsList-name {
 			font-size: 35rpx;
 			font-weight: bold;
-			position: relative;
 		}
 	}
 
 	.select-button {
-		width: 375rpx;
-		position: absolute;
-		right: 100rpx;
-		top: 510rpx;
-		z-index: 999;
+		display: flex;
+		gap: 16rpx;
 	}
 </style>

subpkg/pages/mintir/scrollView/scrollView.vue

@@ -2,7 +2,7 @@
 	<view class="listview">
 		<view class="listview-all">
 			<view class="listview-name">
-				数据检测
+				数据监测
 			</view>
 			<view class="listview-seleven">
 				<uni-data-select v-model="value" :localdata="range" @change="change" :clear="false"></uni-data-select>
@@ -51,28 +51,102 @@
 						{{dataList.delvCnt}}
 					</view>
 				</view>
-			</view>
-			<view class="listview-all-b">
-				<view class="listview-table-all-three">
-					<view class="listview-table-name">
-						集采条目数
-					</view>
-					<view class="listview-table-many">
-						<span style=" visibility: hidden;">￥</span>
-						{{dataList.fasCnt}}
-					</view>
-				</view>
-				<view class="listview-table-all-four">
-					<view class="listview-table-name">
-						非集采条目数
-					</view>
-					<view class="listview-table-many">
-						<span style=" visibility: hidden;">￥</span>
-						{{dataList.othCnt}}
-					</view>
-				</view>
+			</view>
+			<view class="listview-all-b">
+				<view class="listview-table-all-three">
+					<view class="listview-table-name">
+						集采条目数
+					</view>
+					<view class="listview-table-many">
+						<span style=" visibility: hidden;">￥</span>
+						{{dataList.fasCnt}}
+					</view>
+				</view>
+				<view class="listview-table-all-four">
+					<view class="listview-table-name">
+						非集采条目数
+					</view>
+					<view class="listview-table-many">
+						<span style=" visibility: hidden;">￥</span>
+						{{dataList.othCnt}}
+					</view>
+				</view>
 			</view>
 		</view>
+		<view class="spd-section">
+            <!-- 耗材SPD -->
+            <view class="spd-card spd-card-border">
+             <view class="spd-title spd-title-border">耗材SPD</view>
+                <view class="spd-row spd-row-hc">
+                    <view class="spd-col">
+                        <view>遗留耗材</view>
+                        <view class="spd-num">¥3,285,671</view>
+                    </view>
+                    <view class="spd-col">
+                        <view>医用耗材</view>
+                        <view class="spd-num">¥8,451,328</view>
+                    </view>
+                    <view class="spd-col">
+                        <view>试剂耗材</view>
+                        <view class="spd-num">¥3,670,083</view>
+                    </view>
+                    <view class="spd-col">
+                        <view>总务耗材</view>
+                        <view class="spd-num">¥1,236,409</view>
+                    </view>
+                </view>
+                <view class="spd-row spd-row-wrap">
+                    <view class="spd-col">
+                        <view>集采</view>
+                        <view class="spd-num-small">¥7,120,500</view>
+                    </view>
+                    <view class="spd-col">
+                        <view>非集采</view>
+                        <view class="spd-num-small">¥1,330,828</view>
+                    </view>
+                </view>
+                <view class="spd-row spd-row-bottom">
+                    <view class="spd-col">
+                        非集采比例：<text class="spd-num-small">15.75%</text>
+                    </view>
+                    <view class="spd-col">
+                        服务费：<text class="spd-num-small">¥126,520/月</text>
+                    </view>
+                </view>
+            </view>
+            <!-- 药品SPD -->
+            <view class="spd-card spd-card-border">
+                <view class="spd-title spd-title-border">药品SPD</view>
+                <view class="spd-row spd-row-yp">
+                    <view class="spd-col">
+                        <view>遗留耗材</view>
+                        <view class="spd-num">¥3,285,671</view>
+                    </view>
+                    <view class="spd-col">
+                        <view>医用耗材</view>
+                        <view class="spd-num">¥8,451,328</view>
+                    </view>
+                </view>
+                <view class="spd-row spd-row-wrap">
+                    <view class="spd-col">
+                        <view>集采</view>
+                        <view class="spd-num-small">¥7,120,500</view>
+                    </view>
+                    <view class="spd-col">
+                        <view>非集采</view>
+                        <view class="spd-num-small">¥1,330,828</view>
+                    </view>
+                </view>
+                <view class="spd-row spd-row-bottom">
+                    <view class="spd-col">
+                        非集采比例：<text class="spd-num-small">15.75%</text>
+                    </view>
+                    <view class="spd-col">
+                        服务费：<text class="spd-num-small">¥126,520/月</text>
+                    </view>
+                </view>
+            </view>
+        </view>
 	</view>
 </template>
 
@@ -222,5 +296,85 @@
 
 			}
 		}
-	}
+
+		.spd-section {
+			margin-top: 40rpx;
+		}
+		.spd-card {
+			position: relative;
+    		padding: 24rpx 16rpx;
+			background: #fff;
+			margin-bottom: 30rpx;
+			padding: 24rpx 16rpx;
+			box-shadow: 0 2rpx 8rpx rgba(0,128,128,0.08);
+			position: relative;
+		}
+		.spd-card-border {
+			border: 4rpx solid #90ffe4;
+			border-radius: 16rpx;
+		}
+		.spd-title {
+			font-size: 35rpx;
+			font-weight: bold;
+		}
+		.spd-row, .spd-row-hc, .spd-row-yp {
+	margin-top: 10rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 12rpx;
+}
+.spd-col {
+    flex: 1;
+    text-align: center;
+    font-size: 24rpx;
+    color: #333;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 4rpx;
+}
+.spd-num {
+    font-size: 20rpx;
+    color: #000;
+    font-weight: bold;
+    margin-top: 4rpx;
+}
+.spd-num-small {
+    font-size: 18rpx;
+    color: #008080;
+    font-weight: bold;
+    margin-top: 2rpx;
+}
+.spd-hline {
+    width: 100%;
+    height: 4rpx;
+    background-color: #90ffe4;
+    border-radius: 10rpx;
+    margin: 18rpx 0 0 0;
+}
+.spd-card-border {
+    border: 4rpx solid #90ffe4;
+    border-radius: 16rpx;
+}
+.spd-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #000;
+    text-align: center;
+    margin-bottom: 18rpx;
+    letter-spacing: 2rpx;
+}
+.spd-row-wrap, .spd-row-bottom {
+    border-bottom: none;
+    padding-bottom: 0;
+}
+.spd-title-border {
+	 margin-left: -16rpx;
+	width: calc(100% + 36rpx); 
+    border-bottom: 4rpx solid #90ffe4;
+    padding-bottom: 20rpx;
+}
+}
 </style>

unpackage/dist/build/mp-weixin/app.json

@@ -30,7 +30,7 @@
     "list": [
       {
         "pagePath": "pages/mintir/index",
-        "text": "数据检测",
+        "text": "数据监测",
         "iconPath": "static/home.jpg",
         "selectedIconPath": "static/homeset.jpg"
       },

unpackage/dist/build/mp-weixin/pages/mintir/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "数据检测",
+  "navigationBarTitleText": "数据监测",
   "enablePullDownRefresh": true,
   "usingComponents": {
     "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select",