first commit

src/view/performance/Suborderdetailspage.vue

@@ -72,7 +72,31 @@
 			
 			<br>
 			<h3>成品入仓完成率</h3>
-			 <div class="progress-wrapper">
+			<div class="progress-wrapper" >
+				   <div
+				     class="progress-row"
+				     v-for="item in order_progressList"
+				     :key="item.subOrderNo"
+				   >
+				     <div class="progress-info">
+				       <span style="font-size: 20px;"><strong>总订单进度---订单编号：</strong>{{ item.subOrderNo }}</span>
+				     </div>
+				 
+				     <el-progress
+				       :percentage="Math.min(item.percentage, 100)"
+				       :stroke-width="24" 
+				       :text-inside="true"
+				       style="flex: 1; width: 70%;"
+				       :format="() => item.percentage + '%'"
+				       :status="item.percentage >= 100 ? 'success' : 'success'"
+				     />
+				   </div>
+				 </div>
+			
+				
+				<br>
+				
+			  <div class="progress-wrapper">
 				 <div
 				   class="progress-row"
 				   v-for="item in progressList"
@@ -82,15 +106,16 @@
 					 <span style='font-size: 20px;'><strong>子订单编号：</strong>{{ item.subOrderNo }}</span>
 				   </div>
 				   <el-progress
-					 :percentage="item.percentage"
-					 :status="item.percentage >= 100 ? 'success' : 'success'"
-					 :stroke-width="17"
-					 :text-inside="true"
-					 style="flex: 1;width: 79%;"
+				     :percentage="Math.min(item.percentage, 100)"
+				     :stroke-width="24"
+				     :text-inside="true"
+				     style="flex: 1; width: 70%;"
+				     :format="() => item.percentage + '%'"
+				     :status="item.percentage >= 100 ? 'success' : 'success'"
 				   />
 				 </div>
-			   </div>
-			  <br>
+			    </div>
+			<br>
 			
 			<div style="display: flex; align-items: center;">
 				<el-tag type="info" style="width: 40px; height: 40px; margin-right: 10px;"><h2>包数</h2></el-tag>
@@ -167,6 +192,7 @@ const searchOrder = async (query) => {
   }
 };
 
