Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages.json

@@ -162,14 +162,6 @@
 				"navigationStyle": "custom"
 			}
 
-		},
-		
-		{
-			"path": "pages/Warehouse/procurement",
-			"style": {
-				"navigationStyle": "custom"
-			}
-
 		}, 
 		{
 			"path": "pages/Warehouse/picking",
@@ -185,19 +177,6 @@
 			}
 		
 		}, 
-		{
-			"path": "pages/Warehouse/paymoney",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		
-		},
-		{
-			"path": "pages/Warehouse/procurecart",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
 		{
 			"path": "pages/procurement/purchaseorder",
 			"style": {

pages/Warehouse/paymoney.vue

@@ -1,11 +0,0 @@
-<template>
-	<view class="">
-		
-	</view>
-</template>
-
-<script setup lang="ts">
-	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps, onUnmounted } from 'vue';
-
-</script>
-

pages/procurement/components/carditem.vue

@@ -390,7 +390,7 @@
 				align-items: center;
 
 				view {
-					width: 5.5vw;
+					min-width: 5.5vw;
 					height: 1.8vw;
 					border-radius: 0.9vw;
 					border: 1px solid #D2D2D2;
@@ -401,6 +401,7 @@
 					font-weight: 400;
 					font-size: 1vw;
 					color: #555555;
+					padding: 0 0.25vw;
 				}
 			}
 

pages/procurement/components/details.vue

@@ -24,11 +24,11 @@
 										<text> 规格型号: {{v.specificationModel}}</text>
 									</view>
 									<view>
-										<text v-if="v.multiUnitType=='1'">采购单价: ￥{{v.oneUnitPrice}} </text>    
+										<text v-if="v.multiUnitType=='1'">采购单价: ￥{{Number(v.oneUnitPrice).toFixed(2)}} </text>    
 										<text v-if="v.multiUnitType=='1'">采购单位: {{ v.oneUnit}}</text>
-										<text v-if="v.multiUnitType=='2'">采购单价: ￥{{v.twoUnitPrice}} </text>   
+										<text v-if="v.multiUnitType=='2'">采购单价: ￥{{Number(v.twoUnitPrice).toFixed(2)}} </text>   
 										<text v-if="v.multiUnitType=='2'">采购单位: {{ v.twoUnit}}</text> 
-										<text v-if="v.multiUnitType=='3'">采购单价: ￥{{v.referenceUnitPrice}} </text>   
+										<text v-if="v.multiUnitType=='3'">采购单价: ￥{{Number(v.referenceUnitPrice).toFixed(2)}} </text>   
 										<text v-if="v.multiUnitType=='3'">采购单位: {{ v.materialUnits}}</text> 
 									</view>
 									<view>