first commit

src/view/performance/baozhuangbaogong.vue

@@ -868,10 +868,12 @@ const add_Dialog = async () => {
 				serialNumber = parseInt(_sao_baoshu.value, 10);
 			}
 			console.log(serialNumber)
+			
+			const arr = add_searchInfo.value.split(',')
 		for (let i = 0; i < resultArrays.length; i++) {
 			if (slArray[i]) {
 				let params = {};
-				params.order_id = add_searchInfo.value;
+				params.order_id = arr[0];
 				params.sczl_jtbh = add_formData['机台号'];
 				params.gxmc = add_formData['工序'];
 				params.sys_id = add_formData['人员'];

src/view/performance/zongjianbaogong.vue

@@ -916,10 +916,12 @@ const add_Dialog = async () => {
 				serialNumber = parseInt(_sao_baoshu.value, 10);
 			}
 			console.log(serialNumber)
+			
+			const arr = add_searchInfo.value.split(',')
 		for (let i = 0; i < resultArrays.length; i++) {
 			if (slArray[i]) {
 				let params = {};
-				params.order_id = add_searchInfo.value;
+				params.order_id = arr[0];
 				params.sczl_jtbh = add_formData['机台号'];
 				params.gxmc = add_formData['工序'];
 				params.sys_id = add_formData['人员'];

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -58,12 +58,24 @@
 				  <el-table-column align="left"  label="款号"   	prop="生产款号"  width="110" />
 				  <el-table-column align="left"  label="款式"       	prop="款式"   	width="100"/> 
 				  <el-table-column align="left"  label="数量"    	prop="订单数量" 	width="60" />
-				  <el-table-column align="center" label="状态" prop="gd_statu" width="70" >
-					  <template #default="{ row }">
-						  <el-tag :type="row.gd_statu === '1-计划中' ? 'warning' : (row.gd_statu === '2-生产中' ? 'success' : 'info')">
-							  {{ row.gd_statu === '1-计划中' ? '计划中' : (row.gd_statu === '2-生产中' ? '生产中' : '已完工') }}
-						  </el-tag>
-					  </template>
+				  <el-table-column align="center" label="状态" prop="gd_statu" width="115" >
+				      <template #default="{ row }">
+				        <el-tag :type="row.gd_statu === '1-计划中' ? 'warning' : 
+				                       (row.gd_statu === '已裁剪' ? 'primary' : 
+				                       (row.gd_statu === '已车缝' ? '' : 
+				                       (row.gd_statu === '2-生产中' ? 'success' :
+				                       (row.gd_statu.includes('总检已') ? 
+				                         (parseInt(row.gd_statu.match(/\d+/)?.[0]) >= 95 ? 'success' : 'info') : 
+				                       (row.gd_statu === '已完工' ? 'success' : 'info')))))">
+				              {{ row.gd_statu === '1-计划中' ? '计划中' : 
+				                 (row.gd_statu === '已裁剪' ? '已裁剪' : 
+				                 (row.gd_statu === '已车缝' ? '已车缝' : 
+				                 (row.gd_statu === '2-生产中' ? '生产中' :
+				                 (row.gd_statu.includes('总检已') ? 
+				                   (parseInt(row.gd_statu.match(/\d+/)?.[0]) >= 95 ? '已完工' : row.gd_statu.replace('总检已', '总检')) : 
+				                 row.gd_statu)))) }}
+				        </el-tag>
+				      </template>
 				  </el-table-column>
 				  <el-table-column align="left"  label="落货日期"   	prop="落货日期" 	width="100" />
 				  <el-table-column align="left"  label="船样"    	prop="船样合计" 	width="60" />

src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -45,12 +45,24 @@
 						<el-table-column   align="left" label="订单编号" prop="订单编号"  width="115" />
 						<el-table-column   align="left" label="款号" prop="生产款号"  width="150" />
 						<el-table-column   align="left" label="款式" prop="款式"  width="110" />
-						<el-table-column align="left" label="订单状态" prop="gd_statu" width="100" >
-							<template #default="{ row }">
-							<el-tag :type="row.gd_statu === '1-计划中' ? 'warning' : (row.gd_statu === '2-生产中' ? 'success' : 'info')">
-							{{ row.gd_statu === '1-计划中' ? '计划中' : (row.gd_statu === '2-生产中' ? '生产中' : '已完工') }}
-							</el-tag>
-							</template>
+						<el-table-column align="center" label="状态" prop="gd_statu" width="115" >
+						    <template #default="{ row }">
+						      <el-tag :type="row.gd_statu === '1-计划中' ? 'warning' : 
+						                     (row.gd_statu === '已裁剪' ? 'primary' : 
+						                     (row.gd_statu === '已车缝' ? '' : 
+						                     (row.gd_statu === '2-生产中' ? 'success' :
+						                     (row.gd_statu.includes('总检已') ? 
+						                       (parseInt(row.gd_statu.match(/\d+/)?.[0]) >= 95 ? 'success' : 'info') : 
+						                     (row.gd_statu === '已完工' ? 'success' : 'info')))))">
+						            {{ row.gd_statu === '1-计划中' ? '计划中' : 
+						               (row.gd_statu === '已裁剪' ? '已裁剪' : 
+						               (row.gd_statu === '已车缝' ? '已车缝' : 
+						               (row.gd_statu === '2-生产中' ? '生产中' :
+						               (row.gd_statu.includes('总检已') ? 
+						                 (parseInt(row.gd_statu.match(/\d+/)?.[0]) >= 95 ? '已完工' : row.gd_statu.replace('总检已', '总检')) : 
+						               row.gd_statu)))) }}
+						      </el-tag>
+						    </template>
 						</el-table-column>
 						<el-table-column   align="left" label="订单数量" prop="订单数量"  width="90" />
 						<el-table-column   align="left" label="包装完工数量" prop="工单完工数量"  width="110" />