+const order_progressList = ref([])
 // 选择订单编号时获取子订单编号
 const handleOrderSelect = async (orderNo) => {
 	console.log('orderNo',orderNo)
@@ -175,16 +201,22 @@ const handleOrderSelect = async (orderNo) => {
     orderform.value.子订单编号 = '';
     return;
   }
-  const SubOrderProgress_list = await SubOrderProgress({order:orderNo.split('---')[0]});
-  console.log(SubOrderProgress_list)
-  console.log(SubOrderProgress_list)
-  progressList.value = SubOrderProgress_list.data.result.map(item => ({
+  const SubOrder_list = await SubOrderProgress({order:orderNo.split('---')[0]});
+  console.log(SubOrder_list)
+  //订单编号
+  order_progressList.value = SubOrder_list.data.list.map(item => ({
+    subOrderNo: item['订单编号'],
+    入仓数量: item['订单总入仓数量'],
+    裁剪数量: item['订单总裁剪数量'],
+    percentage: parseFloat(item['订单完成率'].replace('%', ''))
+  }))
+  //子订单编号
+  progressList.value = SubOrder_list.data.result.map(item => ({
     subOrderNo: item['子订单编号'],
     入仓数量: item['入仓数量'],
     裁剪数量: item['裁剪数量'],
     percentage: parseFloat(item['完成率'].replace('%', ''))
   }))
-  
  
   try {
     // 调用子订单接口
@@ -232,15 +264,21 @@ const handleOrderSelect2 = async (orderNo) => {
       // 更新表单数据
       updateFormData(res.data.workOrderData);
 	  
-	  const SubOrderProgress_list = await SubOrderProgress({order:res.data.workOrderData['订单编号']});
-	  console.log(SubOrderProgress_list)
-	  	console.log(SubOrderProgress_list)
-	  	progressList.value = SubOrderProgress_list.data.result.map(item => ({
-	  	  subOrderNo: item['子订单编号'],
-	  	  入仓数量: item['入仓数量'],
-	  	  裁剪数量: item['裁剪数量'],
-	  	  percentage: parseFloat(item['完成率'].replace('%', ''))
-	  	}))
+	  const SubOrder_list = await SubOrderProgress({order:res.data.workOrderData['订单编号']});
+	  //订单编号
+	  order_progressList.value = SubOrder_list.data.list.map(item => ({
+	    subOrderNo: item['订单编号'],
+	    入仓数量: item['订单总入仓数量'],
+	    裁剪数量: item['订单总裁剪数量'],
+	    percentage: parseFloat(item['订单完成率'].replace('%', ''))
+	  }))
+	  //子订单编号
+	  progressList.value = SubOrder_list.data.result.map(item => ({
+	    subOrderNo: item['子订单编号'],
+	    入仓数量: item['入仓数量'],
+	    裁剪数量: item['裁剪数量'],
+	    percentage: parseFloat(item['完成率'].replace('%', ''))
+	  }))
       
       // 检查表单完整性（确保在数据更新后检查）
       if (isFormValid()) {
@@ -419,4 +457,15 @@ defineExpose({open})
 :deep(.el-table__body .status-plan-usage-lows) {
   background: white !important;
 }
+
+/* 全局修改 el-progress 的背景颜色 */
+:deep(.el-progress-bar .el-progress-bar__outer) {
+  background-color: Orange; /* 自定义背景色 */
+}
+/* ▶ 改变进度条中文字的颜色和字体大小 */
+:deep(.el-progress-bar__innerText) {
+  color: black !important;
+  font-size: 20px !important;
+  font-weight: bold;
+}
 </style>

src/view/yunyin/shengchanguanli/components/SubOrder.vue

@@ -37,7 +37,31 @@
 			</el-table>
 			<br>
 			<h3>成品入仓完成率</h3>
-			 <div class="progress-wrapper">
+			<div class="progress-wrapper" >
+				   <div
+				     class="progress-row"
+				     v-for="item in order_progressList"
+				     :key="item.subOrderNo"
+				   >
+				     <div class="progress-info">
+				       <span style="font-size: 20px;"><strong>总订单进度---订单编号：</strong>{{ item.subOrderNo }}</span>
+				     </div>
+				 
+				     <el-progress
+				       :percentage="Math.min(item.percentage, 100)"
+				       :stroke-width="24" 
+				       :text-inside="true"
+				       style="flex: 1; width: 70%;"
+				       :format="() => item.percentage + '%'"
+				       :status="item.percentage >= 100 ? 'success' : 'success'"
+				     />
+				   </div>
+				 </div>
+			
+				
+				<br>
+				
+			  <div class="progress-wrapper">
 				 <div
 				   class="progress-row"
 				   v-for="item in progressList"
@@ -47,15 +71,16 @@
 					 <span style='font-size: 20px;'><strong>子订单编号：</strong>{{ item.subOrderNo }}</span>
 				   </div>
 				   <el-progress
-					 :percentage="item.percentage"
-					 :status="item.percentage >= 100 ? 'success' : 'success'"
-					 :stroke-width="17"
-					 :text-inside="true"
-					 style="flex: 1;width: 79%;"
+				     :percentage="Math.min(item.percentage, 100)"
+				     :stroke-width="24"
+				     :text-inside="true"
+				     style="flex: 1; width: 70%;"
+				     :format="() => item.percentage + '%'"
+				     :status="item.percentage >= 100 ? 'success' : 'success'"
 				   />
 				 </div>
-			   </div>
-			  <br>
+			    </div>
+			<br>
 			  
 			<div style="display: flex; align-items: center;">
 				<el-tag type="info" style="width: 40px; height: 40px; margin-right: 10px;"><h2>包数</h2></el-tag>
@@ -102,6 +127,7 @@ const orderform = ref({
   });
   
 const progressList = ref([])
+const order_progressList = ref([])
 const open = async (ddzbh,gongxu) => {
 	console.log("orderid",ddzbh)
 	console.log("gx",gongxu)
@@ -126,9 +152,16 @@ const open = async (ddzbh,gongxu) => {
 	orderdata.splice(0,order.data.data.length,...order.data.data);//表格数据
 	arr.splice(0,order.data.arr.length,...order.data.arr);//表格尺码投数据
 	
-	const SubOrderProgress_list = await SubOrderProgress({order:order.data.workOrderData['订单编号']});
-	console.log(SubOrderProgress_list)
-	progressList.value = SubOrderProgress_list.data.result.map(item => ({
+	const SubOrder_list = await SubOrderProgress({order:order.data.workOrderData['订单编号']});
+	//订单编号
+	order_progressList.value = SubOrder_list.data.list.map(item => ({
+	  subOrderNo: item['订单编号'],
+	  入仓数量: item['订单总入仓数量'],
+	  裁剪数量: item['订单总裁剪数量'],
+	  percentage: parseFloat(item['订单完成率'].replace('%', ''))
+	}))
+	//子订单编号
+	progressList.value = SubOrder_list.data.result.map(item => ({
 	  subOrderNo: item['子订单编号'],
 	  入仓数量: item['入仓数量'],
 	  裁剪数量: item['裁剪数量'],
@@ -258,4 +291,15 @@ defineExpose({open})
   background: white !important;
 }
 
+
+/* 全局修改 el-progress 的背景颜色 */
+:deep(.el-progress-bar .el-progress-bar__outer) {
+  background-color: Orange; /* 自定义背景色 */
+}
+/* ▶ 改变进度条中文字的颜色和字体大小 */
+:deep(.el-progress-bar__innerText) {
+  color: black !important;
+  font-size: 20px !important;
+  font-weight: bold;
+}
 </style>