Merge branch 'master' of https://git.7in6.com/dacheng/mes-dacheng-admin-backend-ui

src/view/performance/Suborderdetailspage.vue

@@ -52,6 +52,7 @@
 		   <el-text style="font-size: 24px;">款式:&nbsp;</el-text>
 		   <el-input v-model="orderform['款式']" disabled  style="width: 10%; height: 40px;" />
 		</div>
+		
 		<br>
 		  <el-table  ref="multipleTable" 
 			style="width: 100%; height: 37vh; font-size: 16px;margin-left: 10px;" 
@@ -69,6 +70,28 @@
 			  <el-table-column align="left" label="完成百分比" prop="scale"  width="100"/>
 			</el-table>
 			
+			<br>
+			<h3>成品入仓完成率</h3>
+			 <div class="progress-wrapper">
+				 <div
+				   class="progress-row"
+				   v-for="item in progressList"
+				   :key="item.subOrderNo"
+				 >
+				   <div class="progress-info">
+					 <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%;"
+				   />
+				 </div>
+			   </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>
 				<h2 style="margin: 0 20px 0 0;">白格子图标表示“已有包”</h2>
@@ -94,7 +117,7 @@
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import { ElMessage, ElMessageBox, LAST_KEYS } from 'element-plus';
 import {ref, reactive} from 'vue';
-import {SubWorkOrderStatusList,Mabaolist,Apiorder,Apiorderids} from '@/api/mes/job';
+import {SubWorkOrderStatusList,Mabaolist,Apiorder,Apiorderids,SubOrderProgress} from '@/api/mes/job';
 import { useUserStore } from '@/pinia/modules/user';
 defineOptions({name: 'Company'})
 
@@ -146,12 +169,23 @@ const searchOrder = async (query) => {
 
 // 选择订单编号时获取子订单编号
 const handleOrderSelect = async (orderNo) => {
+	console.log('orderNo',orderNo)
   if (!orderNo) {
     subOrderOptions.value = [];
     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 => ({
+    subOrderNo: item['子订单编号'],
+    入仓数量: item['入仓数量'],
+    裁剪数量: item['裁剪数量'],
+    percentage: parseFloat(item['完成率'].replace('%', ''))
+  }))
+  
+ 
   try {
     // 调用子订单接口
     const res = await Apiorderids({ order:orderNo.split('---')[0]}); // 假设接口需要传订单编号
@@ -163,17 +197,18 @@ const handleOrderSelect = async (orderNo) => {
       if (subOrderOptions.value.length === 1) {
         orderform.value.子订单编号 = subOrderOptions.value[0].value;
         const ress = await SubWorkOrderStatusList({ order:orderform.value.子订单编号}); 
-        if (ress.code === 0) {
-        orderform.value.客户编号 = ress.data.workOrderData['客户编号'];
-        orderform.value.款号 = ress.data.workOrderData['款号'];
-        orderform.value.款式 = ress.data.workOrderData['款式']; 
-        // 检查表单完整性（确保在数据更新后检查）
-        if (isFormValid()) {
-            await open(orderNo); // 执行后续操作
-        } else {
-        ElMessage.warning('请填写完整所有字段');
-        }
-    }
+				
+		if (ress.code === 0) {
+			orderform.value.客户编号 = ress.data.workOrderData['客户编号'];
+			orderform.value.款号 = ress.data.workOrderData['款号'];
+			orderform.value.款式 = ress.data.workOrderData['款式']; 
+			// 检查表单完整性（确保在数据更新后检查）
+			if (isFormValid()) {
+				await open(orderNo); // 执行后续操作
+			} else {
+			ElMessage.warning('请填写完整所有字段');
+			}
+		}
     }
 
     }
@@ -183,6 +218,7 @@ const handleOrderSelect = async (orderNo) => {
   }
 };
 
+const progressList = ref([])
 // 选择子订单编号时获取订单信息
 const handleOrderSelect2 = async (orderNo) => {
   if (!orderNo) {
@@ -195,6 +231,16 @@ const handleOrderSelect2 = async (orderNo) => {
     if (res.code === 0) {
       // 更新表单数据
       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('%', ''))
+	  	}))
       
       // 检查表单完整性（确保在数据更新后检查）
       if (isFormValid()) {

src/view/performance/zongjianbaogong.vue

@@ -889,7 +889,7 @@ const add_Dialog = async () => {
 			add_printxp();
 
 			search.value = '';
-			// add_searchInfo.value = ''; 
+			add_searchInfo.value = ''; 
 			successres('报工成功')
 			// 上报成功后 清空所有输入框上报数量
 			  if (slformdata) {

src/view/yunyin/shengchanguanli/chengpinrucang.vue

@@ -29,7 +29,7 @@
   
           <!-- 右侧区域 -->
           <layout-content >
-          <el-main>
+          <!-- <el-main> -->
             <div class="gva-table-box">
               <!-- 表格数据 -->
               <el-table ref="multipleTable" style="width: 100%;height: 33vh" tooltip-effect="dark"
@@ -45,10 +45,10 @@
                <el-table-column  sortable align="center" label="生产款号" prop="生产款号"  width="170" />
                <el-table-column  sortable align="center" label="款式" prop="款式"  width="120" />
                <!-- <el-table-column   align="center" label="实裁数量" prop="实裁数量"  width="110" /> -->
-               <el-table-column   align="center" label="本月入仓数量" prop="入仓数量"  width="110" />
-               <el-table-column   align="center" label="累计入仓数量" prop="累计入仓数量"  width="130" />
+               <el-table-column   align="center" label="本月总检完工数量" prop="入仓数量"  width="150" />
+               <el-table-column   align="center" label="累计总检完工数量" prop="累计入仓数量"  width="150" />
                <el-table-column   align="center" label="裁剪总产量" prop="裁剪总产量"  width="120" />
-               <el-table-column   align="center" label="实际合格率" prop="裁剪合格率"  width="120" />
+               <el-table-column  sortable align="center" label="实际合格率" prop="裁剪合格率"  width="120" />
                <!-- <el-table-column   align="center" label="车缝总产量" prop="车缝总产量"  width="200" />
                <el-table-column   align="center" label="车缝合格率" prop="车缝合格率"  width="200" /> -->
                <el-table-column   align="center" label="返工总数" prop="返工总数"  width="120" />
@@ -79,9 +79,9 @@
                <el-table-column  sortable align="center" label="订单编号" prop="订单编号"  width="120" />
                <el-table-column  sortable align="center" label="子订单编号" prop="子订单编号"  width="160" />
                <el-table-column  sortable align="center" label="PO号" prop="生产款号"  width="200" />
-               <el-table-column  sortable align="center" label="本月入仓数量" prop="入仓数量"  width="130" />
-               <el-table-column   align="center" label="累计入仓数量" prop="累计入仓数量"  width="130" />
-               <el-table-column  sortable align="center" label="裁剪数量" prop="裁剪数量"  width="100" />
+               <el-table-column   align="center" label="本月总检完工数量" prop="入仓数量"  width="150" />
+               <el-table-column   align="center" label="累计总检完工数量" prop="累计入仓数量"  width="150" />
+               <el-table-column   align="center" label="裁剪数量" prop="裁剪数量"  width="100" />
                <el-table-column  sortable align="center" label="实际合格率" prop="实际合格率"  width="120" />
                <!-- <el-table-column  sortable align="center" label="车缝数量" prop="车缝数量"  width="100" />
                <el-table-column  sortable align="center" label="车缝合格率" prop="车缝合格率"  width="120" /> -->
@@ -94,7 +94,7 @@
               </div>
             </div>
   
-          </el-main>
+          <!-- </el-main> -->
         </layout-content>
         </layout>
       </layout>

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

@@ -36,6 +36,7 @@
 			  <el-table-column align="left" label="完成百分比" prop="scale"  width="100"/>
 			</el-table>
 			<br>
+			<h3>成品入仓完成率</h3>
 			 <div class="progress-wrapper">
 				 <div
 				   class="progress-row"
@@ -44,10 +45,6 @@
 				 >
 				   <div class="progress-info">
 					 <span style='font-size: 20px;'><strong>子订单编号：</strong>{{ item.subOrderNo }}</span>
-					 <!-- &nbsp;&nbsp;&nbsp;
-					 <span style='font-size: 20px;'><strong>成品入仓数量：</strong>{{ item['入仓数量'] }}</span>
-					 &nbsp;&nbsp;&nbsp;
-					 <span style='font-size: 20px;'><strong>裁剪数量：</strong>{{ item['裁剪数量'] }}</span> -->
 				   </div>
 				   <el-progress
 					 :percentage="item.percentage"
@@ -124,11 +121,11 @@ const open = async (ddzbh,gongxu) => {
 	const SubOrderProgress_list = await SubOrderProgress({order:order.data.workOrderData['订单编号']});
 	console.log(SubOrderProgress_list)
 	progressList.value = SubOrderProgress_list.data.result.map(item => ({
-	      subOrderNo: item['子订单编号'],
-		  入仓数量: item['入仓数量'],
-		  裁剪数量: item['裁剪数量'],
-	      percentage: parseFloat(item['完成率'].replace('%', ''))
-	    }))
+	  subOrderNo: item['子订单编号'],
+	  入仓数量: item['入仓数量'],
+	  裁剪数量: item['裁剪数量'],
+	  percentage: parseFloat(item['完成率'].replace('%', ''))
+	}))
 }
 
 	const satusCellClass = ({row, column, rowIndex, columnIndex}) =>{